X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Flibrte_eal%2Fcommon%2Feal_common_pci.c;h=4d877ea026791cb40f091a56ac48d83c7154a5cb;hb=3031749c2df04a63cdcef186dcce3781e61436e8;hp=e882458c1cae5365d9f731fad6551bd51b7efb45;hpb=cd5b32ee33ca37828fbcba51c988e13e82645583;p=dpdk.git diff --git a/lib/librte_eal/common/eal_common_pci.c b/lib/librte_eal/common/eal_common_pci.c index e882458c1c..4d877ea026 100644 --- a/lib/librte_eal/common/eal_common_pci.c +++ b/lib/librte_eal/common/eal_common_pci.c @@ -1,13 +1,13 @@ /*- * BSD LICENSE - * - * Copyright(c) 2010-2013 Intel Corporation. All rights reserved. + * + * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * Redistributions in binary form must reproduce the above copyright @@ -17,7 +17,7 @@ * * Neither the name of Intel Corporation nor the names of its * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR @@ -32,7 +32,7 @@ */ /* BSD LICENSE * - * Copyright(c) 2013 6WIND. + * Copyright 2013-2014 6WIND S.A. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -61,6 +61,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include #include #include #include @@ -77,30 +78,25 @@ #include #include #include +#include #include "eal_private.h" -struct pci_driver_list driver_list; -struct pci_device_list device_list; - -static struct rte_pci_addr *dev_blacklist = NULL; -static unsigned dev_blacklist_size = 0; +struct pci_driver_list pci_driver_list; +struct pci_device_list pci_device_list; -static int is_blacklisted(struct rte_pci_device *dev) +static struct rte_devargs *pci_devargs_lookup(struct rte_pci_device *dev) { - struct rte_pci_addr *loc = &dev->addr; - unsigned i; - - for (i = 0; i < dev_blacklist_size; i++) { - if ((loc->domain == dev_blacklist[i].domain) && - (loc->bus == dev_blacklist[i].bus) && - (loc->devid == dev_blacklist[i].devid) && - (loc->function == dev_blacklist[i].function)) { - return 1; - } - } + struct rte_devargs *devargs; - return 0; /* not in blacklist */ + TAILQ_FOREACH(devargs, &devargs_list, next) { + if (devargs->type != RTE_DEVTYPE_BLACKLISTED_PCI && + devargs->type != RTE_DEVTYPE_WHITELISTED_PCI) + continue; + if (!memcmp(&dev->addr, &devargs->pci.addr, sizeof(dev->addr))) + return devargs; + } + return NULL; } /* @@ -118,8 +114,7 @@ pci_probe_all_drivers(struct rte_pci_device *dev) struct rte_pci_driver *dr = NULL; int rc; - 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); if (rc < 0) /* negative value is an error */ @@ -129,7 +124,8 @@ pci_probe_all_drivers(struct rte_pci_device *dev) continue; /* initialize subsequent driver instances for this device */ if ((dr->drv_flags & RTE_PCI_DRV_MULTIPLE) && - (!dev->blacklisted)) + (dev->devargs == NULL || + dev->devargs->type != RTE_DEVTYPE_BLACKLISTED_PCI)) while (rte_eal_pci_probe_one_driver(dr, dev) == 0) ; return 0; @@ -137,24 +133,6 @@ pci_probe_all_drivers(struct rte_pci_device *dev) return -1; } -/* - * Check if a device is ok to use according to whitelist rules. - */ -static int -pcidev_is_whitelisted(struct rte_pci_device *dev) -{ - char buf[16]; - if (dev->addr.domain == 0) { - rte_snprintf(buf, sizeof(buf), PCI_SHORT_PRI_FMT, dev->addr.bus, - dev->addr.devid, dev->addr.function); - if (eal_dev_is_whitelisted(buf, NULL)) - return 1; - } - rte_snprintf(buf, sizeof(buf), PCI_PRI_FMT, dev->addr.domain,dev->addr.bus, - dev->addr.devid, dev->addr.function); - return eal_dev_is_whitelisted(buf, NULL); -} - /* * Scan the content of the PCI bus, and call the devinit() function for * all registered drivers that have a matching entry in its id_table @@ -164,33 +142,48 @@ int rte_eal_pci_probe(void) { struct rte_pci_device *dev = NULL; + struct rte_devargs *devargs; + int probe_all = 0; + + if (rte_eal_devargs_type_count(RTE_DEVTYPE_WHITELISTED_PCI) == 0) + probe_all = 1; + + TAILQ_FOREACH(dev, &pci_device_list, next) { + + /* set devargs in PCI structure */ + devargs = pci_devargs_lookup(dev); + if (devargs != NULL) + dev->devargs = devargs; - TAILQ_FOREACH(dev, &device_list, next) - if (!eal_dev_whitelist_exists()) + /* probe all or only whitelisted devices */ + if (probe_all) pci_probe_all_drivers(dev); - else if (pcidev_is_whitelisted(dev) && pci_probe_all_drivers(dev) < 0 ) - rte_exit(EXIT_FAILURE, "Requested device " PCI_PRI_FMT - " cannot be used\n", dev->addr.domain,dev->addr.bus, - dev->addr.devid, dev->addr.function); + else if (devargs != NULL && + devargs->type == RTE_DEVTYPE_WHITELISTED_PCI && + pci_probe_all_drivers(dev) < 0) + rte_exit(EXIT_FAILURE, "Requested device " PCI_PRI_FMT + " cannot be used\n", dev->addr.domain, dev->addr.bus, + dev->addr.devid, dev->addr.function); + } return 0; } /* dump one device */ static int -pci_dump_one_device(struct rte_pci_device *dev) +pci_dump_one_device(FILE *f, struct rte_pci_device *dev) { int i; - printf(PCI_PRI_FMT, dev->addr.domain, dev->addr.bus, + fprintf(f, PCI_PRI_FMT, dev->addr.domain, dev->addr.bus, dev->addr.devid, dev->addr.function); - printf(" - vendor:%x device:%x\n", dev->id.vendor_id, + fprintf(f, " - vendor:%x device:%x\n", dev->id.vendor_id, dev->id.device_id); for (i = 0; i != sizeof(dev->mem_resource) / sizeof(dev->mem_resource[0]); i++) { - printf(" %16.16"PRIx64" %16.16"PRIx64"\n", - dev->mem_resource[i].phys_addr, + fprintf(f, " %16.16"PRIx64" %16.16"PRIx64"\n", + dev->mem_resource[i].phys_addr, dev->mem_resource[i].len); } return 0; @@ -198,12 +191,12 @@ pci_dump_one_device(struct rte_pci_device *dev) /* dump devices on the bus */ void -rte_eal_pci_dump(void) +rte_eal_pci_dump(FILE *f) { struct rte_pci_device *dev = NULL; - TAILQ_FOREACH(dev, &device_list, next) { - pci_dump_one_device(dev); + TAILQ_FOREACH(dev, &pci_device_list, next) { + pci_dump_one_device(f, dev); } } @@ -211,19 +204,12 @@ rte_eal_pci_dump(void) void 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 */ void rte_eal_pci_unregister(struct rte_pci_driver *driver) { - TAILQ_REMOVE(&driver_list, driver, next); -} - -void -rte_eal_pci_set_blacklist(struct rte_pci_addr *blacklist, unsigned size) -{ - dev_blacklist = blacklist; - dev_blacklist_size = size; + TAILQ_REMOVE(&pci_driver_list, driver, next); }