From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on0067.outbound.protection.outlook.com [104.47.36.67]) by dpdk.org (Postfix) with ESMTP id DF6542BA2 for ; Tue, 17 Jan 2017 11:06:32 +0100 (CET) Received: from CY1PR03CA0014.namprd03.prod.outlook.com (10.174.128.24) by CY4PR03MB2472.namprd03.prod.outlook.com (10.168.165.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.845.12; Tue, 17 Jan 2017 10:06:31 +0000 Received: from BN1AFFO11FD027.protection.gbl (2a01:111:f400:7c10::111) by CY1PR03CA0014.outlook.office365.com (2603:10b6:600::24) 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; Tue, 17 Jan 2017 10:06:31 +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 BN1AFFO11FD027.mail.protection.outlook.com (10.58.52.87) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.803.8 via Frontend Transport; Tue, 17 Jan 2017 10:06:30 +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 v0HA67Tl024558; Tue, 17 Jan 2017 03:06:28 -0700 From: Shreyansh Jain To: CC: , , Shreyansh Jain Date: Tue, 17 Jan 2017 15:39:33 +0530 Message-ID: <1484647774-28984-9-git-send-email-shreyansh.jain@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1484647774-28984-1-git-send-email-shreyansh.jain@nxp.com> References: <1484581107-2025-1-git-send-email-shreyansh.jain@nxp.com> <1484647774-28984-1-git-send-email-shreyansh.jain@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131291211910618790; (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)(39860400002)(39450400003)(39410400002)(39380400002)(39840400002)(39850400002)(39400400002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(4326007)(2906002)(189998001)(97736004)(81156014)(626004)(8676002)(5660300001)(8936002)(8656002)(54906002)(30001)(47776003)(38730400001)(36756003)(77096006)(6916009)(48376002)(50986999)(6666003)(33646002)(85426001)(76176999)(50466002)(50226002)(86362001)(575784001)(110136003)(81166006)(92566002)(2950100002)(68736007)(5003940100001)(305945005)(356003)(2351001)(106466001)(105606002)(104016004); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR03MB2472; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD027; 1:6wCWjBpJrCYDr7knXXGuW1RbrWf+Djmv9QVV3gHqu/NmQVkron67ZVesNeqDps1FuHyaUJetJPsaq/9LsgAt0TirkXRb3/H9e0mWr7/uwK94ccCYgqaWj4e3DVQ5phFjTRoS2czAfo8MG/i1B+4+gl00g66h5uEdGbSMsX8QiGpBCnrohjEwqw50WSPk8sQIbWv3dMVIOODgohlJ9jZT6wNRAKmecSHRaZWoHhieozwdMWxaXQYs3dj4q9+l1pubE7MuXZiNUrJnEb09kuXvw+iES6iuI8H3j9pPkYcP/30Jcj+AsJxOszcUP3zRVuA6mvGoa9ggd2h1sQuK0dZthjJDAloDnfU+w3OeyVl+TWDP3FLdxe6pSjgDdYbuNJ0ukkjD3RQYRIbijjyu6dZDp9G45ufEVzfER95nCtTGzyU2DXHei3b6WYrjUKwdZAmcLhKZGZG+5J2XwjDGIzRf2BrfPWHQJuTLaHKjUuP8B/aAUOE0ebxGzZecgn3nVTJ1ppf36z+Wss2VgkyxOpJIGZlq2YX1fjMaSr78vs+ktsrbMCLxjyA7w8oCxCUEkSjGlCZh1JfIbqYf/UmcagCxee6BNbTicfCQNmDacVJgtThmqiBXsnX/4XHqotfFvpX0ibU0kBmJ2qeifaGRKbLmlIRlGZA9goXrbfL31mbIlYjkc2VWQPauG/eb9IELkvdJxxN3ghSnzp/Am4ruav+eDA== MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 1d742e67-1905-48a6-751b-08d43ec08276 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:CY4PR03MB2472; X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2472; 3:mD3daRwMJXzv/+l9wZgp0AuIre3tdWUVeyBdiBvPSvqCEcvBc3Rw5FK674LVXMr5TgaxzgwA+IZ68dsfzD+RHiPfvV+tjGKPqcJpENdl4m8AdQb1aAPrt+xbQFf8kuLDBLDNAxPcpTT0eXOmerVBab+BcPZ9mf4AFtCSukGGMz7nlaTIF87rhxels99GQ+UidYYlonT3FhTN80tLR3ziAgl6Uz5sH8o2dUZu28f11xbeeKCYBz0rv8JQ3q8Jn+Erc+ItlOaLMZ83+aHl5f+YUT2oqu1Ywm9XPPKj/G0lYxo65fPqPvwZXRRK8omC/0ALZ9IgvYDJMkZEGf6FnerB/ZbJmJfkup/Qq/I8WU4o32SKYC7yAUcr3yEQhg9tqeVa X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2472; 25:mN4qiQnipua0eqc0NsTDya39hGQYuBLvmMPymXx55p8Y+uMaLu4IaNjZoxbh/yCv0CG6AkEo/5e+eBI9h8nj9adoS7fCuLI+yqFnQx60Jh/NagP+fpHihMikhDMj6px+cOarewdq7PXusPsUDZRW/0/wG0Ys5giRawvGVkyKO6orueA9x327e0iwYobgZFB5R3WlEGi/ho2kcsaulHCf2xdOb3bzbNiMntg2qIKmzn4rnR3j7HHJmTGw7kNwJlA6n4ASBXsUxvkfrSwIuMdz+bXSHIAqvZ89XW2jgT5ceb1fPhggffdqBAM4kQKQT1F+2whB7Yb+0WMGSsrGWKf0mK1pKhoFbpwlmUOw2FmAgOEs4TkVakDmjZ7sPud8te2fZlDLMAO7c1N6RTmQsEsC975q5H7EH/0cN9qNS9Cjdj0XF332ZOiWqbXJxgnUMG82m1GOVu1rEwcu9QdopfFL8V0mQpitiIpUqeryzlPD176HJiIcsNz0RMrGcpBzsST6xfCo1haDWkGVbFoOTmCyZgjNGAme94L/ZAqie+SOEDH0lC+HdiO6tOVNkVRlvshH3yL3KJgqHOAlgvQvd0/RG554hOowX9Iis1yI1YAPS1I/8bWf9ukUD0L3ZuNg6j/vACUvdJYSWKwEeDxEhU02PuX35z6MvfdCEa8t1g9dlnM4WYMbLcwwQLj3rJy9znSdjXJjn3lpOF3RLpASQovBYkhCfn1YVpqORXpFb/3bIJg80nq7GCQxe2eCVP6XU4UUuaFkcYtVd8swZmzJv6IS/0KTiXgYMFnUYp3TpT7hqqs= X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2472; 31:Yy6R4WNWlDVWI8Y81DF6hhKTbiv+oXVe6S3qvcUdVyzI44DHKB2/CwkIFjY5kugaopWOPpcsfNeHOFkEMVnx79TAOP1cUNmST9/Mf/zsTEt7zrIO/hdDR1o5HowmyIBk3aZjCMNHeEzxgVysDgeqtFxssy1dc0ZL5pk2zx4ITpt2eP4kC9saZPmrbfscq0urxa3kiUTM55RgZzwAmWYJzONQ5/v5VBxMMhwaqGhuQUI+/6JZ5LNkPHc5CItLzk2i53H8jw7BB02KfCcWnXgZcQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095060)(601004)(2401047)(13023025)(13017025)(13015025)(13024025)(13018025)(5005006)(8121501046)(3002001)(10201501046)(6055026)(6096035)(20161123561025)(20161123559025)(20161123556025)(20161123563025)(20161123565025); SRVR:CY4PR03MB2472; BCL:0; PCL:0; RULEID:(400006); SRVR:CY4PR03MB2472; X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2472; 4:jSFgCRKB2zW4VXTFvFkWMMxdjyX7u9k/wLIV0WV92oVMjINExyDXb6sUHhySRGLKGrTUCAehm2wMnRtByvv2ye9CZCwkfUTcrzKsD1WkMGWeJ9HXtUF/F/PuY7csCdP7KHSaVnKL2NmhKVB4BLXBBNm8NlEs4ZIEKSyenikF3w/9M8PjvH0lCBaPVWevmkQbfP7Vl7Q2Wt1+AtmM0AS0Rhr/lBRq26OIfRCAtpIJNDcgGOqaxkOK9NhygigQ08rmYuVG5M7rrVUxNg0M9jSnK1UJFVnsYT8vUGjDJMSXKg2pnpFd+jDbu2bn+iahzPE72eeTykuUr/a4OYod/RhE0qu39ves2RmEgGNIsqwk0ecuhYsmvFYlWSQmYuTvQbKVCXXkiyuZPK9j8HY6QoPdPqHH5xAOUjxmAKuxWJAtaWbh9bLSQbAaf+25j//MAL+K+ob3cXhfM/pmphilzt2UOR2aHte0sA22yaGW6rD3RJmGgGDg73TWg/gPjWu+8IBpHRx8ohUG98AzY92Lk1Hs2lpk/4UXKrmBzBiCcTprw6JEsGqNF7MnLu1+UTpHozjXPAp5FzfOTdwSDyBt2stkp2yMyfylNYn8tELK6TFNtaABWqSbcpYsyX9UcKBJnDrwLVo0YF6PV6EcRAg9IUP6UeOWZ5GdO990AMspeYdhIW7VWvqvs/VlYRc4+hDpLHRPC5wGpErxrc19QyLPDH0ZApzLyBn/52E8S0B9QOKh1pdFOnXFAsx0FtoGkVOtdTMr X-Forefront-PRVS: 01901B3451 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR03MB2472; 23:k75p4n03EbffkResWwNqV2CcAQEE7teigFVTwHLhl?= =?us-ascii?Q?Ua2eN/oVNVNXojmfrsyIiSht19sNH1nRPSAGHE5WSZYY7fuPd5aZ605XTIm0?= =?us-ascii?Q?6qiD0o1XfuWY24TSiKRErKEnyAKJMV54DISN0Y4mtgXXxcMCMohz0riaERZT?= =?us-ascii?Q?rmzl7Q4d9/poSpVy6rELoyoCTmUuxLh6GyCtj6wn7rXQTOPWg1ifFf90OV1x?= =?us-ascii?Q?VzhFtfYc4FM9MkoKs9fAmd17QP1W2Sgz4Cdn2iP2Lw0Q+hX20Vcqezbkwj/6?= =?us-ascii?Q?VjiWj5gYeCv4mz5yX/X9707kSAKFN5uSD3Ufy33rGr69iq8igVNcAAM+hUZb?= =?us-ascii?Q?HzVatqsk+eL4rH6yGfaJDDV8apmdGBkrwAUKFSFtDrrFLnss5p4DRqZiMVc+?= =?us-ascii?Q?btl6V1ldn2tVyQ1kc50XFs2sJdvZJwHZJ3S0TpuRgUTfGK/VUI6lv4U+bh+U?= =?us-ascii?Q?DOhjQYcRqZNPMAY8yHgZBaFVMaXJnMVN1DcadLFW9Hyq7ByKFsRv5deo5j2b?= =?us-ascii?Q?sY9AhBwvesXbFg4jVSNYPeilFweOkBz9WbQ4Vy6H6m9PCpX/iqBnLZ0ts9OM?= =?us-ascii?Q?9lGTLaTy7pQ4Yw94lkrCN+OvVpe1Pqi5Na4Kfmj1K+0pXFwGDG78TO9ojBjl?= =?us-ascii?Q?pkP1RPUxRzyi+sSOx7sJNxt0P666VQ4xZrsK57c0vNgNa2SBxxqnFNIbvv8x?= =?us-ascii?Q?WUdz7QMI7+/670b/c43oL5NaBAO3p3p/x/7gQn503kOb91EZGKhM6iVZqvlX?= =?us-ascii?Q?uTgWWZQL0shLMZzBqs6LQpOnURpK5OAh0hexDsZZyNXN2KNVmmlZcazPd/I+?= =?us-ascii?Q?ICHrQLn3JJKSU68Vybtbjp/pjPgI/5TufthMF8ARN/4ZMzytW5PnZHtom4Km?= =?us-ascii?Q?aLIWnLhcf/WgwtPMOEtiQuim3u5mkMvQivxVeNgaraA0orfts2uxINKMNml7?= =?us-ascii?Q?+cdbs64KWSFzBu5PxbedgiD1iugw2Kfr8GU3od/Zt2AYyQ0d1cAB3UKd4i5z?= =?us-ascii?Q?JXp+E9xgXexFncHV1MAF0u05em6CHgbTXio0Ob7GtYBj6WepFFa8rbRkNnvn?= =?us-ascii?Q?i2n91s1j/KkmzCpHnxg3qnNo+WOp0Czi6JEaqWHL+0gY3xgx1by8A3xibGol?= =?us-ascii?Q?hU+QA+AvU+Ya/VIxtAJCHNe4iSu4zCD1nwNgR32Gs4SEBOw0IAzmaAE1g/rU?= =?us-ascii?Q?vv+b0IYUHWXkeZ23x2xchhN7ItWzk0X/pnKjnx1LqMGhLSxoz9zeSDU8sJ9p?= =?us-ascii?Q?mIr7EhZZCq7bkIIWXOZau/9i9Pj32dQZUlsssvcibCgvTaXIq9NqNhdSptxa?= =?us-ascii?Q?K7lUYFAwUQ2eOUO9t80L3aBpqaI+Dss7QEpJDeGN0wV?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2472; 6:lnJYI6ud5L10+s5/hPxGDl1mPWgUyYlayGm22J033anhAil+y08lGUZa4SHAyKs0ymCzmr/pslr6/DOjKHuL/pWDq9i8BNYaPk9kVNAnQaCXrlOdWahJxwkg+wadeeORvYG2wnJNB5sEPnehnzMwd69jieToFQ92511d0pFX53kBaPkrlZ9aBBJ+WCTPX58dYAQt83TIeVQr3ohefRZoX/OcxOPm4NYlAIn1/XDywbJ8q7m0B1dDLLKcgDqHp1MxU0KHlYMFtDgH4G8mbG4LQTGKEq3LAybm5JNYNBTM+90+C3pC2oYDB6C4EYbVXdSr+btp7vg33AGXUF2uZCdubYvSLO/AC+/E2s9dUIJJCbtOnb4l7bw2qXTfca76Fvvx5H9KOv4goGUt3fVd5I23CkXjhiLEqgyWbUvd5wiPX1EPfqDZiCn9lxqS7mhQFeD7; 5:xcfZNayv3YbpKUWs+8Z5a6uzQIJX1MXANPiMWb34bYmqPxLDVdzm9YXz1zgDLOcCV72VDxJ5VZ8fk3i5hCjggpwxOcxDo0xfokIsrWPj6gKmOgKEGoQWUXWsbtfI3vvoesg0pgXOED9mkjYMpIWfI408ySPJqkghVrqcPqNJeVu0H2/IVK+qKY/IczL4hbSl; 24:0MaiVm3GRtloEVn/joGY4iebaPNtKmHfOQ3INpfMTjiGibxxUOuhzhiGI2lPAMZkbxeiHqXaYbeWD5UP5oP/v4+D1NtIedVCXyfitbCGLbg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2472; 7:zYJycy0vl43QtmDv0G+D7AdLLil/E+Zrh53TqIa/79mrBoNBCNT8KM6YuAuIeAsG8/8NO28ALgpz5id5NrYG84F0T8L7YphI/mIy2HiwamOXh0oaU9iCl2jS0I0n4VZbGUi5hUGmmlrPsNerJ1o5RCy6BIi3hhkfXiPb9p6LkU+Pb/rep8UzA9u63sfX0y7kk7RTcuKqGVUjrgVtbC7rT6B23TGPbvcFupzaE3aOrpxsZID9ox2hh6F7pZ/BXV2WWt19wZfbWP9Pis93pDfy7aLcHfi1AilOnw0bgbNWBYIgt5z9jZOxAQMi7oGTOADRW3B7C7B+bp7Y6fjAorEC1holOxs/fep99W2F7Lkkl5KqgpaLjsf/ubIumGyIt09SDK2XmukGaIc2MHQQKo84nvZKiGqdz470NAwtAcYvwuhPMp4UOId/ZkNcWkVEQIds5LXS1QSVTDf74BnH5RhsIw== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jan 2017 10:06:30.7654 (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: CY4PR03MB2472 Subject: [dpdk-dev] [PATCH v7 8/9] 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: Tue, 17 Jan 2017 10:06:33 -0000 Remove EAL initiated direct PCI scan/probe and enable PCI Bus linkage. Signed-off-by: Shreyansh Jain --- 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 | 36 +++++++++++---------- 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, 45 insertions(+), 87 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 5f2cab5..d8c1350 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) @@ -315,7 +310,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 */ @@ -342,7 +337,7 @@ pci_detach_all_drivers(struct rte_pci_device *dev) if (dev == NULL) return -1; - TAILQ_FOREACH(dr, &pci_driver_list, next) { + FOREACH_DRIVER_ON_PCIBUS(dr) { rc = rte_eal_pci_detach_dev(dr, dev); if (rc < 0) /* negative value is an error */ @@ -363,6 +358,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) @@ -374,7 +370,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; @@ -404,7 +400,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; @@ -412,7 +408,7 @@ rte_eal_pci_detach(const struct rte_pci_addr *addr) if (ret < 0) goto err_return; - TAILQ_REMOVE(&pci_device_list, dev, next); + rte_eal_pci_remove_device(dev); free(dev); return 0; } @@ -441,7 +437,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); @@ -489,7 +485,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); } } @@ -498,16 +494,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