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

pci/dpdk: use rte_eal_dev_attach/detach for DPDK 17.11-rc3

Browse Source 
DPDK 17.11-rc3 removes pci_probe*
and pci_detach functions. It introduces
different ones - rte_eal_dev_attach/detach.
Those have a slightly different signature.

Change-Id: Iadde9ff37c64190dad41929997f9ff78379f36e1
Signed-off-by: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/387656
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Dariusz Stojaczyk 2017-11-15 23:09:35 +01:00 committed by Ben Walker
parent 779dd1bc10
commit fbccbb28c7
1 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
lib/env_dpdk/pci.c
View File

@ -78,23 +78,29 @@ spdk_pci_device_fini(struct rte_pci_device *device)
void
spdk_pci_device_detach(struct spdk_pci_device *device)
{
struct rte_pci_addr addr;
addr.domain = device->addr.domain;
addr.bus = device->addr.bus;
addr.devid = device->addr.devid;
addr.function = device->addr.function;
#if RTE_VERSION >= RTE_VERSION_NUM(16, 11, 0, 0)
#if RTE_VERSION < RTE_VERSION_NUM(17, 05, 0, 0)
rte_eal_device_remove(&device->device);
#endif
#endif
#if RTE_VERSION >= RTE_VERSION_NUM(17, 05, 0, 4)
rte_pci_detach(&addr);
#if RTE_VERSION >= RTE_VERSION_NUM(17, 11, 0, 3)
struct spdk_pci_addr addr;
char bdf[32];
addr.domain = device->addr.domain;
addr.bus = device->addr.bus;
addr.dev = device->addr.devid;
addr.func = device->addr.function;
spdk_pci_addr_fmt(bdf, sizeof(bdf), &addr);
if (rte_eal_dev_detach(&device->device) < 0) {
fprintf(stderr, "Failed to detach PCI device %s (device already removed?).\n", bdf);
}
#elif RTE_VERSION >= RTE_VERSION_NUM(17, 05, 0, 4)
rte_pci_detach(&device->addr);
#else
rte_eal_pci_detach(&addr);
rte_eal_pci_detach(&device->addr);
#endif
}
@ -103,12 +109,18 @@ spdk_pci_device_attach(struct spdk_pci_enum_ctx *ctx,
spdk_pci_enum_cb enum_cb,
void *enum_ctx, struct spdk_pci_addr *pci_address)
{
#if RTE_VERSION >= RTE_VERSION_NUM(17, 11, 0, 3)
char bdf[32];
spdk_pci_addr_fmt(bdf, sizeof(bdf), pci_address);
#else
struct rte_pci_addr addr;
addr.domain = pci_address->domain;
addr.bus = pci_address->bus;
addr.devid = pci_address->dev;
addr.function = pci_address->func;
#endif
pthread_mutex_lock(&ctx->mtx);
@ -124,7 +136,9 @@ spdk_pci_device_attach(struct spdk_pci_enum_ctx *ctx,
ctx->cb_fn = enum_cb;
ctx->cb_arg = enum_ctx;
#if RTE_VERSION >= RTE_VERSION_NUM(17, 05, 0, 4)
#if RTE_VERSION >= RTE_VERSION_NUM(17, 11, 0, 3)
if (rte_eal_dev_attach(bdf, "") != 0) {
#elif RTE_VERSION >= RTE_VERSION_NUM(17, 05, 0, 4)
if (rte_pci_probe_one(&addr) != 0) {
#else
if (rte_eal_pci_probe_one(&addr) != 0) {
@ -165,8 +179,9 @@ spdk_pci_enumerate(struct spdk_pci_enum_ctx *ctx,
ctx->cb_fn = enum_cb;
ctx->cb_arg = enum_ctx;
#if RTE_VERSION >= RTE_VERSION_NUM(17, 05, 0, 4)
#if RTE_VERSION >= RTE_VERSION_NUM(17, 11, 0, 3)
if (rte_bus_probe() != 0) {
#elif RTE_VERSION >= RTE_VERSION_NUM(17, 05, 0, 4)
if (rte_pci_probe() != 0) {
#else
if (rte_eal_pci_probe() != 0) {