Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/131560/?format=api
{ "id": 131560, "url": "http://patches.dpdk.org/api/patches/131560/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20230918024612.1600536-27-chaoyong.he@corigine.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20230918024612.1600536-27-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230918024612.1600536-27-chaoyong.he@corigine.com", "date": "2023-09-18T02:46:12", "name": "[v4,26/26] net/nfp: extend the usage of nfp BAR from 8 to 24", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "970905cc0adc8174967a95dc84c3653bbc7b911e", "submitter": { "id": 2554, "url": "http://patches.dpdk.org/api/people/2554/?format=api", "name": "Chaoyong He", "email": "chaoyong.he@corigine.com" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20230918024612.1600536-27-chaoyong.he@corigine.com/mbox/", "series": [ { "id": 29531, "url": "http://patches.dpdk.org/api/series/29531/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=29531", "date": "2023-09-18T02:45:46", "name": "refact the nfpcore module", "version": 4, "mbox": "http://patches.dpdk.org/series/29531/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/131560/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/131560/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 954E2425C9;\n\tMon, 18 Sep 2023 04:50:24 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id A3F7F42D6B;\n\tMon, 18 Sep 2023 04:48:00 +0200 (CEST)", "from NAM02-BN1-obe.outbound.protection.outlook.com\n (mail-bn1nam02on2093.outbound.protection.outlook.com [40.107.212.93])\n by mails.dpdk.org (Postfix) with ESMTP id 1254642D72\n for <dev@dpdk.org>; Mon, 18 Sep 2023 04:47:58 +0200 (CEST)", "from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5)\n by BL0PR13MB4401.namprd13.prod.outlook.com (2603:10b6:208:1c3::22)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.24; Mon, 18 Sep\n 2023 02:47:56 +0000", "from SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::7a1c:2887:348a:84bd]) by SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::7a1c:2887:348a:84bd%6]) with mapi id 15.20.6792.026; Mon, 18 Sep 2023\n 02:47:56 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=A6e6LzUSM19IeWd8ysZE/D8bAYsaWKQ7UY/C1OC4ggVuJACOch3zpzv2dBA5KChQ1yoSoJQr3E/bfZ88quMBJaFaexUMmMtMZgEUno62TdJrIe2hF1s/lOiF2r1nX/3P3C9wTpFrjhlO6XcNXJfxauqRQxGxBBAyK81jrPSMPOyhq73v93wyh6XCcJo49S/CgIDgKlo5hPieUxLz3Rhk801zQhrQ52SN2RFcG9RabOVpNcibYqcsAvVzbTbF4qILTzmWwhnowJtcvTvfCDEVBwfTvD/PeThMKCdZPpH36tORSCSEe+RiCu9ZIWNYdmhLaQOGgp314Ve4KMToxgw3bw==", "ARC-Message-Signature": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;\n s=arcselector9901;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1;\n bh=+AoPw+x289OVKJjKTW2kCXo3MFdIzz8xf6rjKQi7PzE=;\n b=ett9Qqn9Vkf4ChhWW/yGsMixyWZxLSQjbqqTRczloiJg16kxTmSHPZic4NFjAYY4WXdgbotT/gn8aUKj5oQO9aG3MCy2RAAYjvtIrycb759V1WG71H5FefbwFNfL1iv12Erubg4fNGXOpQElwdd/OcG/8WJKt+tbyEj68SnO/L9AgY/8FAAK4NCBrhq8a7xcPyaGDCwx2rdwVLuqWgLxjXwRrAkwlAFQh2YSqilB1GyE/v9EVD9w8ASewuQEXfn+wtEjBu6FRq4NzNoY7yHB+lp1kcg4Ma/qnKD3w1gd3BVL2XC7WdYFgEbpJAj899pvzWU2mWMS4iUh9o7cd1riCg==", "ARC-Authentication-Results": "i=1; mx.microsoft.com 1; spf=pass\n smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com;\n dkim=pass header.d=corigine.com; arc=none", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=+AoPw+x289OVKJjKTW2kCXo3MFdIzz8xf6rjKQi7PzE=;\n b=VlFBTP3K+bMxlv4IPjq8eneyHNI1vfzY4SS0e3sjbIkh60CnL3qAlHL4+9d8k/5DVKO+LIy6QhebHKcejFLT/z7LklTUqsIYvFE9M04u1T13KPrF8rW+J+8MR6OoflsLgP0KZFX99L9BwuFYr2aTJBwB1ZGvlNMbreoHx9BvU1w=", "Authentication-Results": "dkim=none (message not signed)\n header.d=none;dmarc=none action=none header.from=corigine.com;", "From": "Chaoyong He <chaoyong.he@corigine.com>", "To": "dev@dpdk.org", "Cc": "Chaoyong He <chaoyong.he@corigine.com>,\n =?utf-8?q?Niklas_S=C3=B6derlund?= <niklas.soderlund@corigine.com>", "Subject": "[PATCH v4 26/26] net/nfp: extend the usage of nfp BAR from 8 to 24", "Date": "Mon, 18 Sep 2023 10:46:12 +0800", "Message-Id": "<20230918024612.1600536-27-chaoyong.he@corigine.com>", "X-Mailer": "git-send-email 2.39.1", "In-Reply-To": "<20230918024612.1600536-1-chaoyong.he@corigine.com>", "References": "<20230915091551.1459606-1-chaoyong.he@corigine.com>\n <20230918024612.1600536-1-chaoyong.he@corigine.com>", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "X-ClientProxiedBy": "SE2P216CA0016.KORP216.PROD.OUTLOOK.COM\n (2603:1096:101:114::20) To SJ0PR13MB5545.namprd13.prod.outlook.com\n (2603:10b6:a03:424::5)", "MIME-Version": "1.0", "X-MS-PublicTrafficType": "Email", "X-MS-TrafficTypeDiagnostic": "SJ0PR13MB5545:EE_|BL0PR13MB4401:EE_", "X-MS-Office365-Filtering-Correlation-Id": "548904ea-d991-4028-61de-08dbb7f1a95b", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n 8nX/daNgNzGSTjJkrb16DTuBv3KV4GnJ+fPN6ogMfD3rbU40e/pVKo7FJPdbR+gTVv2l8vC3I4I7OqcO5sjvBGeacQLO0BPUl3PC7y+ME+lBptqTuNK2R34+j27ZiSSl3DKR675LG/2GB9zY1gO+NLWHgAvcegcF03hVReeCDg2oOl0X4Bzz0410EA+NzX03YQf7YSlgpPkxrrNsekU34wjKZTZQMipcegwSsy8oNBjFjUX9kIlRafbLK0KhBq2+Fxh5WLJDNDfvhz+scEWX4WADYn8UKpN+5L4q8eY9UUvaXOaoxfnvq6NA2wcjVn4PNEkz+kx4lGPCjc0KQtXqNDxb/IOhfXJuOXyBDuhcjp5oMaqDJ5YvDdllD79K2D7ToN4jP1Ffwtgz2JdJoTyLd6DSrRVAl83PKS5f4F0yg8xnuhOuEz/AHtoK/zKUauAVgtvFRjWYrJj8gxJIfkWzKSgaGjUwcguVysEK2gmvIeAj7evK5REJFdasNSRd3ntKQ+IjIiuzhKgPx/nwYyFXP7g8y6ps+566X9VBxOQBovqNxt43ifhNsl/IwHEWMLB5SE3mecQ198llSZ3NMjB5TsJLiSed4CuYle3e6hLy+bxzvKb765WzyCKB//SKWfXRAqINUO3tKNB//uvfGSMZK1QIdKIzoBR61F/xIZ0rRcc=", "X-Forefront-Antispam-Report": "CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;\n IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE;\n SFS:(13230031)(366004)(136003)(376002)(346002)(39830400003)(396003)(186009)(1800799009)(451199024)(5660300002)(26005)(107886003)(1076003)(8936002)(4326008)(8676002)(2616005)(2906002)(30864003)(86362001)(38350700002)(38100700002)(36756003)(83380400001)(66574015)(44832011)(66946007)(6506007)(6486002)(52116002)(66476007)(66556008)(54906003)(6666004)(478600001)(6512007)(41300700001)(316002)(6916009);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "=?utf-8?q?kQDatud4higIPt7As8QXzjL7vpow?=\n\t=?utf-8?q?QjFE2NocSFQyMSm7A2IH4a0D+O6OxRSWieGBQgtcu/9IuOMxi3k3YN4cA+3AEUmA2?=\n\t=?utf-8?q?5QciN7FPqokHfWlJ2yAR5USQyQNUfuLMNPU7iwWl7lMbAYl+rcNG0WKqKtisDyXUd?=\n\t=?utf-8?q?oDnQI6hP+r2AzpEOmWogrDTYJLLQdeQoeZup2SO31wlzXTeQE5srk1uarM78C5ybY?=\n\t=?utf-8?q?FnXqDbyJx0sKfX4qkhIggWzP6V11jpb3gq8QHYoFWkjhOWijTP3ggOeV48OMJ9SN0?=\n\t=?utf-8?q?LSaYKjqqUYGRPRUS3xH20rt+bArZNODiFH4tzg4MLNEnpq0EMeXv2bMEJFd50DSbN?=\n\t=?utf-8?q?V7OlzqBL17RAnuyirquQUW/fGC3gx0b0SkSJPjEuazc7MS1ZaJVDVbPklYQkKgObR?=\n\t=?utf-8?q?eyxMk653XSMfyFNLTKuXs9WOasK3lkO5tCXAURi+ap3uhAzxixk3ZZuA7gJrCyviy?=\n\t=?utf-8?q?wVS6UwF2BL0WactbjQ3YwELYZ+CRN98QPgANHSeNpQq1mL/KHymB9PoFBobBGnVPS?=\n\t=?utf-8?q?hUFeZRkzZQNQmSfkOcBdnc+lYOqZxp1p5RLUfVtIBOJULnbcc3/wk2gc3axNMcWq0?=\n\t=?utf-8?q?DRODQqzZRZWLREo18sGi4Izs9YBERr+/wBxuMhAq/OR/027ycLLP5ZPy6iYQihWTl?=\n\t=?utf-8?q?CPsy+RcuiFLpkQouRrjfZz40DMbl2ABG1a9Dtrv1lgMWJOg8pUBTHE73gdKjiAInk?=\n\t=?utf-8?q?CWMSuRsgOnXdqC824bs9+e4xRp6NvToC9+hc5tvCaj8cOjk51FK9KrGvkoHgfcmJY?=\n\t=?utf-8?q?Ib9OTIxZvbbAa5rfQ8+jzwCyYArEQPmbCm85n8ZZk0BExLhc3XFDPNGvcM9oOXq0l?=\n\t=?utf-8?q?snlKC9mSG28R57sQT+3d7CpqZySH/DZ7gwAQIG3cyuM+F29JjTlap+8arYtSGXz/a?=\n\t=?utf-8?q?7v0U19g2ZqWyQZ7TEVoh+6xYdI2mCMqPIExwijDjUXnwm0Bx7YwoYkInrN2EwNSyP?=\n\t=?utf-8?q?Z0aQT04xGyItpoqJy+ERSHFulG6AiWNydG5SOJl5P4mjGprOf09UuOVSaz8qptmzU?=\n\t=?utf-8?q?82/yYABnG8C1jsGv4KoL+y2SZtKf2xfTmA9JRx91nDnzJkIgZZpQkISbkTNwCzUfd?=\n\t=?utf-8?q?oovRAwl/XzcdMrrfFhpJ4DOdvkjcjYtUwvB/mQwcbtuKmTEo2YVJyoGndkPb2mUaO?=\n\t=?utf-8?q?Y7CkF+rcHlwrX2scdy1gT+eGPg6d3HruSlVQQc4HUipCajGeBOWbgoD4yCLy8ho0v?=\n\t=?utf-8?q?1ZpaFOi/OE+OxosNiGHe8IbxuPNE50jt1kyeqvhvmjiNBHqL2rWEKXGYtsJ/I7vTD?=\n\t=?utf-8?q?KaDGpJAVEG836rYvl4Ppkb8Gn7uCQtqffvb6ga3lKi4EJS3ifUnB5HcQthZN7MRk9?=\n\t=?utf-8?q?+Jk4KDLyJ70NWMjm6+5EC1k9nR2286CwhE/GN5qMNA1KxhMYXtDN/6Hs3CDCiS3zT?=\n\t=?utf-8?q?IEj01YH6M4GeHb+/luBOxu57F4sYGvAawk8pwQ0AzLUs9V25y5jKUU31cUk+1tPyW?=\n\t=?utf-8?q?bXQBATHFNyT5vVdfwlsGqJS8A+1uxm9mTT4Ws7gqlWV4ZqTpo/5Rj79mwwXx+2HrS?=\n\t=?utf-8?q?uiaTyWaFoQpft84yTcDs8AhyZ/BigxHrUA=3D=3D?=", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 548904ea-d991-4028-61de-08dbb7f1a95b", "X-MS-Exchange-CrossTenant-AuthSource": "SJ0PR13MB5545.namprd13.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Internal", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "18 Sep 2023 02:47:56.1374 (UTC)", "X-MS-Exchange-CrossTenant-FromEntityHeader": "Hosted", "X-MS-Exchange-CrossTenant-Id": "fe128f2c-073b-4c20-818e-7246a585940c", "X-MS-Exchange-CrossTenant-MailboxType": "HOSTED", "X-MS-Exchange-CrossTenant-UserPrincipalName": "\n Vpnb9CN6hSC26rUAlR3lJO9UK6UMXwkZrdX0xEiat1uPfFgUIOPIS9fvlXwF5upzF2LvICYdWUkaICflVtGsTFUu0H2BzRgouS1CBhWqbVE=", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "BL0PR13MB4401", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "Sync the logic from kernel driver, adjust the definition of structure,\nand extend the usage of nfp BAR from 8 to 24.\n\nThis will greatly enhance the scalability of nfp PMD.\n\nSigned-off-by: Chaoyong He <chaoyong.he@corigine.com>\nReviewed-by: Niklas Söderlund <niklas.soderlund@corigine.com>\n---\n drivers/net/nfp/nfp_ethdev.c | 8 +-\n drivers/net/nfp/nfpcore/nfp6000_pcie.c | 477 ++++++++++++++++++-------\n drivers/net/nfp/nfpcore/nfp6000_pcie.h | 1 +\n drivers/net/nfp/nfpcore/nfp_cpp.h | 5 +-\n drivers/net/nfp/nfpcore/nfp_cppcore.c | 2 +-\n 5 files changed, 348 insertions(+), 145 deletions(-)", "diff": "diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c\nindex a645e23a4d..a4386b771c 100644\n--- a/drivers/net/nfp/nfp_ethdev.c\n+++ b/drivers/net/nfp/nfp_ethdev.c\n@@ -918,9 +918,9 @@ nfp_pf_init(struct rte_pci_device *pci_dev)\n \t * use a lock file if UIO is being used.\n \t */\n \tif (pci_dev->kdrv == RTE_PCI_KDRV_VFIO)\n-\t\tcpp = nfp_cpp_from_nfp6000_pcie(pci_dev, false);\n+\t\tcpp = nfp_cpp_from_nfp6000_pcie(pci_dev, dev_info, false);\n \telse\n-\t\tcpp = nfp_cpp_from_nfp6000_pcie(pci_dev, true);\n+\t\tcpp = nfp_cpp_from_nfp6000_pcie(pci_dev, dev_info, true);\n \n \tif (cpp == NULL) {\n \t\tPMD_INIT_LOG(ERR, \"A CPP handle can not be obtained\");\n@@ -1121,9 +1121,9 @@ nfp_pf_secondary_init(struct rte_pci_device *pci_dev)\n \t * use a lock file if UIO is being used.\n \t */\n \tif (pci_dev->kdrv == RTE_PCI_KDRV_VFIO)\n-\t\tcpp = nfp_cpp_from_nfp6000_pcie(pci_dev, false);\n+\t\tcpp = nfp_cpp_from_nfp6000_pcie(pci_dev, dev_info, false);\n \telse\n-\t\tcpp = nfp_cpp_from_nfp6000_pcie(pci_dev, true);\n+\t\tcpp = nfp_cpp_from_nfp6000_pcie(pci_dev, dev_info, true);\n \n \tif (cpp == NULL) {\n \t\tPMD_INIT_LOG(ERR, \"A CPP handle can not be obtained\");\ndiff --git a/drivers/net/nfp/nfpcore/nfp6000_pcie.c b/drivers/net/nfp/nfpcore/nfp6000_pcie.c\nindex 40076cdc11..13cf523506 100644\n--- a/drivers/net/nfp/nfpcore/nfp6000_pcie.c\n+++ b/drivers/net/nfp/nfpcore/nfp6000_pcie.c\n@@ -19,6 +19,8 @@\n #include <unistd.h>\n #include <fcntl.h>\n \n+#include <rte_io.h>\n+\n #include \"nfp_cpp.h\"\n #include \"nfp_logs.h\"\n #include \"nfp_target.h\"\n@@ -59,20 +61,12 @@\n #define NFP_PCIE_P2C_GENERAL_TOKEN_OFFSET(bar, x) ((x) << ((bar)->bitsize - 4))\n #define NFP_PCIE_P2C_GENERAL_SIZE(bar) (1 << ((bar)->bitsize - 4))\n \n-#define NFP_PCIE_CFG_BAR_PCIETOCPPEXPBAR(id, bar, slot) \\\n-\t(NFP_PCIE_BAR(id) + ((bar) * 8 + (slot)) * 4)\n-\n-#define NFP_PCIE_CPP_BAR_PCIETOCPPEXPBAR(bar, slot) \\\n-\t(((bar) * 8 + (slot)) * 4)\n+#define NFP_PCIE_P2C_EXPBAR_OFFSET(bar_index) ((bar_index) * 4)\n \n struct nfp_pcie_user;\n struct nfp6000_area_priv;\n \n /* Describes BAR configuration and usage */\n-#define NFP_BAR_MIN 1\n-#define NFP_BAR_MID 5\n-#define NFP_BAR_MAX 7\n-\n struct nfp_bar {\n \tstruct nfp_pcie_user *nfp; /**< Backlink to owner */\n \tuint32_t barcfg; /**< BAR config CSR */\n@@ -80,22 +74,26 @@ struct nfp_bar {\n \tuint64_t mask; /**< Mask of the BAR aperture (read only) */\n \tuint32_t bitsize; /**< Bit size of the BAR aperture (read only) */\n \tuint32_t index; /**< Index of the BAR */\n-\tint lock; /**< If the BAR has been locked */\n+\tbool lock; /**< If the BAR has been locked */\n \n-\tchar *csr;\n \tchar *iomem; /**< mapped IO memory */\n+\tstruct rte_mem_resource *resource; /**< IOMEM resource window */\n };\n \n-#define BUSDEV_SZ 13\n+#define NFP_PCI_BAR_MAX (PCI_64BIT_BAR_COUNT * 8)\n+\n struct nfp_pcie_user {\n-\tstruct nfp_bar bar[NFP_BAR_MAX];\n+\tstruct rte_pci_device *pci_dev;\n+\tconst struct nfp_dev_info *dev_info;\n \n-\tint device;\n \tint lock;\n-\tchar busdev[BUSDEV_SZ];\n-\tint barsz;\n-\tint dev_id;\n-\tchar *cfg;\n+\n+\t/* PCI BAR management */\n+\tuint32_t bars;\n+\tstruct nfp_bar bar[NFP_PCI_BAR_MAX];\n+\n+\t/* Reserved BAR access */\n+\tchar *csr;\n };\n \n /* Generic CPP bus access interface. */\n@@ -206,19 +204,19 @@ nfp_bar_write(struct nfp_pcie_user *nfp,\n \t\tstruct nfp_bar *bar,\n \t\tuint32_t newcfg)\n {\n-\tint base;\n-\tint slot;\n-\n-\tbase = bar->index >> 3;\n-\tslot = bar->index & 7;\n+\tuint32_t xbar;\n \n-\tif (nfp->cfg == NULL)\n-\t\treturn (-ENOMEM);\n+\txbar = NFP_PCIE_P2C_EXPBAR_OFFSET(bar->index);\n \n-\tbar->csr = nfp->cfg +\n-\t\t\tNFP_PCIE_CFG_BAR_PCIETOCPPEXPBAR(nfp->dev_id, base, slot);\n-\n-\t*(uint32_t *)(bar->csr) = newcfg;\n+\tif (nfp->csr != NULL) {\n+\t\trte_write32(newcfg, nfp->csr + xbar);\n+\t\t/* Readback to ensure BAR is flushed */\n+\t\trte_read32(nfp->csr + xbar);\n+\t} else {\n+\t\txbar += nfp->dev_info->pcie_cfg_expbar_offset;\n+\t\trte_pci_write_config(nfp->pci_dev, &newcfg, sizeof(uint32_t),\n+\t\t\t\txbar);\n+\t}\n \n \tbar->barcfg = newcfg;\n \n@@ -249,105 +247,323 @@ nfp_reconfigure_bar(struct nfp_pcie_user *nfp,\n \treturn nfp_bar_write(nfp, bar, newcfg);\n }\n \n-/*\n- * Map all PCI bars. We assume that the BAR with the PCIe config block is\n- * already mapped.\n+static uint32_t\n+nfp_bitsize_calc(uint64_t mask)\n+{\n+\tuint64_t tmp = mask;\n+\tuint32_t bit_size = 0;\n+\n+\tif (tmp == 0)\n+\t\treturn 0;\n+\n+\tfor (; tmp != 0; tmp >>= 1)\n+\t\tbit_size++;\n+\n+\treturn bit_size;\n+}\n+\n+static int\n+nfp_cmp_bars(const void *ptr_a,\n+\t\tconst void *ptr_b)\n+{\n+\tconst struct nfp_bar *a = ptr_a;\n+\tconst struct nfp_bar *b = ptr_b;\n+\n+\tif (a->bitsize == b->bitsize)\n+\t\treturn a->index - b->index;\n+\telse\n+\t\treturn a->bitsize - b->bitsize;\n+}\n+\n+static bool\n+nfp_bars_for_secondary(uint32_t index)\n+{\n+\tuint8_t tmp = index & 0x07;\n+\n+\tif (tmp == 0x06 || tmp == 0x07)\n+\t\treturn true;\n+\telse\n+\t\treturn false;\n+}\n+\n+/**\n+ * Map all PCI bars and fetch the actual BAR configurations from the board.\n+ * We assume that the BAR with the PCIe config block is already mapped.\n *\n * BAR0.0: Reserved for General Mapping (for MSI-X access to PCIe SRAM)\n+ * BAR0.1: --\n+ * BAR0.2: --\n+ * BAR0.3: --\n+ * BAR0.4: --\n+ * BAR0.5: --\n+ * BAR0.6: --\n+ * BAR0.7: --\n *\n- * Halving PCItoCPPBars for primary and secondary processes.\n- * For CoreNIC firmware:\n- * NFP PMD just requires two fixed slots, one for configuration BAR,\n- * and another for accessing the hw queues. Another slot is needed\n- * for setting the link up or down. Secondary processes do not need\n- * to map the first two slots again, but it requires one slot for\n- * accessing the link, even if it is not likely the secondary process\n- * starting the port.\n- * For Flower firmware:\n- * NFP PMD need another fixed slots, used as the configureation BAR\n- * for ctrl vNIC.\n+ * BAR1.0-BAR1.7: --\n+ * BAR2.0-BAR2.7: --\n */\n static int\n nfp_enable_bars(struct nfp_pcie_user *nfp)\n {\n-\tint x;\n-\tint end;\n-\tint start;\n+\tint pf;\n+\tuint32_t i;\n+\tuint8_t min_bars;\n \tstruct nfp_bar *bar;\n+\tenum rte_proc_type_t type;\n+\tstruct rte_mem_resource *res;\n+\tconst uint32_t barcfg_msix_general = NFP_PCIE_BAR_PCIE2CPP_MAPTYPE\n+\t\t\t(NFP_PCIE_BAR_PCIE2CPP_MAPTYPE_GENERAL) |\n+\t\t\tNFP_PCIE_BAR_PCIE2CPP_LENGTHSELECT_32BIT;\n+\n+\ttype = rte_eal_process_type();\n+\tif (type == RTE_PROC_PRIMARY)\n+\t\tmin_bars = 12;\n+\telse\n+\t\tmin_bars = 4;\n+\n+\tfor (i = 0; i < RTE_DIM(nfp->bar); i++) {\n+\t\tif (i != 0) {\n+\t\t\tif (type == RTE_PROC_PRIMARY) {\n+\t\t\t\tif (nfp_bars_for_secondary(i))\n+\t\t\t\t\tcontinue;\n+\t\t\t} else {\n+\t\t\t\tif (!nfp_bars_for_secondary(i))\n+\t\t\t\t\tcontinue;\n+\t\t\t}\n+\t\t}\n \n-\tif (rte_eal_process_type() == RTE_PROC_PRIMARY) {\n-\t\tstart = NFP_BAR_MID;\n-\t\tend = NFP_BAR_MIN;\n-\t} else {\n-\t\tstart = NFP_BAR_MAX;\n-\t\tend = NFP_BAR_MID;\n+\t\t/* 24 NFP bars mapping into BAR0, BAR2 and BAR4 */\n+\t\tres = &nfp->pci_dev->mem_resource[(i >> 3) * 2];\n+\n+\t\t/* Skip over BARs that are not mapped */\n+\t\tif (res->addr != NULL) {\n+\t\t\tbar = &nfp->bar[i];\n+\t\t\tbar->resource = res;\n+\t\t\tbar->barcfg = 0;\n+\n+\t\t\tbar->nfp = nfp;\n+\t\t\tbar->index = i;\n+\t\t\t/* The resource shared by 8 bars */\n+\t\t\tbar->mask = (res->len >> 3) - 1;\n+\t\t\tbar->bitsize = nfp_bitsize_calc(bar->mask);\n+\t\t\tbar->base = 0;\n+\t\t\tbar->lock = false;\n+\t\t\tbar->iomem = (char *)res->addr +\n+\t\t\t\t\t((bar->index & 7) << bar->bitsize);\n+\n+\t\t\tnfp->bars++;\n+\t\t}\n \t}\n \n-\tfor (x = start; x > end; x--) {\n-\t\tbar = &nfp->bar[x - 1];\n-\t\tbar->barcfg = 0;\n-\t\tbar->nfp = nfp;\n-\t\tbar->index = x;\n-\t\tbar->mask = (1 << (nfp->barsz - 3)) - 1;\n-\t\tbar->bitsize = nfp->barsz - 3;\n-\t\tbar->base = 0;\n-\t\tbar->iomem = NULL;\n-\t\tbar->lock = 0;\n-\t\tbar->csr = nfp->cfg + NFP_PCIE_CFG_BAR_PCIETOCPPEXPBAR(nfp->dev_id,\n-\t\t\t\tbar->index >> 3, bar->index & 7);\n-\t\tbar->iomem = nfp->cfg + (bar->index << bar->bitsize);\n+\tif (nfp->bars < min_bars) {\n+\t\tPMD_DRV_LOG(ERR, \"Not enough usable BARs found.\");\n+\t\treturn -EINVAL;\n \t}\n+\n+\tswitch (nfp->pci_dev->id.device_id) {\n+\tcase PCI_DEVICE_ID_NFP3800_PF_NIC:\n+\t\tpf = nfp->pci_dev->addr.function & 0x07;\n+\t\tnfp->csr = nfp->bar[0].iomem + NFP_PCIE_BAR(pf);\n+\t\tbreak;\n+\tcase PCI_DEVICE_ID_NFP4000_PF_NIC:\n+\tcase PCI_DEVICE_ID_NFP6000_PF_NIC:\n+\t\tnfp->csr = nfp->bar[0].iomem + NFP_PCIE_BAR(0);\n+\t\tbreak;\n+\tdefault:\n+\t\tPMD_DRV_LOG(ERR, \"Unsupported device ID: %04hx!\",\n+\t\t\t\tnfp->pci_dev->id.device_id);\n+\t\treturn -EINVAL;\n+\t}\n+\n+\t/* Configure, and lock, BAR0.0 for General Target use (MSI-X SRAM) */\n+\tbar = &nfp->bar[0];\n+\tbar->lock = true;\n+\n+\tnfp_bar_write(nfp, bar, barcfg_msix_general);\n+\n+\t/* Sort bars by bit size - use the smallest possible first. */\n+\tqsort(&nfp->bar[0], nfp->bars, sizeof(nfp->bar[0]), nfp_cmp_bars);\n+\n \treturn 0;\n }\n \n-static struct nfp_bar *\n-nfp_alloc_bar(struct nfp_pcie_user *nfp)\n+/* Check if BAR can be used with the given parameters. */\n+static bool\n+matching_bar_exist(struct nfp_bar *bar,\n+\t\tint target,\n+\t\tint action,\n+\t\tint token,\n+\t\tuint64_t offset,\n+\t\tsize_t size,\n+\t\tint width)\n {\n-\tint x;\n-\tint end;\n-\tint start;\n-\tstruct nfp_bar *bar;\n+\tint bar_width;\n+\tint bar_token;\n+\tint bar_target;\n+\tint bar_action;\n+\tuint32_t map_type;\n+\n+\tbar_width = NFP_PCIE_BAR_PCIE2CPP_LENGTHSELECT_OF(bar->barcfg);\n+\tswitch (bar_width) {\n+\tcase NFP_PCIE_BAR_PCIE2CPP_LENGTHSELECT_32BIT:\n+\t\tbar_width = 4;\n+\t\tbreak;\n+\tcase NFP_PCIE_BAR_PCIE2CPP_LENGTHSELECT_64BIT:\n+\t\tbar_width = 8;\n+\t\tbreak;\n+\tcase NFP_PCIE_BAR_PCIE2CPP_LENGTHSELECT_0BYTE:\n+\t\tbar_width = 0;\n+\t\tbreak;\n+\tdefault:\n+\t\tbar_width = -1;\n+\t\tbreak;\n+\t}\n \n-\tif (rte_eal_process_type() == RTE_PROC_PRIMARY) {\n-\t\tstart = NFP_BAR_MID;\n-\t\tend = NFP_BAR_MIN;\n-\t} else {\n-\t\tstart = NFP_BAR_MAX;\n-\t\tend = NFP_BAR_MID;\n+\t/* Make sure to match up the width */\n+\tif (bar_width != width)\n+\t\treturn false;\n+\n+\tbar_token = NFP_PCIE_BAR_PCIE2CPP_TOKEN_BASEADDRESS_OF(bar->barcfg);\n+\tbar_action = NFP_PCIE_BAR_PCIE2CPP_ACTION_BASEADDRESS_OF(bar->barcfg);\n+\tmap_type = NFP_PCIE_BAR_PCIE2CPP_MAPTYPE_OF(bar->barcfg);\n+\tswitch (map_type) {\n+\tcase NFP_PCIE_BAR_PCIE2CPP_MAPTYPE_TARGET:\n+\t\tbar_token = -1;\n+\t\t/* FALLTHROUGH */\n+\tcase NFP_PCIE_BAR_PCIE2CPP_MAPTYPE_BULK:\n+\t\tbar_action = NFP_CPP_ACTION_RW;\n+\t\tif (action == 0)\n+\t\t\taction = NFP_CPP_ACTION_RW;\n+\t\t/* FALLTHROUGH */\n+\tcase NFP_PCIE_BAR_PCIE2CPP_MAPTYPE_FIXED:\n+\t\tbreak;\n+\tdefault:\n+\t\t/* We don't match explicit bars through the area interface */\n+\t\treturn false;\n \t}\n \n-\tfor (x = start; x > end; x--) {\n-\t\tbar = &nfp->bar[x - 1];\n-\t\tif (bar->lock == 0) {\n-\t\t\tbar->lock = 1;\n-\t\t\treturn bar;\n-\t\t}\n+\tbar_target = NFP_PCIE_BAR_PCIE2CPP_TARGET_BASEADDRESS_OF(bar->barcfg);\n+\tif ((bar_target < 0 || bar_target == target) &&\n+\t\t\t(bar_token < 0 || bar_token == token) &&\n+\t\t\tbar_action == action &&\n+\t\t\tbar->base <= offset &&\n+\t\t\t(bar->base + (1 << bar->bitsize)) >= (offset + size))\n+\t\treturn true;\n+\n+\t/* No match */\n+\treturn false;\n+}\n+\n+static int\n+find_matching_bar(struct nfp_pcie_user *nfp,\n+\t\tint target,\n+\t\tint action,\n+\t\tint token,\n+\t\tuint64_t offset,\n+\t\tsize_t size,\n+\t\tint width)\n+{\n+\tuint32_t n;\n+\n+\tfor (n = 0; n < nfp->bars; n++) {\n+\t\tstruct nfp_bar *bar = &nfp->bar[n];\n+\n+\t\tif (bar->lock)\n+\t\t\tcontinue;\n+\n+\t\tif (matching_bar_exist(bar, target, action, token,\n+\t\t\t\toffset, size, width))\n+\t\t\treturn n;\n+\t}\n+\n+\treturn -1;\n+}\n+\n+/* Return EAGAIN if no resource is available */\n+static int\n+find_unused_bar_noblock(struct nfp_pcie_user *nfp,\n+\t\tint target,\n+\t\tint action,\n+\t\tint token,\n+\t\tuint64_t offset,\n+\t\tsize_t size,\n+\t\tint width)\n+{\n+\tint ret;\n+\tuint32_t n;\n+\tconst struct nfp_bar *bar;\n+\n+\tfor (n = 0; n < nfp->bars; n++) {\n+\t\tbar = &nfp->bar[n];\n+\n+\t\tif (bar->bitsize == 0)\n+\t\t\tcontinue;\n+\n+\t\t/* Just check to see if we can make it fit... */\n+\t\tret = nfp_compute_bar(bar, NULL, NULL, target, action,\n+\t\t\t\ttoken, offset, size, width);\n+\t\tif (ret != 0)\n+\t\t\tcontinue;\n+\n+\t\tif (!bar->lock)\n+\t\t\treturn n;\n+\t}\n+\n+\treturn -EAGAIN;\n+}\n+\n+static int\n+nfp_alloc_bar(struct nfp_pcie_user *nfp,\n+\t\tstruct nfp6000_area_priv *priv)\n+{\n+\tint ret;\n+\tint bar_num;\n+\tsize_t size = priv->size;\n+\tint token = priv->token;\n+\tint target = priv->target;\n+\tint action = priv->action;\n+\tint width = priv->width.bar;\n+\tuint64_t offset = priv->offset;\n+\n+\t/* Bar size should small than 16MB */\n+\tif (size > (1 << 24))\n+\t\treturn -EINVAL;\n+\n+\tbar_num = find_matching_bar(nfp, target, action, token,\n+\t\t\toffset, size, width);\n+\tif (bar_num >= 0) {\n+\t\t/* Found a perfect match. */\n+\t\tnfp->bar[bar_num].lock = true;\n+\t\treturn bar_num;\n \t}\n \n-\treturn NULL;\n+\tbar_num = find_unused_bar_noblock(nfp, target, action, token,\n+\t\t\toffset, size, width);\n+\tif (bar_num < 0)\n+\t\treturn bar_num;\n+\n+\tnfp->bar[bar_num].lock = true;\n+\tret = nfp_reconfigure_bar(nfp, &nfp->bar[bar_num],\n+\t\t\ttarget, action, token, offset, size, width);\n+\tif (ret < 0) {\n+\t\tnfp->bar[bar_num].lock = false;\n+\t\treturn ret;\n+\t}\n+\n+\treturn bar_num;\n }\n \n static void\n nfp_disable_bars(struct nfp_pcie_user *nfp)\n {\n-\tint x;\n-\tint end;\n-\tint start;\n+\tuint32_t i;\n \tstruct nfp_bar *bar;\n \n-\tif (rte_eal_process_type() == RTE_PROC_PRIMARY) {\n-\t\tstart = NFP_BAR_MID;\n-\t\tend = NFP_BAR_MIN;\n-\t} else {\n-\t\tstart = NFP_BAR_MAX;\n-\t\tend = NFP_BAR_MID;\n-\t}\n-\n-\tfor (x = start; x > end; x--) {\n-\t\tbar = &nfp->bar[x - 1];\n-\t\tif (bar->iomem) {\n+\tfor (i = 0; i < nfp->bars; i++) {\n+\t\tbar = &nfp->bar[i];\n+\t\tif (bar->iomem != NULL) {\n \t\t\tbar->iomem = NULL;\n-\t\t\tbar->lock = 0;\n+\t\t\tbar->lock = false;\n \t\t}\n \t}\n }\n@@ -364,7 +580,6 @@ nfp6000_area_init(struct nfp_cpp_area *area,\n \tuint32_t target = NFP_CPP_ID_TARGET_of(dest);\n \tuint32_t action = NFP_CPP_ID_ACTION_of(dest);\n \tstruct nfp6000_area_priv *priv = nfp_cpp_area_priv(area);\n-\tstruct nfp_pcie_user *nfp = nfp_cpp_priv(nfp_cpp_area_cpp(area));\n \n \tpp = nfp_target_pushpull(NFP_CPP_ID(target, action, token), address);\n \tif (pp < 0)\n@@ -383,9 +598,7 @@ nfp6000_area_init(struct nfp_cpp_area *area,\n \telse\n \t\tpriv->width.bar = priv->width.write;\n \n-\tpriv->bar = nfp_alloc_bar(nfp);\n-\tif (priv->bar == NULL)\n-\t\treturn -ENOMEM;\n+\tpriv->bar = NULL;\n \n \tpriv->target = target;\n \tpriv->action = action;\n@@ -393,17 +606,29 @@ nfp6000_area_init(struct nfp_cpp_area *area,\n \tpriv->offset = address;\n \tpriv->size = size;\n \n-\tret = nfp_reconfigure_bar(nfp, priv->bar, priv->target, priv->action,\n-\t\t\tpriv->token, priv->offset, priv->size,\n-\t\t\tpriv->width.bar);\n-\n \treturn ret;\n }\n \n static int\n nfp6000_area_acquire(struct nfp_cpp_area *area)\n {\n+\tint bar_num;\n \tstruct nfp6000_area_priv *priv = nfp_cpp_area_priv(area);\n+\tstruct nfp_pcie_user *nfp = nfp_cpp_priv(nfp_cpp_area_cpp(area));\n+\n+\t/* Already allocated. */\n+\tif (priv->bar != NULL)\n+\t\treturn 0;\n+\n+\tbar_num = nfp_alloc_bar(nfp, priv);\n+\tif (bar_num < 0) {\n+\t\tPMD_DRV_LOG(ERR, \"Failed to allocate bar %d:%d:%d:%#lx: %d\",\n+\t\t\t\tpriv->target, priv->action, priv->token,\n+\t\t\t\tpriv->offset, bar_num);\n+\t\treturn bar_num;\n+\t}\n+\n+\tpriv->bar = &nfp->bar[bar_num];\n \n \t/* Calculate offset into BAR. */\n \tif (nfp_bar_maptype(priv->bar) ==\n@@ -432,7 +657,7 @@ nfp6000_area_release(struct nfp_cpp_area *area)\n {\n \tstruct nfp6000_area_priv *priv = nfp_cpp_area_priv(area);\n \n-\tpriv->bar->lock = 0;\n+\tpriv->bar->lock = false;\n \tpriv->bar = NULL;\n \tpriv->iomem = NULL;\n }\n@@ -603,7 +828,8 @@ nfp_acquire_process_lock(struct nfp_pcie_user *desc)\n \n \tmemset(&lock, 0, sizeof(lock));\n \n-\tsnprintf(lockname, sizeof(lockname), \"/var/lock/nfp_%s\", desc->busdev);\n+\tsnprintf(lockname, sizeof(lockname), \"/var/lock/nfp_%s\",\n+\t\t\tdesc->pci_dev->device.name);\n \tdesc->lock = open(lockname, O_RDWR | O_CREAT, 0666);\n \tif (desc->lock < 0)\n \t\treturn desc->lock;\n@@ -693,32 +919,11 @@ nfp6000_get_serial(struct rte_pci_device *dev,\n }\n \n static int\n-nfp6000_set_barsz(struct rte_pci_device *dev,\n-\t\tstruct nfp_pcie_user *desc)\n-{\n-\tint i = 0;\n-\tuint64_t tmp;\n-\n-\ttmp = dev->mem_resource[0].len;\n-\n-\twhile (tmp >>= 1)\n-\t\ti++;\n-\n-\tdesc->barsz = i;\n-\n-\treturn 0;\n-}\n-\n-static int\n-nfp6000_init(struct nfp_cpp *cpp,\n-\t\tstruct rte_pci_device *dev)\n+nfp6000_init(struct nfp_cpp *cpp)\n {\n \tint ret = 0;\n \tstruct nfp_pcie_user *desc = nfp_cpp_priv(cpp);\n \n-\tmemset(desc->busdev, 0, BUSDEV_SZ);\n-\tstrlcpy(desc->busdev, dev->device.name, sizeof(desc->busdev));\n-\n \tif (rte_eal_process_type() == RTE_PROC_PRIMARY &&\n \t\t\tnfp_cpp_driver_need_lock(cpp)) {\n \t\tret = nfp_acquire_process_lock(desc);\n@@ -726,12 +931,6 @@ nfp6000_init(struct nfp_cpp *cpp,\n \t\t\treturn -1;\n \t}\n \n-\tif (nfp6000_set_barsz(dev, desc) < 0)\n-\t\treturn -1;\n-\n-\tdesc->cfg = dev->mem_resource[0].addr;\n-\tdesc->dev_id = dev->addr.function & 0x7;\n-\n \tret = nfp_enable_bars(desc);\n \tif (ret != 0) {\n \t\tPMD_DRV_LOG(ERR, \"Enable bars failed\");\n@@ -749,7 +948,6 @@ nfp6000_free(struct nfp_cpp *cpp)\n \tnfp_disable_bars(desc);\n \tif (nfp_cpp_driver_need_lock(cpp))\n \t\tclose(desc->lock);\n-\tclose(desc->device);\n \tfree(desc);\n }\n \n@@ -789,6 +987,7 @@ nfp_cpp_operations *nfp_cpp_transport_operations(void)\n */\n struct nfp_cpp *\n nfp_cpp_from_nfp6000_pcie(struct rte_pci_device *pci_dev,\n+\t\tconst struct nfp_dev_info *dev_info,\n \t\tbool driver_lock_needed)\n {\n \tint ret;\n@@ -801,6 +1000,8 @@ nfp_cpp_from_nfp6000_pcie(struct rte_pci_device *pci_dev,\n \t\treturn NULL;\n \n \tmemset(nfp, 0, sizeof(*nfp));\n+\tnfp->pci_dev = pci_dev;\n+\tnfp->dev_info = dev_info;\n \n \tret = nfp6000_get_interface(pci_dev, &interface);\n \tif (ret != 0) {\ndiff --git a/drivers/net/nfp/nfpcore/nfp6000_pcie.h b/drivers/net/nfp/nfpcore/nfp6000_pcie.h\nindex 8847f6f946..8e2cfb69e6 100644\n--- a/drivers/net/nfp/nfpcore/nfp6000_pcie.h\n+++ b/drivers/net/nfp/nfpcore/nfp6000_pcie.h\n@@ -14,6 +14,7 @@\n const struct nfp_cpp_operations *nfp_cpp_transport_operations(void);\n \n struct nfp_cpp *nfp_cpp_from_nfp6000_pcie(struct rte_pci_device *pci_dev,\n+\t\tconst struct nfp_dev_info *dev_info,\n \t\tbool driver_lock_needed);\n \n #endif /* __NFP6000_PCIE_H__ */\ndiff --git a/drivers/net/nfp/nfpcore/nfp_cpp.h b/drivers/net/nfp/nfpcore/nfp_cpp.h\nindex e879c7c920..2defc4fa16 100644\n--- a/drivers/net/nfp/nfpcore/nfp_cpp.h\n+++ b/drivers/net/nfp/nfpcore/nfp_cpp.h\n@@ -18,6 +18,8 @@ struct nfp_cpp_area;\n \n #define NFP_CPP_NUM_TARGETS 16\n \n+#define PCI_64BIT_BAR_COUNT 3\n+\n /*\n * NFP CPP operations structure\n */\n@@ -26,8 +28,7 @@ struct nfp_cpp_operations {\n \tsize_t area_priv_size;\n \n \t/* Instance an NFP CPP */\n-\tint (*init)(struct nfp_cpp *cpp,\n-\t\t\tstruct rte_pci_device *dev);\n+\tint (*init)(struct nfp_cpp *cpp);\n \n \t/*\n \t * Free the bus.\ndiff --git a/drivers/net/nfp/nfpcore/nfp_cppcore.c b/drivers/net/nfp/nfpcore/nfp_cppcore.c\nindex 8b2d00a6a1..f9b08a12b6 100644\n--- a/drivers/net/nfp/nfpcore/nfp_cppcore.c\n+++ b/drivers/net/nfp/nfpcore/nfp_cppcore.c\n@@ -947,7 +947,7 @@ nfp_cpp_alloc(struct rte_pci_device *pci_dev,\n \t * NOTE: cpp_lock is NOT locked for op->init,\n \t * since it may call NFP CPP API operations\n \t */\n-\terr = cpp->op->init(cpp, pci_dev);\n+\terr = cpp->op->init(cpp);\n \tif (err < 0) {\n \t\tPMD_DRV_LOG(ERR, \"NFP interface initialization failed\");\n \t\tfree(cpp);\n", "prefixes": [ "v4", "26/26" ] }