raw/ioat: fix build when ioat dmadev enabled

The build of the raw/ioat driver only occurs when the equivalent dmadev
drivers are disabled. Complications occur when the ioat dmadev is being
built but not the idxd. In this case, only the idxd part of raw/ioat
gets built, but the definition of the logtype is in the ioat part,
causing build errors.

  .../raw_ioat_idxd_bus.c.o: In function `idxd_vdev_mmap_wq':
  idxd_bus.c:(.text+0x116): undefined reference to `ioat_pmd_logtype'

Fix this by moving the logtype definition to the common C file, and
renaming it to avoid conflicts with a similarly named value in the
dma/ioat driver.

Fixes: ff06fa2cf3 ("raw/ioat: probe idxd PCI")
Cc: stable@dpdk.org

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
This commit is contained in:
Bruce Richardson 2022-06-23 14:49:32 +01:00 committed by Thomas Monjalon
parent dd51b7bd66
commit 7580f35ea7
3 changed files with 4 additions and 4 deletions

View File

@ -9,6 +9,8 @@
#include "ioat_private.h"
RTE_LOG_REGISTER_DEFAULT(ioat_rawdev_logtype, INFO);
static const char * const xstat_names[] = {
"failed_enqueues", "successful_enqueues",
"copies_started", "copies_completed"

View File

@ -18,10 +18,10 @@
#include <rte_rawdev_pmd.h>
#include "rte_ioat_rawdev.h"
extern int ioat_pmd_logtype;
extern int ioat_rawdev_logtype;
#define IOAT_PMD_LOG(level, fmt, args...) rte_log(RTE_LOG_ ## level, \
ioat_pmd_logtype, "IOAT: %s(): " fmt "\n", __func__, ##args)
ioat_rawdev_logtype, "IOAT: %s(): " fmt "\n", __func__, ##args)
#define IOAT_PMD_DEBUG(fmt, args...) IOAT_PMD_LOG(DEBUG, fmt, ## args)
#define IOAT_PMD_INFO(fmt, args...) IOAT_PMD_LOG(INFO, fmt, ## args)

View File

@ -28,8 +28,6 @@ static struct rte_pci_driver ioat_pmd_drv;
#define IOAT_DEVICE_ID_BDXF 0x6f2F
#define IOAT_DEVICE_ID_ICX 0x0b00
RTE_LOG_REGISTER_DEFAULT(ioat_pmd_logtype, INFO);
#define DESC_SZ sizeof(struct rte_ioat_generic_hw_desc)
#define COMPLETION_SZ sizeof(__m128i)