Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/19767/?format=api
{ "id": 19767, "url": "http://patchwork.dpdk.org/api/patches/19767/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/1484801117-779-12-git-send-email-thomas.monjalon@6wind.com/", "project": { "id": 1, "url": "http://patchwork.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<1484801117-779-12-git-send-email-thomas.monjalon@6wind.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1484801117-779-12-git-send-email-thomas.monjalon@6wind.com", "date": "2017-01-19T04:45:15", "name": "[dpdk-dev,v11,11/13] pci: use bus driver for scan/probe", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "9987dbf4187ab9d1423ab421453354d21a2678e8", "submitter": { "id": 1, "url": "http://patchwork.dpdk.org/api/people/1/?format=api", "name": "Thomas Monjalon", "email": "thomas.monjalon@6wind.com" }, "delegate": { "id": 1, "url": "http://patchwork.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/1484801117-779-12-git-send-email-thomas.monjalon@6wind.com/mbox/", "series": [], "comments": "http://patchwork.dpdk.org/api/patches/19767/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/19767/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id B053CFB70;\n\tThu, 19 Jan 2017 05:46:00 +0100 (CET)", "from mail-wm0-f42.google.com (mail-wm0-f42.google.com\n\t[74.125.82.42]) by dpdk.org (Postfix) with ESMTP id 5ACF9FB34\n\tfor <dev@dpdk.org>; Thu, 19 Jan 2017 05:45:34 +0100 (CET)", "by mail-wm0-f42.google.com with SMTP id c206so58683136wme.0\n\tfor <dev@dpdk.org>; Wed, 18 Jan 2017 20:45:34 -0800 (PST)", "from XPS13.localdomain (184.203.134.77.rev.sfr.net.\n\t[77.134.203.184]) by smtp.gmail.com with ESMTPSA id\n\tt194sm2568586wmd.1.2017.01.18.20.45.32\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tWed, 18 Jan 2017 20:45:33 -0800 (PST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=6wind-com.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=4lDpErPm2PcQCb7XhuupSoqCYOf15UwH8WRN4b9xZSQ=;\n\tb=szdv7QJ7S/BXXVkI7qNbc8cLDUza0DOio7c9IdxGr2HCAaHDtMEXJMGwNRDCZDDoOu\n\tiL+TKb9txoMBpFwnbS8vDCbPivqydEIBJqFeho3j3dDRDjbxD9CLKRosER37Soz2uMGc\n\tttyniZoOAYqSUvkzPSJVBv/h9AJ/0xKnKbpZmIwvj05AC4dlll4zOhnFnyH3BgTBq98C\n\tW5ynkHH9F10L2zipsG/aPJTvqSMHrIaHlO/jfcd9PsFAWNWcJ8PDwyYV1qvClilDFzci\n\tGaWOxKCbXdfT9Hp36S+a5Af0QR5uNzKYVrTu982+WMEduopHg5PdjeQ1qzbHkVPS1KmY\n\tRCgQ==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=4lDpErPm2PcQCb7XhuupSoqCYOf15UwH8WRN4b9xZSQ=;\n\tb=ZpnnzXPtPs6nJgIev7TsPpsYrCHWE82le2dZGBfPEXl3ykpeLybXl++Q3zxMjFkghH\n\tpBl4pL8as9pG/hKYjeR2b6uooPmLuI4cHBcpzJVIypLyzfYaEMA+UHVhO+N1+hyqro3s\n\tLnN0nKyU+RaUe5ogU9GqNzscG0Fbk8arnzGuqo1duTlk4nKpRzOj6vm+lnOUPjlxwDL2\n\tabrDaNAJJN1kq8X1BU+7DYoYomr2stp04ttS5q7Gxi+rt+dsnSav74nqfzTjXmm4KPuk\n\t6znG9k8FWsF0a1Cuj8YesNF94Px4PLqmK+RmiDstqyo6RJEEy2XUQ5MNS7QbxjaOqMGU\n\t9XiQ==", "X-Gm-Message-State": "AIkVDXJKY4Ra48idakX3dTc234MFx5ruqMFkrxeRBP9J0JnEgK8EvidbZ/csGOWGfwL9jBBJ", "X-Received": "by 10.223.160.43 with SMTP id k40mr6452066wrk.24.1484801133795; \n\tWed, 18 Jan 2017 20:45:33 -0800 (PST)", "From": "Thomas Monjalon <thomas.monjalon@6wind.com>", "To": "Shreyansh Jain <shreyansh.jain@nxp.com>", "Cc": "dev@dpdk.org", "Date": "Thu, 19 Jan 2017 05:45:15 +0100", "Message-Id": "<1484801117-779-12-git-send-email-thomas.monjalon@6wind.com>", "X-Mailer": "git-send-email 2.7.0", "In-Reply-To": "<1484801117-779-1-git-send-email-thomas.monjalon@6wind.com>", "References": "<1484748329-5418-1-git-send-email-shreyansh.jain@nxp.com>\n\t<1484801117-779-1-git-send-email-thomas.monjalon@6wind.com>", "Subject": "[dpdk-dev] [PATCH v11 11/13] pci: use bus driver for scan/probe", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Shreyansh Jain <shreyansh.jain@nxp.com>\n\nRemove EAL initiated direct PCI scan/probe and enable PCI Bus linkage.\n\nSigned-off-by: Shreyansh Jain <shreyansh.jain@nxp.com>\nReviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>\nSigned-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>\n---\n lib/librte_eal/bsdapp/eal/eal.c | 7 -----\n lib/librte_eal/bsdapp/eal/eal_pci.c | 32 ++++++++-------------\n lib/librte_eal/bsdapp/eal/rte_eal_version.map | 2 --\n lib/librte_eal/common/eal_common_pci.c | 26 +++++++----------\n lib/librte_eal/common/eal_private.h | 10 -------\n lib/librte_eal/common/include/rte_pci.h | 19 +++----------\n lib/librte_eal/linuxapp/eal/eal.c | 7 -----\n lib/librte_eal/linuxapp/eal/eal_pci.c | 38 +++++++++----------------\n lib/librte_eal/linuxapp/eal/rte_eal_version.map | 2 --\n 9 files changed, 41 insertions(+), 102 deletions(-)", "diff": "diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c\nindex ee7c9de..a7f2671 100644\n--- a/lib/librte_eal/bsdapp/eal/eal.c\n+++ b/lib/librte_eal/bsdapp/eal/eal.c\n@@ -562,9 +562,6 @@ rte_eal_init(int argc, char **argv)\n \tif (rte_eal_timer_init() < 0)\n \t\trte_panic(\"Cannot init HPET or TSC timers\\n\");\n \n-\tif (rte_eal_pci_init() < 0)\n-\t\trte_panic(\"Cannot init PCI\\n\");\n-\n \teal_check_mem_on_local_socket();\n \n \tif (eal_plugins_init() < 0)\n@@ -617,10 +614,6 @@ rte_eal_init(int argc, char **argv)\n \tif (rte_bus_probe())\n \t\trte_panic(\"Cannot probe devices\\n\");\n \n-\t/* Probe & Initialize PCI devices */\n-\tif (rte_eal_pci_probe())\n-\t\trte_panic(\"Cannot probe PCI\\n\");\n-\n \tif (rte_eal_dev_init() < 0)\n \t\trte_panic(\"Cannot init pmd devices\\n\");\n \ndiff --git a/lib/librte_eal/bsdapp/eal/eal_pci.c b/lib/librte_eal/bsdapp/eal/eal_pci.c\nindex 48bfe24..103ad70 100644\n--- a/lib/librte_eal/bsdapp/eal/eal_pci.c\n+++ b/lib/librte_eal/bsdapp/eal/eal_pci.c\n@@ -87,6 +87,9 @@\n * enabling bus master.\n */\n \n+/* Forward declaration of PCI bus */\n+struct rte_pci_bus rte_pci_bus;\n+\n /* Map pci device */\n int\n rte_eal_pci_map_device(struct rte_pci_device *dev)\n@@ -313,19 +316,19 @@ pci_scan_one(int dev_pci_fd, struct pci_conf *conf)\n \t}\n \n \t/* device is valid, add in list (sorted) */\n-\tif (TAILQ_EMPTY(&pci_device_list)) {\n-\t\tTAILQ_INSERT_TAIL(&pci_device_list, dev, next);\n+\tif (TAILQ_EMPTY(&rte_pci_bus.device_list)) {\n+\t\trte_eal_pci_add_device(dev);\n \t}\n \telse {\n \t\tstruct rte_pci_device *dev2 = NULL;\n \t\tint ret;\n \n-\t\tTAILQ_FOREACH(dev2, &pci_device_list, next) {\n+\t\tTAILQ_FOREACH(dev2, &rte_pci_bus.device_list, next) {\n \t\t\tret = rte_eal_compare_pci_addr(&dev->addr, &dev2->addr);\n \t\t\tif (ret > 0)\n \t\t\t\tcontinue;\n \t\t\telse if (ret < 0) {\n-\t\t\t\tTAILQ_INSERT_BEFORE(dev2, dev, next);\n+\t\t\t\trte_eal_pci_insert_device(dev2, dev);\n \t\t\t\treturn 0;\n \t\t\t} else { /* already registered */\n \t\t\t\tdev2->kdrv = dev->kdrv;\n@@ -337,7 +340,7 @@ pci_scan_one(int dev_pci_fd, struct pci_conf *conf)\n \t\t\t\treturn 0;\n \t\t\t}\n \t\t}\n-\t\tTAILQ_INSERT_TAIL(&pci_device_list, dev, next);\n+\t\trte_eal_pci_add_device(dev);\n \t}\n \n \treturn 0;\n@@ -365,6 +368,10 @@ rte_eal_pci_scan(void)\n \t\t\t.matches = &matches[0],\n \t};\n \n+\t/* for debug purposes, PCI can be disabled */\n+\tif (internal_config.no_pci)\n+\t\treturn 0;\n+\n \tfd = open(\"/dev/pci\", O_RDONLY);\n \tif (fd < 0) {\n \t\tRTE_LOG(ERR, EAL, \"%s(): error opening /dev/pci\\n\", __func__);\n@@ -659,21 +666,6 @@ rte_eal_pci_ioport_unmap(struct rte_pci_ioport *p)\n \treturn ret;\n }\n \n-/* Init the PCI EAL subsystem */\n-int\n-rte_eal_pci_init(void)\n-{\n-\t/* for debug purposes, PCI can be disabled */\n-\tif (internal_config.no_pci)\n-\t\treturn 0;\n-\n-\tif (rte_eal_pci_scan() < 0) {\n-\t\tRTE_LOG(ERR, EAL, \"%s(): Cannot scan PCI bus\\n\", __func__);\n-\t\treturn -1;\n-\t}\n-\treturn 0;\n-}\n-\n struct rte_pci_bus rte_pci_bus = {\n \t.bus = {\n \t\t.scan = rte_eal_pci_scan,\ndiff --git a/lib/librte_eal/bsdapp/eal/rte_eal_version.map b/lib/librte_eal/bsdapp/eal/rte_eal_version.map\nindex afa1643..c7c2a05 100644\n--- a/lib/librte_eal/bsdapp/eal/rte_eal_version.map\n+++ b/lib/librte_eal/bsdapp/eal/rte_eal_version.map\n@@ -6,8 +6,6 @@ DPDK_2.0 {\n \teal_parse_sysfs_value;\n \teal_timer_source;\n \tlcore_config;\n-\tpci_device_list;\n-\tpci_driver_list;\n \tper_lcore__lcore_id;\n \tper_lcore__rte_errno;\n \trte_calloc;\ndiff --git a/lib/librte_eal/common/eal_common_pci.c b/lib/librte_eal/common/eal_common_pci.c\nindex c53e2bd..5149e6e 100644\n--- a/lib/librte_eal/common/eal_common_pci.c\n+++ b/lib/librte_eal/common/eal_common_pci.c\n@@ -83,11 +83,6 @@\n \n #include \"eal_private.h\"\n \n-struct pci_driver_list pci_driver_list =\n-\tTAILQ_HEAD_INITIALIZER(pci_driver_list);\n-struct pci_device_list pci_device_list =\n-\tTAILQ_HEAD_INITIALIZER(pci_device_list);\n-\n extern struct rte_pci_bus rte_pci_bus;\n \n #define SYSFS_PCI_DEVICES \"/sys/bus/pci/devices\"\n@@ -311,7 +306,7 @@ pci_probe_all_drivers(struct rte_pci_device *dev)\n \tif (dev->driver != NULL)\n \t\treturn 0;\n \n-\tTAILQ_FOREACH(dr, &pci_driver_list, next) {\n+\tFOREACH_DRIVER_ON_PCIBUS(dr) {\n \t\trc = rte_eal_pci_probe_one_driver(dr, dev);\n \t\tif (rc < 0)\n \t\t\t/* negative value is an error */\n@@ -332,6 +327,7 @@ int\n rte_eal_pci_probe_one(const struct rte_pci_addr *addr)\n {\n \tstruct rte_pci_device *dev = NULL;\n+\n \tint ret = 0;\n \n \tif (addr == NULL)\n@@ -343,7 +339,7 @@ rte_eal_pci_probe_one(const struct rte_pci_addr *addr)\n \tif (pci_update_device(addr) < 0)\n \t\tgoto err_return;\n \n-\tTAILQ_FOREACH(dev, &pci_device_list, next) {\n+\tFOREACH_DEVICE_ON_PCIBUS(dev) {\n \t\tif (rte_eal_compare_pci_addr(&dev->addr, addr))\n \t\t\tcontinue;\n \n@@ -373,7 +369,7 @@ rte_eal_pci_detach(const struct rte_pci_addr *addr)\n \tif (addr == NULL)\n \t\treturn -1;\n \n-\tTAILQ_FOREACH(dev, &pci_device_list, next) {\n+\tFOREACH_DEVICE_ON_PCIBUS(dev) {\n \t\tif (rte_eal_compare_pci_addr(&dev->addr, addr))\n \t\t\tcontinue;\n \n@@ -385,7 +381,7 @@ rte_eal_pci_detach(const struct rte_pci_addr *addr)\n \t\t\t/* positive value means driver doesn't support it */\n \t\t\tcontinue;\n \n-\t\tTAILQ_REMOVE(&pci_device_list, dev, next);\n+\t\trte_eal_pci_remove_device(dev);\n \t\tfree(dev);\n \t\treturn 0;\n \t}\n@@ -414,7 +410,7 @@ rte_eal_pci_probe(void)\n \tif (rte_eal_devargs_type_count(RTE_DEVTYPE_WHITELISTED_PCI) == 0)\n \t\tprobe_all = 1;\n \n-\tTAILQ_FOREACH(dev, &pci_device_list, next) {\n+\tFOREACH_DEVICE_ON_PCIBUS(dev) {\n \n \t\t/* set devargs in PCI structure */\n \t\tdevargs = pci_devargs_lookup(dev);\n@@ -462,7 +458,7 @@ rte_eal_pci_dump(FILE *f)\n {\n \tstruct rte_pci_device *dev = NULL;\n \n-\tTAILQ_FOREACH(dev, &pci_device_list, next) {\n+\tFOREACH_DEVICE_ON_PCIBUS(dev) {\n \t\tpci_dump_one_device(f, dev);\n \t}\n }\n@@ -471,16 +467,16 @@ rte_eal_pci_dump(FILE *f)\n void\n rte_eal_pci_register(struct rte_pci_driver *driver)\n {\n-\tTAILQ_INSERT_TAIL(&pci_driver_list, driver, next);\n-\trte_eal_driver_register(&driver->driver);\n+\tTAILQ_INSERT_TAIL(&rte_pci_bus.driver_list, driver, next);\n+\tdriver->bus = &rte_pci_bus;\n }\n \n /* unregister a driver */\n void\n rte_eal_pci_unregister(struct rte_pci_driver *driver)\n {\n-\trte_eal_driver_unregister(&driver->driver);\n-\tTAILQ_REMOVE(&pci_driver_list, driver, next);\n+\tTAILQ_REMOVE(&rte_pci_bus.driver_list, driver, next);\n+\tdriver->bus = NULL;\n }\n \n /* Add a device to PCI bus */\ndiff --git a/lib/librte_eal/common/eal_private.h b/lib/librte_eal/common/eal_private.h\nindex 9e7d8f6..68386e8 100644\n--- a/lib/librte_eal/common/eal_private.h\n+++ b/lib/librte_eal/common/eal_private.h\n@@ -108,16 +108,6 @@ int rte_eal_timer_init(void);\n */\n int rte_eal_log_init(const char *id, int facility);\n \n-/**\n- * Init the PCI infrastructure\n- *\n- * This function is private to EAL.\n- *\n- * @return\n- * 0 on success, negative on error\n- */\n-int rte_eal_pci_init(void);\n-\n struct rte_pci_driver;\n struct rte_pci_device;\n \ndiff --git a/lib/librte_eal/common/include/rte_pci.h b/lib/librte_eal/common/include/rte_pci.h\nindex 957cddb..bab8df4 100644\n--- a/lib/librte_eal/common/include/rte_pci.h\n+++ b/lib/librte_eal/common/include/rte_pci.h\n@@ -87,12 +87,6 @@ extern \"C\" {\n #include <rte_dev.h>\n #include <rte_bus.h>\n \n-TAILQ_HEAD(pci_device_list, rte_pci_device); /**< PCI devices in D-linked Q. */\n-TAILQ_HEAD(pci_driver_list, rte_pci_driver); /**< PCI drivers in D-linked Q. */\n-\n-extern struct pci_driver_list pci_driver_list; /**< Global list of PCI drivers. */\n-extern struct pci_device_list pci_device_list; /**< Global list of PCI devices. */\n-\n /** Pathname of PCI devices directory. */\n const char *pci_get_sysfs_path(void);\n \n@@ -208,8 +202,6 @@ struct rte_pci_device {\n \t.subsystem_device_id = PCI_ANY_ID\n #endif\n \n-struct rte_pci_driver;\n-\n /**\n * Initialisation function for the driver called during PCI probing.\n */\n@@ -416,17 +408,14 @@ rte_pci_match(const struct rte_pci_driver *pci_drv,\n \t const struct rte_pci_device *pci_dev);\n \n /**\n- * Probe the PCI bus for registered drivers.\n- *\n- * Scan the content of the PCI bus, and call the probe() function for\n- * all registered drivers that have a matching entry in its id_table\n- * for discovered devices.\n+ * Probe the PCI bus\n *\n * @return\n * - 0 on success.\n- * - Negative on error.\n+ * - !0 on error.\n */\n-int rte_eal_pci_probe(void);\n+int\n+rte_eal_pci_probe(void);\n \n /**\n * Map the PCI device resources in user space virtual memory address\ndiff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c\nindex bf6b818..6bb7fc9 100644\n--- a/lib/librte_eal/linuxapp/eal/eal.c\n+++ b/lib/librte_eal/linuxapp/eal/eal.c\n@@ -803,9 +803,6 @@ rte_eal_init(int argc, char **argv)\n \tif (rte_eal_log_init(logid, internal_config.syslog_facility) < 0)\n \t\trte_panic(\"Cannot init logs\\n\");\n \n-\tif (rte_eal_pci_init() < 0)\n-\t\trte_panic(\"Cannot init PCI\\n\");\n-\n #ifdef VFIO_PRESENT\n \tif (rte_eal_vfio_setup() < 0)\n \t\trte_panic(\"Cannot init VFIO\\n\");\n@@ -888,10 +885,6 @@ rte_eal_init(int argc, char **argv)\n \tif (rte_bus_probe())\n \t\trte_panic(\"Cannot probe devices\\n\");\n \n-\t/* Probe & Initialize PCI devices */\n-\tif (rte_eal_pci_probe())\n-\t\trte_panic(\"Cannot probe PCI\\n\");\n-\n \tif (rte_eal_dev_init() < 0)\n \t\trte_panic(\"Cannot init pmd devices\\n\");\n \ndiff --git a/lib/librte_eal/linuxapp/eal/eal_pci.c b/lib/librte_eal/linuxapp/eal/eal_pci.c\nindex c40814d..d6f9855 100644\n--- a/lib/librte_eal/linuxapp/eal/eal_pci.c\n+++ b/lib/librte_eal/linuxapp/eal/eal_pci.c\n@@ -55,6 +55,9 @@\n * IGB_UIO driver (or doesn't initialize, if the device wasn't bound to it).\n */\n \n+/* Forward declaration of PCI bus */\n+struct rte_pci_bus rte_pci_bus;\n+\n static int\n pci_get_kernel_driver_by_path(const char *filename, char *dri_name)\n {\n@@ -347,21 +350,19 @@ pci_scan_one(const char *dirname, const struct rte_pci_addr *addr)\n \t\tdev->kdrv = RTE_KDRV_NONE;\n \n \t/* device is valid, add in list (sorted) */\n-\tif (TAILQ_EMPTY(&pci_device_list)) {\n-\t\trte_eal_device_insert(&dev->device);\n-\t\tTAILQ_INSERT_TAIL(&pci_device_list, dev, next);\n+\tif (TAILQ_EMPTY(&rte_pci_bus.device_list)) {\n+\t\trte_eal_pci_add_device(dev);\n \t} else {\n \t\tstruct rte_pci_device *dev2;\n \t\tint ret;\n \n-\t\tTAILQ_FOREACH(dev2, &pci_device_list, next) {\n+\t\tTAILQ_FOREACH(dev2, &rte_pci_bus.device_list, next) {\n \t\t\tret = rte_eal_compare_pci_addr(&dev->addr, &dev2->addr);\n \t\t\tif (ret > 0)\n \t\t\t\tcontinue;\n \n \t\t\tif (ret < 0) {\n-\t\t\t\tTAILQ_INSERT_BEFORE(dev2, dev, next);\n-\t\t\t\trte_eal_device_insert(&dev->device);\n+\t\t\t\trte_eal_pci_insert_device(dev2, dev);\n \t\t\t} else { /* already registered */\n \t\t\t\tdev2->kdrv = dev->kdrv;\n \t\t\t\tdev2->max_vfs = dev->max_vfs;\n@@ -371,8 +372,8 @@ pci_scan_one(const char *dirname, const struct rte_pci_addr *addr)\n \t\t\t}\n \t\t\treturn 0;\n \t\t}\n-\t\trte_eal_device_insert(&dev->device);\n-\t\tTAILQ_INSERT_TAIL(&pci_device_list, dev, next);\n+\n+\t\trte_eal_pci_add_device(dev);\n \t}\n \n \treturn 0;\n@@ -448,6 +449,10 @@ rte_eal_pci_scan(void)\n \tchar dirname[PATH_MAX];\n \tstruct rte_pci_addr addr;\n \n+\t/* for debug purposes, PCI can be disabled */\n+\tif (internal_config.no_pci)\n+\t\treturn 0;\n+\n \tdir = opendir(pci_get_sysfs_path());\n \tif (dir == NULL) {\n \t\tRTE_LOG(ERR, EAL, \"%s(): opendir failed: %s\\n\",\n@@ -464,6 +469,7 @@ rte_eal_pci_scan(void)\n \n \t\tsnprintf(dirname, sizeof(dirname), \"%s/%s\",\n \t\t\t\tpci_get_sysfs_path(), e->d_name);\n+\n \t\tif (pci_scan_one(dirname, &addr) < 0)\n \t\t\tgoto error;\n \t}\n@@ -709,22 +715,6 @@ rte_eal_pci_ioport_unmap(struct rte_pci_ioport *p)\n \treturn ret;\n }\n \n-/* Init the PCI EAL subsystem */\n-int\n-rte_eal_pci_init(void)\n-{\n-\t/* for debug purposes, PCI can be disabled */\n-\tif (internal_config.no_pci)\n-\t\treturn 0;\n-\n-\tif (rte_eal_pci_scan() < 0) {\n-\t\tRTE_LOG(ERR, EAL, \"%s(): Cannot scan PCI bus\\n\", __func__);\n-\t\treturn -1;\n-\t}\n-\n-\treturn 0;\n-}\n-\n struct rte_pci_bus rte_pci_bus = {\n \t.bus = {\n \t\t.scan = rte_eal_pci_scan,\ndiff --git a/lib/librte_eal/linuxapp/eal/rte_eal_version.map b/lib/librte_eal/linuxapp/eal/rte_eal_version.map\nindex b557e7c..84dfbe7 100644\n--- a/lib/librte_eal/linuxapp/eal/rte_eal_version.map\n+++ b/lib/librte_eal/linuxapp/eal/rte_eal_version.map\n@@ -6,8 +6,6 @@ DPDK_2.0 {\n \teal_parse_sysfs_value;\n \teal_timer_source;\n \tlcore_config;\n-\tpci_device_list;\n-\tpci_driver_list;\n \tper_lcore__lcore_id;\n \tper_lcore__rte_errno;\n \trte_calloc;\n", "prefixes": [ "dpdk-dev", "v11", "11/13" ] }