From patchwork Tue Sep 25 12:54:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shreyansh Jain X-Patchwork-Id: 45313 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 [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C85851B148; Tue, 25 Sep 2018 14:55:19 +0200 (CEST) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80048.outbound.protection.outlook.com [40.107.8.48]) by dpdk.org (Postfix) with ESMTP id 44D891B136 for ; Tue, 25 Sep 2018 14:55:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZsFdZIVsT81q5eP1N+2C8SPRtaIt2udfDCMQKg+afoI=; b=xmOHhz4rozTlkxiAIveIfD35cMLusHyXLtXX9Z/tElB189vzT1n/0a+RKp5r8VSh+dMxz6igSUZmX+W0mF5Qpbb5eLsIJehOuqhfrIBB/vr9DUXcRCYKjYAcFXp0UEdKKUpw7lS1pBaL6yRgcDs88PRZF1GQSWO4V93396MCwJc= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=shreyansh.jain@nxp.com; Received: from Tophie.ap.freescale.net (14.142.187.166) by AM0PR04MB4676.eurprd04.prod.outlook.com (2603:10a6:208:75::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1143.18; Tue, 25 Sep 2018 12:55:14 +0000 From: Shreyansh Jain To: ferruh.yigit@intel.com Cc: dev@dpdk.org, anatoly.burakov@intel.com, Shreyansh Jain , hemant.agrawal@nxp.com Date: Tue, 25 Sep 2018 18:24:19 +0530 Message-Id: <20180925125423.7505-2-shreyansh.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180925125423.7505-1-shreyansh.jain@nxp.com> References: <20180925125423.7505-1-shreyansh.jain@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: TYAPR01CA0123.jpnprd01.prod.outlook.com (2603:1096:404:2d::15) To AM0PR04MB4676.eurprd04.prod.outlook.com (2603:10a6:208:75::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9ea27677-d70c-4a4b-73cd-08d622e624a2 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534165)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB4676; X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4676; 3:QDuxRGOyrFQXMmRX6QtQDH17NeNQh9TPc4g7QIR1tmwNKxcBeEo/cTE3wEEXdnB9tu/N5nTbFTmShy3J4aCGI2tdM6LILCoQR4or2eMKzKPeWUUrMLPwTv0cmRSJumO4MOY63mxoyvZCbLCf3AlvQtCxmP06+f24ZdEd24JtfK4iyw6827MBR1xyFkVmVTEXL/WvACdAWjBjPJVDU5i20xmZjYG/eVrtmdDVtn/y+UBRg0Z6pm93crGZ9yCtuBcV; 25:AJ2+41+tXkLkjMV2wEt2d1BFOAQR75bHc/W4dOAHAlQVYuKACOnpcWZghS89FGAPVLb4YHJP8R7bSbbcSGq+E+iNaQQ+Z9HKvCQXNAw1Mu3ZAxgF/prXsjzaWsiCRAyX3KlXAuFF7V42zJJIMW4AWtyRY6wOd4ns9MJZ4JbscEQMAo3zNIXFSWTO+IWgbB2AMr5Dn6Q19KtvsgHaym4ky6lNaGjXvJm1Gdsd96Zcpqddqu97lAHnzhGwv670zTf7LTlEliGejXl1fq/Ya59JAW4d7Jxx8HBrCrhZ8+cGSxAKCCCrufGghfkIFX+S11s0BRc7w4Y81Rl9wKvtCKEkzA==; 31:WPjDYwtfbwP6ZyvpPLUm3ovAssooxLYFj80f6LkAAByxVk+vLrhiqI68pr0yswVFhChfyW6dObQfuib8sC+goVYii67zus3KZFsy3qTl/JT+4PpSm6jap4B5qv4kV8i1D1FpcXUiWOZdsv1S1SrwZ13dg0YF03MN9rfldKU8/9TT/LIEtL2vvfr4coj2b2BHyCem/suo0WfhsQxp9dWWqmf0rrpjgHN2dOEs3fzgEcI= X-MS-TrafficTypeDiagnostic: AM0PR04MB4676: X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4676; 20:53qxlwLrPB2hWiKg54k0Rvyy+TWd2caSov30wCScPHajHqIvhHN+DIKnnUsEb8Sdf9jqTTTBBnXUTVyJwp0XUOvkzirHOpnj7EyBIuAC44z+M2cJr9H77AGtf5QOld7q+GKL3Z8DCN+vKfvcNOJR/wTMRun4+YxPsixq5rnNltYfVog6h8Z+hp6O1GcJ8Y42j16dG/gLWYUeXZ/CjNYeKzsa1ko4UMoEnWD/VymCHzfqE8T+fhebx6i1Bej9KYC7Nz/5jjmQXVxudWf/wwZHPUpIqvNUCLpJJwuy8x6vEqef0cfBueuUiwbozW0Ibg7eZ7e4r3s1nKUTEvVe9Wn8uuVPZ/WBZkvJwMbeP7KBIGLE6xbnxLKA9oHbI09FiQwMFsJKeXbnqR62yY+TPvTq93WSd9q0yseuBDFuds1qPvmZBGTYCJSWzVukvnZksnR1MA2qDOAgGYsa4O2ZDm2NSMBl72V/c/aIRXNCZD76WRyUUkOhHObi37+aGbNIxbNb; 4:dHnJKR9r0r4vzKHjFHTqvcPveMdskjAn96odPP2qHLVEoCGf+4C8suD1gl5OxdZZly/ALyNpr2jmgP1HMU883gXaMS0mBuLuWRwfm8oj4RK6ftJ5L9Sodl0fvdS9fQ/5FiWs+5v6nthUaN8imKuVwyDvGAeZOlAO38laP0lDUSzoJvwuT0nxDuoRZKS1Owvr6y9SQzfUSCKLWupjHReN00JLznpl7PubtLLOrCA3ouonFhwFjFXUWCCbC/0nRI1ypIwEhRIz/DInK3pYFU4Ksap7f+GnPwIcC48ro71yAauby6rO/7exzzohTKTofNqR X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3231355)(944501410)(52105095)(3002001)(6055026)(149066)(150027)(6041310)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(201708071742011)(7699051); SRVR:AM0PR04MB4676; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB4676; X-Forefront-PRVS: 08062C429B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(376002)(136003)(346002)(39860400002)(396003)(189003)(199004)(2616005)(5660300001)(48376002)(478600001)(8676002)(11346002)(186003)(86362001)(66066001)(25786009)(16526019)(36756003)(2361001)(7736002)(97736004)(6916009)(26005)(34290500001)(305945005)(106356001)(486006)(105586002)(53936002)(476003)(956004)(6512007)(5009440100003)(386003)(8936002)(68736007)(51416003)(50226002)(76176011)(3846002)(1076002)(6506007)(316002)(6116002)(47776003)(16586007)(2906002)(6486002)(2351001)(81156014)(44832011)(81166006)(446003)(52116002)(50466002)(4326008)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4676; H:Tophie.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR04MB4676; 23:DoLHdzLOI+5O1ZEx1NV4zv1rv8QMLaHBbpyoxOHlg?= YZkrS3lhhY0TGNJ76uHqvmaFCeOgReZRtlzQAYCl/j9cytgiQEKtM9VkY7aDb3uAFFvbznIq9YU//kTZ+vKcolp01qPh/MPmRbrZTzX5tqJMC8pCH16hay6x1A835jrc4jsZUxAUDvECUKwTgQPNk3Im4P3dupK0jt+HFMDzvtNkHSxYQT4G0Zymq+eEp2RpDVnblvPLlODz4oA7Di1l5iin5+VN7w0WjxnKrfTNZVcyi2w8JCEmMGjT00b38wV7h3fexG4M8AulynZ1O9H0hF/SmN1cUf/wBVml6uJSVuXVnj3bXcXZ+MrFf2KWAN9K0VeYBaBLyOpP55O/vstrkghofw79gv6Z0IOasCJzcubNwT1x8W/7TAKKC/nk0ePOa8tx2AluXKHkKLCNdpFTfeR0G4840mKwI7vz4p2RqPwxmtiYgZsLoEfLKDT4ifpAlomOBxezJs79zl5Xkk00AlOiTTgk9OY7iNMxtmCmgOSd4tvvR+FMgaquJQ6anlREe5CFflqmQO535HmOTVDd9Viv5G6rLnY2/Agmn+QYK5A0BNY6Dx4L4MhwS2W/MUbANcvPdu70+fHu0RZ9fUsfZAfR2LW8mhVOtaD/pl0elRECBgLRfuG7L45kdZ87par1gXHg1cZueL/HXUA78Pw+RLvM+MFrj4oyWuv4oyaUPXu9eokLdq9bcp/3/2qv+bNmtsiRPBPYBfjJVhcxcwY/30z53wGx2hvjQg30IQRaiPc4/a0EMPmd6+ko5YGajiqXf1hCWbK007hwROeTnwQSJtRiiNd3nrIZvaNeWv0y+jzEivN0vjPmaB2di6dnuGu3JmtHYtZ4Xd3RRSwZ69Ih+S/O3XCwNUKGKwjXizYWrt/9Y6F0/J9rPxaUF+1ppIdqINkaxeCwerk/QTvP+V8Ya6oQZkR72c8+FEb8dlhqmmqglRsfTc31XtURkp4uD9bDQFMN5jCSnmnAhkce0CWjhXh3DJPVJB6W8BiLbhFaEVX6uJdlkz4NZP4lf4eYiJYe7afa2nGZQxmOczFqNSempX2YKtsFvHhdJcf0PGVS/4As4wegtcepMfKspl8sbwgp82gPQrdog62X1DIhoNhK1zKa3ip5gkQ+bS9AD7tezaWNxO4zZwi4OOqaKJ1y3vFIf7VnUsB18UYnNCb/rPO7z89frbSbftgJoqWT0P1GzN1m0EuC311dDo4zGm/VAglomOWsih36/6+Bc6JYjvDe1yCuAjbCa9H/fxATGjK4ZGuK9YtIkufgQNUZ4bXIvq5KcM= X-Microsoft-Antispam-Message-Info: ByTrCXxT8jCynTi+GfgLmRzRQM5q64VPgUIpzogBBnXO63uLBEiUFA99uvSV/zSAX6DnM5Oao4Um+xQT1ez5c7nily+tXY+ouQA9N6RWG0bYdqqqaUJyx5uqSGrVRIFbFWiJ9K4KVtuRfKxBx49lD0cm0WeO+zWu7H9MKtNlmWjZs1wPw3meMLdtJNaRZeK+g4hraFiyR5XXAN6WQw3CgPG8b64I1RVUfV6IpiwfFy+tiwYS5sdq0n0uQ3qHn49NOlVhJeP+FEtfXnUTcyzNhMJ7qxnx4TuKfvIiYw975e30rLvUxo3cx3MdvI4/2ML8YOJU+UkIfXDYXCnuzJf8yTCRI9L1nUhH0owyVRxfyuY= X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4676; 6:zfDgo9IQBNPnonWVuM0T+6JbMR89uJyvXbBOyswXo6CGSRCOiCMjXZt62tkfuQI3eYLUDrvz+iReMZqc0R2WAlsLfQnLYNU1dYxb+cL4uvzHpUe4f2ykhLbEuFw1KWWcykvjVrBlRGzlYKaRF6qs8ZVkYORoM0e9nC5jkBOUyt33zHGxdG0HooRVHg/a+9iz6nppkwxNGAXZ4dzVTfQUWhy86wYa0gKlYs6WgGTQqosSL26JjO/AtakRJIdeVVvrXhf5OP0tgT6iZ4cf11P6PL0MmmOhkj1lgpcgLo6gVTjf6KfHWFfULyPpvhzlvwKSSp/1kAdEmv+RKTd+DGV8+bScA63xPlHqKCM48YcobWnAuNAJoUOy7l0FglSbkJrhP34sq6mOP/J8iLGt0EJGQycxsN/jnrXWWIDHYbSeVLi+3BZlfWLuyPA7e7sN1jTG+Fo8nu33cFxLJJtjIj8v1w==; 5:pbaaRv4nadIJOyx6Fi+KkupLRR9G0izcafrdx9Q3KfybiVXbxqHVfiJ9T7dTfSLCH1xEamSgVX4gq6VGvaYlsxkb882VqT0m7lxcSjCdRz2IeYFEBjf/HhiYaU8LqHIPYdMpY5cva6zkClLGVqy7cv8ALCACXyW0GbNQhUzQm0c=; 7:DbYpwQeY68pgChb6uBnDkt3x1GKBLqQyr9cCG/s5cQbf5DRR7y3VCd8JxWO5r4ZPTsVhWsPaH22uFqLxeRHUoyyLRDo4WmHnIjctg3uBZ39Qa+MtX1yPZDPcGPlobyCRoCjySvFV6YWVIZ6NAC6jSe3fujSO4yI4HRjUXzVgzuZlP+WJFwCmBRwJaIJy5NRmVRhNZgKi/Ko11k+yesCnc9fMJgd9A8altFwxD7E2DqiV+iDyXvZ7RlD3o7v/xRGZ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Sep 2018 12:55:14.5844 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9ea27677-d70c-4a4b-73cd-08d622e624a2 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4676 Subject: [dpdk-dev] [PATCH 1/5] bus/fslmc: fix physical addressing check 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" In case RTE_LIBRTE_DPAA2_USE_PHYS_IOVA is enabled, only supported class is RTE_IOVA_PA. Fixes: f7768afac101 ("bus/fslmc: support dynamic IOVA") Cc: hemant.agrawal@nxp.com Signed-off-by: Shreyansh Jain --- drivers/bus/fslmc/fslmc_bus.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c index d2900edc5..f5135e538 100644 --- a/drivers/bus/fslmc/fslmc_bus.c +++ b/drivers/bus/fslmc/fslmc_bus.c @@ -487,6 +487,10 @@ rte_dpaa2_get_iommu_class(void) bool is_vfio_noiommu_enabled = 1; bool has_iova_va; +#ifdef RTE_LIBRTE_DPAA2_USE_PHYS_IOVA + return RTE_IOVA_PA; +#endif + if (TAILQ_EMPTY(&rte_fslmc_bus.device_list)) return RTE_IOVA_DC; From patchwork Tue Sep 25 12:54:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shreyansh Jain X-Patchwork-Id: 45314 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 [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 826941B12B; Tue, 25 Sep 2018 14:55:23 +0200 (CEST) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80075.outbound.protection.outlook.com [40.107.8.75]) by dpdk.org (Postfix) with ESMTP id 576FF1B14D for ; Tue, 25 Sep 2018 14:55:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=RNsOVDgk7Z+JCrN9EtXtujjHqzRDBh73TicazP/on0c=; b=xBqinUBY72kc9157qRK9r5jMKkVX4aPZulyzJQeCgpTJq4mRYY+ZSamHhqBkjbb6zOp5focasB+CtAg6IatzWU2v4ExOxSPIhS93x0/CUH9OLbwZpKVXf01W11JQ6Lfl+8Lh4L8OYrzKPZez6YcX4NpezFttNWm6QM7UnI5epyo= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=shreyansh.jain@nxp.com; Received: from Tophie.ap.freescale.net (14.142.187.166) by AM0PR04MB4676.eurprd04.prod.outlook.com (2603:10a6:208:75::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1143.18; Tue, 25 Sep 2018 12:55:18 +0000 From: Shreyansh Jain To: ferruh.yigit@intel.com Cc: dev@dpdk.org, anatoly.burakov@intel.com, Shreyansh Jain Date: Tue, 25 Sep 2018 18:24:20 +0530 Message-Id: <20180925125423.7505-3-shreyansh.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180925125423.7505-1-shreyansh.jain@nxp.com> References: <20180925125423.7505-1-shreyansh.jain@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: TYAPR01CA0123.jpnprd01.prod.outlook.com (2603:1096:404:2d::15) To AM0PR04MB4676.eurprd04.prod.outlook.com (2603:10a6:208:75::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 546d3bc1-5fe0-49b2-b5a6-08d622e6267e X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534165)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB4676; X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4676; 3:5aPCLpOgW/tJ+MtDGIoxkbEgPAqbDA2vwgW6dA0RGqkOWT4iGsiwl6QDRuyo3GcxAlOfgFmfPe3nA16xHnZUrBpqs56XnT1aDlXpbaOR9ryFD9nbv2MDWgJWQH7pvTk3/yHvA+hCO1J3QlRhnUigOp4VUn28q0E5sNK5LnY+lOw+vPK8C+FunvKtskPbGlbUu4Wny5AlXdp19hI3Lg5Ezgeiv6lBxXmmxaTow1yrDMWgFD+7EjcG9yTG1YHT/++b; 25:rkSCJVHSz1nQEmgRTxFOzgadXJH80Ea5U/pqO4LLcQrc47jdfTDfwMfUv8jyFDPZG6BwgX49yt2mtUP46c4+Ad15hIk2D/0jQcCTSQSlplx2Q9HTsGu7wybs/Amg6vTWBTdhRv1FWE/VDRfH4zjLXoOXgs45ynMRExTFe3W5b1oT8xVFoQdiUJWP+bLKlSUW0IppNtql7zLz6b7pjWRXKK1Wg80J0OvPoKUpua9GTnyYIAeYyRdE0TFNxl/sNmCQW/JO4keseVbYL6PQGiInXvlXklg4VOqHo8stCgR5vJudlrDDSuqokkrdLquR/4YNPCC47q6f45wLhn6SX8/gmw==; 31:+9mZpqc5W4+S6X14q9i7oax/YD8iMKUFY4htAyPXI1c9XiB0S4Yfk0LyPMLec7FNeiNbF7tMAUtaYKAkPLkjL+xLPCYpp7xtqeezMhusL11HcVMu4Ssn8oX5ylXEIQIFZ3Iv1LCBXtHgFpY4SBfuQevKINB/EdjeQuQKcepqgH3TufqD+GVH5JNOoXPEwT8uy1AEeYREGmEmpVJELMsmdtCBYSNy6kMLWGDf4mTM7cQ= X-MS-TrafficTypeDiagnostic: AM0PR04MB4676: X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4676; 20:uRiLwD92siXUz+rmK4JgRPdHmyEZxm1KOB4AvX8OiBu8DVQG3jJ1IvNm7mLQiF2/FQdNimhU2ngBKuKYUqiGpLfzNN23jViNO6fEO978nVf6qDbR8AA+mASH5G4X1MCfwddQnp+ESOr6/zMy0VNgKpr5ip6HOmMsfNBhCdbrmPtqNOhtDdFGHFtDSbnEWQGTnfORinmwLRSa7VS1JA5BLRwyzRVVUOXXywvO8nEujfsfO+7d9vAw3AWBF64EZEIjs+D5zdhzxoq8P/giNrqgpXOAznVNPPJMOSUTmYvdC6gwup7Ojfhaw8rQ3pk1Svl+cwl4VLFSjnZv7Dt+Q0hJmEF7jC4kA+0KWBnBRh0bXOD7E1bghUODJuJJCyzMfPMM+kutjosP7tH5cIxo27O9iMenQacHHIpTTWnWzAV5uGlm/oaK6w8oV+7XkY2M8xA82EK3wvc0TatiETSP8JzINTgaqZmSNjuKhZZL/OCbaktMdIkudUrRrn0346Z+WbTn; 4:PhJAoaRlEHCibFfVr3uaunBY7BOVycxFxyk65YybJzzgEu9gH9cwXoBUE1E51lFeSXhnVQGLprTgqPkMeP5n7BZY6yjd2EuS5Dv01xS+lG6hxL1LQQcGm9q2oYblORjoxFnkv7lftJMyI/UTGzcREL9bmikdUUkCYBGHN3webXG4W4+FnuDQHjobf/4AqA51pT8J0j3nRsnCga9Imt1UsYAZhJXlQJnQ/rdN0LGVlvA0D8SynIcZk6kKz8jTOVUHQtUP+HEERkzbpu2mVWKzB2z+p+TDl05D0yka4TxGM3kTxALOyOKRN+tMSu6WxVkw X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3231355)(944501410)(52105095)(3002001)(6055026)(149066)(150027)(6041310)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(201708071742011)(7699051); SRVR:AM0PR04MB4676; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB4676; X-Forefront-PRVS: 08062C429B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(376002)(136003)(346002)(39860400002)(396003)(189003)(199004)(2616005)(5660300001)(48376002)(478600001)(8676002)(11346002)(186003)(86362001)(66066001)(25786009)(16526019)(36756003)(2361001)(7736002)(97736004)(6916009)(26005)(34290500001)(305945005)(106356001)(486006)(105586002)(53936002)(476003)(956004)(6512007)(5009440100003)(386003)(8936002)(68736007)(51416003)(50226002)(76176011)(3846002)(6666003)(1076002)(6506007)(316002)(6116002)(47776003)(16586007)(14444005)(2906002)(6486002)(2351001)(81156014)(44832011)(81166006)(446003)(52116002)(50466002)(4326008)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4676; H:Tophie.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR04MB4676; 23:PT8EYrItvFFizM7m4dQGts+NA6M6VTnZmI2UDFqMY?= d2p31axqPMg/K604eJQ/O4Hjy30HlJF370ePR73VNOVrrRHOvvqIWvMrK1t1gSs7stWfHORB/m04wNDBQ7bL2XsDojtz267l5ApkwEsKvT3Fyz5YHNdL84yqWx0CQZZGeTMmkISBtwJpc4iIKk4SMaPi91BchyyxlhfgNCK7LSP57j+hm6Wy2WfNh0SUfYY91dAc+XnKxu5F6gUdJk2s32mTf/61q+JaGyxP55njmfhZCGFsKxMbn5wOenU7Hgn8jEtJ5PjN+k8ofWBgIQMidNrN1Mizh2bK9EP9oIoOLxDUz+tFn+hGzYMx1rUldP/WaTJ7qwfShGnf0BU98bHcWW4MrE5SfoeLAn6tzb637sWQLx3zQy+BRyVySDyBt72xZia7Yg3Vg3nHsz4Cx8DWPt2Sg797VwS9YRKxbqc2UN1f1Sg+HgB8lo6WFd24BVbWOh1sm8BYdwDZNGUgnZKOenBGJSbAIOA4hdQmLCLT2dfEefDwQ9XEu5G9L6neGlycCjpdJEqsg7/Z3PEeCp3bsuAaJVmQxHDcfYDF0TQQEOWyEMC+nJJE+Qw28gY13O+0NEy/aTAKvyZpp/x1oHGEJGeZo6n6lTTkD447YJ+GTeO76fSlcuXrUnoqFOuQbEckd+pZ9N2uAhfHNiDUeqX+013sJu8VAIZggwRg1/hgAKIn5ofHDP/obEat9TES9tnv3PhLM8zdPKny1j4s3GusDEcUzAe7I9/4lt0UaeyPEVnOxe0+aSz69nU9vfKjqJySg3UBtEOb/zhvBFPTtZGQ8nRFaLc9gnLIKsv/7r0RYtbIhxIkXeYt68vPfLeXYZhQ5+DyDOp5SShT7Bm33J1uUF0SdsR+uXL6jR1hcS+KiiUxlKtLSKI77sgZ0Pw5KcnV2yt3N9DMPOyLD0XNAH0VBdIKZAnKXSudP679dAEVl9kbjjouHnrsHZXR8bNPz4gThmw7a9hrtoB44SJoCZvSdEiqCDIBE7cWaLnsv8gEThhuZieUtG2gt0teK1q+iPmXvdpPR6A3RXDYVXx4USk7zo+TRqzWb4gNr896mspbNXahmV1tYXC9jrTYOpSUhe0uJrT3fxu1csCsOoCucmPSCGjhdokJ1GUW1PInR/+QJy8P6B0pkuCfscxzEsGA4jvjDXmEj5sAKX0bt+zSmnA7L2bKJ4Lf6vJ0C+yWrLZp9ZX4lC7d/hb5WjnRwP7t14NotnEj63bgyE6mkDwrZ18oJm1HtQAyRVgZOrkQFKCtQikkFR04CnpwfJ6ycmvjHqcYECdYSQaqfnPp+0Ml5TIIvjOXxh/2kyso101VkSKD8mjBw== X-Microsoft-Antispam-Message-Info: gdpUBXhuwUqQQUB1vTjrvzsx1s0No067593Y5SQ7vkM9YC6oEDrrTW6nPzSoVAEu6e4KAECOTT0U7j6NtM5tkTy3CnIn69mhNEMcbWAmnNIabf2aU38s/DSuYTkiknzeCEFxnLTa4AWPvOPvMet2NdXvLO1+J9pe3W5nJ0XPF1kIutscs1PcP7PS7/HH+vNYcThRZC141YjFyGkkH8d5sHmPaUMa7bFN3v7wQDFhiktiCBKyhNCCKQSLZ7S0OUrDR9i5wGM+k6RatmiFSJ7ah7u3KK/XpOQT1TGQAw/azkjYN4/hJ5dEVjGrFCUznff+qGrKdzrcQqU0p98XNBiU19XftXtmJK9EP3cxlnXcQM4= X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4676; 6:sqiDfwfmlZ+9O+bk8BeNnkxhKeTI5PUHG6Ak2/MYuogF6aauy/qo+BjtsE1lVFLWgbhp39MHUuamRiD+dFo10eYT5ISOlVM5fkwhuBBVOrKOFS77XINtkcUf38DwJtp2mmPZvjcwvtOANOb6Ao7Fw1ZuMIFj4lzMAsaY0Ktytr61C/GSQqOLbdrxXi8PPfjk9V0kQy1JJVjVHe8UeAIUGmzrmOkq7PhgLzfnKAkcesr8F7RBXyrq4jM/wQxn4r2DIbtM8rgpVXaAyn4X0V16TPkL9LYwJFW9msajJ9RyOgR8fiiLCASgGfkUoeU/wRl0qX+fO+QJWYfnlh3iCvrixkAq1fvVsBwYGZ/PrAk+RJscaOsxZEdTYJggv0SCW/+yAlA5ie4oW+zxCCL2hYv0uR711F2fahVJtWQr8Flap5uMG2ajv+ZHlBEXAtuNTTN0PASOfzoVZDRXSfIjvdmgIA==; 5:XToxn/XVNUkxiooAvbLbRpS1KNvd0/RSD4RvvubD5zbp+LOExlLo9Lvp/LFJvpmD9dSWkk8/HctQXyw1bqeb5xoTAgP8E6nQd0UsEQbf5usywE33Shznl1flO3r1kp/UPaQgbE+WnckG8gqEhWUBiyNIW6j+/WzkZgUVmOQ3qb4=; 7:i8VLzB7mnrMEd2JH3iWHshlgvjdZ9Yh1nNPIfo2kwwem2KSMSvtfj+0fLcmXsFabcSmtF87xiVMU78l0H4iZ78SoK8Q7l+NGQ4ULr8TOt9Jldk6h0U4BHEeoCH7yYGHlAzPs8apow6/E+xnISg+umEOQCvu7MiJDAIKBJcUSAPVSe2hZckGDWfZjMQucL2kbUq8eL4TVfpRa6+V2dplfzW3cBHdNInZewlMTSO1PaDyzGxDxhO88EwMFYfPegsar SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Sep 2018 12:55:18.0788 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 546d3bc1-5fe0-49b2-b5a6-08d622e6267e X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4676 Subject: [dpdk-dev] [PATCH 2/5] drivers: common as dependency for 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" It is possible that bus requires common library for compilation. Prior to this patch, bus and common compiled parallel. But, post this dependency is created. This is especially important for the DPAA/FSLMC buses which are going to use the common/dpaax library. Signed-off-by: Shreyansh Jain --- drivers/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/Makefile b/drivers/Makefile index 75660765e..7d5da5d9f 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -5,6 +5,7 @@ include $(RTE_SDK)/mk/rte.vars.mk DIRS-y += common DIRS-y += bus +DEPDIRS-bus := common DIRS-y += mempool DEPDIRS-mempool := common bus DIRS-y += net From patchwork Tue Sep 25 12:54:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shreyansh Jain X-Patchwork-Id: 45315 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 [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E51211B155; Tue, 25 Sep 2018 14:55:26 +0200 (CEST) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70072.outbound.protection.outlook.com [40.107.7.72]) by dpdk.org (Postfix) with ESMTP id 85E5B1B154 for ; Tue, 25 Sep 2018 14:55:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=od3GsH6atEUFi2HMUCsyVITGTSeOgIE+iHjJsK3JDwg=; b=wuCmjJJTy/PqBWyxxVbyi8MWE0PVAsKKzz2C+TWA8cQFGoHq76VIx450WzK6VDi756ILmNjRjO24t3cs0/x6rTPkl8Nv+5NWbRuIDGBPqSF9hLDsBi4F07DS+n40qE6D56OLjZtqLCqbU1+F4MzF1vpEHEW/t7DITYvxQJh+n94= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=shreyansh.jain@nxp.com; Received: from Tophie.ap.freescale.net (14.142.187.166) by AM0PR04MB4676.eurprd04.prod.outlook.com (2603:10a6:208:75::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1143.18; Tue, 25 Sep 2018 12:55:21 +0000 From: Shreyansh Jain To: ferruh.yigit@intel.com Cc: dev@dpdk.org, anatoly.burakov@intel.com, Shreyansh Jain Date: Tue, 25 Sep 2018 18:24:21 +0530 Message-Id: <20180925125423.7505-4-shreyansh.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180925125423.7505-1-shreyansh.jain@nxp.com> References: <20180925125423.7505-1-shreyansh.jain@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: TYAPR01CA0123.jpnprd01.prod.outlook.com (2603:1096:404:2d::15) To AM0PR04MB4676.eurprd04.prod.outlook.com (2603:10a6:208:75::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 59c5a296-9ade-46e1-6554-08d622e6285f X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534165)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB4676; X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4676; 3:A5RTsq2xlRCnevuxqPRuSY4FzNDK6c8yO+5Y71EvtUEWOrsSh8S8IJzbhnoxLlzEma8C4Bh3Je8HXdyHodp38bCUpZF3XgvunoIkw5YkxffpGuEq6VJl9gnoJkdJ8kPW/oO1++JbYMH6+ae6O38qzMK6gNeKBLiICsap5j9i03Hr33EW4sYJy+r5QIYcs7ZDQxmymcdfAlryRhfBKmHaknlzWI+ZkSqa36LeABZavj+QmYUqQnd9/G/Ji2UL21ni; 25:TZXDXS296QgK3jd7tR7HTok5T/Siqr3oGMHEOQmRQAww7pwUMRbg0qukjegPb3UOzseboP4fKuRAKVCyqJ0E0gUOD2Ba2grjx7wPZEavtzflXOBUDR9N8FEW7alu59u2/CZuebbk4nK8vlVt3c/6uQr9DK4U9BNGW51Mhoujb3SWS14qdEC9JJBqrd7WRCSRja0bGIPINWcPPr7HxhOWxGTqpiweg/4patuc+NNK3JEZktsqXB04Osir5uCoV3PxpXaEURdr/lIBdixE9tyv5Hs9BPl8QwPy3VB9273xAV1UYlpn3ToXHe9K2wvaObW+wpGYdYWzOpQqPrjLOXeuTg==; 31:J/lK+DrJuEXsF27B4P4sEaE13O7X3feHyudkULEJf3/iHjz0WUGLgr3votsRsLSgVbrkFJJzbuWNpnz2IONwJU5mOotpbaNfRWNY3szMHB3chGN0miNGiM7AvN0K6mGvwi5OxRhteq5RA2qI1noAIOPDUaD6hP2+lhc97A0D8rNiZRpGuRAMCMq5atzGu3lOlw7ZJBlai39uyE9gnaZ/gIxskjucZ6WMaau15DAZ99g= X-MS-TrafficTypeDiagnostic: AM0PR04MB4676: X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4676; 20:UnfBe56wKeLjAtFzfJCe5fMHtKYoK51XEDPB6laoTVNiLpcUb5vwtkBwO5I8aF8gkAUIZqQWMa0W/KtDXyNvpB9/8CeZzNAFrtC2sbhVatQ+j0J24QPZQ0VcVNaZKGYguFTr9sWAlCwIWG+tudeWxVSosNaVsfKFyKNng8H/FM6J/0Q0R1GNr74XJ595wKMlGLf/dm4kyIanx/5PWd67OB/SuDbwDiFnrHwstH+/AgTZb9BGFzl/G+Qr5CFMzFh6DFE3xAZQU70vpsajct77mDNa1reld8d89QwIc8IV6yx76EeaYF2f5VMjmVxZxvLbwI5zg5/NzayasLWQSa8YESym4F1Y+Bj44uon8nP4Y98D6zxcL/vQBa4bNWtgbMP6aJgDHssSxKP/uk9FGi7XEDkWebN9ll8I6ziWdr4DwcYTjzYUGjyhwhSBG6f4XcvWwxfUwdO2gNfYoAaaRvqRRkrj+osED2mjSHVZGzztuCLJZjRqDfe+hWQyzdNd9njT; 4:pEXlIQ4oUgYYjuHirORjEbpaVtcJB6Dkm4eY47EgoBz0iiqq3yMrtnbYcxqx394y/2YDzBu/zj7SHNWJ4WMsgOD/ycHT50vr9aSsnCSDTZIyudQjdyKm4nClVSzKpYPIRYPF+AbFBvE4DcrWbOqBzSYiqsoslD36k/xh9+RnfvqHEKo4EutL/9n0kwvtIn7vhmIQ5EGfrbevttH0c4LubD2iVuWYbYAGmClYBiP8XI9zzpQ1LSkKrS7V9md02Oe6yWgzVUd0trazBUHTN7PnP3bEXFFLO2hj2Wxwc4IbRIKkFsE62D2TBJ5YCMU6gRGseAe8+ofqFMMTSBsLg5O9euBj+8cPrNCR6xoFpcxt698gX0nB9QP2gJsnUdB43B9C X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(131327999870524)(163750095850); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3231355)(944501410)(52105095)(3002001)(6055026)(149066)(150027)(6041310)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(201708071742011)(7699051); SRVR:AM0PR04MB4676; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB4676; X-Forefront-PRVS: 08062C429B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(376002)(136003)(346002)(39860400002)(396003)(189003)(199004)(2616005)(5660300001)(48376002)(478600001)(8676002)(11346002)(575784001)(186003)(86362001)(66066001)(25786009)(16526019)(36756003)(2361001)(7736002)(97736004)(6916009)(26005)(34290500001)(305945005)(106356001)(486006)(105586002)(53936002)(476003)(956004)(6512007)(5009440100003)(386003)(8936002)(68736007)(51416003)(50226002)(76176011)(3846002)(1076002)(6506007)(316002)(6116002)(47776003)(16586007)(14444005)(2906002)(6486002)(2351001)(81156014)(44832011)(81166006)(446003)(52116002)(50466002)(4326008)(110426005)(21314002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4676; H:Tophie.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR04MB4676; 23:3qQr+njCulOtxXe1Tzsn7eRkTmbqnMU/AtfAT8oBG?= EAj5VhRZqkOL64IbwYpZxZAM3n5mbKIIdgdFlWxy29pR4kJNXgKEcHdF0Qp365FAh8y4WVuAHgh7NgwbGpzhAHsN8exV3I6oPJU+s6hIuB99PLXwP1kt7bgCRKtaoRoGyIFMMcpfitpoVS0ihNjH7b7qaPF7jm9PG0sVZYi+wRdYQ07p2xx4c5D7B8M2bezltQ5/dy/GyrUd/y+aSFnxubrhXmEc1LC98cS2Q2tgHx9WRzJujg2K7DPquPhbntlSjNX7kb7AH7mTZLLZQTz1ddsCHlxj7ffjMru5RvEWCoUJfu+FPMxE4mWGk1ftRQVP/Z3dAggMpboQ5ZdD8DxMLNfRZHLQ2IidDxts+mY+hAK2M30lAztmCQpTuI47DplCHFyYB1DwDhl4afG080jN6chH22sTSRzr1WFZbB/Mqjbfwq/DRWI+RMlJYxqhpSg2jWk9Bdj398P6aha2kf/yXzh4RMJAM2aRiWm/q1ZseJe+Has2zY8mDLNMTfYUfC3bolTfPSxCZCEUk3FLAqFsmUevvW/AAyz070fikbTlRl99OpCC/p3T/XjmqULhq4Dz2DA0kUIFNqkMnozegC8ATe/CoNF5g7NjiKmNgV5ry0yhgNVfvMub3Q+lO80bxFIPe3cGm/6wgGfD2IUcNMsF4UXYwhJj0nSH9b33dp7CUTiGja5IO0kThMdTD7h1rEVVJXPOAOIzLmNXovKS+RAlkabFLJyDYkzal7ittiCLMw5+6Mnye3Qb04+ZETtqVLgs6JoL2bpuPb+mHxVF8A12zhUlURDUv6OnOGb6Fd/NbYhvDqU/rbg2xTrCAM8zsaTcewlRMo5OaAdH13GvFOMtSVEnVtae9ZJ2xG3IDKpHLmCaljBJH9bfRN2ZIsRI/j6rNwxOR5hz2tLG/0Rsu9mlJNgDuNEgA3SZJl8xBB4b7zjWtvxWEgavx8R2UyPqmm/9D/8AUKt3CXLS0SLhWtHpDVFIw2SJjZmW/MSICmZNZ+Sa9H/RpcbfvLLLotRsK/fipMcMtfvBoTb+cMNlY+5pwe+LYan1Cdo2cbN5FX8MZBZ5L5+Gwzh092888gs3LeSCQyqcGBSoWJbPLdZdRCrmjootmy13GbvI8ikzsCUyC8v2KhWUxz3wL6Iu6b9BCsEmcpxdURyTdz1RuxyYri5Ym92Cxgnw09TqnWais+hnVAsn8YjYk7kp1/TjAFt2o7KnCnAbht4cCtHbRxgrPBq1rGb3ENLfu1jD2ftoP+4exshFZn1Z8vFXyq3DaXcHC+8icabn4+UoKhBWliqKGq38Xb+owrsdsmMqD1N4THBsZ1BIFZ8HjbpvnEfd0w5euBzgUI= X-Microsoft-Antispam-Message-Info: nbSL01tYK3h09XZhFk1+pWNHR1GEMaonIXfA7uoY2RQJznOOK5Qy4mt3Rv7xSgNl89qS13HTqNJpJhv07HPJ+AMg4tVIQ0jyQx1VaLC1wyAXRnm77rMWLEqQowok6/dx7GRrEjBbsv01wc3T4GiijhA6gnP5LqDl5l962V/Kf3U1LdwNWP8o/x8rL31vnvkQDE+G+XWjHIM6HcgxLxvM1SnMenZDHz97+BGAtcFged15DWxgXbwPgIyZrmLBUkdc3BPWwDXYyXRf7rUPAvtnsQB6Qdegi6vmH4gaO4YFof5WfzYLAB4XfEWRsRdasqigIBXKAgrM8guMeBr0gNhr+7kez4biOQHAVFyj2/3Zxp0= X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4676; 6:IJjGKAR8TcuZCUSV6VmmzFwQEKVbhIn7oPKoo2RV0gamt+4dghgSg+m0UKDcmUOPxJ56GhktA6RP//UX99wVwW8QHrBsfGJcTiZIcp/AwsSoAmlmLt0+lNXs3thI/lAfrYrO+Xd98FFHOKkjsmjLmPA2dRtqe/XHsgSQg8Bly9HSdOjAbzlh5Yt9BvKQ4/fR+CEYQwfu52jMI2+HjjYTNH/DubFnR90XrrMOIj6LabE2/LSkWqaxErx0f+wOy5lMvBP3Ji1++3MQyOoOQUHAh3I0aj+/2d1x5HlXi6sU9duRS3WZHU6NHA6HzC9jovmotnLoqTsH3lCEhC8j0Nqn+cmJppPTl98CHI0kQhb4E2cUjSLR99eUt+sJhWmYYX3rvVSvAhd1F7o51pdQhDaswNY6CDKKE6brFiNsF1TCQJPy9yOM7tfRJ9DcSi7wl/YB1qwvKTGS1wmzk/P5HCHU1Q==; 5:VYTBKFWo/Dg5QJiMXQapfeU3H9IyRpBe1Wezw0lehjK4dCKkfYfDxegNIzGqUUCBZAoNDqLf2Y7iDZxvP/3mJgqTaCR2tnn87GoHr1/PTJI9oGd0L7j7PiiGg+BV3HZ5F2NFBRY8dYkyfchJ6wUA5oQVAQFg6PjuCcm/nnNSSAg=; 7:fhZd5u5EptQpMNWh2xyv632GSJMG5fMI/D2sidI30+wBFoVhpzQcG325AYtGAcdwQMFI0sOQq6HHQ9o1EASzpHv3WWVME9fJKKZKFz0rE1grMVXDZwm3QwjBR92yMeWN9yXMrcf6PBduMaVJYRPHiZU0Ii/ujzpTQAJaGN4+7YQaZ/HB2uy5ZalBClrkrK9Q4Af2Gg36qo6JpHVIowoWN37cxJtFqU7qCPf7PZc1tqGWLy55WIRIJz+Fq06QlSsY SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Sep 2018 12:55:21.2301 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 59c5a296-9ade-46e1-6554-08d622e6285f X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4676 Subject: [dpdk-dev] [PATCH 3/5] common/dpaax: add library for PA VA translation table 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" A common library, valid for dpaaX drivers, which is used to maintain a local copy of PA->VA translations. In case of physical addressing mode (one of the option for FSLMC, and only option for DPAA bus), the addresses of descriptors Rx'd are physical. These need to be converted into equivalent VA for rte_mbuf and other similar calls. Using the rte_mem_virt2iova or rte_mem_virt2phy is expensive. This library is an attempt to reduce the overall cost associated with this translation. A small table is maintained, containing continuous entries representing a continguous physical range. Each of these entries stores the equivalent VA, which is fed during mempool creation, or memory allocation/deallocation callbacks. Signed-off-by: Shreyansh Jain --- config/common_base | 5 + config/common_linuxapp | 5 + drivers/common/Makefile | 4 + drivers/common/dpaax/Makefile | 31 ++ drivers/common/dpaax/dpaax_iova_table.c | 509 ++++++++++++++++++ drivers/common/dpaax/dpaax_iova_table.h | 104 ++++ drivers/common/dpaax/dpaax_logs.h | 39 ++ drivers/common/dpaax/meson.build | 12 + .../common/dpaax/rte_common_dpaax_version.map | 12 + drivers/common/meson.build | 2 +- 10 files changed, 722 insertions(+), 1 deletion(-) create mode 100644 drivers/common/dpaax/Makefile create mode 100644 drivers/common/dpaax/dpaax_iova_table.c create mode 100644 drivers/common/dpaax/dpaax_iova_table.h create mode 100644 drivers/common/dpaax/dpaax_logs.h create mode 100644 drivers/common/dpaax/meson.build create mode 100644 drivers/common/dpaax/rte_common_dpaax_version.map diff --git a/config/common_base b/config/common_base index 6eb65ba4e..ba3dd05bc 100644 --- a/config/common_base +++ b/config/common_base @@ -138,6 +138,11 @@ CONFIG_RTE_ETHDEV_PROFILE_WITH_VTUNE=n # CONFIG_RTE_ETHDEV_TX_PREPARE_NOOP=n +# +# Common libraries, before Bus/PMDs +# +CONFIG_RTE_LIBRTE_COMMON_DPAAX=n + # # Compile the Intel FPGA bus # diff --git a/config/common_linuxapp b/config/common_linuxapp index 9c5ea9d89..57a847f3e 100644 --- a/config/common_linuxapp +++ b/config/common_linuxapp @@ -29,6 +29,11 @@ CONFIG_RTE_PROC_INFO=y CONFIG_RTE_LIBRTE_VMBUS=y CONFIG_RTE_LIBRTE_NETVSC_PMD=y +# +# Common libraries, before Bus/PMDs +# +CONFIG_RTE_LIBRTE_COMMON_DPAAX=y + # NXP DPAA BUS and drivers CONFIG_RTE_LIBRTE_DPAA_BUS=y CONFIG_RTE_LIBRTE_DPAA_MEMPOOL=y diff --git a/drivers/common/Makefile b/drivers/common/Makefile index 5f72da0ed..1a5a6706c 100644 --- a/drivers/common/Makefile +++ b/drivers/common/Makefile @@ -12,4 +12,8 @@ ifeq ($(CONFIG_RTE_LIBRTE_MVPP2_PMD),y) DIRS-y += mvep endif +ifeq ($(CONFIG_RTE_LIBRTE_COMMON_DPAAX),y) +DIRS-y += dpaax +endif + include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/common/dpaax/Makefile b/drivers/common/dpaax/Makefile new file mode 100644 index 000000000..94d2cf0ce --- /dev/null +++ b/drivers/common/dpaax/Makefile @@ -0,0 +1,31 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright 2018 NXP +# + +include $(RTE_SDK)/mk/rte.vars.mk + +# +# library name +# +LIB = librte_common_dpaax.a + +CFLAGS += -DALLOW_EXPERIMENTAL_API +CFLAGS += -O3 +CFLAGS += $(WERROR_FLAGS) + +# versioning export map +EXPORT_MAP := rte_common_dpaax_version.map + +# library version +LIBABIVER := 1 + +# +# all source are stored in SRCS-y +# +SRCS-y += dpaax_iova_table.c + +LDLIBS += -lrte_eal + +SYMLINK-y-include += dpaax_iova_table.h + +include $(RTE_SDK)/mk/rte.lib.mk \ No newline at end of file diff --git a/drivers/common/dpaax/dpaax_iova_table.c b/drivers/common/dpaax/dpaax_iova_table.c new file mode 100644 index 000000000..73acd1646 --- /dev/null +++ b/drivers/common/dpaax/dpaax_iova_table.c @@ -0,0 +1,509 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2018 NXP + */ + +#include + +#include "dpaax_iova_table.h" +#include "dpaax_logs.h" + +/* Global dpaax logger identifier */ +int dpaax_logger; + +/* Global table reference */ +struct dpaax_iova_table *dpaax_iova_table_p; + +static int dpaax_handle_memevents(void); + +/* A structure representing the device-tree node available in /proc/device-tree. + */ +struct reg_node { + phys_addr_t addr; + size_t len; +}; + +/* A ntohll equivalent routine + * XXX: This is only applicable for 64 bit environment. + */ +static void +rotate_8(unsigned char *arr) +{ + uint32_t temp; + uint32_t *first_half; + uint32_t *second_half; + + first_half = (uint32_t *)(arr); + second_half = (uint32_t *)(arr + 4); + + temp = *first_half; + *first_half = *second_half; + *second_half = temp; + + *first_half = ntohl(*first_half); + *second_half = ntohl(*second_half); +} + +/* read_memory_nodes + * Memory layout for DPAAx platforms (LS1043, LS1046, LS1088, LS2088, LX2160) + * are populated by Uboot and available in device tree: + * /proc/device-tree/memory@
/reg <= register. + * Entries are of the form: + * (<8 byte start addr><8 byte length>)(..more similar blocks of start,len>).. + * + * @param count + * OUT populate number of entries found in memory node + * @return + * Pointer to array of reg_node elements, count size + */ +static struct reg_node * +read_memory_node(unsigned int *count) +{ + int fd, ret, i; + unsigned int j; + glob_t result = {0}; + struct stat statbuf = {0}; + char file_data[MEM_NODE_FILE_LEN]; + struct reg_node *nodes = NULL; + + *count = 0; + + ret = glob(MEM_NODE_PATH_GLOB, 0, NULL, &result); + if (ret != 0) { + DPAAX_ERR("Unable to glob device-tree memory node: (%s)(%d)", + MEM_NODE_PATH_GLOB, ret); + goto out; + } + + if (result.gl_pathc != 1) { + /* Either more than one memory@ node found, or none. + * In either case, cannot work ahead. + */ + DPAAX_ERR("Found (%zu) entries in device-tree. Not supported!", + result.gl_pathc); + goto out; + } + + DPAAX_DEBUG("Opening and parsing device-tree node: (%s)", + result.gl_pathv[0]); + fd = open(result.gl_pathv[0], O_RDONLY); + if (fd < 0) { + DPAAX_ERR("Unable to open the device-tree node: (%s)(fd=%d)", + MEM_NODE_PATH_GLOB, fd); + goto cleanup; + } + + /* Stat to get the file size */ + ret = fstat(fd, &statbuf); + if (ret != 0) { + DPAAX_ERR("Unable to get device-tree memory node size."); + goto cleanup; + } + + DPAAX_DEBUG("Size of device-tree mem node: %lu", statbuf.st_size); + if (statbuf.st_size > MEM_NODE_FILE_LEN) { + DPAAX_WARN("More memory nodes available than assumed."); + DPAAX_WARN("System may not work properly!"); + } + + ret = read(fd, file_data, statbuf.st_size > MEM_NODE_FILE_LEN ? + MEM_NODE_FILE_LEN : statbuf.st_size); + if (ret <= 0) { + DPAAX_ERR("Unable to read device-tree memory node: (%d)", ret); + goto cleanup; + } + + /* The reg node should be multiple of 16 bytes, 8 bytes each for addr + * and len. + */ + *count = (statbuf.st_size / 16); + if ((*count) <= 0 || (statbuf.st_size % 16 != 0)) { + DPAAX_ERR("Invalid memory node values or count. (size=%lu)", + statbuf.st_size); + goto cleanup; + } + + /* each entry is of 16 bytes, and size/16 is total count of entries */ + nodes = malloc(sizeof(struct reg_node) * (*count)); + if (!nodes) { + DPAAX_ERR("Failure in allocating working memory."); + goto cleanup; + } + memset(nodes, 0, sizeof(struct reg_node) * (*count)); + + for (i = 0, j = 0; i < (statbuf.st_size) && j < (*count); i += 16, j++) { + memcpy(&nodes[j], file_data + i, 16); + /* Rotate (ntohl) each 8 byte entry */ + rotate_8((unsigned char *)(&(nodes[j].addr))); + rotate_8((unsigned char *)(&(nodes[j].len))); + } + + DPAAX_DEBUG("Device-tree memory node data:"); + do { + DPAAX_DEBUG("\n %08" PRIx64 " %08zu", nodes[j].addr, nodes[j].len); + } while (--j); + +cleanup: + close(fd); + globfree(&result); +out: + return nodes; +} + +int +dpaax_iova_table_populate(void) +{ + int ret; + unsigned int i, node_count; + size_t tot_memory_size, total_table_size; + struct reg_node *nodes; + struct dpaax_iovat_element *entry; + + /* dpaax_iova_table_p is a singleton - only one instance should be + * created. + */ + if (dpaax_iova_table_p) { + DPAAX_DEBUG("Multiple allocation attempt for IOVA Table (%p)", + dpaax_iova_table_p); + /* This can be an error case as well - some path not cleaning + * up table - but, for now, it is assumed that if IOVA Table + * pointer is valid, table is allocated. + */ + return 0; + } + + nodes = read_memory_node(&node_count); + if (nodes == NULL || node_count <= 0) { + DPAAX_WARN("PA->VA translation not available;"); + DPAAX_WARN("Expect performance impact."); + return -1; + } + + tot_memory_size = 0; + for (i = 0; i < node_count; i++) + tot_memory_size += nodes[i].len; + + DPAAX_DEBUG("Total available PA memory size: %zu", tot_memory_size); + + /* Total table size = meta data + tot_memory_size/8 */ + total_table_size = sizeof(struct dpaax_iova_table) + + (sizeof(struct dpaax_iovat_element) * node_count) + + ((tot_memory_size / DPAAX_MEM_SPLIT) * sizeof(uint64_t)); + + /* TODO: This memory doesn't need to shared but needs to be always + * pinned to RAM (no swap out) - using hugepage rather than malloc + */ + dpaax_iova_table_p = rte_zmalloc(NULL, total_table_size, 0); + if (dpaax_iova_table_p == NULL) { + DPAAX_WARN("Unable to allocate memory for PA->VA Table;"); + DPAAX_WARN("PA->VA translation not available;"); + DPAAX_WARN("Expect performance impact."); + free(nodes); + return -1; + } + + /* Initialize table */ + dpaax_iova_table_p->count = node_count; + entry = dpaax_iova_table_p->entries; + + DPAAX_DEBUG("IOVA Table entries: (entry start = %p)", (void *)entry); + DPAAX_DEBUG("\t(entry),(start),(len),(next)"); + + for (i = 0; i < node_count; i++) { + /* dpaax_iova_table_p + * | dpaax_iova_table_p->entries + * | | + * | | + * V V + * +------+------+-------+---+----------+---------+--- + * |iova_ |entry | entry | | pages | pages | + * |table | 1 | 2 |...| entry 1 | entry2 | + * +-----'+.-----+-------+---+;---------+;--------+--- + * \ \ / / + * `~~~~~~|~~~~~>pages / + * \ / + * `~~~~~~~~~~~>pages + */ + entry[i].start = nodes[i].addr; + entry[i].len = nodes[i].len; + if (i > 0) + entry[i].pages = entry[i-1].pages + + ((entry[i-1].len/DPAAX_MEM_SPLIT)); + else + entry[i].pages = (uint64_t *)((unsigned char *)entry + + (sizeof(struct dpaax_iovat_element) * + node_count)); + + DPAAX_DEBUG("\t(%u),(%8"PRIx64"),(%8zu),(%8p)", + i, entry[i].start, entry[i].len, entry[i].pages); + } + + /* Release memory associated with nodes array - not required now */ + free(nodes); + + DPAAX_DEBUG("Adding mem-event handler\n"); + ret = dpaax_handle_memevents(); + if (ret) { + DPAAX_ERR("Unable to add mem-event handler"); + DPAAX_WARN("Cases with non-buffer pool mem won't work!"); + } + + return 0; +} + +void +dpaax_iova_table_depopulate(void) +{ + if (dpaax_iova_table_p == NULL) + return; + + rte_free(dpaax_iova_table_p->entries); + dpaax_iova_table_p = NULL; + + DPAAX_DEBUG("IOVA Table cleanedup"); +} + +int +dpaax_iova_table_add(phys_addr_t paddr, void *vaddr, size_t length) +{ + int found = 0; + unsigned int i; + size_t req_length = length, e_offset; + struct dpaax_iovat_element *entry; + uintptr_t align_vaddr; + phys_addr_t align_paddr; + + align_paddr = paddr & DPAAX_MEM_SPLIT_MASK; + align_vaddr = ((uintptr_t)vaddr & DPAAX_MEM_SPLIT_MASK); + + /* Check if paddr is available in table */ + entry = dpaax_iova_table_p->entries; + for (i = 0; i < dpaax_iova_table_p->count; i++) { + if (align_paddr < entry[i].start) { + /* Address lower than start, but not found in previous + * iteration shouldn't exist. + */ + DPAAX_ERR("Add: Incorrect entry for PA->VA Table" + "(%"PRIu64")", paddr); + DPAAX_ERR("Add: Lowest address: %"PRIu64"", + entry[i].start); + return -1; + } + + if (align_paddr > (entry[i].start + entry[i].len)) + continue; + + /* align_paddr >= start && align_paddr < (start + len) */ + found = 1; + + do { + e_offset = ((align_paddr - entry[i].start) / DPAAX_MEM_SPLIT); + /* TODO: Whatif something already exists at this + * location - is that an error? For now, ignoring the + * case. + */ + entry[i].pages[e_offset] = align_vaddr; + DPAAX_DEBUG("Added: vaddr=%zu for Phy:%"PRIu64" at %zu" + " remaining len %zu", align_vaddr, + align_paddr, e_offset, req_length); + + /* Incoming request can be larger than the + * DPAAX_MEM_SPLIT size - in which case, multiple + * entries in entry->pages[] are filled up. + */ + if (req_length <= DPAAX_MEM_SPLIT) + break; + align_paddr += DPAAX_MEM_SPLIT; + align_vaddr += DPAAX_MEM_SPLIT; + req_length -= DPAAX_MEM_SPLIT; + } while (1); + + break; + } + + if (!found) { + /* There might be case where the incoming physical address is + * beyond the address discovered in the memory node of + * device-tree. Specially if some malloc'd area is used by EAL + * and the memevent handlers passes that across. But, this is + * not necessarily an error. + */ + DPAAX_DEBUG("Add: Unable to find slot for vaddr:(%p)," + " phy(%"PRIu64")", + vaddr, paddr); + return -1; + } + + DPAAX_DEBUG("Add: Found slot at (%"PRIu64")[(%zu)] for vaddr:(%p)," + " phy(%"PRIu64"), len(%zu)", entry[i].start, e_offset, + vaddr, paddr, length); + return 0; +} + +int +dpaax_iova_table_del(phys_addr_t paddr, size_t len __rte_unused) +{ + int found = 0; + unsigned int i; + size_t e_offset; + struct dpaax_iovat_element *entry; + phys_addr_t align_paddr; + + align_paddr = paddr & DPAAX_MEM_SPLIT_MASK; + + /* Check if paddr is available in table */ + entry = dpaax_iova_table_p->entries; + for (i = 0; i < dpaax_iova_table_p->count; i++) { + if (align_paddr < entry[i].start) { + /* Address lower than start, but not found in previous + * iteration shouldn't exist. + */ + DPAAX_ERR("Del: Incorrect entry for PA->VA Table " + "(%"PRIu64")", paddr); + DPAAX_ERR("Del: Lowest address: %"PRIu64, + entry[i].start); + return -1; + } + + if (align_paddr > (entry[i].start + entry[i].len)) + continue; + + /* align_paddr >= start && align_paddr < (start + len) */ + found = 1; + e_offset = (align_paddr / DPAAX_MEM_SPLIT); + entry->pages[e_offset] = 0; + + /* Addition might have populated multiple entries, but removal + * won't do that. Someone might be using internal entries. + * Removal is essentially a dummy - maynot be ever required + */ + break; + } + + if (!found) { + DPAAX_WARN("Del: Unable to find slot for phy(%"PRIu64")", + paddr); + return -1; + } + + DPAAX_DEBUG("Del: Found slot at (%"PRIu64")[(%zu)] for phy(%"PRIu64")", + entry[i].start, e_offset, paddr); + return 0; +} + +/* dpaax_iova_table_dump + * Dump the table, with its entries, on screen. Only works in Debug Mode + * Not for weak hearted - the tables can get quite large + */ +void +dpaax_iova_table_dump(void) +{ + unsigned int i, j; + struct dpaax_iovat_element *entry; + + /* In case DEBUG is not enabled, some 'if' conditions might misbehave + * as they have nothing else in them except a DPAAX_DEBUG() which if + * tuned out would leave 'if' naked. + */ + if (rte_log_get_global_level() < RTE_LOG_DEBUG) { + DPAAX_ERR("Set log level to Debug for PA->Table dump!"); + return; + } + + DPAAX_DEBUG(" === Start of PA->VA Translation Table ==="); + if (dpaax_iova_table_p == NULL) + DPAAX_DEBUG("\tNULL"); + + entry = dpaax_iova_table_p->entries; + for (i = 0; i < dpaax_iova_table_p->count; i++) { + DPAAX_DEBUG("\t(%16i),(%16"PRIu64"),(%16zu),(%16p)", + i, entry[i].start, entry[i].len, entry[i].pages); + DPAAX_DEBUG("\t\t (PA), (VA)"); + for (j = 0; j < (entry->len/DPAAX_MEM_SPLIT); j++) { + if (entry[i].pages[j] == 0) + continue; + DPAAX_DEBUG("\t\t(%16"PRIx64"),(%16"PRIx64")", + (entry[i].start + (j * sizeof(uint64_t))), + entry[i].pages[j]); + } + } + DPAAX_DEBUG(" === End of PA->VA Translation Table ==="); +} + +static void +dpaax_memevent_cb(enum rte_mem_event type, const void *addr, size_t len, + void *arg __rte_unused) +{ + struct rte_memseg_list *msl; + struct rte_memseg *ms; + size_t cur_len = 0, map_len = 0; + phys_addr_t phys_addr; + void *virt_addr; + int ret; + + DPAAX_DEBUG("Called with addr=%p, len=%zu", addr, len); + + msl = rte_mem_virt2memseg_list(addr); + + while (cur_len < len) { + const void *va = RTE_PTR_ADD(addr, cur_len); + + ms = rte_mem_virt2memseg(va, msl); + phys_addr = rte_mem_virt2phy(ms->addr); + virt_addr = ms->addr; + map_len = ms->len; + + DPAAX_DEBUG("Request for %s, va=%p, virt_addr=%p," + "iova=%"PRIu64", map_len=%zu", + type == RTE_MEM_EVENT_ALLOC ? + "alloc" : "dealloc", + va, virt_addr, phys_addr, map_len); + + if (type == RTE_MEM_EVENT_ALLOC) + ret = dpaax_iova_table_add(phys_addr, virt_addr, + map_len); + else + ret = dpaax_iova_table_del(phys_addr, map_len); + + if (ret != 0) { + DPAAX_ERR("PA-Table entry update failed. " + "Map=%d, addr=%p, len=%zu, err:(%d)", + type, va, map_len, ret); + return; + } + + cur_len += map_len; + } +} + +static int +dpaax_memevent_walk_memsegs(const struct rte_memseg_list *msl __rte_unused, + const struct rte_memseg *ms, size_t len, + void *arg __rte_unused) +{ + DPAAX_DEBUG("Walking for %p (pa=%"PRIu64") and len %zu", + ms->addr, ms->phys_addr, len); + dpaax_iova_table_add(rte_mem_virt2phy(ms->addr), ms->addr, len); + return 0; +} + +static int +dpaax_handle_memevents(void) +{ + /* First, walk through all memsegs and pin them, before installing + * handler. This assures that all memseg which have already been + * identified/allocated by EAL, are already part of PA->VA Table. This + * is especially for cases where application allocates memory before + * the EAL or this is an externally allocated memory passed to EAL. + */ + rte_memseg_contig_walk_thread_unsafe(dpaax_memevent_walk_memsegs, NULL); + + return rte_mem_event_callback_register("dpaax_memevents_cb", + dpaax_memevent_cb, NULL); +} + +RTE_INIT(dpaax_log) +{ + dpaax_logger = rte_log_register("pmd.common.dpaax"); + if (dpaax_logger >= 0) + rte_log_set_level(dpaax_logger, RTE_LOG_NOTICE); +} diff --git a/drivers/common/dpaax/dpaax_iova_table.h b/drivers/common/dpaax/dpaax_iova_table.h new file mode 100644 index 000000000..056e4e0a1 --- /dev/null +++ b/drivers/common/dpaax/dpaax_iova_table.h @@ -0,0 +1,104 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2018 NXP + */ + +#ifndef _DPAAX_IOVA_TABLE_H_ +#define _DPAAX_IOVA_TABLE_H_ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +struct dpaax_iovat_element { + phys_addr_t start; /**< Start address of block of physical pages */ + size_t len; /**< Difference of end-start for quick access */ + uint64_t *pages; /**< VA for each physical page in this block */ +}; + +struct dpaax_iova_table { + unsigned int count; /**< No. of blocks of contiguous physical pages */ + struct dpaax_iovat_element entries[0]; +}; + +/* Pointer to the table, which is common for DPAA/DPAA2 and only a single + * instance is required across net/crypto/event drivers. This table is + * populated iff devices are found on the bus. + */ +extern struct dpaax_iova_table *dpaax_iova_table_p; + +/* Device tree file for memory layout is named 'memory@' where the 'addr' + * is SoC dependent, or even Uboot fixup dependent. + */ +#define MEM_NODE_PATH_GLOB "/proc/device-tree/memory[@0-9]*/reg" +/* Device file should be multiple of 16 bytes, each containing 8 byte of addr + * and its length. Assuming max of 5 entries. + */ +#define MEM_NODE_FILE_LEN ((16 * 5) + 1) + +/* Table is made up of DPAAX_MEM_SPLIT elements for each contiguous zone. This + * helps avoid separate handling for cases where more than one size of hugepage + * is supported. + */ +#define DPAAX_MEM_SPLIT (1<<21) +#define DPAAX_MEM_SPLIT_MASK ~(DPAAX_MEM_SPLIT - 1) /**< Floor aligned */ +#define DPAAX_MEM_SPLIT_MASK_OFF (DPAAX_MEM_SPLIT - 1) /**< Offset */ + +/* APIs exposed */ +int dpaax_iova_table_populate(void); +void dpaax_iova_table_depopulate(void); +int dpaax_iova_table_add(phys_addr_t paddr, void *vaddr, size_t length); +int dpaax_iova_table_del(phys_addr_t paddr, size_t len); +void dpaax_iova_table_dump(void); + +static inline void *dpaax_iova_table_get_va(phys_addr_t paddr) __attribute__((hot)); + +static inline void * +dpaax_iova_table_get_va(phys_addr_t paddr) { + unsigned int i = 0, index; + void *vaddr = 0; + phys_addr_t paddr_align = paddr & DPAAX_MEM_SPLIT_MASK; + size_t offset = paddr & DPAAX_MEM_SPLIT_MASK_OFF; + struct dpaax_iovat_element *entry; + + entry = dpaax_iova_table_p->entries; + + do { + if (unlikely(i > dpaax_iova_table_p->count)) + break; + + if (paddr_align < entry[i].start) { + /* Incorrect paddr; Not in memory range */ + return 0; + } + + if (paddr_align > (entry[i].start + entry[i].len)) { + i++; + continue; + } + + /* paddr > entry->start && paddr <= entry->(start+len) */ + index = (paddr_align - entry[i].start)/DPAAX_MEM_SPLIT; + vaddr = (void *)((uintptr_t)entry[i].pages[index] + offset); + break; + } while (1); + + return vaddr; +} + +#endif /* _DPAAX_IOVA_TABLE_H_ */ diff --git a/drivers/common/dpaax/dpaax_logs.h b/drivers/common/dpaax/dpaax_logs.h new file mode 100644 index 000000000..bf1b27cc1 --- /dev/null +++ b/drivers/common/dpaax/dpaax_logs.h @@ -0,0 +1,39 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2018 NXP + */ + +#ifndef _DPAAX_LOGS_H_ +#define _DPAAX_LOGS_H_ + +#include + +extern int dpaax_logger; + +#define DPAAX_LOG(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, dpaax_logger, "dpaax: " fmt "\n", \ + ##args) + +/* Debug logs are with Function names */ +#define DPAAX_DEBUG(fmt, args...) \ + rte_log(RTE_LOG_DEBUG, dpaax_logger, "dpaax: %s(): " fmt "\n", \ + __func__, ##args) + +#define DPAAX_INFO(fmt, args...) \ + DPAAX_LOG(INFO, fmt, ## args) +#define DPAAX_ERR(fmt, args...) \ + DPAAX_LOG(ERR, fmt, ## args) +#define DPAAX_WARN(fmt, args...) \ + DPAAX_LOG(WARNING, fmt, ## args) + +/* DP Logs, toggled out at compile time if level lower than current level */ +#define DPAAX_DP_LOG(level, fmt, args...) \ + RTE_LOG_DP(level, PMD, fmt, ## args) + +#define DPAAX_DP_DEBUG(fmt, args...) \ + DPAAX_DP_LOG(DEBUG, fmt, ## args) +#define DPAAX_DP_INFO(fmt, args...) \ + DPAAX_DP_LOG(INFO, fmt, ## args) +#define DPAAX_DP_WARN(fmt, args...) \ + DPAAX_DP_LOG(WARNING, fmt, ## args) + +#endif /* _DPAAX_LOGS_H_ */ diff --git a/drivers/common/dpaax/meson.build b/drivers/common/dpaax/meson.build new file mode 100644 index 000000000..98a1bdd48 --- /dev/null +++ b/drivers/common/dpaax/meson.build @@ -0,0 +1,12 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 NXP + +allow_experimental_apis = true + +if host_machine.system() != 'linux' + build = false +endif + +sources = files('dpaax_iova_table.c') + +cflags += ['-D_GNU_SOURCE'] diff --git a/drivers/common/dpaax/rte_common_dpaax_version.map b/drivers/common/dpaax/rte_common_dpaax_version.map new file mode 100644 index 000000000..6c0efde20 --- /dev/null +++ b/drivers/common/dpaax/rte_common_dpaax_version.map @@ -0,0 +1,12 @@ +DPDK_18.11 { + global: + + dpaax_iova_table_add; + dpaax_iova_table_del; + dpaax_iova_table_depopulate; + dpaax_iova_table_dump; + dpaax_iova_table_p; + dpaax_iova_table_populate; + + local: *; +}; \ No newline at end of file diff --git a/drivers/common/meson.build b/drivers/common/meson.build index f828ce7f7..0257d4d2b 100644 --- a/drivers/common/meson.build +++ b/drivers/common/meson.build @@ -2,6 +2,6 @@ # Copyright(c) 2018 Cavium, Inc std_deps = ['eal'] -drivers = ['mvep', 'octeontx', 'qat'] +drivers = ['dpaax', 'mvep', 'octeontx', 'qat'] config_flag_fmt = 'RTE_LIBRTE_@0@_COMMON' driver_name_fmt = 'rte_common_@0@' From patchwork Tue Sep 25 12:54:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shreyansh Jain X-Patchwork-Id: 45316 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 [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3F5F81B176; Tue, 25 Sep 2018 14:55:30 +0200 (CEST) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70040.outbound.protection.outlook.com [40.107.7.40]) by dpdk.org (Postfix) with ESMTP id D84941B160 for ; Tue, 25 Sep 2018 14:55:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=aio6peQKHsZ6NstvR1rXTJ+ebqMat0KZVZZpwGkCJzw=; b=JIj4v1rgR9+mDCZPYhzM4aG0IatvNn8XereTeHn1lbQQcF2SVuV6Pva6g21qSTRyU3AnK81cIMkmHjo6IojuEIop9hV83kH22bl46Agmcp58D3bm7WzexyXTklTbIP0DWtxBvO5JQlSgvyhv1fOdzwQKG3c0bi/kxArmKVNfqTs= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=shreyansh.jain@nxp.com; Received: from Tophie.ap.freescale.net (14.142.187.166) by AM0PR04MB4676.eurprd04.prod.outlook.com (2603:10a6:208:75::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1143.18; Tue, 25 Sep 2018 12:55:24 +0000 From: Shreyansh Jain To: ferruh.yigit@intel.com Cc: dev@dpdk.org, anatoly.burakov@intel.com, Shreyansh Jain Date: Tue, 25 Sep 2018 18:24:22 +0530 Message-Id: <20180925125423.7505-5-shreyansh.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180925125423.7505-1-shreyansh.jain@nxp.com> References: <20180925125423.7505-1-shreyansh.jain@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: TYAPR01CA0123.jpnprd01.prod.outlook.com (2603:1096:404:2d::15) To AM0PR04MB4676.eurprd04.prod.outlook.com (2603:10a6:208:75::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 77c6209f-eead-4bea-ce80-08d622e62a3b X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534165)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB4676; X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4676; 3:MLl2E+yn1lYnxp7ESYG4lIVQrkrFBFP/E+XDVs37F1ewUYJusHIDiAABy16jl6jiZroaZnoHmPk8JY17v+drwuZKl02Ne14PKAzYhDLnttMKXqvYLzkeepkfWz5kAayF4fWJzBhofPX5Hm73IBWl2rJREpXV0avAGp6PnB7vr5p0Yy7Wv277hxVbFZ4WKZV33N8RoZfQcobQohksPL2NFh9jyrydQXIppbeuBAt/hBlJtboXbyelfmpWMGd3Hp2Y; 25:VPFqworivdD0JySBQxwgRL3IYGWOkt080j0O9k1mp8Q1Sf/dJCxTyZgTMB0ojF97J/vCN200nknmOU+sJQ+f5pqciX0ES7JOAI/fzOtjfNgRBLBVmNM/ectSYoU60Q1HO8WQCUFy5QwbpyaG3kQcMrmP1TqTaG02F33voO/+jXtu/8btQjb/9uGqpKLSd8Yyb9LmrnX4oFAdBRcgCSrr/cM2RgZGfKxgt/Teelniiy/DMkWVh9q+cW2NKHo0KU4/eou5Fwp9qH1XpbpHc+m+br3J0UxLbpjqnz1v7LMSHdFG/MSkH8mEEh/L6VWAFQ9HtCHSivVnRFL6KxvtiQUrRQ==; 31:fHHjnfFJlgPcm7V2rqmpESXl9qPfe2/vjJA4XjgMO8JNXj+eBZcu4XU0woNrhTrbhp85ihwTt0MBvrbh4cAWhy3dD6vblXjOYH4dgqu5ePG4Ec13s6JukysmckqRk9CM944jcy7Fwn9FJFxV050gqpBYklgF2YbdkkuLyNAw/fDc1OFWFl91Q0HzQEudOAdf7aWHQfmWaps6HEJbj8M8yfg+CZXWhOX++fickj7if2Q= X-MS-TrafficTypeDiagnostic: AM0PR04MB4676: X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4676; 20:JnvIFOcOT/zN8p+G+SAGYFGtehD68M81QSLBk/i1HI7Lnp56E1A0p2ZPT3EOykhs1On2eZGJEyL3/TBrJrH+C4SGrGll6anWjx3vXSOjaWXvazaRRlpxi62ufSHh8y1wBG1EkUH8YhYP41W5SGyYh5HfPEcq4x5Zq3Zb/5keJl0kk9eX2wNeBZd0pKoHpn4lWiFI0R4vfHo7+sMYMcjVDDEH6B42pLHbsvwV2qEiMHr8Ry0A1gtnlnwZiiMeYKCGBz0/4VAzlc9kwo1VJW2GQO+SljDHueQbfFjwsVXfcU5KPW7CWDATF9UOaHvh93a7CXmpys5/NJjrsjVAd7sb1i4uqXBp24jMQEVzhzgZfhaeRs5mqJ7TMAzt5Y/8f27lNFW8EV14EUrxXwjkfmplLYr0RxPmbnss2s4/hXq+d3oB8/Evnd60QmkCSG4OTnYCl0BEPoBfB8OZSJs6ibNN3egSpCJ2zJDS5nwsa6yEH1VjdYN6oc3i6FqW1VlOeBnf; 4:vcCUigzm4NS/Bg3jMyi/NXG7Mmz9KhPRHRsxfnNVEHu3nJsP9DbUNhp4oS10TYIzxHbLXScpJ5fgpRWjT52nq6jVZ60bodlt3xWEY9BmHZQfoCvUSlwrBeXhWmCUk3FiaxTt1L9c2B2LLwYkOhkKKGmGEONHqLRvUJecsHPBf5pKDi+i8cZeQaJa6me6qryXOLagNfJ8iNwI56krw9+N0KlX66oAXutXRVqZl9TAeKGTkbe5seLA0t0OLJdmN3dNj8lOw0CtGByuLfrWfORMZVyegNwBhW4y97IfPFLlsOHdwkgNunPOcTKbNbj1k+4B X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3231355)(944501410)(52105095)(3002001)(6055026)(149066)(150027)(6041310)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(201708071742011)(7699051); SRVR:AM0PR04MB4676; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB4676; X-Forefront-PRVS: 08062C429B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(376002)(136003)(346002)(39860400002)(396003)(189003)(199004)(2616005)(5660300001)(48376002)(478600001)(8676002)(11346002)(575784001)(186003)(86362001)(66066001)(25786009)(16526019)(36756003)(2361001)(7736002)(97736004)(6916009)(26005)(34290500001)(305945005)(106356001)(486006)(105586002)(53936002)(476003)(956004)(6512007)(5009440100003)(386003)(8936002)(68736007)(51416003)(50226002)(76176011)(3846002)(1076002)(6506007)(316002)(6116002)(47776003)(16586007)(2906002)(6486002)(2351001)(81156014)(44832011)(81166006)(446003)(52116002)(50466002)(4326008)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4676; H:Tophie.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR04MB4676; 23:Hl8Jap0vBRBxc4FzBy/qLC1SmKM0FPhwffb3X2TRF?= 4iwofmBYMq2lo5RFdxWER5IDUNWuFN87KzkL8rk99N7we4GuwH2GSaFv7rcjfWYbx1IVNKHRybtv7bHzpnqY6U+5IYQ+K/rv/mXxn0LWt8YIYUTUu1GkmBhiFAXeNJI3hDCLV69SMhhj20AQf7//yqvrzlGUn71zvIPxRRIDoJJi//u2WlPqDdhO0pPiN2ezOFgZndS+poP6yFfkniOM2dhm26Lm0pW4gD/nstfLsEyMl4fo9Wo9knonbfPSC4eNzHduQFEajdfJUW2Ous9wp50tJwZBklOJaU672HOdvYIxrvXmd20stkPfOYOHeuSfJRMGEfJZxAlis3T9tVt5re4IolOVTOlwc5meZOTql3zronSpOicAG6oLuxinUhYs1qqzalNtY1LYhFpz8ZsAkWDYYo4OgoOOT6vHRgHnlDIVepH3Sr/W8Eeovv9WJsWiFZXy8/3S+jswvnwDGWsHEkJaqrG80EhMse2mcQblOgWdKOiqxvrM82O5Fbjfd/y/lGFvbL4fmYhyoUW/zYLaRox0KvK0+xyaO92H6Wn/OM8b885KSCySFQzt+uk6e57esWNqJvlqDZuupzbXFhEKOLnzcbjAf0fY7RXlSRlrUAtYeSseuMs0C5u0pGSdreda5TPcT6fUW1xs7pWLKgYerWhFqZmvVvRfC2bTqvuFnW9oxMFlPEK4Bp7oR4STtmPpVJbxMKK0zX+J8EiOc443plZWwk1fbWvPSGJez8EHsLgNPaExSWF9yQOysq2gnSCotlppiArZkxVbCaCFJUUpOMT3X2vREgz8AulZO5t0b1TGWETO42njbAdE2gFV9nD2fsL2X8ZUD8QA75X4TlfyGgdU1vXoh9GjOFV8yYVDdk+3nCLsHmaWdMY5nBIfA1H2OZ8htcjIE9NQCucQfOQRuJTewB3gNJTRebdCvWLL+RN+McVMVWR9V5OKIlKJgE1YMge5QeSt94vNhxt+v0z0erIgmMUY+0oORP3zbHB0bFk/xJl2F0eDRprP9AQohPQ4yKTSUAtzQZUgFiA/ad1Lbkigc34tDrK/3XotxrIhQL4rEnSDTmjQ50zJgnrNLuBOvYnSXmxGRGzscRqo1FD/c3nihn78yk4N91+l4jDAa4Is6eyPFVUQM3x7Hl9IrblVHqKhPj+dn/SFYjmhTwkF5ziOYW/zGX5otwmIySOvuUlJfh2s987VTVYHnvdtcg3TXAkknMun1LkwDgSBaPt7RFI2w5vZUjN3dUkEEc+C3FYt3+KF/eCm2OOoH92Hcf72J8wtITLmuSaQiwL98SDIpRA X-Microsoft-Antispam-Message-Info: OBz7NH+346UWbM9cF7MQKm+2u4yjrUzUR46F2nII+pwIUQD3KCPy2dJjkrsUcqAsXVM9s4+tkJbeF2xJMIzkvHniURI9VhOAidmRxDeFLZ8rrgEU5VW9jZi40OohNdZbOqQZNLex95poSiH/BuOR7Ygw3HCSpfofP/beLaOK04wEj9pFFqNoXZX7Xu3JIaDQW5mU5IE8EfV1MFLUa385fzHylRQJxPXnZac6dRqbk+NRyVMgyt2ewC7mSkxGgxG1UPWSRNzxpD0GWKCu+YnO7io2CJlKg8QiTdcVYVwdKj5NXutWIAPO1vVIL8EnKFwXHQA+NPqgXJEqvT5znGXS30MbbFeATs3xFMhcRlyRMv4= X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4676; 6:QHHdTNgqXAWwK1cemoKllzEcGkDg8IlRZm+2BDEh/3XSuEcNH7wvwDzJN5QyuRXDrTWwiBgvdewl0h2q0KABUi3UwvuP5Sqnpxer3Sc8CuQKJc4GlCzlbR0bi0Cq73ccHSYz7Y9TrN+dI6SSNGOZZ08i5u34frk+tvI+ImPRgR02b0t5eIqPQr8/4NL9TsAlRE373WOX7URX9mjj0BQReuR4itnfNR10MjT6QqMxDStJJEvCb9PYweBXhcaYF5JCj4Uph9C5zHbdqHbQJDEg6CkZP7BCGy3VNPAb2swZLglUHn5hCMXP4vbjHS646/wX4WIMgyNmb4Ebwic4J9T+uWoz0BIM8MvxFoF4OiypPhGaPtznfF2QIJY2xRKTqtsPh9kfKbYpc+9XO/SvyFuNyEtiu9AtgfnMS2B+LwTmMwX77znbX0eupNTWnnjw+V19xp3ljQqFv/TQOUnaXJusLQ==; 5:+pd+iBUAzjidSp5K5LcK3w/odGCz6yLSSatEcByxsLRibjtwl8uH5mBpKOeNFuLFw2EoYBo10aoBDlazx/AKA9NIam0WqBxUyes9mpiGMORoE5uzzyZD0ZNo+1Xbyw6PHWerWSH2a8/aMmCVFGSLWBDMUTZYf5et9snaUWPPjhA=; 7:7CZfto4DhVPMx0F2jIpA/F0a0sTYkLkWNZH7HL/JhxcB+ku+c48ki/9A9oNkdQbuJgs5N/6HtFlCixUAaDiHPpAnfxEG4RwltKSy4IMwjLQtdUl2yc9k9LMmTdMjKVvN5McHRJXWy5ggS5JeOYQDy32JPc/YN+8/dn1XTkZ+nKcRoULutsN613UEznh9Ozu/qRpN/PD2jXQ44Q6ZdHZZEGk6D8OxZOFVDqtiRXqNXIlGg4fLrPI5YllnQFucrEXA SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Sep 2018 12:55:24.3513 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 77c6209f-eead-4bea-ce80-08d622e62a3b X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4676 Subject: [dpdk-dev] [PATCH 4/5] dpaa: enable dpaax library 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" With this patch, dpaa bus and ethernet devices on this bus would start using the physical-virtual library interfaces. This patch impacts mempool/dpaa, event/dpaa and net/dpaa as they are dependent on the bus/dpaa and thus impact linkage of libraries. Signed-off-by: Shreyansh Jain --- drivers/bus/dpaa/Makefile | 1 + drivers/bus/dpaa/dpaa_bus.c | 4 ++++ drivers/bus/dpaa/meson.build | 2 +- drivers/bus/dpaa/rte_dpaa_bus.h | 6 ++++++ drivers/crypto/dpaa_sec/Makefile | 1 + drivers/crypto/dpaa_sec/dpaa_sec.c | 6 ++++++ drivers/event/dpaa/Makefile | 1 + drivers/mempool/dpaa/Makefile | 1 + drivers/mempool/dpaa/dpaa_mempool.c | 3 +++ drivers/mempool/dpaa/dpaa_mempool.h | 4 +--- drivers/net/dpaa/Makefile | 1 + mk/rte.app.mk | 1 + 12 files changed, 27 insertions(+), 4 deletions(-) diff --git a/drivers/bus/dpaa/Makefile b/drivers/bus/dpaa/Makefile index bffaa9d92..5eb7c24db 100644 --- a/drivers/bus/dpaa/Makefile +++ b/drivers/bus/dpaa/Makefile @@ -48,5 +48,6 @@ SRCS-$(CONFIG_RTE_LIBRTE_DPAA_BUS) += \ LDLIBS += -lpthread LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring LDLIBS += -lrte_ethdev +LDLIBS += -lrte_common_dpaax include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c index 16fabd1be..8bfb085e9 100644 --- a/drivers/bus/dpaa/dpaa_bus.c +++ b/drivers/bus/dpaa/dpaa_bus.c @@ -34,6 +34,7 @@ #include #include +#include #include #include @@ -546,6 +547,9 @@ rte_dpaa_bus_probe(void) fclose(svr_file); } + /* And initialize the PA->VA translation table */ + dpaax_iova_table_populate(); + /* For each registered driver, and device, call the driver->probe */ TAILQ_FOREACH(dev, &rte_dpaa_bus.device_list, next) { TAILQ_FOREACH(drv, &rte_dpaa_bus.driver_list, next) { diff --git a/drivers/bus/dpaa/meson.build b/drivers/bus/dpaa/meson.build index d10b62c03..42676fbc5 100644 --- a/drivers/bus/dpaa/meson.build +++ b/drivers/bus/dpaa/meson.build @@ -5,7 +5,7 @@ if host_machine.system() != 'linux' build = false endif -deps += ['eventdev'] +deps += ['common_dpaax', 'eventdev'] sources = files('base/fman/fman.c', 'base/fman/fman_hw.c', 'base/fman/netcfg_layer.c', diff --git a/drivers/bus/dpaa/rte_dpaa_bus.h b/drivers/bus/dpaa/rte_dpaa_bus.h index 15dc6a4ac..1d580a000 100644 --- a/drivers/bus/dpaa/rte_dpaa_bus.h +++ b/drivers/bus/dpaa/rte_dpaa_bus.h @@ -8,6 +8,7 @@ #include #include +#include #include #include @@ -110,6 +111,11 @@ extern struct dpaa_memseg_list rte_dpaa_memsegs; static inline void *rte_dpaa_mem_ptov(phys_addr_t paddr) { struct dpaa_memseg *ms; + void *va; + + va = dpaax_iova_table_get_va(paddr); + if (likely(va != NULL)) + return va; /* Check if the address is already part of the memseg list internally * maintained by the dpaa driver. diff --git a/drivers/crypto/dpaa_sec/Makefile b/drivers/crypto/dpaa_sec/Makefile index 9be447041..674a7a398 100644 --- a/drivers/crypto/dpaa_sec/Makefile +++ b/drivers/crypto/dpaa_sec/Makefile @@ -38,5 +38,6 @@ SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA_SEC) += dpaa_sec.c LDLIBS += -lrte_bus_dpaa LDLIBS += -lrte_mempool_dpaa +LDLIBS += -lrte_common_dpaax include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c index 2f0a5d285..65df12592 100644 --- a/drivers/crypto/dpaa_sec/dpaa_sec.c +++ b/drivers/crypto/dpaa_sec/dpaa_sec.c @@ -107,6 +107,12 @@ dpaa_mem_vtop(void *vaddr) static inline void * dpaa_mem_ptov(rte_iova_t paddr) { + void *va; + + va = (void *)dpaax_iova_table_get_va(paddr); + if (likely(va)) + return va; + return rte_mem_iova2virt(paddr); } diff --git a/drivers/event/dpaa/Makefile b/drivers/event/dpaa/Makefile index ddd855227..6f93e7f40 100644 --- a/drivers/event/dpaa/Makefile +++ b/drivers/event/dpaa/Makefile @@ -34,5 +34,6 @@ LDLIBS += -lrte_mempool_dpaa LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs LDLIBS += -lrte_eventdev -lrte_pmd_dpaa -lrte_bus_vdev +LDLIBS += -lrte_common_dpaax include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/mempool/dpaa/Makefile b/drivers/mempool/dpaa/Makefile index da8da1e90..9cf36856c 100644 --- a/drivers/mempool/dpaa/Makefile +++ b/drivers/mempool/dpaa/Makefile @@ -31,5 +31,6 @@ SRCS-$(CONFIG_RTE_LIBRTE_DPAA_MEMPOOL) += dpaa_mempool.c LDLIBS += -lrte_bus_dpaa LDLIBS += -lrte_eal -lrte_mempool -lrte_ring +LDLIBS += -lrte_common_dpaax include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/mempool/dpaa/dpaa_mempool.c b/drivers/mempool/dpaa/dpaa_mempool.c index 1c121223b..ce3f370ff 100644 --- a/drivers/mempool/dpaa/dpaa_mempool.c +++ b/drivers/mempool/dpaa/dpaa_mempool.c @@ -26,6 +26,7 @@ #include #include +#include /* List of all the memseg information locally maintained in dpaa driver. This * is to optimize the PA_to_VA searches until a better mechanism (algo) is @@ -280,6 +281,8 @@ dpaa_populate(struct rte_mempool *mp, unsigned int max_objs, MEMPOOL_INIT_FUNC_TRACE(); + dpaax_iova_table_add(paddr, vaddr, len); + if (!mp || !mp->pool_data) { DPAA_MEMPOOL_ERR("Invalid mempool provided\n"); return 0; diff --git a/drivers/mempool/dpaa/dpaa_mempool.h b/drivers/mempool/dpaa/dpaa_mempool.h index 092f326cb..533e1c6e2 100644 --- a/drivers/mempool/dpaa/dpaa_mempool.h +++ b/drivers/mempool/dpaa/dpaa_mempool.h @@ -43,10 +43,8 @@ struct dpaa_bp_info { }; static inline void * -DPAA_MEMPOOL_PTOV(struct dpaa_bp_info *bp_info, uint64_t addr) +DPAA_MEMPOOL_PTOV(struct dpaa_bp_info *bp_info __rte_unused, uint64_t addr) { - if (bp_info->ptov_off) - return ((void *) (size_t)(addr + bp_info->ptov_off)); return rte_dpaa_mem_ptov(addr); } diff --git a/drivers/net/dpaa/Makefile b/drivers/net/dpaa/Makefile index d7a0a50c5..1c4f7d914 100644 --- a/drivers/net/dpaa/Makefile +++ b/drivers/net/dpaa/Makefile @@ -38,6 +38,7 @@ LDLIBS += -lrte_bus_dpaa LDLIBS += -lrte_mempool_dpaa LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs +LDLIBS += -lrte_common_dpaax # install this header file SYMLINK-$(CONFIG_RTE_LIBRTE_DPAA_PMD)-include := rte_pmd_dpaa.h diff --git a/mk/rte.app.mk b/mk/rte.app.mk index 899d51a23..89a008fe3 100644 --- a/mk/rte.app.mk +++ b/mk/rte.app.mk @@ -115,6 +115,7 @@ ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),n) _LDLIBS-$(CONFIG_RTE_DRIVER_MEMPOOL_BUCKET) += -lrte_mempool_bucket _LDLIBS-$(CONFIG_RTE_DRIVER_MEMPOOL_STACK) += -lrte_mempool_stack ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y) +_LDLIBS-$(CONFIG_RTE_LIBRTE_COMMON_DPAAX) += -lrte_common_dpaax _LDLIBS-$(CONFIG_RTE_LIBRTE_DPAA_MEMPOOL) += -lrte_mempool_dpaa endif ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) From patchwork Tue Sep 25 12:54:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shreyansh Jain X-Patchwork-Id: 45317 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 [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1F13A1B17D; Tue, 25 Sep 2018 14:55:33 +0200 (CEST) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70071.outbound.protection.outlook.com [40.107.7.71]) by dpdk.org (Postfix) with ESMTP id 5C7E71B17A for ; Tue, 25 Sep 2018 14:55:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=T0unqp9AS5YGSq9jjLcz1Fl7sLVTvLaqfAJOy+s9oe4=; b=hRpO5FWm+614QB1E1Fi+z9sVHe0I6+KMIMVkVO6wyFORns5kJWZTfVefqMGrvU1j3NHh8Kzw9wNgQ0prVK8yUTAXILvRB4122pbJCv1alHVPqXn4Fss2IB+bQ5QfLThKOmeTYEVkLaC+aVjn+d5YED/bwk/ALu1J2IswhOI14Ho= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=shreyansh.jain@nxp.com; Received: from Tophie.ap.freescale.net (14.142.187.166) by AM0PR04MB4676.eurprd04.prod.outlook.com (2603:10a6:208:75::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1143.18; Tue, 25 Sep 2018 12:55:27 +0000 From: Shreyansh Jain To: ferruh.yigit@intel.com Cc: dev@dpdk.org, anatoly.burakov@intel.com, Shreyansh Jain Date: Tue, 25 Sep 2018 18:24:23 +0530 Message-Id: <20180925125423.7505-6-shreyansh.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180925125423.7505-1-shreyansh.jain@nxp.com> References: <20180925125423.7505-1-shreyansh.jain@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: TYAPR01CA0123.jpnprd01.prod.outlook.com (2603:1096:404:2d::15) To AM0PR04MB4676.eurprd04.prod.outlook.com (2603:10a6:208:75::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: eaac4bfe-cecb-46b5-8f93-08d622e62c1d X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534165)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB4676; X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4676; 3:6rGVPPmEVWmZ/+o+u+4mxQWyaqPRcQ38lAyDeYyV78LDKMbtLOC8hheH5l6LUkfOKcPNZQ+eUY3TLow9w8sXmeXx7xXL0xWVmRmbxN8LagkE1fu6DVZ+/dEjozcS9u+NR/lGLAix0iwCFDyfK+XH+IZNtDNjFqAzu3oGhbReKH6ZW9RvLZvD9tmDsOiUhdy5BmJB1rKzzIWPTeH7Mz+LAKbDvVu1BJVpBeO79JB5LO1IfAqiXvC94yZ0fWqybzmP; 25:Qcpn0pP/TZ2FQAtutgK4aEG82IcCJeX6cCeWZu8Kwgv2bxwkPyR8Enm1efYXhOR8gj0bYmG98dqFanTOxpMk8UWfdCxGNLRELm91X32x1A3bMo2jy0qttRifiD7qwh3CDBeBMyIbPIObRJ1qOFoSbZoW0HqLvAiOfEG1AP3XPy8ctK3bDDYBipfvvSFCHyrtkSGugjzbsqT51xpcAHPWYlYibCvEESFxzSRVZ9wqFIpbKyoYvkpXZziImsGNOiEsfS5B0Oigw/iEnepQzTPoFmpv2W//hciRrp2OlrBoqWvOMxF7EYMyZ2GWP61+6IucVFZTJzHEyJdxWOkBIRe9pA==; 31:t1PlgseKVdZSHePQHMEvhcFtdbQvKN1pxQmHGaPLSOx1wqe70yKyYRGEOPbZglSVUOsSJXDYa01Npj5toRnIjY9cJxDsrCRxnVYIl3toPB0hm5DnTASd8qjpdMsJpNHfTehmiqeGTKmQX+ChDXdEjgOW88sSMliJ7soaGIOCnpiyaOWRWlKNUI74H9jxDiHy1qNtsCdhLEjRMon6UjsEc/wf9zSWmDjeldf1VSjShEk= X-MS-TrafficTypeDiagnostic: AM0PR04MB4676: X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4676; 20:N/YRnOWIut9BIthYL4jp3WL4KT6T7hz7aerwoa1k77ooXNgaIwyNUmJjsFiJUT/JrqIPS5ktot2xGvWT//3Xj/io1fYXzNjAA/YAd3OqTlRXX91BkY8mmTr7OPWGNSAPG1zbl8OE2jSvhIxp0X+MyDucpIaeWBrE+kTLKIPHz+VGUIOMoM+rPjirF7wjCS3SeFR16kM9h/cjzs0qJODbzV2bZq5Hs1DwDjK+VZNBaqHlCA4eE4vc9RFPhg8I3cUr+f1KpJXfUMvrNU18ef6kOUrp07R9k+kOftVCK/o6rh3RVXqNY4kOXVZedBh0g16VUqPnDHrrNQYhFdfV4vAh5B7WzPtOse6qDGzIQF4BoQquy/IuX9mjORvpcgwyPDvSpHP5PgI1bPyrGWMGpgxwAaFGosvR4TtQkcfAsK06zxXxn2GP4boYgi/i/MS2U1FZem9ytxnJX5VY887msS1wT0nycaMluTeaOjP5ZMe2W1V/7tfU+wJu37FvpoPIlo1F; 4:eRSdrV+qOm+kxMpE+Uj518KRl4yfJ9rep6Ck3tYoAXjeD/FhMvBG+Lb/Fx1IHqD0cPN+whBdbel2YqGiijl+L6iFFhB4uMEWFNKAWMyKitUZRjujAFHlh23Ybp68GK5IuW7VPiDzLETfSDns16sw4jycF73N45ak60N8VLBwRre3uy6+jvF1Y8AdLO9DyPJQvIHBwwP6Fda33kKU7mDxiHjMw9CKwzNOIFKTd0uDgzqMRuHz8n1H50BMO4k3gE+XJD8XZovQjiBm91JIkCTYhZ+9Y8Y7IrbV3A09h307XQJGtOSpki4xKXPe+bi/jL3f9oRKcaBzbI8cqwJcwloZnXd/QNn/nk66nodJGESrWCM= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(275809806118684); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3231355)(944501410)(52105095)(3002001)(6055026)(149066)(150027)(6041310)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(201708071742011)(7699051); SRVR:AM0PR04MB4676; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB4676; X-Forefront-PRVS: 08062C429B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(376002)(136003)(346002)(39860400002)(396003)(189003)(199004)(2616005)(5660300001)(48376002)(478600001)(8676002)(11346002)(575784001)(186003)(86362001)(66066001)(25786009)(16526019)(36756003)(2361001)(7736002)(97736004)(6916009)(26005)(34290500001)(305945005)(106356001)(486006)(105586002)(53936002)(476003)(956004)(6512007)(5009440100003)(386003)(8936002)(68736007)(51416003)(50226002)(76176011)(3846002)(6666003)(1076002)(6506007)(316002)(6116002)(47776003)(16586007)(14444005)(2906002)(6486002)(2351001)(81156014)(44832011)(81166006)(446003)(52116002)(50466002)(4326008)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4676; H:Tophie.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR04MB4676; 23:/tINcOz3hZX6Bj9MSNAopIe33itNvtut3OO+UZIxJ?= CQaBKkPoAxAexI9VhdMmC+QYVKYKXx/xbkbmWyqQDj15KyEb/4B6M2edsmuxNPiBTlVxKhju0lF7vjXNdpWLsMuKVh+gZnpFlgi+h5BKLPmqOCWlvvj9iZAvAmdwISi+18LTVsUqjzoKiu2CQ0HiDGQkJUQissXnbzD8yUeh8i/cAd8A6/ryTx0tVw/O4GPV5ASwPjuqBnmr9eOplM21bG+fWx5JH95IrQORMnTXNgrJ42qoW3vw9aOrJspCVhugTv6IKpcpHKFM+73k6qd+zr+9MIcPsSVvh5RBM1rB94686nWwJsnKU+GWKK9HZ5MP8xUtzMLmTZv3hQ6A2KIlJ4roPB4tzLSGs5ELCivaYWZUWQsipMGWEZF4b6ZZZXjKtl7RpNfpi1SuNBGgGSQOF3PaJ7uhpepoI3TPb0LYK6oaWeBvCVIPWgWs9o8qnBnPRIOKjFzM4rmKdKubKFL0WDlj16Hj40XS55KWtX4qcF3ppvyXN6/JrG2CfdnDcaLSIqygM97IYjw2eo4JSFMB3Y7igeaWVt/IBjFkM75mM4PYE5KOGTs/Xq39IXJcjRF3xbI6TjVBt1tQwlpa2npQygGEc/LRDxIUjIGQ1mMtS4EYcJjteEX0dCFEdO3GvUeW3m66i7AMp595hNHmpSX4BKMNlvKGziBUxIICsGfr2ZHAcdibVmavYCXk2oFuCCXkbUoED4MtIydsnIEYfQafajU4t0Vz18hshIlggLOkoYDSjuozyS9OwvrmX4TxEpYiW5LF+w1fS7nu0DAsk2lyVgzEsrCfQjDYCG+rsTCqFEgaB1EYWItfRkJK62Hsbavxe3pQ93A2QQ5oXpeB8W9ZIaukz2fYh3nY31X5oE0ZaPhIlH46WDs410Mur80iUXHyJb2gHd9v2NkUoOgVconZDvg3C27MndfptwBipagZ4Z2Mswm29uERzWSlQYlBm2fHN7nLpEqFFV5EM5gpPQmSvxeNuuhAKZN0r8RPPvnRSFR9ZgymsN2mEXAWnAP2WNeGxHVLy1JwL9pcv2/nksUazCnr/lcB/UZACEf1scJviBOqF1XdeGpGcy/xM/QE5XGvyKX7p15+0S2DbJICnOZ6OrH5RgVxNnoSfwDnlvI0unkI8J7sFSU1NKjw/5q9tLGCrVLLeDa9UPoWcTtVaqwTkX1vpLC2H2K9GGWKxXqNXejqVYZw2YvbacjHkDSkYf2WcQpH148YdwWxCtbY88mxN3C1wqqKb8kiZbW0dTVZy/EzCig2uoFJr+IQw0JsD9wFmtyKs5QGcjMjNOiXH34Fk24x4J8ndiQtbN9O+rwUejvbVWlvr5/w8q+RXE0t8h7LoI= X-Microsoft-Antispam-Message-Info: 1F71SGMQmJb4xsXhYff59uKTPl16Xvjn5bDxK9qzvTF6YXWbIm+A+YGu2a9elEZfkbnCBnkGvQjcUwdbDjQ2EEja9MTqC7j4oU7xIgtQBec/FRdEvnqr9vn6u4N2/Swr0i1M5XF6kPU/eLAQ2Z4WmwiaiN+qka34XBwUkOk8aEcAXagN6XGJUYwFOvDyB9/4PGStNoiJJ4vqJHqXwa/3aMY+qIMb4AyEZfAKap+n8h3EVhOm5DtDvQICiKZFGk9vWoJG+gRWRu86LLdwjNaEkXcx+oTmbXjKTDpOWmAOnyBUAqcKYRyP1z+TG+SEK47vBzZ16xMUHaqFNAsBFuOcYpaR0B/ihH5gs/fR05MCuC8= X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4676; 6:LDnBR3x85Ey8eHgTCDrnN6kV1Q6V3x2EZmV3wKxZrjEY+E2t9LFlHWGBLZKBmkKaKxlqMNglhZpTkhbjIH0jyD2Q5z4N5IIPZLPFSc0FiAliue7mdQkauAbnzUVcyHoPKpKULaHMHVkVTb/k5BSX9jv4uNT+hZ+ELIbAgh8YLK0kNSBebQUm/9OFTwbvwy3pndFF50YTmAu1jmM5YsXTIK2vwoAkrhdeVU4i9ERiinqjkqFqU8K+PsKeFaUOEO0W0xDgg+rRpwttQNeki+s0nI45CZO2lsqSggf5rEG6JP/ZNy47wPOrM9JJQ7UUlSUGc34Ldvt6jYxt+m9+dOuKTnOP1qtuCTiWdMXg2311ok2cUX9iR15LxmSZqdw/WdDXcDQLgPbu1rB1lpYRD2mapDX426cngh72w2HLdguf6RaBAy9MmJp3Y2bD2t4ZtyO8GD5IT4gYlw7teuSJ5Sud8w==; 5:N7dYkAv/YC+XADq/qxghDZBOj9fFwFx1RvFV6qFSQhQxOkWT8FgOuX3b5cnyupfk8zTgL5f4wzCme/Kkb9hqkLlg9QstuXq46QDsyXYIRrfWF7TeAQR4XmzzsxPBvjzy83xO0Z/G7XTtHHPTC/MFlXQddifaQRPwNjJD8lUFAuo=; 7:vEyQ4Za4vzdJ3IVJycxFsew/gFrsB+1FN6Nf4nHfm3cTuPyW4afNAahTEBsLZPq0/fahUrurjpKlcvJq3V8AJsbnc3+qfNxBxKg8x8zzSd/Et6DJ/KHJ+j1t/fA7RrEJh0XbNRr30tCTMdlDlx9BVBNtvZAxhBfYJFtz51JRgUGY/KyT0tqVPkH8w6TP7oe3DcLeCPZVE68520GTTV8s0RZrzksm9iXPjR8rA0+8UpIsUoOu3CcFl8LciG0XlKh6 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Sep 2018 12:55:27.5085 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: eaac4bfe-cecb-46b5-8f93-08d622e62c1d X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4676 Subject: [dpdk-dev] [PATCH 5/5] fslmc: enable dpaax library 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" With this patch, fslmc bus and ethernet devices on this bus would start using the physical-virtual library interfaces. This patch impacts mempool/dpaa2, event/dpaa2, net/dpaa2, raw/dpaa2_cmdif and raw/dpaa2_qdma as they are dependent on the bus/fslmc and thus impact linkage of libraries. Signed-off-by: Shreyansh Jain --- drivers/bus/fslmc/Makefile | 1 + drivers/bus/fslmc/fslmc_bus.c | 20 +++++++++++++++ drivers/bus/fslmc/meson.build | 2 +- drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c | 7 ------ drivers/bus/fslmc/portal/dpaa2_hw_pvt.h | 32 ++++++++---------------- drivers/crypto/dpaa2_sec/Makefile | 1 + drivers/event/dpaa2/Makefile | 2 ++ drivers/mempool/dpaa2/Makefile | 1 + drivers/mempool/dpaa2/dpaa2_hw_mempool.c | 29 +++------------------ drivers/net/dpaa2/Makefile | 1 + drivers/raw/dpaa2_cmdif/Makefile | 2 ++ drivers/raw/dpaa2_qdma/Makefile | 1 + mk/rte.app.mk | 1 + 13 files changed, 45 insertions(+), 55 deletions(-) diff --git a/drivers/bus/fslmc/Makefile b/drivers/bus/fslmc/Makefile index 515d0f534..c5b580a4a 100644 --- a/drivers/bus/fslmc/Makefile +++ b/drivers/bus/fslmc/Makefile @@ -19,6 +19,7 @@ CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/qbman/include CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring LDLIBS += -lrte_ethdev +LDLIBS += -lrte_common_dpaax # versioning export map EXPORT_MAP := rte_bus_fslmc_version.map diff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c index f5135e538..7dbe01e08 100644 --- a/drivers/bus/fslmc/fslmc_bus.c +++ b/drivers/bus/fslmc/fslmc_bus.c @@ -20,6 +20,8 @@ #include #include "fslmc_logs.h" +#include + int dpaa2_logtype_bus; #define VFIO_IOMMU_GROUP_PATH "/sys/kernel/iommu_groups" @@ -375,6 +377,19 @@ rte_fslmc_probe(void) probe_all = rte_fslmc_bus.bus.conf.scan_mode != RTE_BUS_SCAN_WHITELIST; + /* In case of PA, the FD addresses returned by qbman APIs are physical + * addresses, which need conversion into equivalent VA address for + * rte_mbuf. For that, a table (a serial array, in memory) is used to + * increase translation efficiency. + * This has to be done before probe as some device initialization + * (during) probe allocate memory (dpaa2_sec) which needs to be pinned + * to this table. + */ + ret = dpaax_iova_table_populate(); + if (ret) { + DPAA2_BUS_WARN("PA->VA Translation table not available;"); + } + TAILQ_FOREACH(dev, &rte_fslmc_bus.device_list, next) { TAILQ_FOREACH(drv, &rte_fslmc_bus.driver_list, next) { ret = rte_fslmc_match(drv, dev); @@ -450,6 +465,11 @@ rte_fslmc_driver_unregister(struct rte_dpaa2_driver *driver) fslmc_bus = driver->fslmc_bus; + /* Cleanup the PA->VA Translation table; From whereever this function + * is called from. + */ + dpaax_iova_table_depopulate(); + TAILQ_REMOVE(&fslmc_bus->driver_list, driver, next); /* Update Bus references */ driver->fslmc_bus = NULL; diff --git a/drivers/bus/fslmc/meson.build b/drivers/bus/fslmc/meson.build index 22a56a6fc..49d71d2ba 100644 --- a/drivers/bus/fslmc/meson.build +++ b/drivers/bus/fslmc/meson.build @@ -5,7 +5,7 @@ if host_machine.system() != 'linux' build = false endif -deps += ['eventdev', 'kvargs'] +deps += ['common_dpaax', 'eventdev', 'kvargs'] sources = files('fslmc_bus.c', 'fslmc_vfio.c', 'mc/dpbp.c', diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c b/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c index db49d637f..39c5adf90 100644 --- a/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c +++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c @@ -28,13 +28,6 @@ #include "portal/dpaa2_hw_pvt.h" #include "portal/dpaa2_hw_dpio.h" -/* List of all the memseg information locally maintained in dpaa2 driver. This - * is to optimize the PA_to_VA searches until a better mechanism (algo) is - * available. - */ -struct dpaa2_memseg_list rte_dpaa2_memsegs - = TAILQ_HEAD_INITIALIZER(rte_dpaa2_memsegs); - TAILQ_HEAD(dpbp_dev_list, dpaa2_dpbp_dev); static struct dpbp_dev_list dpbp_dev_list = TAILQ_HEAD_INITIALIZER(dpbp_dev_list); /*!< DPBP device list */ diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h index ec8f42806..7306d2598 100644 --- a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h +++ b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h @@ -9,6 +9,7 @@ #define _DPAA2_HW_PVT_H_ #include +#include #include #include @@ -277,42 +278,29 @@ enum qbman_fd_format { */ #define DPAA2_EQ_RESP_ALWAYS 1 -/* Various structures representing contiguous memory maps */ -struct dpaa2_memseg { - TAILQ_ENTRY(dpaa2_memseg) next; - char *vaddr; - rte_iova_t iova; - size_t len; -}; - -TAILQ_HEAD(dpaa2_memseg_list, dpaa2_memseg); -extern struct dpaa2_memseg_list rte_dpaa2_memsegs; - #ifdef RTE_LIBRTE_DPAA2_USE_PHYS_IOVA extern uint8_t dpaa2_virt_mode; static void *dpaa2_mem_ptov(phys_addr_t paddr) __attribute__((unused)); -/* todo - this is costly, need to write a fast coversion routine */ + static void *dpaa2_mem_ptov(phys_addr_t paddr) { - struct dpaa2_memseg *ms; + void *va; if (dpaa2_virt_mode) return (void *)(size_t)paddr; - /* Check if the address is already part of the memseg list internally - * maintained by the dpaa2 driver. - */ - TAILQ_FOREACH(ms, &rte_dpaa2_memsegs, next) { - if (paddr >= ms->iova && paddr < - ms->iova + ms->len) - return RTE_PTR_ADD(ms->vaddr, (uintptr_t)(paddr - ms->iova)); - } + va = (void *)dpaax_iova_table_get_va(paddr); + if (likely(va != NULL)) + return va; /* If not, Fallback to full memseg list searching */ - return rte_mem_iova2virt(paddr); + va = rte_mem_iova2virt(paddr); + + return va; } static phys_addr_t dpaa2_mem_vtop(uint64_t vaddr) __attribute__((unused)); + static phys_addr_t dpaa2_mem_vtop(uint64_t vaddr) { const struct rte_memseg *memseg; diff --git a/drivers/crypto/dpaa2_sec/Makefile b/drivers/crypto/dpaa2_sec/Makefile index da3d8f84f..1f951a14b 100644 --- a/drivers/crypto/dpaa2_sec/Makefile +++ b/drivers/crypto/dpaa2_sec/Makefile @@ -51,5 +51,6 @@ LDLIBS += -lrte_bus_fslmc LDLIBS += -lrte_mempool_dpaa2 LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring LDLIBS += -lrte_cryptodev +LDLIBS += -lrte_common_dpaax include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/event/dpaa2/Makefile b/drivers/event/dpaa2/Makefile index 46f7d061e..de6771551 100644 --- a/drivers/event/dpaa2/Makefile +++ b/drivers/event/dpaa2/Makefile @@ -21,6 +21,7 @@ CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linuxapp/eal LDLIBS += -lrte_eal -lrte_eventdev LDLIBS += -lrte_bus_fslmc -lrte_mempool_dpaa2 -lrte_pmd_dpaa2 LDLIBS += -lrte_bus_vdev -lrte_pmd_dpaa2_sec +LDLIBS += -lrte_common_dpaax CFLAGS += -I$(RTE_SDK)/drivers/net/dpaa2 CFLAGS += -I$(RTE_SDK)/drivers/net/dpaa2/mc CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa2_sec @@ -39,4 +40,5 @@ CFLAGS += -DALLOW_EXPERIMENTAL_API SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV) += dpaa2_hw_dpcon.c SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV) += dpaa2_eventdev.c + include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/mempool/dpaa2/Makefile b/drivers/mempool/dpaa2/Makefile index 9e4c87d79..0fc69c3bf 100644 --- a/drivers/mempool/dpaa2/Makefile +++ b/drivers/mempool/dpaa2/Makefile @@ -30,6 +30,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL) += dpaa2_hw_mempool.c LDLIBS += -lrte_bus_fslmc LDLIBS += -lrte_eal -lrte_mempool -lrte_ring +LDLIBS += -lrte_common_dpaax SYMLINK-$(CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL)-include := rte_dpaa2_mempool.h diff --git a/drivers/mempool/dpaa2/dpaa2_hw_mempool.c b/drivers/mempool/dpaa2/dpaa2_hw_mempool.c index 84ff12811..e74825598 100644 --- a/drivers/mempool/dpaa2/dpaa2_hw_mempool.c +++ b/drivers/mempool/dpaa2/dpaa2_hw_mempool.c @@ -30,6 +30,8 @@ #include "dpaa2_hw_mempool.h" #include "dpaa2_hw_mempool_logs.h" +#include + struct dpaa2_bp_info rte_dpaa2_bpid_info[MAX_BPID]; static struct dpaa2_bp_list *h_bp_list; @@ -393,31 +395,8 @@ dpaa2_populate(struct rte_mempool *mp, unsigned int max_objs, void *vaddr, rte_iova_t paddr, size_t len, rte_mempool_populate_obj_cb_t *obj_cb, void *obj_cb_arg) { - struct dpaa2_memseg *ms; - - /* For each memory chunk pinned to the Mempool, a linked list of the - * contained memsegs is created for searching when PA to VA - * conversion is required. - */ - ms = rte_zmalloc(NULL, sizeof(struct dpaa2_memseg), 0); - if (!ms) { - DPAA2_MEMPOOL_ERR("Unable to allocate internal memory."); - DPAA2_MEMPOOL_WARN("Fast Physical to Virtual Addr translation would not be available."); - /* If the element is not added, it would only lead to failure - * in searching for the element and the logic would Fallback - * to traditional DPDK memseg traversal code. So, this is not - * a blocking error - but, error would be printed on screen. - */ - return 0; - } - - ms->vaddr = vaddr; - ms->iova = paddr; - ms->len = len; - /* Head insertions are generally faster than tail insertions as the - * buffers pinned are picked from rear end. - */ - TAILQ_INSERT_HEAD(&rte_dpaa2_memsegs, ms, next); + /* Insert entry into the PA->VA Table */ + dpaax_iova_table_add(paddr, vaddr, len); return rte_mempool_op_populate_default(mp, max_objs, vaddr, paddr, len, obj_cb, obj_cb_arg); diff --git a/drivers/net/dpaa2/Makefile b/drivers/net/dpaa2/Makefile index 42d45c1a8..59f7bf4a7 100644 --- a/drivers/net/dpaa2/Makefile +++ b/drivers/net/dpaa2/Makefile @@ -41,5 +41,6 @@ LDLIBS += -lrte_bus_fslmc LDLIBS += -lrte_mempool_dpaa2 LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs +LDLIBS += -lrte_common_dpaax include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/raw/dpaa2_cmdif/Makefile b/drivers/raw/dpaa2_cmdif/Makefile index 9b863dda2..83b5ecb56 100644 --- a/drivers/raw/dpaa2_cmdif/Makefile +++ b/drivers/raw/dpaa2_cmdif/Makefile @@ -21,6 +21,7 @@ LDLIBS += -lrte_eal LDLIBS += -lrte_kvargs LDLIBS += -lrte_mempool_dpaa2 LDLIBS += -lrte_rawdev +LDLIBS += -lrte_common_dpaax EXPORT_MAP := rte_pmd_dpaa2_cmdif_version.map @@ -33,4 +34,5 @@ SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV) += dpaa2_cmdif.c SYMLINK-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV)-include += rte_pmd_dpaa2_cmdif.h + include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/raw/dpaa2_qdma/Makefile b/drivers/raw/dpaa2_qdma/Makefile index d88809ead..2f79a3f41 100644 --- a/drivers/raw/dpaa2_qdma/Makefile +++ b/drivers/raw/dpaa2_qdma/Makefile @@ -22,6 +22,7 @@ LDLIBS += -lrte_mempool LDLIBS += -lrte_mempool_dpaa2 LDLIBS += -lrte_rawdev LDLIBS += -lrte_ring +LDLIBS += -lrte_common_dpaax EXPORT_MAP := rte_pmd_dpaa2_qdma_version.map diff --git a/mk/rte.app.mk b/mk/rte.app.mk index 89a008fe3..abfbe387c 100644 --- a/mk/rte.app.mk +++ b/mk/rte.app.mk @@ -119,6 +119,7 @@ _LDLIBS-$(CONFIG_RTE_LIBRTE_COMMON_DPAAX) += -lrte_common_dpaax _LDLIBS-$(CONFIG_RTE_LIBRTE_DPAA_MEMPOOL) += -lrte_mempool_dpaa endif ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) +_LDLIBS-$(CONFIG_RTE_LIBRTE_COMMON_DPAAX) += -lrte_common_dpaax _LDLIBS-$(CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL) += -lrte_mempool_dpaa2 endif