From patchwork Sun Dec 4 10:11:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shreyansh Jain X-Patchwork-Id: 17632 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id B247AFA80; Sun, 4 Dec 2016 11:10:33 +0100 (CET) Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-bl2nam02on0069.outbound.protection.outlook.com [104.47.38.69]) by dpdk.org (Postfix) with ESMTP id 38F5B5598 for ; Sun, 4 Dec 2016 11:09:37 +0100 (CET) Received: from BLUPR0301CA0009.namprd03.prod.outlook.com (10.162.113.147) by BN1PR0301MB0738.namprd03.prod.outlook.com (10.160.78.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.747.10; Sun, 4 Dec 2016 10:09:34 +0000 Received: from BN1BFFO11FD007.protection.gbl (2a01:111:f400:7c10::1:118) by BLUPR0301CA0009.outlook.office365.com (2a01:111:e400:5259::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.761.9 via Frontend Transport; Sun, 4 Dec 2016 10:09:34 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) 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.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BN1BFFO11FD007.mail.protection.outlook.com (10.58.144.70) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.734.4 via Frontend Transport; Sun, 4 Dec 2016 10:09:34 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:; UpperCasedChecksum:; SizeAsReceived:690; Count:10 Received: from Tophie.ap.freescale.net ([10.232.14.87]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id uB4A8pKH019825; Sun, 4 Dec 2016 03:09:31 -0700 From: Shreyansh Jain To: CC: , , Shreyansh Jain Date: Sun, 4 Dec 2016 15:41:28 +0530 Message-ID: <1480846288-2517-14-git-send-email-shreyansh.jain@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1480846288-2517-1-git-send-email-shreyansh.jain@nxp.com> References: <1480846288-2517-1-git-send-email-shreyansh.jain@nxp.com> X-IncomingHeaderCount: 10 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131253197744323015; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.158.2; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(2980300002)(1110001)(1109001)(339900001)(336004)(189002)(199003)(106466001)(2351001)(105606002)(36756003)(69596002)(626004)(97736004)(5660300001)(110136003)(2950100002)(6666003)(6916009)(189998001)(4326007)(2906002)(104016004)(92566002)(50226002)(8936002)(81166006)(81156014)(50466002)(68736007)(356003)(8666005)(305945005)(7846002)(48376002)(8676002)(33646002)(38730400001)(47776003)(5003940100001)(575784001)(39410400001)(39400400001)(39380400001)(39450400002)(50986999)(77096006)(86362001)(85426001)(76176999)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:BN1PR0301MB0738; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD007; 1:FrklOlluq5sw6HUxJ4UajgLb6vkKRsYdu8mYRnLNdhLxlXvheoKVCE2662J6bywjS1/cYdbTiETwm+lod1zRtZddGivC+t4ovHAbJO6+D5t/bVm9+V5wc/JJiGyfZG1h/7h1aOIILMMmka9X9aBhWqcHs4ytSVRhXQ45IlW9IewAG2SgngWxptKaUGmNTekKgeIbt4TKLyz61bDR4U4YfZhz7mBdS/TKmrPUdjCBCxAuyDgQvhTAFfiYfERLwuEY5EjTwEeWG0ddxquoJF5mQvuJ7so7XNEt+qnHaS81x6TSTcLKrK2/q2iMIrVUh2k0BilJ0btGQ1OPboXCImDEETNoZzj/0GHKRAi0XK7sRY5j7xl/1RE8sAdgCKBgKpQJCpi3qcQGaZOIiw4Gyng1K1vOV4Ku1m+SSZrYeiENWR3Rau7djxMUJQb5Ee0K4iv11BqgS2Jd/KcDpkgi3IKTuxowymtj/OIVTi6nD72v126sbp4PmXgV/y8t0Fm8NU9sp483CFHAgBOKd36ZJ782aOte5AL9Yz/+6S153xXr1hwTZdzVv4RRrTnKR9SlMSgKyRlTRlXggVpmpGy3cqpH067QM2c1rb8zEMoasg2SXZ93NWWOKVkdy5so2WO5nj/TOBNx2Ndocb/RLhujj20Q+h4HK9MIU+o7tr3O2ckPsZS5Ts1QfVcm6NATV/ZVXeA7LMdiFz1CfMH75qL8EjzfuKTmEmpxswqNlKIUjAwnNZ0= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 2a0b1eab-80c9-4cef-39c7-08d41c2da5a6 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:BN1PR0301MB0738; X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0738; 3:P+iqfVd4x6pqPTpcOYmD6Gha55oxLf5h4N1nEATUpt8Qmg0m49Bb/yZE2fHeKbW4YubYMkScK6gWDj/nd7lvIoRbdEosTibFeJJmjttWCm/27AtQQOvA5mTBxuq/dlNj6MMaay8hmp9dSwO8BfbA/aAb6k0jMfJPeKliFNk9Kc9rLHVAf7+8222J4taqkk20qcvGl7Cytm5a54Zs4G3WnbcS+Lm1qfZ6NR3x47XVa1bXVtyN2eHqpW+q4vsm94SxVl6SbEFzY+qF5YZc9zdwVpneYw6APz8bHW8L3impsgUhzV3n8xuKDZWZ2gHN3tvHJ2LfqZPKVe6DqhT5+iZUs3vDw8scUsTs2M5JzCIXSoxVOyQYhdIwRI4XrGQ9UwIv X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0738; 25:zXlKaj8AsQd1e9/WG8w6W6+80cU4VOOmWTqL6eiwM4/sKITqs5CVumoBPLY7Q1qIrAQFm+1td9t43YRHxwUrYCXWzEcY/+eLBnEYLsrlORaDXiHynGsrJW+YhCwyLwGcL4R8HknEaorDbNSUNR39dE5zEOAWpwae6DnlQF79erzrxTABG9YLx9bdlviAb7wCPgx6F5BheRAZSthPZowEqNF9GO+Rt0plYsMOdmqgfig8BI4fXpCkDZdD9Wensp3ZB3Ib0ulg0utl32hfk43Ze4bQi/iNLviwA2kzaRQGuFKorhBjRHDZfoUMHwZnBJa7XBqoL7P2i3g7PdIwzFBZ2pkpxBP+wHLEnCZ7Q9To4/M7EO4E5tttYXYFmChWKe3vRW8QfHnHaCpgSx3Ue9Ly4N+LMmlK7LrIJCUQUlusS2GxrV/ppRLuHiD13zeVCBaVuaABE75cK25ypWkTKPqo7uwnvxj2ADtQxdi07fah0S5zoyTBC2Y35S3nHP94lk12ms+1TFJ0zWy4ZFqGI8++C/dQtjkNQIjgMzE5kyBjNvOKcWu39brD+UOxJTgP2KiF28jj5kvtMYhAwrhxALLm90wGKZ+8DzvkqOSnLhdc7oDN/F1kqFUvZyKVPdfobIgzCo2pAy/NrhcxJr2de73WT6nLV5rY5YnH1ryK9d5g4YQkoOkqDC7sx1gTqWVn8CZzXa2IJt/QlRmQxoHewkSr0NOzk64+EmcGl/Uy1lStpcXPgtGgaksAsl7UD0w0Z61x5FGYfXuIHfBt7ZRBckF6TQ== X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0738; 31:UtV0ybY+v2td/8ZOLOpsbkg9mXUBqF/4pkwAg6XzLqlgf2RrnqS375XcJMtlG+sOMWnBv593KY4THvHcxy1NRimCdymO3Bp58NDoigKuTvI83HmESrww9aCU1rqyuSuZgYHpkx+zHKrJGcjxyyFKDzVGbW1oWvYNWv5Bn+ImFFH3TAAZFVGiGL04ps0XAFZjY8o4eO2NDHKaJ9VXWlVpZuMSUpLK2yNcDHAqTenDavc4lpuwBs9/VDJa6pR0TNp4wtwQSquAglc1LLMmbLPdqg== 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)(13018025)(13017025)(13015025)(13023025)(8121501046)(5005006)(13024025)(10201501046)(3002001)(6055026)(6096035)(20161123556025)(20161123565025)(20161123563025)(20161123561025)(20161123559025); SRVR:BN1PR0301MB0738; BCL:0; PCL:0; RULEID:(400006); SRVR:BN1PR0301MB0738; X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0738; 4:4NeZC3kJWSdy5wFzEOVrzmP4M6Qu2l8oeA8CGCC0qmeWxmtqWOYJywt8VsqAuucMssMKq7pIAjv/yZhryGrmkb7yYkGzobegVsvnNoaHL/wMx4qJll2VBjZYR68thDDCfVZ3wqbIWUIuiZQphs7rYwGskHdReW8I3peBxaS/meum7PPKrhiyfFw7mF3pwG0S+m53F/NhWbM3gK0QFuCTT9ovtq3NnNqVlVJUfp128HBAkQ/vT/ITOEXGj2ERLjzOcumaZE9Vvixj4Jp642/eEGE4UPeCA6UoWwxOOog3wmFTuTrKi+i2QbhGPr6bt5q/IU9k5Rfq1QLOPtuv3BRplrWKxHSA4I6YiS1wo05fBIoD5yVFST1/exL5WO6kBwV4Aven304mzOOTuBTGh3Uw6UtMu5jy2bWa7uJ3FI6VYMtL5+vLNRSL8vv5gK0ledBZR0m0x0TBI2YxFItgISSiKBRF4d4a6n/9Icy0DBG8vOSnzuPjuT9CKg0zwMa25ab2jkBg/eLCsTLstJ5kjNmGY1/vD8g9V4LlhdDlSvoaRrmNCht5iJ7aD0e8pgD9/q6CzaoWYDq94RjHW4+DvDmy2T0KuI3fILjhh8lhU7JAO9oZZPuu94UB3gHPfgyfAChb6iYFXPE/XL6+CNvtFAocFGzJpKEN1vamgptLCYcJ4BYdUjvOD2d0xQxhnEl0n9RgOGEGrzm1iHFV0ys85J8Wz/vx+aAWGC9Oq1jff4FdZ8vc+M3SosiaPQzzw0TfoD7O X-Forefront-PRVS: 014617085B X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN1PR0301MB0738; 23:ljq7tDtfgpRvo7ag4uLvTUwcC8ieBGDpGQlRgKL?= =?us-ascii?Q?QZ8t4Wqdo4cXLeK7N20F1kb+VTBwH7nOTisi7AEz6N/67zSnhjsa2SNaQGhE?= =?us-ascii?Q?PtZLv2nEmiLJ+0NN9y5TpHK5s8JYAN1Jvp0mBdit6Aei7cFqMmRyT5pv8m01?= =?us-ascii?Q?/JjgdbH6SdTuTpKKruJySthjl80vi+cq/3oHiBhRI/Tk0YQRhvtzjWS6es8u?= =?us-ascii?Q?pG49BJUZaLJ6Hlq6LDpvppd//0tZqEfwE5pBNpxwh6S31FKP3d04X5E+7Bq+?= =?us-ascii?Q?fQC/PXMY4HWgLj0gQCWqnQNnRqlx0bRwLAIt+AACdDbREjqE/96RtIEQhYco?= =?us-ascii?Q?9Mx3PPHYAORKvjo9BXkBUbI1kjKYWzvrXuLmDfm4db/WIx5yghhu7WfJTxbE?= =?us-ascii?Q?lI+PbDgj0QOien5GcE6p9Mi3QkyhMwEfFUtlY0hlbYgRU2ABO+32D/yCflu5?= =?us-ascii?Q?FB+OcYtXc1dF+f9LzrxcxK4HPjfZeryv9HmyG9gUL1QwyS/nREiYFwlLKoMI?= =?us-ascii?Q?B5WchvtFzhhgIzXfXKaySLqEiCNJBSP1WXZJDQQ92lLN4V2h+HZprIrdTYgU?= =?us-ascii?Q?MpXSMgr3i/eyfSS+JjgCx99xuBMnYaJLItI3ECourCO678zR8Gjs42ZoOXNI?= =?us-ascii?Q?QTzNsamWbPM6zdK+NRbbX58B8C5LX8u7BIQQ7yGKAMgYD6kuc6Y6kUqvE/xw?= =?us-ascii?Q?+nGiY61Cr9A83U00B817B1fet+4xNG5Ij1oAM1iZ9cnHGrugmMAqBVdNJnoH?= =?us-ascii?Q?WzmIH75HD8qleF4f0AHCNwxllHuOIP1oH993xO/cqO8MhqLPVb2KACJ5Hv+0?= =?us-ascii?Q?iiMi19a33/Nn1tik+y+QfBVvnY7aLMFFZPq37lNoBCJcRfGbr043ihZvES2G?= =?us-ascii?Q?wm/VT3cyFxfA3Qtbtk5DFHSJFJamCZZC3eksgMFVEtlCIJd7H66rweneWO63?= =?us-ascii?Q?TBbhJua60Vi8rVvPa2gYpaS5Vs9Q7ELr2gYzncFx1fjGdlX5CY8EUufwdCBn?= =?us-ascii?Q?TxejF13oWlR11aEV8XvlAkD1cahvfAcaarrobqr78kbc8iDN+ET1Fg4bJpuc?= =?us-ascii?Q?FMJ1hwG9QV7eKSo11T33JSUHKZ3eWlyZo7v7hsk5Kko98yexPY26RwOQulBn?= =?us-ascii?Q?i9rxkX+TysGBJ3QFPhBDrkZV3fHlIhcD6pAjmfQmIM3+Rm7nGMNOjQHeufY8?= =?us-ascii?Q?ngscK6Au2fV5DMA8iHFz13irjdVk+ADy4Q6kqsnYfM0lxT/infRTnV/sPvsi?= =?us-ascii?Q?gPl39GgqLJL+SPuhMipx82sCjKM5Ic0ft+BkmCRJr?= X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0738; 6:v6BeI6wiwiucfB1vyzhzmmfnAYFx64pPxYBIFVsOf5rQM9oouwtfTPi68gwTEwvPrS4QlcwsQNOrsM+gZyjhSwM6mZNrLXfLUBFUAFVJc3fevmO3gYuOqIlKcp160KlezkTRBo0SwF3ZpSJEymRqaMKpMa21g9S+AIDW3X8+admZ8gW9GUYfKx1nICD2ztk7t7uR2mMFBSx7ww/yviMmoEBvIs/h90SnmlodEtwkMr/iu7+SE0LsEzatWblzjyjOznxhPNmUn3Ztfw0wdGjzen23DCUSllobqRNmnAwVb7rv9NtkSF8hArYhTPTqpyA94ng7nhXU1gwOoofxIALYALijS1bJwTRGnj1aKsu1bmYdmxsMaV8C1r9zMrTkWPrac+DCD4xxRbmuOpu0k4X7QXFQ+duhWGkfa5SveRxi6jzshvgXuV3mDORAjsqprr9I; 5:5xYVqNw+iQ/ZI2bIDHwD9lfqS/l8lgF+qqd/xsVBHFR5T/l9TXqyIZZC4JIEKkkj1MgbQf8jj2D/WahRimUF256NXYUlBRy+A760votTKZZpRoLsKm2Eetjd6i6hjL5Bg0SBV5rtKywUU4uY7eu1nDDVgPVu59ND3Tiy0klLvs7iiNiLTq/zr3MnpsjNWv3T; 24:4S5GJddEtqnJbwwbDJCv05Sm3RzqmnQSlwbyGCSmp+rbgTDAw21p758vpB0j9etqB0ws7dPWAkpW9wDtuLg8aXoy8crLKIYFt9Rfvp5WWBg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0738; 7:TyPAamEggZtm0barPPpzhvof5OzjLDIWdPYvBYOpFJ4E1NtI1q5yNQHNv+OxUVpsCxaCyySbVUJ4zuEVAcCG7zcCHnwx6VobaTmtsbBllK9leOkosBe1cbejiCLrLu9GejMpRbOMAnG/HfUOH/oNyPXIBJOHxEmCJhrSARiInopKD5mfqVja42xLF7N/dOEjeDmYrJaJHSNT/slpKmlxKvKl2/6TkYrBdFB9QY5oBe+yrihuLGbG/eotFXpEEguQeSixgVtvNL/UhNixzeTxADRkNqUvFjW/2viwmzgxaPKDQ5EJbf/5BzIjRrMH5WeQqxCTq35aWviGUpqaCGu5NeCfVwplA7ODoeeMvrK6fDHncjfjDzelFna9WFDY9lYiNj38+oTFp4zNtm8wPSNOWNeSluw+iBg6LLf9+E32iAOoyo+Ru67ln6G1gM6AiwVGaeLSumqPhkxC+AGyp4Rrdg== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Dec 2016 10:09:34.1983 (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.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN1PR0301MB0738 Subject: [dpdk-dev] [PATCH 13/13] eal/pci: remove PCI probe and init calls 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Now that PCI bus handles the scan/probe methods, independent calls to PCI scan and probe can be removed from the code. PCI device and driver list are also removed. rte_device and rte_driver list continue to exist. As does the VDEV lists. Signed-off-by: Shreyansh Jain --- lib/librte_eal/bsdapp/eal/eal_pci.c | 15 --------- lib/librte_eal/bsdapp/eal/rte_eal_version.map | 3 -- lib/librte_eal/common/eal_common_pci.c | 43 ------------------------- lib/librte_eal/common/eal_private.h | 10 ------ lib/librte_eal/common/include/rte_pci.h | 19 ----------- lib/librte_eal/linuxapp/eal/eal_pci.c | 16 --------- lib/librte_eal/linuxapp/eal/rte_eal_version.map | 3 -- 7 files changed, 109 deletions(-) diff --git a/lib/librte_eal/bsdapp/eal/eal_pci.c b/lib/librte_eal/bsdapp/eal/eal_pci.c index ab04408..5344f9a 100644 --- a/lib/librte_eal/bsdapp/eal/eal_pci.c +++ b/lib/librte_eal/bsdapp/eal/eal_pci.c @@ -680,21 +680,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(NULL) < 0) { - RTE_LOG(ERR, EAL, "%s(): Cannot scan PCI bus\n", __func__); - return -1; - } - return 0; -} - struct rte_bus pci_bus = { .scan = rte_eal_pci_scan, .match = rte_eal_pci_match_default, diff --git a/lib/librte_eal/bsdapp/eal/rte_eal_version.map b/lib/librte_eal/bsdapp/eal/rte_eal_version.map index 23fc1c1..0d2c8ec 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; @@ -41,7 +39,6 @@ DPDK_2.0 { rte_eal_mp_wait_lcore; rte_eal_parse_devargs_str; rte_eal_pci_dump; - rte_eal_pci_probe; rte_eal_pci_probe_one; rte_eal_pci_register; rte_eal_pci_scan; diff --git a/lib/librte_eal/common/eal_common_pci.c b/lib/librte_eal/common/eal_common_pci.c index 4093746..6d7b53e 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) @@ -464,44 +459,6 @@ rte_eal_pci_detach(const struct rte_pci_addr *addr) return -1; } -/* - * 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. - */ -int -rte_eal_pci_probe(void) -{ - struct rte_pci_device *dev = NULL; - struct rte_devargs *devargs; - int probe_all = 0; - int ret = 0; - - if (rte_eal_devargs_type_count(RTE_DEVTYPE_WHITELISTED_PCI) == 0) - probe_all = 1; - - TAILQ_FOREACH(dev, &pci_device_list, next) { - - /* set devargs in PCI structure */ - devargs = pci_devargs_lookup(dev); - if (devargs != NULL) - dev->device.devargs = devargs; - - /* probe all or only whitelisted devices */ - if (probe_all) - ret = pci_probe_all_drivers(NULL, dev); - else if (devargs != NULL && - devargs->type == RTE_DEVTYPE_WHITELISTED_PCI) - ret = pci_probe_all_drivers(NULL, dev); - if (ret < 0) - rte_exit(EXIT_FAILURE, "Requested device " PCI_PRI_FMT - " cannot be used\n", dev->addr.domain, dev->addr.bus, - dev->addr.devid, dev->addr.function); - } - - return 0; -} - int rte_eal_pci_probe_default(struct rte_driver *driver, struct rte_device *device) { diff --git a/lib/librte_eal/common/eal_private.h b/lib/librte_eal/common/eal_private.h index e006d95..06ec172 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 c0a0c6a..95e6656 100644 --- a/lib/librte_eal/common/include/rte_pci.h +++ b/lib/librte_eal/common/include/rte_pci.h @@ -86,12 +86,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); @@ -390,19 +384,6 @@ rte_eal_pci_match_default(struct rte_driver *drv, struct rte_device *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. - * - * @return - * - 0 on success. - * - Negative on error. - */ -int rte_eal_pci_probe(void); - -/** * Map the PCI device resources in user space virtual memory address * * Note that driver should not call this function when flag diff --git a/lib/librte_eal/linuxapp/eal/eal_pci.c b/lib/librte_eal/linuxapp/eal/eal_pci.c index de4ed86..a79b47c 100644 --- a/lib/librte_eal/linuxapp/eal/eal_pci.c +++ b/lib/librte_eal/linuxapp/eal/eal_pci.c @@ -765,22 +765,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(NULL) < 0) { - RTE_LOG(ERR, EAL, "%s(): Cannot scan PCI bus\n", __func__); - return -1; - } - - return 0; -} - struct rte_bus pci_bus = { .scan = rte_eal_pci_scan, .match = rte_eal_pci_match_default, diff --git a/lib/librte_eal/linuxapp/eal/rte_eal_version.map b/lib/librte_eal/linuxapp/eal/rte_eal_version.map index c873a7f..48e847c 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; @@ -41,7 +39,6 @@ DPDK_2.0 { rte_eal_mp_wait_lcore; rte_eal_parse_devargs_str; rte_eal_pci_dump; - rte_eal_pci_probe; rte_eal_pci_probe_one; rte_eal_pci_register; rte_eal_pci_scan;