X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Flibrte_eal%2Fcommon%2Feal_common_pci.c;h=4229aafb77c68f867403512c3851edba93dd74d0;hb=d6a9090d48146a2c2cabf5fe66ef1d1db885abc0;hp=f9c0a8c8bdc28923eea77e68f8cecb3bbf8d0f0d;hpb=12204589517e06230e24e0f23396222f2929bd77;p=dpdk.git diff --git a/lib/librte_eal/common/eal_common_pci.c b/lib/librte_eal/common/eal_common_pci.c index f9c0a8c8bd..4229aafb77 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-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 @@ -74,7 +74,6 @@ #include #include #include -#include #include #include #include @@ -85,70 +84,140 @@ 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_devargs *devargs; TAILQ_FOREACH(devargs, &devargs_list, next) { - if (devargs->type != RTE_DEVTYPE_BLACKLISTED_PCI) + 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 1; + if (!rte_eal_compare_pci_addr(&dev->addr, &devargs->pci.addr)) + return devargs; } - return 0; /* not in blacklist */ + return NULL; } /* * If vendor/device ID match, call the devinit() function of all - * registered driver for the given device. Return -1 if no driver is - * found for this device. - * For drivers with the RTE_PCI_DRV_MULTIPLE flag enabled, register - * the same device multiple times until failure to do so. - * It is required for non-Intel NIC drivers provided by third-parties such - * as 6WIND. + * registered driver for the given device. Return -1 if initialization + * failed, return 1 if no driver is found for this device. */ static int pci_probe_all_drivers(struct rte_pci_device *dev) { struct rte_pci_driver *dr = NULL; - int rc; + int rc = 0; + + if (dev == NULL) + return -1; - dev->blacklisted = !!is_blacklisted(dev); 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; + return -1; 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) && - (!dev->blacklisted)) - while (rte_eal_pci_probe_one_driver(dr, dev) == 0) - ; return 0; } - return -1; + return 1; } +#ifdef RTE_LIBRTE_EAL_HOTPLUG /* - * Check if a device is ok to use according to whitelist rules. + * If vendor/device ID match, call the devuninit() function of all + * registered driver for the given device. Return -1 if initialization + * failed, return 1 if no driver is found for this device. */ static int -pcidev_is_whitelisted(struct rte_pci_device *dev) +pci_close_all_drivers(struct rte_pci_device *dev) { - struct rte_devargs *devargs; + struct rte_pci_driver *dr = NULL; + int rc = 0; - TAILQ_FOREACH(devargs, &devargs_list, next) { - if (devargs->type != RTE_DEVTYPE_WHITELISTED_PCI) + if (dev == NULL) + return -1; + + TAILQ_FOREACH(dr, &pci_driver_list, next) { + rc = rte_eal_pci_close_one_driver(dr, dev); + if (rc < 0) + /* negative value is an error */ + return -1; + if (rc > 0) + /* positive value means driver not found */ continue; - if (!memcmp(&dev->addr, &devargs->pci.addr, sizeof(dev->addr))) - return 1; + return 0; } - return 0; + return 1; } +/* + * Find the pci device specified by pci address, then invoke probe function of + * the driver of the devive. + */ +int +rte_eal_pci_probe_one(const struct rte_pci_addr *addr) +{ + struct rte_pci_device *dev = NULL; + int ret = 0; + + if (addr == NULL) + return -1; + + TAILQ_FOREACH(dev, &pci_device_list, next) { + if (rte_eal_compare_pci_addr(&dev->addr, addr)) + continue; + + ret = pci_probe_all_drivers(dev); + if (ret < 0) + goto err_return; + return 0; + } + return -1; + +err_return: + RTE_LOG(WARNING, EAL, "Requested device " PCI_PRI_FMT + " cannot be used\n", dev->addr.domain, dev->addr.bus, + dev->addr.devid, dev->addr.function); + return -1; +} + +/* + * Find the pci device specified by pci address, then invoke close function of + * the driver of the devive. + */ +int +rte_eal_pci_close_one(const struct rte_pci_addr *addr) +{ + struct rte_pci_device *dev = NULL; + int ret = 0; + + if (addr == NULL) + return -1; + + TAILQ_FOREACH(dev, &pci_device_list, next) { + if (rte_eal_compare_pci_addr(&dev->addr, addr)) + continue; + + ret = pci_close_all_drivers(dev); + if (ret < 0) + goto err_return; + + TAILQ_REMOVE(&pci_device_list, dev, next); + return 0; + } + return -1; + +err_return: + RTE_LOG(WARNING, EAL, "Requested device " PCI_PRI_FMT + " cannot be used\n", dev->addr.domain, dev->addr.bus, + dev->addr.devid, dev->addr.function); + return -1; +} +#endif /* RTE_LIBRTE_EAL_HOTPLUG */ + /* * 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 @@ -158,15 +227,27 @@ int rte_eal_pci_probe(void) { struct rte_pci_device *dev = NULL; + struct rte_devargs *devargs; int probe_all = 0; + int ret = 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 (pcidev_is_whitelisted(dev) && pci_probe_all_drivers(dev) < 0) + ret = pci_probe_all_drivers(dev); + else if (devargs != NULL && + devargs->type == RTE_DEVTYPE_WHITELISTED_PCI) + ret = pci_probe_all_drivers(dev); + if (ret < 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); @@ -177,19 +258,19 @@ rte_eal_pci_probe(void) /* 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; @@ -197,12 +278,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, &pci_device_list, next) { - pci_dump_one_device(dev); + pci_dump_one_device(f, dev); } }