From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-bl2nam02on0047.outbound.protection.outlook.com [104.47.38.47]) by dpdk.org (Postfix) with ESMTP id 45E9AFA47 for ; Wed, 18 Jan 2017 11:35:40 +0100 (CET) Received: from BN6PR03CA0069.namprd03.prod.outlook.com (10.173.137.31) by MWHPR03MB2480.namprd03.prod.outlook.com (10.169.200.150) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.845.12; Wed, 18 Jan 2017 10:35:38 +0000 Received: from BL2FFO11FD021.protection.gbl (2a01:111:f400:7c09::127) by BN6PR03CA0069.outlook.office365.com (2603:10b6:404:4c::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.860.13 via Frontend Transport; Wed, 18 Jan 2017 10:35:38 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com;nxp.com; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BL2FFO11FD021.mail.protection.outlook.com (10.173.161.100) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.803.8 via Frontend Transport; Wed, 18 Jan 2017 10:35:38 +0000 Received: from tophie.ap.freescale.net ([10.232.14.39]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v0IAYYhd003396; Wed, 18 Jan 2017 03:35:35 -0700 From: Shreyansh Jain To: CC: , , Shreyansh Jain Date: Wed, 18 Jan 2017 16:07:59 +0530 Message-ID: <1484735880-17178-12-git-send-email-shreyansh.jain@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1484735880-17178-1-git-send-email-shreyansh.jain@nxp.com> References: <1484660264-6531-1-git-send-email-shreyansh.jain@nxp.com> <1484735880-17178-1-git-send-email-shreyansh.jain@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131292093387058156; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(7916002)(39400400002)(39850400002)(39410400002)(39840400002)(39450400003)(39380400002)(39860400002)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(77096006)(104016004)(189998001)(81166006)(81156014)(50226002)(8676002)(97736004)(47776003)(106466001)(8936002)(105606002)(575784001)(2906002)(5660300001)(6666003)(4326007)(626004)(53936002)(6916009)(86362001)(68736007)(48376002)(2950100002)(54906002)(110136003)(50466002)(85426001)(38730400001)(36756003)(305945005)(50986999)(33646002)(2351001)(8656002)(5003940100001)(356003)(76176999)(92566002); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR03MB2480; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD021; 1:qIBjKVILhHYyUCml18ekEbnLn+DXhTO+LceiuNTOgWVFYpiz2I7rh98ejSWwr/qjJ0pv9VrX+mwUUqqkQIqtIR33Wi2Zq1ZIYTv6aGyeoojo8j5vMG1Ts6JoT7Slu3g4/+YskoqYHYgxMPS1uGMCqjI9udbOlfF+0mB0ao0xQHdT1jsBBLIf73IhHilwxeXcYuYVjyQMYSv2RHYuGhPjCdlrRMepzPi7EauenWEXZ4tv03+7dn1wU+cA4MvgLZ113+fzJt2OVZm6l4pEteuqbSqDiHBCt6UKXRemI+C3uAs4dd09XRZ/FjvQkCEzMRvljTZye3ali1mQcTrOxkVc5DXofdBcgTFB0Eo55VxSg5P+X6SLBCMsARzUGc6hWeBlyvtyJ787EGv8XuozirPOuWFZ910Yy4esLtmiHS+fHljzIwwSr7fgCV+uxaUxQi//OSDySo/iSipqCyeBjeaPtbZ5TCYvuP+roI2kN+QhuwDg9ODzcfDykwAbie+9G+hpFFsxXS749i/WXDEczDu/eYFyzSarZxKIp8+jPl+pzis53bC8XTdKoYQ/Zlkue7TtyU43y2jVAUoZoLXirrAfCGaJf2euW4bHVncOB5anr9YL0bigYQjh4RGBNq15nk+7NAkeTu2VU7UbxdXa8lCWftj+wbA/CBid8D7z/mktwBM+SZ3lJ2pYRqHGW5bBEhtBKyx3mhhAo7ueqOh4OQdOkA== MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 3d18ecf7-9cf4-41f5-caa3-08d43f8dbe9b X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:MWHPR03MB2480; X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2480; 3:V/EeOZN/0ROg0HLlOGLvHtgV86GihlPf0vKfYpj8NMw4TDRDUmJPk2Kx4qHx1QyEvqxrBw5DuM6g7kLVm13vkEarRM1xok5GQVVE3Tkk3c54N5e9QxTqagiae+/z7D3OAzO80c9CwXTFgmVsNT4OdCsXFfNS5NpnNMwFpqSbFv8/MP2Is0b56BaqMNSuhEsLd7p7BxDs8UwxTIUZ8myvVdTKsAKICLeJwTavswlt0StRa1X7Nl4dMJYXbSMzbeenToJS5MkjaRuZUIfKf1MvQ+1H+/Fekwyw4CqpNF211hl698ZBoEXuri7s6DZtnXalenCG3E4RvXKMAh8AQHOj19a0P2sWamUTJLuAy8G4y+b1vENEinchK9HlcLcJPtF9; 25:nziMcs0BZAY35ran2LyevWnsF4/e5hN6Pq76Vq1h37lleN4pi8gR7i2ii8bJXoZNZ0n7sc6BYH0Pjd50HALIbGLzfBwAyTBKaK+ykZI/oeouWaaKSWeaExGe7Xrt20whN5rHrw0ACLpzLqu9GxSn2ufIExK/fV4NyHBus+DhRLoBzI/Ps8LSxJzDMWjrxn1WXHE2GZAcZX/xGoEbQ+aSs1VM1O1oC0TTUU5z/ugtgxz82+g2puLX+wEcUeIqVHTp2ySAjT023Q59yrpaNQ6qXrFP4AQ0NvJeWVJyV+ULr7zCY532OTMmj0ZVGYwJHeZEZVlPS4K9GzKus0Gv82EaY6iChkjRaOJM+SsY0e1AGB9Mxlin2JThsJC9WUwWO/7E2khxlYbrVund+njpn9+P8/C2/5pegkLEmnFSfi/tmVWSKipV9y0CLlK/HidTOrNMoyVBt2n7xxhApjnqhuE4vg== X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2480; 31:1Vl0DjTgSvKiTOGumJFDgDMVjzYSAfZlglCNbvgOvPMGebRhLztWDmz3d/csMHFtwrOCbwnUeisfGxzltF6+HFLtZsjWCCRIaX0sxUC0Obikt+YnQr7Qk07qFoMifp+yUSzWtB4OlfYDNIUEOSe2JyMYfokGzR7VFipk1jKGkT3Eep47uTKJGhNDFyiW4XB13iJvqj89Okuy8IKHbU8Vf6aegzZc/nm1ONn3KXiUnrooEG+rZS0kHcpDAc8GqOvzpTm1i31M+5pC2cnjbFH//g== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(228905959029699); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095060)(601004)(2401047)(13015025)(13024025)(13023025)(13018025)(13017025)(5005006)(8121501046)(3002001)(10201501046)(6055026)(6096035)(20161123565025)(20161123563025)(20161123556025)(20161123561025)(20161123559025); SRVR:MWHPR03MB2480; BCL:0; PCL:0; RULEID:(400006); SRVR:MWHPR03MB2480; X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2480; 4:NlWhyYv3uUIJiYnw1w5IKQSlsYXePPd0iLOIUWoeadykGHb00zBBMF8ECse0qMZe89agiYLnuWuCOTBo9U7gpxx2oXvfYT0o/x7Oqbni//mmyjhU2QMLHPb8GA0TZYgpfi8ztJAwa+9q1O5pnOBu+rfa3a2MJG7a5W+LFDL7xfHvmvtoyJ5p8op2RSXyc8xtD2D6+ISktMHLFLLLd5wEXCoVrwDhogsBCcClOimkI5kA4pKcDdr9HtCleUDWMZ8D1aRVgBoyd5sjCjRjaUuM0KATV3RDIjVSWHcuOHkK+2maNhZ1GPBXa/oJNTb/thXEAClKflfJQDjHmiQ6VSQMG7FsF27KXfxebtMVLFVM3pOLJPsGZ3/8/JKJTaUusPu8oqN1iVdA9tlp2D1tuTpP8oYguXY974APwzZRbolgJ870eV9PNfjPwjCVHBxjizw3m/+dKC25MLsnvuRhra0j0AUEvQBi4EHZlqrQG5CabI97WccNCuAxo5HKQLIbAptCiOAVIzawKe9V8ONA5o4H/bZZhpUze1p9HGbBf2hF0XLcPykATSkzFafvDmN9VxhdqnZWuAdmCyJZ+SP4W8Z7qS3xMPn43JwnSfJlce/scX9WRUsu+MysZEbV62v3Dyrkpm9vbsMfnqHCc2qy/Da1D5ChM9U5Sm24oSHlh2fPkmJ9DyN2POAatsqF75bMPCnzcKIZhbm+Ff1T9tYLLXpXpTEC/rv3d9OsCjN/TpKVGRYoXIYetcu5kRpuSoD+2HjnDTK51J0i/dgQTjIgGCCsMw== X-Forefront-PRVS: 01917B1794 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR03MB2480; 23:TSnlbYAA6VpOo51nKBqSQrA/HCQwt/tclK46GhAbX?= =?us-ascii?Q?zblvDr3U3pUQLCVN+voQuZUT6pc/OujguIhBANBRHMiZVeqp+lKbgHi51E0D?= =?us-ascii?Q?d1R4QOwkRFOAwK8OGST5sxq2q3uMwfDyOdnV0NAgVZR2PjIdKjNTs+ttNYgr?= =?us-ascii?Q?1pQT+XxkQ8ajvkXSBIXeZOZv7xTKGX2II6XgFDiYtoulu5bgkReXAbgHAHGJ?= =?us-ascii?Q?H84zl7tekurFQWuqG3MvnEOQ5PcWffgopNdSpj6cogeKoTtpHdL21hfvSqbu?= =?us-ascii?Q?p799+eUCEzp/FNhEeFcRdJl/zQM7fybZpDvNzf6Y3U5Oyo0Z6YnwZgfMT85Z?= =?us-ascii?Q?93gI1qyOauOhT52il0oroSiLsc6TgladtA9/kHo67RTWAVscdst1gsMBVLAV?= =?us-ascii?Q?fOTkFnaYBmo3izfP/ov6LczS3jTRUgsaJlHZE2mLs68ehDmmDgAuGt9tMCpg?= =?us-ascii?Q?iaK/dqMJ5LTiyIVICRCycGxj3GBg+BUUmtW8U07ZDee6sFe2/2TyV0asQqJB?= =?us-ascii?Q?cBm6biae/TLSemVD2BDAJxFJSe9M8nOP89KhkqxDGcnOgqhVrtmrIVGP2NUT?= =?us-ascii?Q?pXmhMNoaD1mnzJRHyzlG3eUD+CRZWaSapTAK0IOlhj9q7ryWV4sjisnDnnP1?= =?us-ascii?Q?54WtGAZMEgp1Tpwruz5MJtI2zhkctksEkR7imFw/d7MVhx405HXjB1RWuJHr?= =?us-ascii?Q?OJGEMrgAuFHbVCVms0A57HBkktmPsMk8VEctUxZCZT1OcCYSZ6Z9XswSRRi8?= =?us-ascii?Q?WGiSTkUSOHCiFNzz1indsmr6zcb0cwNyoXiZpEOja8D+LWlO8msNA+qGeaU5?= =?us-ascii?Q?G+vgttbD1/CAd+QKdogc4QcfdV2f/XqZLZ6II9MXqyEdYXyQN4TvQH0qHq7p?= =?us-ascii?Q?0ePyslisiDjnAJ+gglEw65hLpYibDW6g6blQA3kQe2IyIjw4/pbZTUuqgMVP?= =?us-ascii?Q?QN5KV5TBsU4On5fmxwTOvJJxoWB+8FOUk9cM6x9dI7QzWq5o1/YXJk7hKrdE?= =?us-ascii?Q?bF3DLaVptA+RRYMn1B63aAjVSHmZC4H74X01pZD0u6b55Yj3sZBmOYrDatcs?= =?us-ascii?Q?xDPg9rIhTrzMwcYBm/F12Vf9MQc0q/Rqxnk4MY8jBMpf3kK7lzoxRauVYm9o?= =?us-ascii?Q?3iGLfAr+FgkCOXMwqDmOOW13OtRmwomGae0ha83TaN9dwRpUb7W5v4tnw0U7?= =?us-ascii?Q?1eT1QJmb9w1RxvyDMjDYbU7WkLyL/hojrt14g+iFPsQkHZWZBZEZMRnObqXF?= =?us-ascii?Q?Chu7OyvqtxbjY1UOGj7f7W72ni1OXPIOTmhTvO2VL8MXAGaZztbA9+0fCEDO?= =?us-ascii?Q?zNHZ37wNYl0feMj18eNybuWRCQ2et1TmGgkAjLJWoTg?= X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2480; 6:ziEyGZ/V5mS4DOCslO+z+nXL6joAzOc+kM1+kPm6NzMImGzAbLpxjyl9pcNoLPvpUkMJmDsNAR345p9hGjypRnnW9cMa0XiNC6u256khDaP851oo0isrBlwb6y649VJ39VWRjsAOlIK2t+sjZkqZwq1NFhzdE2n0iTv27GQFlynQvUGvzPChH6sAmaZr5GZDewqfaYhpqoSqZMKdOTM9hEjUwarvOB8Web1XWAhATpnXLWYRRYOVzWt5arLRi8PhrPmZzRPhmdf37X+XTchllylqiHg2hQ3gZJl/wfFOtN89GotfO9CzyMEoAWsxHfqhVC7+B9IDGg80IcSTPkyHRKsBooxbN4u1adz1XMc6hiJp1EZewwv2fYvNuUKDh2J5SQV9XIZDylhR9k8fWISzG3EG8cPfFRrJXtVQfQBDRp8jgIJFVlxnZXg+FF4wD6Sq; 5:P85n7/uk0RZdapDaDFgdk3eoqRc3T1Lo6Y8n26R0ny1Tvi6FPCapnI3aC8rQQrF1MyqsxBgsqW97InVrYo4SJ13EARzk2/5GWlpBU4yrr014rFxPSlwH1mVQVbnOi5OL+NFwiMkahkc+RlV36Sf5gM/yUR6C1GkFC2LwOjXMuMyNri8bi8v6PabtF0rls41p; 24:aG8Vs0BIlCR1/180VCI+J+Cn1Uwb1OnhwDHAQpuHLS3BxsbTlynsRBjBIxz+hRQIRxkAUBYDHYdpvgXV/DgQkFrc8s27y2iknebRcy13kKY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2480; 7:LRoDL3NyzYFRw02CUhYwzL8WGfk+dB2BBVHau2CvnNYhwYxH7sm6+8f202opypxhoLBS6Woqrg5R45Ldd9NNxIyghMMuzy9aUcF9C76hW27EywsAPh8wPmfF236tZcFYLxD+SszZNBTet9TqMUMKddFlOdlhh55UjC7iAUM63KIgIpfFPBZ7GUTQkupCVpcLCE5lcGQFf0DI0HvOnaVw0EbMu8/cECZAo1p6kUy72PD42A41Q/OdIphoPBV4l51esWR7tvf0XTzp6+soCf26KArIxCARJ603/hg/NZzK7Zy+fn4BWQOE/VsqVhwpyj3JUupt5BGGrrU+xQZweic4OVA29RHo3K2rEfmVYnW8eRKSLwFfjiGJwWSKr8G8Quy0s1l/o1x5pRkkfNxnyNwY1OPWmtyUHxHJhXM1/8Pu42/U2fMkrFyJJh7BJjP70wYM4kvS1qoF/rKeoPQmlPf35Q== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2017 10:35:38.5342 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR03MB2480 Subject: [dpdk-dev] [PATCH v9 11/12] eal: enable PCI bus X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jan 2017 10:35:41 -0000 Remove EAL initiated direct PCI scan/probe and enable PCI Bus linkage. Signed-off-by: Shreyansh Jain Reviewed-by: Ferruh Yigit --- lib/librte_eal/bsdapp/eal/eal.c | 7 ----- lib/librte_eal/bsdapp/eal/eal_pci.c | 4 +++ lib/librte_eal/bsdapp/eal/rte_eal_version.map | 2 -- lib/librte_eal/common/eal_common_pci.c | 34 ++++++++++---------- lib/librte_eal/common/eal_private.h | 10 ------ lib/librte_eal/common/include/rte_pci.h | 22 +++++-------- lib/librte_eal/linuxapp/eal/eal.c | 7 ----- lib/librte_eal/linuxapp/eal/eal_pci.c | 42 +++++++++---------------- lib/librte_eal/linuxapp/eal/rte_eal_version.map | 2 -- 9 files changed, 44 insertions(+), 86 deletions(-) diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c index a584447..a7f2671 100644 --- a/lib/librte_eal/bsdapp/eal/eal.c +++ b/lib/librte_eal/bsdapp/eal/eal.c @@ -562,9 +562,6 @@ rte_eal_init(int argc, char **argv) if (rte_eal_timer_init() < 0) rte_panic("Cannot init HPET or TSC timers\n"); - if (rte_eal_pci_init() < 0) - rte_panic("Cannot init PCI\n"); - eal_check_mem_on_local_socket(); if (eal_plugins_init() < 0) @@ -613,10 +610,6 @@ rte_eal_init(int argc, char **argv) rte_eal_mp_remote_launch(sync_func, NULL, SKIP_MASTER); rte_eal_mp_wait_lcore(); - /* Probe & Initialize PCI devices */ - if (rte_eal_pci_probe()) - rte_panic("Cannot probe PCI\n"); - /* Probe all the buses and devices/drivers on them */ if (rte_bus_probe()) rte_panic("Cannot probe devices\n"); diff --git a/lib/librte_eal/bsdapp/eal/eal_pci.c b/lib/librte_eal/bsdapp/eal/eal_pci.c index 48bfe24..e0deded 100644 --- a/lib/librte_eal/bsdapp/eal/eal_pci.c +++ b/lib/librte_eal/bsdapp/eal/eal_pci.c @@ -365,6 +365,10 @@ rte_eal_pci_scan(void) .matches = &matches[0], }; + /* for debug purposes, PCI can be disabled */ + if (internal_config.no_pci) + return 0; + fd = open("/dev/pci", O_RDONLY); if (fd < 0) { RTE_LOG(ERR, EAL, "%s(): error opening /dev/pci\n", __func__); diff --git a/lib/librte_eal/bsdapp/eal/rte_eal_version.map b/lib/librte_eal/bsdapp/eal/rte_eal_version.map index c43140c..f9ec086 100644 --- a/lib/librte_eal/bsdapp/eal/rte_eal_version.map +++ b/lib/librte_eal/bsdapp/eal/rte_eal_version.map @@ -6,8 +6,6 @@ DPDK_2.0 { eal_parse_sysfs_value; eal_timer_source; lcore_config; - pci_device_list; - pci_driver_list; per_lcore__lcore_id; per_lcore__rte_errno; rte_calloc; diff --git a/lib/librte_eal/common/eal_common_pci.c b/lib/librte_eal/common/eal_common_pci.c index d2699bd..a17ecaf 100644 --- a/lib/librte_eal/common/eal_common_pci.c +++ b/lib/librte_eal/common/eal_common_pci.c @@ -83,11 +83,6 @@ #include "eal_private.h" -struct pci_driver_list pci_driver_list = - TAILQ_HEAD_INITIALIZER(pci_driver_list); -struct pci_device_list pci_device_list = - TAILQ_HEAD_INITIALIZER(pci_device_list); - #define SYSFS_PCI_DEVICES "/sys/bus/pci/devices" const char *pci_get_sysfs_path(void) @@ -317,7 +312,7 @@ pci_probe_all_drivers(struct rte_pci_device *dev) if (dev->driver != NULL) return 0; - TAILQ_FOREACH(dr, &pci_driver_list, next) { + FOREACH_DRIVER_ON_PCIBUS(dr) { rc = rte_eal_pci_probe_one_driver(dr, dev); if (rc < 0) /* negative value is an error */ @@ -338,6 +333,7 @@ int rte_eal_pci_probe_one(const struct rte_pci_addr *addr) { struct rte_pci_device *dev = NULL; + int ret = 0; if (addr == NULL) @@ -349,7 +345,7 @@ rte_eal_pci_probe_one(const struct rte_pci_addr *addr) if (pci_update_device(addr) < 0) goto err_return; - TAILQ_FOREACH(dev, &pci_device_list, next) { + FOREACH_DEVICE_ON_PCIBUS(dev) { if (rte_eal_compare_pci_addr(&dev->addr, addr)) continue; @@ -379,7 +375,7 @@ rte_eal_pci_detach(const struct rte_pci_addr *addr) if (addr == NULL) return -1; - TAILQ_FOREACH(dev, &pci_device_list, next) { + FOREACH_DEVICE_ON_PCIBUS(dev) { if (rte_eal_compare_pci_addr(&dev->addr, addr)) continue; @@ -391,7 +387,7 @@ rte_eal_pci_detach(const struct rte_pci_addr *addr) /* positive value means driver doesn't support it */ continue; - TAILQ_REMOVE(&pci_device_list, dev, next); + rte_eal_pci_remove_device(dev); free(dev); return 0; } @@ -420,7 +416,7 @@ rte_eal_pci_probe(void) if (rte_eal_devargs_type_count(RTE_DEVTYPE_WHITELISTED_PCI) == 0) probe_all = 1; - TAILQ_FOREACH(dev, &pci_device_list, next) { + FOREACH_DEVICE_ON_PCIBUS(dev) { /* set devargs in PCI structure */ devargs = pci_devargs_lookup(dev); @@ -468,7 +464,7 @@ rte_eal_pci_dump(FILE *f) { struct rte_pci_device *dev = NULL; - TAILQ_FOREACH(dev, &pci_device_list, next) { + FOREACH_DEVICE_ON_PCIBUS(dev) { pci_dump_one_device(f, dev); } } @@ -477,16 +473,22 @@ rte_eal_pci_dump(FILE *f) void rte_eal_pci_register(struct rte_pci_driver *driver) { - TAILQ_INSERT_TAIL(&pci_driver_list, driver, next); - rte_eal_driver_register(&driver->driver); + TAILQ_INSERT_TAIL(&rte_pci_bus.driver_list, driver, next); + /* Update Bus references */ + driver->pci_bus = &rte_pci_bus; } -/* unregister a driver */ +/* Unregister a driver */ void rte_eal_pci_unregister(struct rte_pci_driver *driver) { - rte_eal_driver_unregister(&driver->driver); - TAILQ_REMOVE(&pci_driver_list, driver, next); + struct rte_pci_bus *pci_bus; + + pci_bus = driver->pci_bus; + + TAILQ_REMOVE(&pci_bus->driver_list, driver, next); + /* Update Bus references */ + driver->pci_bus = NULL; } /* Add a PCI device to PCI Bus */ diff --git a/lib/librte_eal/common/eal_private.h b/lib/librte_eal/common/eal_private.h index 9e7d8f6..68386e8 100644 --- a/lib/librte_eal/common/eal_private.h +++ b/lib/librte_eal/common/eal_private.h @@ -108,16 +108,6 @@ int rte_eal_timer_init(void); */ int rte_eal_log_init(const char *id, int facility); -/** - * Init the PCI infrastructure - * - * This function is private to EAL. - * - * @return - * 0 on success, negative on error - */ -int rte_eal_pci_init(void); - struct rte_pci_driver; struct rte_pci_device; diff --git a/lib/librte_eal/common/include/rte_pci.h b/lib/librte_eal/common/include/rte_pci.h index 05cf693..53793f3 100644 --- a/lib/librte_eal/common/include/rte_pci.h +++ b/lib/librte_eal/common/include/rte_pci.h @@ -87,12 +87,6 @@ extern "C" { #include #include -TAILQ_HEAD(pci_device_list, rte_pci_device); /**< PCI devices in D-linked Q. */ -TAILQ_HEAD(pci_driver_list, rte_pci_driver); /**< PCI drivers in D-linked Q. */ - -extern struct pci_driver_list pci_driver_list; /**< Global list of PCI drivers. */ -extern struct pci_device_list pci_device_list; /**< Global list of PCI devices. */ - /** Pathname of PCI devices directory. */ const char *pci_get_sysfs_path(void); @@ -124,6 +118,9 @@ TAILQ_HEAD(rte_pci_device_list, rte_pci_device); /** List of PCI drivers */ TAILQ_HEAD(rte_pci_driver_list, rte_pci_driver); +/* Extend PCI bus definition to users */ +extern struct rte_pci_bus rte_pci_bus; + /* PCI Bus iterators */ #define FOREACH_DEVICE_ON_PCIBUS(p) \ TAILQ_FOREACH(p, &(rte_pci_bus.device_list), next) @@ -208,8 +205,6 @@ struct rte_pci_device { .subsystem_device_id = PCI_ANY_ID #endif -struct rte_pci_driver; - /** * Initialisation function for the driver called during PCI probing. */ @@ -416,17 +411,14 @@ rte_pci_match(const struct rte_pci_driver *pci_drv, const struct rte_pci_device *pci_dev); /** - * Probe the PCI bus for registered drivers. - * - * Scan the content of the PCI bus, and call the probe() function for - * all registered drivers that have a matching entry in its id_table - * for discovered devices. + * Probe the PCI bus * * @return * - 0 on success. - * - Negative on error. + * - !0 on error. */ -int rte_eal_pci_probe(void); +int +rte_eal_pci_probe(void); /** * Map the PCI device resources in user space virtual memory address diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c index f77ff5c..6bb7fc9 100644 --- a/lib/librte_eal/linuxapp/eal/eal.c +++ b/lib/librte_eal/linuxapp/eal/eal.c @@ -803,9 +803,6 @@ rte_eal_init(int argc, char **argv) if (rte_eal_log_init(logid, internal_config.syslog_facility) < 0) rte_panic("Cannot init logs\n"); - if (rte_eal_pci_init() < 0) - rte_panic("Cannot init PCI\n"); - #ifdef VFIO_PRESENT if (rte_eal_vfio_setup() < 0) rte_panic("Cannot init VFIO\n"); @@ -884,10 +881,6 @@ rte_eal_init(int argc, char **argv) rte_eal_mp_remote_launch(sync_func, NULL, SKIP_MASTER); rte_eal_mp_wait_lcore(); - /* Probe & Initialize PCI devices */ - if (rte_eal_pci_probe()) - rte_panic("Cannot probe PCI\n"); - /* Probe all the buses and devices/drivers on them */ if (rte_bus_probe()) rte_panic("Cannot probe devices\n"); diff --git a/lib/librte_eal/linuxapp/eal/eal_pci.c b/lib/librte_eal/linuxapp/eal/eal_pci.c index 300064d..51522af 100644 --- a/lib/librte_eal/linuxapp/eal/eal_pci.c +++ b/lib/librte_eal/linuxapp/eal/eal_pci.c @@ -232,7 +232,8 @@ pci_parse_sysfs_resource(const char *filename, struct rte_pci_device *dev) /* Scan one pci sysfs entry, and fill the devices list from it. */ static int -pci_scan_one(const char *dirname, const struct rte_pci_addr *addr) +pci_scan_one(struct rte_pci_bus *pci_bus, const char *dirname, + const struct rte_pci_addr *addr) { char filename[PATH_MAX]; unsigned long tmp; @@ -350,21 +351,19 @@ pci_scan_one(const char *dirname, const struct rte_pci_addr *addr) dev->kdrv = RTE_KDRV_NONE; /* device is valid, add in list (sorted) */ - if (TAILQ_EMPTY(&pci_device_list)) { - rte_eal_device_insert(&dev->device); - TAILQ_INSERT_TAIL(&pci_device_list, dev, next); + if (TAILQ_EMPTY(&pci_bus->device_list)) { + rte_eal_pci_add_device(pci_bus, dev); } else { struct rte_pci_device *dev2; int ret; - TAILQ_FOREACH(dev2, &pci_device_list, next) { + TAILQ_FOREACH(dev2, &pci_bus->device_list, next) { ret = rte_eal_compare_pci_addr(&dev->addr, &dev2->addr); if (ret > 0) continue; if (ret < 0) { - TAILQ_INSERT_BEFORE(dev2, dev, next); - rte_eal_device_insert(&dev->device); + rte_eal_pci_insert_device(dev2, dev); } else { /* already registered */ dev2->kdrv = dev->kdrv; dev2->max_vfs = dev->max_vfs; @@ -374,8 +373,8 @@ pci_scan_one(const char *dirname, const struct rte_pci_addr *addr) } return 0; } - rte_eal_device_insert(&dev->device); - TAILQ_INSERT_TAIL(&pci_device_list, dev, next); + + rte_eal_pci_add_device(pci_bus, dev); } return 0; @@ -390,7 +389,7 @@ pci_update_device(const struct rte_pci_addr *addr) pci_get_sysfs_path(), addr->domain, addr->bus, addr->devid, addr->function); - return pci_scan_one(filename, addr); + return pci_scan_one(&rte_pci_bus, filename, addr); } /* @@ -451,6 +450,10 @@ rte_eal_pci_scan(void) char dirname[PATH_MAX]; struct rte_pci_addr addr; + /* for debug purposes, PCI can be disabled */ + if (internal_config.no_pci) + return 0; + dir = opendir(pci_get_sysfs_path()); if (dir == NULL) { RTE_LOG(ERR, EAL, "%s(): opendir failed: %s\n", @@ -467,7 +470,8 @@ rte_eal_pci_scan(void) snprintf(dirname, sizeof(dirname), "%s/%s", pci_get_sysfs_path(), e->d_name); - if (pci_scan_one(dirname, &addr) < 0) + + if (pci_scan_one(&rte_pci_bus, dirname, &addr) < 0) goto error; } closedir(dir); @@ -712,22 +716,6 @@ rte_eal_pci_ioport_unmap(struct rte_pci_ioport *p) return ret; } -/* Init the PCI EAL subsystem */ -int -rte_eal_pci_init(void) -{ - /* for debug purposes, PCI can be disabled */ - if (internal_config.no_pci) - return 0; - - if (rte_eal_pci_scan() < 0) { - RTE_LOG(ERR, EAL, "%s(): Cannot scan PCI bus\n", __func__); - return -1; - } - - return 0; -} - struct rte_pci_bus rte_pci_bus = { .bus = { .scan = rte_eal_pci_scan, diff --git a/lib/librte_eal/linuxapp/eal/rte_eal_version.map b/lib/librte_eal/linuxapp/eal/rte_eal_version.map index 6f047c5..f0e63c3 100644 --- a/lib/librte_eal/linuxapp/eal/rte_eal_version.map +++ b/lib/librte_eal/linuxapp/eal/rte_eal_version.map @@ -6,8 +6,6 @@ DPDK_2.0 { eal_parse_sysfs_value; eal_timer_source; lcore_config; - pci_device_list; - pci_driver_list; per_lcore__lcore_id; per_lcore__rte_errno; rte_calloc; -- 2.7.4