From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-dm3nam03on0069.outbound.protection.outlook.com [104.47.41.69]) by dpdk.org (Postfix) with ESMTP id 94117FA6D for ; Wed, 18 Jan 2017 15:03:53 +0100 (CET) Received: from BN3PR0301CA0050.namprd03.prod.outlook.com (10.160.152.146) 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 14:03:51 +0000 Received: from BN1AFFO11FD028.protection.gbl (2a01:111:f400:7c10::147) by BN3PR0301CA0050.outlook.office365.com (2a01:111:e400:401e::18) 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 14:03:51 +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 BN1AFFO11FD028.mail.protection.outlook.com (10.58.52.88) 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 14:03:51 +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 v0IE2515026776; Wed, 18 Jan 2017 07:03:49 -0700 From: Shreyansh Jain To: CC: , , Shreyansh Jain Date: Wed, 18 Jan 2017 19:35:27 +0530 Message-ID: <1484748329-5418-12-git-send-email-shreyansh.jain@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1484748329-5418-1-git-send-email-shreyansh.jain@nxp.com> References: <1484735880-17178-1-git-send-email-shreyansh.jain@nxp.com> <1484748329-5418-1-git-send-email-shreyansh.jain@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131292218313403683; (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)(39840400002)(39410400002)(39850400002)(39400400002)(39450400003)(39860400002)(39380400002)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(77096006)(104016004)(189998001)(81166006)(81156014)(8676002)(50226002)(47776003)(97736004)(106466001)(105606002)(8936002)(2906002)(5660300001)(575784001)(6666003)(4326007)(626004)(53936002)(6916009)(68736007)(86362001)(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; BN1AFFO11FD028; 1:7N88dCEqY9muv2NTjSlTZjOY606/I946r94Rd1iaAyk6mwljO8ScQ3YeN4x5cZTfq7KsccvY4/1gun3vPUwMo0sIaBLN6kH/u3hjqCMw4mwrymp5mR5ctOMucRF+msuN9Z1BWbw4i88vBXNjowjley/gkGoGsKUWdioRgtX0xv6ry9CbslujIR/BCWy1hlCFTmzKFUYCvU5M0PMArk/ZMyiHG6P391fjO/qVYv8xwwySMDvwbZiNiSyAlLkTFqnhWEOqlEPCXjrLrsHsxAVvoOysl0oNNQnN5HLQei0lBhGHjI/jnbx/hozJv7IC2k1DjfJoe+/7QKDFyCX20eqyZVTzJFP77Wovrr7JhZN4hWrDewOSASPqV3wTZ77q/P95D3ToO/Y8u/NuwC0OAQIYb9i6dlhzgrhOn8SG314OiMneeTCs7A/q03q2xq1SrKE/bFtn9H+99M7a+iPF6UuYQq3F3z4yM4Djs04srTk9vI7MzsBzQAJJV1vflYGG/P+LUgER0MUhLenwIyHweVq2EB8ebq9icKGtuXh+64QeYWX5HcAv/IV3pg8E9+ifeQck8u2Y3yJa0WOreliujfJnINNZi6oZsYvN5STqc87BI6aR0rWJiZTZugDKZuPtaSRo/BqHTAbex2KtQb6h0KMcD1MJhB+3W9hVX4REaw2YMlSw30qR8DQAI2qdOmKXchMs0yoZTu0M2cMHcxbKfzDmiQ== MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 4155993d-ca0b-410e-8bc7-08d43faad4cc X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:MWHPR03MB2480; X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2480; 3:bi3dBrxLOkNIgfEcMM1AfSCWlpvuTIpIJ/r9wyCo/ZZxgj0wnpR5HdECBI53PwQ6YFqzU4Aa/wBGc9y/8wJ8M4ShqJvwkYOMopZe4XZYXsVjJMnfsR/zAIpLxFliPRZFldcGIZjLO1sA3Cy05PG0aLKXqlcqUThvmv8suJLbpCN+0jcABGRxh/vl2FVtLLCYI0RRA0iogEO09+ESqaEOeEXjCV4cbjsMbtHSfBDRDaOu2ZLCKGnw5sEyzgf1v+/ok77GCZP/gmj0HR8wPCFM5XH2oGtss8aGJNnJ7e7/Nxx8oNQoGexko6+81vwJ7vo/PbA94Q2aQCWzCghDAuf8zzqdTXkexDA1J8I+fSaiZzBu9OKYfPn7TA6UZ8xqQr8y X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2480; 25:bDR3iIyGAR66YXaAbxweRWZpDA3px9aL6SDi4kp4+BejlkdH+OwC+dBtUjTLmp/bMZqMrPakeILJziUHHNuJd8D7ZPlnAoGEx+vwqZseGYsxTKG6xk6mBcLtVhNeJAVoccBAocG6XeNb5fvINadgfnwKQ+gyrXGSXSrNwfPYKvT0FXir/CRs26831+Fp+yUwr6LLPqyvioLuArMyibxzcqcNqQ1DaizKCHbf5TEja+LfspFSecayR9a8Y8N4jcEiJXbS2hSDMq56u5ogXYghekV91IVnUdNNi/wuavguKtNjzF0SlB8ErgYqgmW5rw3VgrBKUY0Vg5Qfx8oWnJXI2VOXnaGduiSqxUVug3xhuYiOEKGuCBZkorbiMNAvR6iMS0m42vPSwcRjEUt1dCGDhIvQd48+0YlCPqWO2zwPzuj+IdSMSE/+lmyL1VFEjblUYIQ/L7SAzX+c6FAXvQzfD3CbCr8wh7Cuoj5sugG86CWXSnkACjYYKEYg7/cxaJA31zxRBzqM1GRloC5JOePLuF+7F1B+FU1RcCBSM+voApZw/6BMnP062tEqI47FNzhL0+6aIOEhA7fWZFbEXbUnD/tHCJ5Jwvlm6pyft7ZVNZ2Ns0uNnpa8/8R5fXqXMDZNQL9PpD0AknZ4wcGTfGAcJsukFndxaMrxnrPGUGIyyE/NDN2zE1jZKQRecqvwZIDB0bojcl+qjIXKcoIERyH/ieaWiBrdp8YJkhUZNovr/eqit3h5SpGg65PlB9AB8s+/wv1VWnDHwAHm8iTiwkDDDC05dsNWhYQzB+RuAH+bQDY= X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2480; 31:DjE7cCL9P1fKIdqvq5Vey4bSY9v1tAq7wjvhvVCHGRfbw5RJB/ht4isbhrqFVNPKUMB2l5VlnljNLUwWEia/7vrG3L6i0JnzkbYrQwTCJq+TddHL+1C/J+0LEbDi3H4V3HX+AMJZ4x4Xok7l4tLPKE0yZmXJm4V3UMCFuRyITkDzV3NmzKV+L2voQiwuB3Tdy6I7ftalgOxBRd5krQYiMav3Yw7i3/1wWTADADR1uRSfv4SC0PVBHHmVkwzcn9PHuLG6sgQqVPOHahkAVJlXhKHLy5KGzTCxawjtGRT3dtw= 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:WZGZi5wXZBTkqE8UT1wjQQ/2orDctkTgC+XMHrn87/13sYBfkiBi1fZgR3IMEAYRz5NHcQe6AzgK8OmDgr/4DU0F7oIdbPHxUmqBAmB7u8V0IL8BsJBT9ZyfeWYgPujd8JiZ4FPvUJHForfJlhhIwwKIbP/KhbvQ3diBxjnFqTXYuPmOEDfpKoIyC19MJzr8YT8N1TPUaQ37704TFghIdy6RVuczZZaQlFhLQHgVMZvf6Fl8Bbzo+MWl4srmucgdRzxcrDvJZ5hOsIZDbSnIjU0iTydtDBxloMeSOBPB66PRlvs8Cm9NaO0boPhZkm9J1MA6OUP3BKVXadY7H+0hX50tkYwVpWvp87I1qFFcJ7tukf3iZDcaZ6kBH+OxgAEuGLviuSVh1ObxEKAU3vYRlyQz2x7nbSNRxJCzAWtXyfET9SA3w2vs8seGx+xZ1uqqMz8xzVlD6brQJzZsNjopl78x4bWpH4Sdr4ENovFVbE2AQKRJz9gIkJ9Qee8REEaFvvMUfwiNzp5VIF+mmvjSox8MnxLKlobArVga9GDeaGFE1m4QSNknxiHDAmCM21VeLMLL/aui42FYKSYmWcEEzVsIY2FaeXhrbNHRuxwSVf8hBKWrkAzy4JeNduYHb/AaNAmElgC4cqYdwRFzd3vDU+2DHojM0aikK7BY3BaIAmoQ4bapcmkVVBtE3wHHaiPma07qnOukTepdplwB/31ilUdb+6KJMT75Syhg+asR3jCIKFn82r40aMOHfgHznC+l+ifGDCV98HMJbH89Rqi3Kg== X-Forefront-PRVS: 01917B1794 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR03MB2480; 23:/MR9Nliv/EMIogkE9hmAQQLdjmf0mG9F7cKEzpCyg?= =?us-ascii?Q?r3uHQ0KrUQfewQ8QLDRwvzJUmMKJVZxPHa4mO3eZIsHjHMm8ZfMyW5bkzFdb?= =?us-ascii?Q?lsL+dEQKjtzv8uyl/9ipoplQ41f1KisXEu4edJshcFjcTG73oJGTQHGBX+al?= =?us-ascii?Q?oOHYtQe06eDvjyGsG/l8tGQ39aGRmmQvmC1OfnvEyhnwkkIf/0AYkq/tQqU9?= =?us-ascii?Q?ODVgDVMEXd0eCjrmV8oS06bRVQhEo9zD2v9+pXTiFfp5JBvy64NArKOsQxEp?= =?us-ascii?Q?deyX+wcefJ/zQ9UlzHOO0zhEzA9J0zT6hATzX58khez0eNMor4RBfDtf6rxe?= =?us-ascii?Q?Gu0lMBTW4sPVgtc3iYxRWfoTZmKse0cgRzw4MqRbe8zSQf88grJPty799FiU?= =?us-ascii?Q?mgRLgJwQgLvZujd/v0/Wp7dvfTq03GNU0rSxBZdBgsFq1kk9iNIPtPfV5LlL?= =?us-ascii?Q?S69btz7hEEp3qUj2u/JvhHiPkkQkfpp871XJk73gylasEtyEwyKwaa2G77M3?= =?us-ascii?Q?fbzpqJHcJXkrjORfL+Mr9itAA6RkBPJ0pnSWMzFcdRsP9+xdy5slWu7hBldp?= =?us-ascii?Q?0y4c+e4Sy6c5ssUujYXE8COEjE2oLF8Cm+Fs+SC4rBmc+CAztOpZ1gPcVcZp?= =?us-ascii?Q?ZkWXE4st6TRh+wdYSirR4QsxptLnil2bu55WQgM+0L4FKuqdGN3byWsGBoTj?= =?us-ascii?Q?2ecvHlVDGlAb+ev3ovO+CzZgLChRy7Av38z+rFClDJN1BCsBxk8r0s6/dWhN?= =?us-ascii?Q?jV+DwgCNQ3xtDH6SiID0+cZSf6mO4VrWU4I5JxtpNdXvrMlUDU6wBqcURFxr?= =?us-ascii?Q?IxL1z1i8H0O6MtcfJF9efae63WOx6c4AyWNePGKrws7QuULf3UIqNugWyXKt?= =?us-ascii?Q?HaoJPq+h9mjttB2suqtNJvLQ+WMVNJsxr668bX6iJrzrE2ewfMBfENy61h2K?= =?us-ascii?Q?S92bFxq5ghBWXayU0FPhsFLDZyI19qOhDFhE37ocZjaOuXZ7O1QR4RNSBtDL?= =?us-ascii?Q?TOu+/Qx7Ez4ARvkozH4CeYMGQU1ArDRZ+ZRIladVxFZ0t7L1vgoHp+Uy3oj0?= =?us-ascii?Q?QTiIuE8j0D4duFpyBc750QZHKDf53anEur8RB1PzuavNg3pe6+LEGPn1HZDG?= =?us-ascii?Q?WgW7RzkVBsVD1nVQ0G2nN0ukER8LXAnFljQZDPn6S/HYdaTJCXQ+UCALzNrB?= =?us-ascii?Q?bQsLmSlMbmaisjWFW4G1rzzZvfxrMFLq0Gc8nPo5PQnqSzEmS5CxzLgwSIve?= =?us-ascii?Q?ob85bxraEchyb5EuhrDOzThp4brFzJWoJJr1LOfc3zRuPUBUR/uviMSkXItq?= =?us-ascii?Q?gXfz6T3xgyWGWkXhd67/tWP7bQ/XnFQnfdiwIEdPx3Q?= X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2480; 6:CSfGnKeAcZAIxgVv/u6Fb2iZ5POOkLjJ8Ue7gPkvCi73K5f5EATWEbcBqYcYEVd5uEpofMJVyhAuc/KCnH1IapXk0HcOvFAfOV3EnENPb5ERiFym8+gcLNvuP4Fk6K3Of9L80Mnh4zi7uV8/SfY8rPzc2dChV5SC9551H6nUxbMznjNXWuelKA6JuysWkRM3YsdK1Zg19/I+6u4TYiWV3GCX/FZ7gte1dXxcqtCeGukX+I7z9GFFSKaih3bHMAPfmvouyWcFyd0R1JgqzvPUokI5nh+YBBghBfxxY26W/NkdGq8TFyjSlnc7b67ur8avmXsuSelVwKfNlTVaPjEeOBqAv480TQd/Pf7WIDs/fcPUOiBCOCj5Ljmv/fWF98larq/zsDedk6tiCMHFZ79n7DA/dopbyFE/R4TqC450vTK+ZYQbHmdCTP5eLGuTt9PP; 5:MN8DQizAtlTerS5OCDXkBPz+HMzN2z/RyEOI/CXoM1dswQfW+Dv9R3Kwh6NWi1NxY2PczCbTkKKPF7rnby4VcNZJ5aTQhJzJ8LNuHgJGZE6BUlEtOEKnX5awpFBmhyMXkOccvJu8IyNbnFinM66OrhpHqQGbWG9BdmZhl81EPlCeXjavQN9ZK//T1LV3gE8l; 24:YkgzF0wUmofIBPeisVNcuSthxkWRQ9Jt08ohSI+FKVdQLiT6hfQGHlz4kd2uXcFZf/oKSW/bHluJQJW2Z/UQjxgdaPppWQmrGyzqxIR+cLY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2480; 7:QfXYzokuM3Nta3i1xet1nKRfQA5GVdwpo2HGM2SNOP1U42/gItDHKtr8nEJNJh+aSWRpUXM4KBXoPkJI3pPvwn9axZ/GtRIaeL/YMOJ2nMiYHQ7s1ewc87s1l5eWRU3uxtvB/CYx+dAJoJkQIWlPNf3yRu8neQrTEr09f33xxIJzkMdn5vZnVVquPdLlnl52I9b4iArFhVVY5PllVpJzq3ofOnMJNh4CTxYGugMei3l40vYlY5G/crp5aFbPH/XFwClFm11cYhAb6nfEadgjbgOYRULs8JdRBN2YAOCS4d4ssWstrG1Saj7CEFDZpwDNbyKGchHOhLndn3Fw7EEXouOmKuBDIoOuFzDxWFpbCRMtvFBjMbOmgNFuw893OQhyU/aGljYCU8EOqWiJF7Cb/qfAUBIjbwYod8WHoolowFIFeWsOc8rOEVeNxBfJ5Z4V3vbw3YuWyG4/5K9K97x6DA== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2017 14:03:51.1375 (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 v10 11/13] 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 14:03:54 -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 4cde957..ca7c0ce 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) @@ -309,7 +304,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 */ @@ -330,6 +325,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) @@ -341,7 +337,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; @@ -371,7 +367,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; @@ -383,7 +379,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; } @@ -412,7 +408,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); @@ -460,7 +456,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); } } @@ -469,16 +465,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