d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

crypto/octeontx: fix global log variable definition

Browse Source 
'cpt_logtype' & 'otx_cryptodev_driver_id' global variables are defined
in a header file which was causing multiple definitions of the
variables. Fixed it by moving the required vars to the .c file and
introducing a new macro so the CPT_LOG macros in common/cpt would use
the associated PMD log var.

Issue has been detected by '-fno-common' gcc flag.

Fixes: bfe2ae495e ("crypto/octeontx: add PMD skeleton")
Cc: stable@dpdk.org

Signed-off-by: Anoob Joseph <anoobj@marvell.com>
Reported-by: Ferruh Yigit <ferruh.yigit@intel.com>
This commit is contained in:
Anoob Joseph 2019-10-04 15:14:35 +05:30 committed by Akhil Goyal
parent 933f42eac9
commit 98c7b9c97e
5 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/common/cpt/cpt_pmd_logs.h
View File

@ -11,8 +11,12 @@
* This file defines log macros
*/
/*
* otx*_cryptodev.h file would define the CPT_LOGTYPE macro for the
* platform.
*/
#define CPT_PMD_DRV_LOG_RAW(level, fmt, args...) \
rte_log(RTE_LOG_ ## level, cpt_logtype, \
rte_log(RTE_LOG_ ## level, CPT_LOGTYPE, \
"cpt: %s(): " fmt "\n", __func__, ##args)
#define CPT_PMD_INIT_FUNC_TRACE() CPT_PMD_DRV_LOG_RAW(DEBUG, " >>")
@ -41,10 +45,4 @@
#define CPT_LOG_DP_ERR(fmt, args...) \
CPT_LOG_DP(ERR, fmt, ## args)
/*
* cpt_logtype will be used for common logging. This field would be initialized
* by otx_* driver routines during PCI probe.
*/
int cpt_logtype;
#endif /* _CPT_PMD_LOGS_H_ */

23
drivers/crypto/octeontx/otx_cryptodev.c
View File

@ -9,13 +9,13 @@
#include <rte_log.h>
#include <rte_pci.h>
/* CPT common headers */
#include "cpt_pmd_logs.h"
#include "otx_cryptodev.h"
#include "otx_cryptodev_ops.h"
static int otx_cryptodev_logtype;
#include "cpt_pmd_logs.h"
uint8_t otx_cryptodev_driver_id;
int otx_cpt_logtype;
static struct rte_pci_id pci_id_cpt_table[] = {
{
@ -27,12 +27,6 @@ static struct rte_pci_id pci_id_cpt_table[] = {
},
};
static void
otx_cpt_logtype_init(void)
{
cpt_logtype = otx_cryptodev_logtype;
}
static int
otx_cpt_pci_probe(struct rte_pci_driver *pci_drv,
struct rte_pci_device *pci_dev)
@ -57,9 +51,6 @@ otx_cpt_pci_probe(struct rte_pci_driver *pci_drv,
/* init user callbacks */
TAILQ_INIT(&(cryptodev->link_intr_cbs));
/* init logtype used in common */
otx_cpt_logtype_init();
/* Invoke PMD device initialization function */
retval = otx_cpt_dev_create(cryptodev);
if (retval == 0)
@ -125,7 +116,7 @@ RTE_PMD_REGISTER_CRYPTO_DRIVER(otx_cryptodev_drv, otx_cryptodev_pmd.driver,
RTE_INIT(otx_cpt_init_log)
{
/* Bus level logs */
otx_cryptodev_logtype = rte_log_register("pmd.crypto.octeontx");
if (otx_cryptodev_logtype >= 0)
rte_log_set_level(otx_cryptodev_logtype, RTE_LOG_NOTICE);
otx_cpt_logtype = rte_log_register("pmd.crypto.octeontx");
if (otx_cpt_logtype >= 0)
rte_log_set_level(otx_cpt_logtype, RTE_LOG_NOTICE);
}

6
drivers/crypto/octeontx/otx_cryptodev.h
View File

@ -12,9 +12,13 @@
#define PCI_VENDOR_ID_CAVIUM 0x177d
#define CPT_81XX_PCI_VF_DEVICE_ID 0xa041
#define CPT_LOGTYPE otx_cpt_logtype
extern int otx_cpt_logtype;
/*
* Crypto device driver ID
*/
uint8_t otx_cryptodev_driver_id;
extern uint8_t otx_cryptodev_driver_id;
#endif /* _OTX_CRYPTODEV_H_ */

2
drivers/crypto/octeontx/otx_cryptodev_hw_access.h
View File

@ -13,6 +13,8 @@
#include <rte_memory.h>
#include <rte_prefetch.h>
#include "otx_cryptodev.h"
#include "cpt_common.h"
#include "cpt_hw_types.h"
#include "cpt_mcode_defines.h"

6
drivers/crypto/octeontx/otx_cryptodev_ops.c
View File

@ -10,14 +10,14 @@
#include <rte_malloc.h>
#include <rte_mempool.h>
#include "cpt_pmd_logs.h"
#include "cpt_ucode.h"
#include "otx_cryptodev.h"
#include "otx_cryptodev_capabilities.h"
#include "otx_cryptodev_hw_access.h"
#include "otx_cryptodev_ops.h"
#include "cpt_pmd_logs.h"
#include "cpt_ucode.h"
/* Forward declarations */
static int