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

pci: rename device and driver lists

Browse Source 
To avoid confusion with virtual devices, rename device_list as
pci_device_list and driver_list as pci_driver_list.

Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
Acked-by: Thomas Monjalon <thomas.monjalon@6wind.com>
This commit is contained in:
Olivier Matz 2014-02-28 18:25:44 +01:00 committed by Thomas Monjalon
parent 20afd76a50
commit 5b1f4a67dd
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/test/test_pci.c
View File

@ -131,7 +131,7 @@ blacklist_all_devices(void)
memset(blacklist, 0, sizeof (blacklist)); memset(blacklist, 0, sizeof (blacklist));
TAILQ_FOREACH(dev, &device_list, next) { TAILQ_FOREACH(dev, &pci_device_list, next) {
if (idx >= sizeof (blacklist) / sizeof (blacklist[0])) { if (idx >= sizeof (blacklist) / sizeof (blacklist[0])) {
printf("Error: too many devices to blacklist"); printf("Error: too many devices to blacklist");
break; break;

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

@ -80,8 +80,8 @@
#include "eal_private.h" #include "eal_private.h"
struct pci_driver_list driver_list; struct pci_driver_list pci_driver_list;
struct pci_device_list device_list; struct pci_device_list pci_device_list;
static struct rte_pci_addr *dev_blacklist = NULL; static struct rte_pci_addr *dev_blacklist = NULL;
static unsigned dev_blacklist_size = 0; static unsigned dev_blacklist_size = 0;
@ -119,7 +119,7 @@ pci_probe_all_drivers(struct rte_pci_device *dev)
int rc; int rc;
dev->blacklisted = !!is_blacklisted(dev); dev->blacklisted = !!is_blacklisted(dev);
TAILQ_FOREACH(dr, &driver_list, next) { TAILQ_FOREACH(dr, &pci_driver_list, next) {
rc = rte_eal_pci_probe_one_driver(dr, dev); rc = rte_eal_pci_probe_one_driver(dr, dev);
if (rc < 0) if (rc < 0)
/* negative value is an error */ /* negative value is an error */
@ -165,7 +165,7 @@ rte_eal_pci_probe(void)
{ {
struct rte_pci_device *dev = NULL; struct rte_pci_device *dev = NULL;
TAILQ_FOREACH(dev, &device_list, next) TAILQ_FOREACH(dev, &pci_device_list, next)
if (!eal_dev_whitelist_exists()) if (!eal_dev_whitelist_exists())
pci_probe_all_drivers(dev); pci_probe_all_drivers(dev);
else if (pcidev_is_whitelisted(dev) && pci_probe_all_drivers(dev) < 0 ) else if (pcidev_is_whitelisted(dev) && pci_probe_all_drivers(dev) < 0 )
@ -202,7 +202,7 @@ rte_eal_pci_dump(void)
{ {
struct rte_pci_device *dev = NULL; struct rte_pci_device *dev = NULL;
TAILQ_FOREACH(dev, &device_list, next) { TAILQ_FOREACH(dev, &pci_device_list, next) {
pci_dump_one_device(dev); pci_dump_one_device(dev);
} }
} }
@ -211,14 +211,14 @@ rte_eal_pci_dump(void)
void void
rte_eal_pci_register(struct rte_pci_driver *driver) rte_eal_pci_register(struct rte_pci_driver *driver)
{ {
TAILQ_INSERT_TAIL(&driver_list, driver, next); TAILQ_INSERT_TAIL(&pci_driver_list, driver, next);
} }
/* unregister a driver */ /* unregister a driver */
void void
rte_eal_pci_unregister(struct rte_pci_driver *driver) rte_eal_pci_unregister(struct rte_pci_driver *driver)
{ {
TAILQ_REMOVE(&driver_list, driver, next); TAILQ_REMOVE(&pci_driver_list, driver, next);
} }
void void

4
lib/librte_eal/common/include/rte_pci.h
View File

@ -85,8 +85,8 @@ extern "C" {
TAILQ_HEAD(pci_device_list, rte_pci_device); /**< PCI devices in D-linked Q. */ TAILQ_HEAD(pci_device_list, rte_pci_device); /**< PCI devices in D-linked Q. */
TAILQ_HEAD(pci_driver_list, rte_pci_driver); /**< PCI drivers in D-linked Q. */ TAILQ_HEAD(pci_driver_list, rte_pci_driver); /**< PCI drivers in D-linked Q. */
extern struct pci_driver_list driver_list; /**< Global list of PCI drivers. */ extern struct pci_driver_list pci_driver_list; /**< Global list of PCI drivers. */
extern struct pci_device_list device_list; /**< Global list of PCI devices. */ extern struct pci_device_list pci_device_list; /**< Global list of PCI devices. */
/** Pathname of PCI devices directory. */ /** Pathname of PCI devices directory. */
#define SYSFS_PCI_DEVICES "/sys/bus/pci/devices" #define SYSFS_PCI_DEVICES "/sys/bus/pci/devices"

2
lib/librte_eal/linuxapp/eal/eal_ivshmem.c
View File

@ -854,7 +854,7 @@ int rte_eal_ivshmem_init(void)
} }
else { else {
TAILQ_FOREACH(dev, &device_list, next) { TAILQ_FOREACH(dev, &pci_device_list, next) {
if (is_ivshmem_device(dev)) { if (is_ivshmem_device(dev)) {

12
lib/librte_eal/linuxapp/eal/eal_pci.c
View File

@ -888,13 +888,13 @@ pci_scan_one(const char *dirname, uint16_t domain, uint8_t bus,
} }
/* device is valid, add in list (sorted) */ /* device is valid, add in list (sorted) */
if (TAILQ_EMPTY(&device_list)) { if (TAILQ_EMPTY(&pci_device_list)) {
TAILQ_INSERT_TAIL(&device_list, dev, next); TAILQ_INSERT_TAIL(&pci_device_list, dev, next);
} }
else { else {
struct rte_pci_device *dev2 = NULL; struct rte_pci_device *dev2 = NULL;
TAILQ_FOREACH(dev2, &device_list, next) { TAILQ_FOREACH(dev2, &pci_device_list, next) {
if (pci_addr_comparison(&dev->addr, &dev2->addr)) if (pci_addr_comparison(&dev->addr, &dev2->addr))
continue; continue;
else { else {
@ -902,7 +902,7 @@ pci_scan_one(const char *dirname, uint16_t domain, uint8_t bus,
return 0; return 0;
} }
} }
TAILQ_INSERT_TAIL(&device_list, dev, next); TAILQ_INSERT_TAIL(&pci_device_list, dev, next);
} }
return 0; return 0;
@ -1068,8 +1068,8 @@ rte_eal_pci_probe_one_driver(struct rte_pci_driver *dr, struct rte_pci_device *d
int int
rte_eal_pci_init(void) rte_eal_pci_init(void)
{ {
TAILQ_INIT(&driver_list); TAILQ_INIT(&pci_driver_list);
TAILQ_INIT(&device_list); TAILQ_INIT(&pci_device_list);
uio_res_list = RTE_TAILQ_RESERVE_BY_IDX(RTE_TAILQ_PCI, uio_res_list); uio_res_list = RTE_TAILQ_RESERVE_BY_IDX(RTE_TAILQ_PCI, uio_res_list);
/* for debug purposes, PCI can be disabled */ /* for debug purposes, PCI can be disabled */