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

bus/pci: fix hotplug operations

Browse Source 
The device handle is already known and does not have to be infered from
the PCI address. The relevant helpers are already available within the
PCI bus to avoid searching for a handle already known.

Additionally, rte_memcpy.h was erroneously included.

Fixes: 00e62aae69c0 ("bus/pci: implement plug/unplug operations")

Signed-off-by: Gaetan Rivet <gaetan.rivet@6wind.com>
This commit is contained in:
Gaetan Rivet 2017-07-15 19:56:41 +02:00 committed by Thomas Monjalon
parent be860f4e4d
commit cbc30ea872
1 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/librte_eal/common/eal_common_pci.c
View File

@ -47,7 +47,6 @@
#include <rte_pci.h> #include <rte_pci.h>
#include <rte_per_lcore.h> #include <rte_per_lcore.h>
#include <rte_memory.h> #include <rte_memory.h>
#include <rte_memcpy.h>
#include <rte_memzone.h> #include <rte_memzone.h>
#include <rte_eal.h> #include <rte_eal.h>
#include <rte_string_fns.h> #include <rte_string_fns.h>
@ -544,32 +543,20 @@ pci_find_device(const struct rte_device *start, rte_dev_cmp_t cmp,
static int static int
pci_plug(struct rte_device *dev, const char *devargs __rte_unused) pci_plug(struct rte_device *dev, const char *devargs __rte_unused)
{ {
struct rte_pci_device *pdev; return pci_probe_all_drivers(RTE_DEV_TO_PCI(dev));
struct rte_pci_addr *addr;
addr = &RTE_DEV_TO_PCI(dev)->addr;
/* Find the current device holding this address in the bus. */
FOREACH_DEVICE_ON_PCIBUS(pdev) {
if (rte_eal_compare_pci_addr(&pdev->addr, addr) == 0)
return rte_pci_probe_one(addr);
}
rte_errno = ENODEV;
return -1;
} }
static int static int
pci_unplug(struct rte_device *dev) pci_unplug(struct rte_device *dev)
{ {
struct rte_pci_device *pdev; struct rte_pci_device *pdev;
int ret;
pdev = RTE_DEV_TO_PCI(dev); pdev = RTE_DEV_TO_PCI(dev);
if (rte_pci_detach(&pdev->addr) != 0) { ret = rte_pci_detach_dev(pdev);
rte_errno = ENODEV; rte_pci_remove_device(pdev);
return -1; free(pdev);
} return ret;
return 0;
} }
struct rte_pci_bus rte_pci_bus = { struct rte_pci_bus rte_pci_bus = {