env_dpdk: add dpdk_pci_device_copy_identifiers

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: I2821cbfc58829e2b7f71d2700e102e8fd6c6c322
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/14544
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@nvidia.com>
Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com>
This commit is contained in:
Jim Harris 2022-09-15 21:06:01 +00:00 committed by Tomasz Zawadzki
parent dabd899365
commit 0c6a7b9153

View File

@ -58,6 +58,7 @@ SPDK_STATIC_ASSERT(offsetof(struct spdk_pci_driver, driver) >= sizeof(struct rte
const char *dpdk_pci_device_get_name(struct rte_pci_device *); const char *dpdk_pci_device_get_name(struct rte_pci_device *);
struct rte_devargs *dpdk_pci_device_get_devargs(struct rte_pci_device *); struct rte_devargs *dpdk_pci_device_get_devargs(struct rte_pci_device *);
void dpdk_pci_device_copy_identifiers(struct rte_pci_device *_dev, struct spdk_pci_device *dev);
int pci_device_init(struct rte_pci_driver *driver, struct rte_pci_device *device); int pci_device_init(struct rte_pci_driver *driver, struct rte_pci_device *device);
int pci_device_fini(struct rte_pci_device *device); int pci_device_fini(struct rte_pci_device *device);
@ -451,16 +452,7 @@ pci_device_init(struct rte_pci_driver *_drv,
dev->dev_handle = _dev; dev->dev_handle = _dev;
dev->addr.domain = _dev->addr.domain; dpdk_pci_device_copy_identifiers(_dev, dev);
dev->addr.bus = _dev->addr.bus;
dev->addr.dev = _dev->addr.devid;
dev->addr.func = _dev->addr.function;
dev->id.class_id = _dev->id.class_id;
dev->id.vendor_id = _dev->id.vendor_id;
dev->id.device_id = _dev->id.device_id;
dev->id.subvendor_id = _dev->id.subsystem_vendor_id;
dev->id.subdevice_id = _dev->id.subsystem_device_id;
dev->socket_id = _dev->device.numa_node;
dev->type = "pci"; dev->type = "pci";
dev->map_bar = map_bar_rte; dev->map_bar = map_bar_rte;
@ -1287,3 +1279,18 @@ dpdk_pci_device_get_devargs(struct rte_pci_device *rte_dev)
{ {
return rte_dev->device.devargs; return rte_dev->device.devargs;
} }
void
dpdk_pci_device_copy_identifiers(struct rte_pci_device *_dev, struct spdk_pci_device *dev)
{
dev->addr.domain = _dev->addr.domain;
dev->addr.bus = _dev->addr.bus;
dev->addr.dev = _dev->addr.devid;
dev->addr.func = _dev->addr.function;
dev->id.class_id = _dev->id.class_id;
dev->id.vendor_id = _dev->id.vendor_id;
dev->id.device_id = _dev->id.device_id;
dev->id.subvendor_id = _dev->id.subsystem_vendor_id;
dev->id.subdevice_id = _dev->id.subsystem_device_id;
dev->socket_id = _dev->device.numa_node;
}