X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Flibrte_eal%2Fcommon%2Feal_common_pci.c;h=7c23e867180436f25d987b26bcac10fb09e14493;hb=591a9d7985c1230;hp=d9ccc74d85c908d3893f4b2ea1cc494bf9a1c5df;hpb=66daf76700061966fad71130ebbd3977a8746d8a;p=dpdk.git diff --git a/lib/librte_eal/common/eal_common_pci.c b/lib/librte_eal/common/eal_common_pci.c index d9ccc74d85..7c23e86718 100644 --- a/lib/librte_eal/common/eal_common_pci.c +++ b/lib/librte_eal/common/eal_common_pci.c @@ -1,39 +1,38 @@ /*- * BSD LICENSE * - * Copyright(c) 2010-2012 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 + * 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 + * * 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 - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived + * * 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 - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * 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 + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * */ /* 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 @@ -62,6 +61,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include #include #include #include @@ -76,30 +76,27 @@ #include #include #include +#include +#include +#include #include "eal_private.h" -struct pci_driver_list driver_list; -struct pci_device_list device_list; +struct pci_driver_list pci_driver_list; +struct pci_device_list pci_device_list; -static struct rte_pci_addr *dev_blacklist = NULL; -static unsigned dev_blacklist_size = 0; - -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; } /* @@ -115,13 +112,20 @@ static int pci_probe_all_drivers(struct rte_pci_device *dev) { struct rte_pci_driver *dr = NULL; - - dev->blacklisted = !!is_blacklisted(dev); - TAILQ_FOREACH(dr, &driver_list, next) { - if (rte_eal_pci_probe_one_driver(dr, dev)) + int rc; + + TAILQ_FOREACH(dr, &pci_driver_list, next) { + rc = rte_eal_pci_probe_one_driver(dr, dev); + if (rc < 0) + /* negative value is an error */ + break; + if (rc > 0) + /* positive value means driver not found */ continue; /* initialize subsequent driver instances for this device */ - if (dr->drv_flags & RTE_PCI_DRV_MULTIPLE) + if ((dr->drv_flags & RTE_PCI_DRV_MULTIPLE) && + (dev->devargs == NULL || + dev->devargs->type != RTE_DEVTYPE_BLACKLISTED_PCI)) while (rte_eal_pci_probe_one_driver(dr, dev) == 0) ; return 0; @@ -138,37 +142,61 @@ 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; + + /* probe all or only whitelisted devices */ + if (probe_all) + pci_probe_all_drivers(dev); + 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); + } - TAILQ_FOREACH(dev, &device_list, next) - pci_probe_all_drivers(dev); - #ifdef RTE_EAL_UNBIND_PORTS - if (atexit(rte_eal_pci_exit) != 0) - RTE_LOG(ERR, EAL, "atexit failure\n"); - #endif 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) { - printf(PCI_PRI_FMT, dev->addr.domain, dev->addr.bus, + int i; + + 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); - printf(" %16.16"PRIx64" %16.16"PRIx64"\n", - dev->mem_resource.phys_addr, dev->mem_resource.len); + + for (i = 0; i != sizeof(dev->mem_resource) / + sizeof(dev->mem_resource[0]); i++) { + fprintf(f, " %16.16"PRIx64" %16.16"PRIx64"\n", + dev->mem_resource[i].phys_addr, + dev->mem_resource[i].len); + } return 0; } /* 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); } } @@ -176,12 +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_set_blacklist(struct rte_pci_addr *blacklist, unsigned size) +rte_eal_pci_unregister(struct rte_pci_driver *driver) { - dev_blacklist = blacklist; - dev_blacklist_size = size; + TAILQ_REMOVE(&pci_driver_list, driver, next); }