From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from stargate3.asicdesigners.com (stargate.chelsio.com [67.207.112.58]) by dpdk.org (Postfix) with ESMTP id 70F03C326 for ; Mon, 20 Jul 2015 19:32:11 +0200 (CEST) Received: from localhost (scalar.blr.asicdesigners.com [10.193.185.94]) by stargate3.asicdesigners.com (8.13.8/8.13.8) with ESMTP id t6KHW5sS030637; Mon, 20 Jul 2015 10:32:06 -0700 From: Rahul Lakkireddy To: dev@dpdk.org Date: Mon, 20 Jul 2015 23:01:35 +0530 Message-Id: <5e6315c050b27539d567799a5b35c8cc9395cacf.1437392218.git.rahul.lakkireddy@chelsio.com> X-Mailer: git-send-email 2.4.1 In-Reply-To: References: In-Reply-To: References: Cc: Felix Marti , Kumar Sanghvi , Nirranjan Kirubaharan Subject: [dpdk-dev] [PATCH v3 1/3] nic_uio: Fix to allow any device to be bound to nic_uio X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Jul 2015 17:32:12 -0000 nic_uio requires the pci ids to be present in rte_pci_dev_ids.h in order to bind the devices to nic_uio. However, it's better to remove this whitelist of pci ids, and instead rely on hw.nic_uio.bdfs kenv parameter to allow binding any device to nic_uio. Suggested-by: David Marchand Signed-off-by: Rahul Lakkireddy Signed-off-by: Kumar Sanghvi --- v3: - Use checks for bus, slot, and function info instead of vendor and device during nic_uio probe for better consistency. v2: - Replace "Intel(R) DPDK" with just "DPDK" in device description for nic_uio. lib/librte_eal/bsdapp/nic_uio/nic_uio.c | 54 +++++++++++---------------------- 1 file changed, 18 insertions(+), 36 deletions(-) diff --git a/lib/librte_eal/bsdapp/nic_uio/nic_uio.c b/lib/librte_eal/bsdapp/nic_uio/nic_uio.c index 2354e84..99a4975 100644 --- a/lib/librte_eal/bsdapp/nic_uio/nic_uio.c +++ b/lib/librte_eal/bsdapp/nic_uio/nic_uio.c @@ -106,24 +106,6 @@ struct pci_bdf { uint32_t function; }; - -#define RTE_PCI_DEV_ID_DECL_EM(vend, dev) {vend, dev}, -#define RTE_PCI_DEV_ID_DECL_IGB(vend, dev) {vend, dev}, -#define RTE_PCI_DEV_ID_DECL_IGBVF(vend, dev) {vend, dev}, -#define RTE_PCI_DEV_ID_DECL_IXGBE(vend, dev) {vend, dev}, -#define RTE_PCI_DEV_ID_DECL_IXGBEVF(vend, dev) {vend, dev}, -#define RTE_PCI_DEV_ID_DECL_I40E(vend, dev) {vend, dev}, -#define RTE_PCI_DEV_ID_DECL_I40EVF(vend, dev) {vend, dev}, -#define RTE_PCI_DEV_ID_DECL_VIRTIO(vend, dev) {vend, dev}, -#define RTE_PCI_DEV_ID_DECL_VMXNET3(vend, dev) {vend, dev}, -#define RTE_PCI_DEV_ID_DECL_ENIC(vend, dev) {vend, dev}, - -const struct device devices[] = { -#include -}; -#define NUM_DEVICES (sizeof(devices)/sizeof(devices[0])) - - static devclass_t nic_uio_devclass; DEFINE_CLASS_0(nic_uio, nic_uio_driver, nic_uio_methods, sizeof(struct nic_uio_softc)); @@ -194,12 +176,15 @@ static int nic_uio_probe (device_t dev) { int i; - - for (i = 0; i < NUM_DEVICES; i++) - if (pci_get_vendor(dev) == devices[i].vend && - pci_get_device(dev) == devices[i].dev) { - - device_set_desc(dev, "Intel(R) DPDK PCI Device"); + unsigned int bus = pci_get_bus(dev); + unsigned int device = pci_get_slot(dev); + unsigned int function = pci_get_function(dev); + + for (i = 0; i < num_detached; i++) + if (bus == pci_get_bus(detached_devices[i]) && + device == pci_get_slot(detached_devices[i]) && + function == pci_get_function(detached_devices[i])) { + device_set_desc(dev, "DPDK PCI Device"); return BUS_PROBE_SPECIFIC; } @@ -256,7 +241,6 @@ static void nic_uio_load(void) { uint32_t bus, device, function; - int i; device_t dev; char bdf_str[256]; char *token, *remaining; @@ -295,17 +279,15 @@ nic_uio_load(void) if (dev == NULL) continue; - for (i = 0; i < NUM_DEVICES; i++) - if (pci_get_vendor(dev) == devices[i].vend && - pci_get_device(dev) == devices[i].dev) { - if (num_detached < MAX_DETACHED_DEVICES) { - printf("nic_uio_load: detaching and storing dev=%p\n", dev); - detached_devices[num_detached++] = dev; - } else - printf("nic_uio_load: reached MAX_DETACHED_DEVICES=%d. dev=%p won't be reattached\n", - MAX_DETACHED_DEVICES, dev); - device_detach(dev); - } + if (num_detached < MAX_DETACHED_DEVICES) { + printf("nic_uio_load: detaching and storing dev=%p\n", + dev); + detached_devices[num_detached++] = dev; + } else { + printf("nic_uio_load: reached MAX_DETACHED_DEVICES=%d. dev=%p won't be reattached\n", + MAX_DETACHED_DEVICES, dev); + } + device_detach(dev); } } -- 2.4.1