Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/131559/?format=api
{ "id": 131559, "url": "http://patchwork.dpdk.org/api/patches/131559/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20230918024612.1600536-26-chaoyong.he@corigine.com/", "project": { "id": 1, "url": "http://patchwork.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-26-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230918024612.1600536-26-chaoyong.he@corigine.com", "date": "2023-09-18T02:46:11", "name": "[v4,25/26] net/nfp: refact the cppcore and PCIe module", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "11b3e7cb4e2ca5452af1ece0c0d72d2a340c9b94", "submitter": { "id": 2554, "url": "http://patchwork.dpdk.org/api/people/2554/?format=api", "name": "Chaoyong He", "email": "chaoyong.he@corigine.com" }, "delegate": { "id": 319, "url": "http://patchwork.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20230918024612.1600536-26-chaoyong.he@corigine.com/mbox/", "series": [ { "id": 29531, "url": "http://patchwork.dpdk.org/api/series/29531/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=29531", "date": "2023-09-18T02:45:46", "name": "refact the nfpcore module", "version": 4, "mbox": "http://patchwork.dpdk.org/series/29531/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/131559/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/131559/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 19637425C9;\n\tMon, 18 Sep 2023 04:50:19 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id B0E8B427DF;\n\tMon, 18 Sep 2023 04:47:59 +0200 (CEST)", "from NAM12-MW2-obe.outbound.protection.outlook.com\n (mail-mw2nam12on2110.outbound.protection.outlook.com [40.107.244.110])\n by mails.dpdk.org (Postfix) with ESMTP id 593D642D87\n for <dev@dpdk.org>; Mon, 18 Sep 2023 04:47:56 +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:54 +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:54 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=Erg8Lih0GGWJvxNd8yCsG8GHbZsLksKhudxKtv0Z1tTnTTitGb2WpRtnZPKbBB/BZMJYTNHT0g5jA6ybqcGN6xcjmONkUKirgp5ZivUOS8T/k8nYHdCQjFmyjTV5gTW/WyYVkHoMoyphFan7TP2hzzAW/b2tRURMYJq1CVm5Z1yqccwgyE/M4Kv6oj2qRV8jGQ76UHXNOVDHIqWKgONmXgqrtpgOvrHEGo3XO5oATiKXOX0qNOMOy4+7Mg3U+fJJ7BEIS0si7VpB80PmXmi/WC3W1kWg4nYPdvp9F8LEYcSJ+ceiAvDkIgH7+mK/+jUeyUvb4a37svSd+2wnBANGyg==", "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=5NlXw4M7J7zpbb+Sg9Ni2bV1678sjBiLqB6Dd847ZO4=;\n b=kWy7ccQ537xj5WAoxJURhbJFuD7g/cSliHMs18TgTreesYp7L6s9n2mHlQ9k2jqZGz7CZJXDDUu4BlwI9Wo6sAND8pxlun5qEdNykZ8+dzeOIJxWzYLQTwAAmaCssZFcB6NR6imw8T+4S7ReB3ZJdfpgbQrbZqizY5h3C+LsOzuDIlW9DuEiZpwYJD3IIi3/rFY1V4FMy9ThKAFuiTWeBmiY8H6Iv43nhi5iQIXlUD4O/xawMxoSO68QQNDDyxO1ZrQIdNZ/C8dZhYjSIJno/Ltt5D30XEU1DEZh6upZwDg3ZbBce6zJ4jB8wShYahRzvmB50FJRwKe0TvnOIUKMeg==", "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=5NlXw4M7J7zpbb+Sg9Ni2bV1678sjBiLqB6Dd847ZO4=;\n b=QjyQahRqv0Dkd/8OiMMZth49Suu+3Q+CYLqmbtAKs+RyZZlyRU5uKqLYt4Hcz+Pn3dUDMtan0RM9wE4EqgUQ6HuvvUjuQ1q4Tv8wJWbCrDsgBies7l3OZyk8LtBS3+odFJFiLJXV0Zzq0ldTGjXxGSwduNcsJ3jep0Kz70AlmT8=", "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 25/26] net/nfp: refact the cppcore and PCIe module", "Date": "Mon, 18 Sep 2023 10:46:11 +0800", "Message-Id": "<20230918024612.1600536-26-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": "f7173fa1-d40f-4d68-52e8-08dbb7f1a85c", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n /1K1RObWpWGt4/Fffpuuwu8W77NPPkYjgO2UdcgX1gbWKn3ttESZGT89ESPTHykIQ9znegNDianZtR0jDi+5teFVvNX6NONqjc7Ooi1zXCRqFM3plaK9m5xtFymO/zMlgK7lCdQbjjW7t+FWWNT8rv0fyyabqo9arycCUvTF9aqPm6FsEa8dn+BxUZBKoTlWVXtJrEb6Xzk+pmCqSaZfYjIImAXC6qbQYJKQR/m53XQtcj452fPgxKqWf1vcr5uMcxACZNZ/FHZUYZELAoGQtb3WCExMxiYo3wTLc3/Zv4UH+7Sj2kuh1Vl3shs1GVdrTztOLU7gaibt+/hV7gLzjIBdENzf3VvZlpuZKzlKimRwI4NKV1/Qzsglkz5ygT2HOLgC0sP99um7I7+30gg+iy8ZrFLEE/ya6KDnl7UuZKKjrEPjiGclpxDbLiu7rGLKk0pjQ0lauRI39gybqh4vSfxcs+FUPdxk31tQN7doLl7yB4Rm8X8C1jEJouEq/f7nTrtNf838P/PMoHeoyfxLJweBJmCl8Muy1Wk8+f3JrL4WtQ/mGig9O2fhwsaIdvNmc2U1xv7JR7a/sOoiP1eeviy9v0uCoQWUfSrJplDT25EeQKsSufaJr6iwB3pi0lzJvguzhI2UAz6VwKqVbxN6iZmQzwPUzFcniRgEtSYVFZ4=", "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?qqrf/nBvgZV+cpy/fHbgexd4+bwx?=\n\t=?utf-8?q?TfZS2Z8QhqbcfWguTv/S9iKGRbODBbxZP9i+/RoiyEkMOuATr6AYwoUWradIBWON0?=\n\t=?utf-8?q?89o9QBLTCUIV+Z6Tr7Nt24Gbj7eQRXmPnwzBI23cfXYMPCZI/u1ykfY4N7ApILl9n?=\n\t=?utf-8?q?4ZdYTh/B/Z86Om8bvp5rZVAaU7cHecErC2K05TtfEow+V/EkflfbFENupfCzNyUhy?=\n\t=?utf-8?q?ayqBFH+4GsEvuDl8LurSRRfIylC0f3FZhvUcTn+1cinX61EdxIVa5iRtIHb0ZOGvZ?=\n\t=?utf-8?q?T4rT5yeFSSfaJBp9WpmW619Fu0f96SnM0/x6ZUcrlm3vhbK2fp8R+RmAbf4oxfN8C?=\n\t=?utf-8?q?bhd4m5EXjz/V14eIQeTdaILRMrgckq9a5xeJVEX6omoGHNuZxbS8AafqOWxCH2B/G?=\n\t=?utf-8?q?Kqfhdh+NA+zKhF0io6Aif+fhHtGWMTmq2HKK77HU2bieNCaA4rkMMJusVsUyFAR6j?=\n\t=?utf-8?q?ux8XVMH8hX3xhknDK3UluvWxJI/QLI3Xo+0vOGMxFq2bJ+riTP0nuj4x4TMI5cDM2?=\n\t=?utf-8?q?L5uHUUqMmHQF6mQvXyZ8sVLVxwgaC49DQ7XCM4tltSRZ0yY3VrQKRRudiXEI2FtDS?=\n\t=?utf-8?q?27Y7+SnfNh1gypWGK18F4IdMJ02fy7B3pq4joTxWMuev4E9OJ9XD/exA7dwMkri9m?=\n\t=?utf-8?q?JyGFg6s3MJXyWQabfYckse78AC60kwejyU320q7ApBXyS6v6/3Xq0Z3lLMQ3gHI0C?=\n\t=?utf-8?q?slSMKIknxxmWf4lAkz5Mdfl1PaE+6BEnx6uISgYg4DzkCrEkZuGCyKbms/mgriFUl?=\n\t=?utf-8?q?ilr6gTujb/8RWdxs4M05uOyiFOQmuCf7Qb1YQxUD61ciRe4R62apkZmzviNDEpyac?=\n\t=?utf-8?q?HfwEezm435el8psZy/HTDW5QNEStqDZQuv8yB/rdR8T8SQunS+iaW1vRMHyUGFI7s?=\n\t=?utf-8?q?MPaU8l1ZjrZr99ztpIyTliP7G8yDpyVRiMqKb37freRNr02Z6J8f0Y0Y5D7oXTORv?=\n\t=?utf-8?q?QWg5llBDgAFWex/Vx//IqQwSurH/lNs4te4RKlF/Q3MxQX0NxZ+wzqVTkjez8QOc2?=\n\t=?utf-8?q?DDSkz5KBh0s/ZkpR89YmqEx/FAhyBP6tmzqaOB6GUWS6Xp09Ou5aeFbSbk9eIJmp5?=\n\t=?utf-8?q?2fTe3jmxpErz7yhrS8D2Fr2oaIHwdSJLxWIDaCCGIi4Lkcn/G8ZD9YRWW56bQpfua?=\n\t=?utf-8?q?imr74QGSaYOUvMNsazhRvBX5Y4wWW5i2ZVmPx0WO0ltdVfPdsHDAQ/VCwfbKp8UXQ?=\n\t=?utf-8?q?luo4+Jw1lgUvNE43AaC9QnIJzakEm3lFiW9fxs/10OTqNhydi3GRqw/wvqifbBNmV?=\n\t=?utf-8?q?KY1Lksenh1vhx4GmbWJxJSwQ6cWV6SuM1pufGjRQJe6NI9au1f7G00XCMKZvYE5OJ?=\n\t=?utf-8?q?mhC39sjZr6EKXfvhM7vmgHMxWKyyQxJfCWj1fnHJSNf6bpFzt3plDS0hTFNRGXXMo?=\n\t=?utf-8?q?PkrjzlrK10QYBfxpIB9GkotpliLNYO7prpa6wHVBAk1GelT2BKkr2dG7ewhtSIiHk?=\n\t=?utf-8?q?FrDugEoJqeB3Ox9S6d7BjABf1b7LWMC7eR7SvkaXXrHPNh8+y0+Fbf3BXrq4KGwPS?=\n\t=?utf-8?q?nDipaySJkl6eSVeVBjdfaGWBB5P6C4hmiA=3D=3D?=", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n f7173fa1-d40f-4d68-52e8-08dbb7f1a85c", "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:54.4984 (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 pdwiEIjRY07z5otOhOXn+UY8ceP8dRxDIra8HPPOND2xgXSM9FFU2hkSae2hTSrA9Wi2WtBP8JLdzf0EirWfSW+cx3FMBsIiquDGKAq8qPo=", "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, use the new entry function from the\nPCIe module instead of the cppcore module.\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 | 9 +-\n drivers/net/nfp/nfpcore/nfp6000_pcie.c | 197 ++++++++++---------------\n drivers/net/nfp/nfpcore/nfp6000_pcie.h | 6 +\n drivers/net/nfp/nfpcore/nfp_cpp.h | 36 +----\n drivers/net/nfp/nfpcore/nfp_cppcore.c | 68 ++++++---\n 5 files changed, 142 insertions(+), 174 deletions(-)", "diff": "diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c\nindex 921fa167dd..a645e23a4d 100644\n--- a/drivers/net/nfp/nfp_ethdev.c\n+++ b/drivers/net/nfp/nfp_ethdev.c\n@@ -23,6 +23,7 @@\n #include \"nfpcore/nfp_mip.h\"\n #include \"nfpcore/nfp_rtsym.h\"\n #include \"nfpcore/nfp_nsp.h\"\n+#include \"nfpcore/nfp6000_pcie.h\"\n \n #include \"nfp_common.h\"\n #include \"nfp_ctrl.h\"\n@@ -917,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_device_name(pci_dev, 0);\n+\t\tcpp = nfp_cpp_from_nfp6000_pcie(pci_dev, false);\n \telse\n-\t\tcpp = nfp_cpp_from_device_name(pci_dev, 1);\n+\t\tcpp = nfp_cpp_from_nfp6000_pcie(pci_dev, true);\n \n \tif (cpp == NULL) {\n \t\tPMD_INIT_LOG(ERR, \"A CPP handle can not be obtained\");\n@@ -1120,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_device_name(pci_dev, 0);\n+\t\tcpp = nfp_cpp_from_nfp6000_pcie(pci_dev, false);\n \telse\n-\t\tcpp = nfp_cpp_from_device_name(pci_dev, 1);\n+\t\tcpp = nfp_cpp_from_nfp6000_pcie(pci_dev, 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 4f453f19a9..40076cdc11 100644\n--- a/drivers/net/nfp/nfpcore/nfp6000_pcie.c\n+++ b/drivers/net/nfp/nfpcore/nfp6000_pcie.c\n@@ -98,6 +98,24 @@ struct nfp_pcie_user {\n \tchar *cfg;\n };\n \n+/* Generic CPP bus access interface. */\n+struct nfp6000_area_priv {\n+\tstruct nfp_bar *bar;\n+\tuint32_t bar_offset;\n+\n+\tint target;\n+\tint action;\n+\tint token;\n+\tuint64_t offset;\n+\tstruct {\n+\t\tint read;\n+\t\tint write;\n+\t\tint bar;\n+\t} width;\n+\tsize_t size;\n+\tchar *iomem;\n+};\n+\n static uint32_t\n nfp_bar_maptype(struct nfp_bar *bar)\n {\n@@ -334,24 +352,6 @@ nfp_disable_bars(struct nfp_pcie_user *nfp)\n \t}\n }\n \n-/* Generic CPP bus access interface. */\n-struct nfp6000_area_priv {\n-\tstruct nfp_bar *bar;\n-\tuint32_t bar_offset;\n-\n-\tuint32_t target;\n-\tuint32_t action;\n-\tuint32_t token;\n-\tuint64_t offset;\n-\tstruct {\n-\t\tint read;\n-\t\tint write;\n-\t\tint bar;\n-\t} width;\n-\tsize_t size;\n-\tchar *iomem;\n-};\n-\n static int\n nfp6000_area_init(struct nfp_cpp_area *area,\n \t\tuint32_t dest,\n@@ -624,87 +624,6 @@ nfp_acquire_process_lock(struct nfp_pcie_user *desc)\n \treturn 0;\n }\n \n-static int\n-nfp6000_set_model(struct rte_pci_device *dev,\n-\t\tstruct nfp_cpp *cpp)\n-{\n-\tuint32_t model;\n-\n-\tif (rte_pci_read_config(dev, &model, 4, 0x2e) < 0) {\n-\t\tPMD_DRV_LOG(ERR, \"nfp set model failed\");\n-\t\treturn -1;\n-\t}\n-\n-\tmodel = model << 16;\n-\tnfp_cpp_model_set(cpp, model);\n-\n-\treturn 0;\n-}\n-\n-static int\n-nfp6000_set_interface(struct rte_pci_device *dev,\n-\t\tstruct nfp_cpp *cpp)\n-{\n-\tuint16_t interface;\n-\n-\tif (rte_pci_read_config(dev, &interface, 2, 0x154) < 0) {\n-\t\tPMD_DRV_LOG(ERR, \"nfp set interface failed\");\n-\t\treturn -1;\n-\t}\n-\n-\tnfp_cpp_interface_set(cpp, interface);\n-\n-\treturn 0;\n-}\n-\n-static int\n-nfp6000_set_serial(struct rte_pci_device *dev,\n-\t\tstruct nfp_cpp *cpp)\n-{\n-\toff_t pos;\n-\tuint16_t tmp;\n-\tuint8_t serial[6];\n-\tint serial_len = 6;\n-\n-\tpos = rte_pci_find_ext_capability(dev, RTE_PCI_EXT_CAP_ID_DSN);\n-\tif (pos <= 0) {\n-\t\tPMD_DRV_LOG(ERR, \"PCI_EXT_CAP_ID_DSN not found. nfp set serial failed\");\n-\t\treturn -1;\n-\t} else {\n-\t\tpos += 6;\n-\t}\n-\n-\tif (rte_pci_read_config(dev, &tmp, 2, pos) < 0) {\n-\t\tPMD_DRV_LOG(ERR, \"nfp set serial failed\");\n-\t\treturn -1;\n-\t}\n-\n-\tserial[4] = (uint8_t)((tmp >> 8) & 0xff);\n-\tserial[5] = (uint8_t)(tmp & 0xff);\n-\n-\tpos += 2;\n-\tif (rte_pci_read_config(dev, &tmp, 2, pos) < 0) {\n-\t\tPMD_DRV_LOG(ERR, \"nfp set serial failed\");\n-\t\treturn -1;\n-\t}\n-\n-\tserial[2] = (uint8_t)((tmp >> 8) & 0xff);\n-\tserial[3] = (uint8_t)(tmp & 0xff);\n-\n-\tpos += 2;\n-\tif (rte_pci_read_config(dev, &tmp, 2, pos) < 0) {\n-\t\tPMD_DRV_LOG(ERR, \"nfp set serial failed\");\n-\t\treturn -1;\n-\t}\n-\n-\tserial[0] = (uint8_t)((tmp >> 8) & 0xff);\n-\tserial[1] = (uint8_t)(tmp & 0xff);\n-\n-\tnfp_cpp_serial_set(cpp, serial, serial_len);\n-\n-\treturn 0;\n-}\n-\n static int\n nfp6000_get_dsn(struct rte_pci_device *pci_dev,\n \t\tuint64_t *dsn)\n@@ -795,12 +714,7 @@ nfp6000_init(struct nfp_cpp *cpp,\n \t\tstruct rte_pci_device *dev)\n {\n \tint ret = 0;\n-\tstruct nfp_pcie_user *desc;\n-\n-\tdesc = malloc(sizeof(*desc));\n-\tif (desc == NULL)\n-\t\treturn -1;\n-\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@@ -809,17 +723,11 @@ nfp6000_init(struct nfp_cpp *cpp,\n \t\t\tnfp_cpp_driver_need_lock(cpp)) {\n \t\tret = nfp_acquire_process_lock(desc);\n \t\tif (ret != 0)\n-\t\t\tgoto error;\n+\t\t\treturn -1;\n \t}\n \n-\tif (nfp6000_set_model(dev, cpp) < 0)\n-\t\tgoto error;\n-\tif (nfp6000_set_interface(dev, cpp) < 0)\n-\t\tgoto error;\n-\tif (nfp6000_set_serial(dev, cpp) < 0)\n-\t\tgoto error;\n \tif (nfp6000_set_barsz(dev, desc) < 0)\n-\t\tgoto error;\n+\t\treturn -1;\n \n \tdesc->cfg = dev->mem_resource[0].addr;\n \tdesc->dev_id = dev->addr.function & 0x7;\n@@ -830,13 +738,7 @@ nfp6000_init(struct nfp_cpp *cpp,\n \t\treturn -1;\n \t}\n \n-\tnfp_cpp_priv_set(cpp, desc);\n-\n \treturn 0;\n-\n-error:\n-\tfree(desc);\n-\treturn -1;\n }\n \n static void\n@@ -873,3 +775,60 @@ nfp_cpp_operations *nfp_cpp_transport_operations(void)\n {\n \treturn &nfp6000_pcie_ops;\n }\n+\n+/**\n+ * Build a NFP CPP bus from a NFP6000 PCI device\n+ *\n+ * @param pdev\n+ * NFP6000 PCI device\n+ * @param driver_lock_needed\n+ * driver lock flag\n+ *\n+ * @return\n+ * NFP CPP handle or NULL\n+ */\n+struct nfp_cpp *\n+nfp_cpp_from_nfp6000_pcie(struct rte_pci_device *pci_dev,\n+\t\tbool driver_lock_needed)\n+{\n+\tint ret;\n+\tstruct nfp_cpp *cpp;\n+\tuint16_t interface = 0;\n+\tstruct nfp_pcie_user *nfp;\n+\n+\tnfp = malloc(sizeof(*nfp));\n+\tif (nfp == NULL)\n+\t\treturn NULL;\n+\n+\tmemset(nfp, 0, sizeof(*nfp));\n+\n+\tret = nfp6000_get_interface(pci_dev, &interface);\n+\tif (ret != 0) {\n+\t\tPMD_DRV_LOG(ERR, \"Get interface failed.\");\n+\t\tfree(nfp);\n+\t\treturn NULL;\n+\t}\n+\n+\tif (NFP_CPP_INTERFACE_TYPE_of(interface) != NFP_CPP_INTERFACE_TYPE_PCI) {\n+\t\tPMD_DRV_LOG(ERR, \"Interface type is not right.\");\n+\t\tfree(nfp);\n+\t\treturn NULL;\n+\t}\n+\n+\tif (NFP_CPP_INTERFACE_CHANNEL_of(interface) !=\n+\t\t\tNFP_CPP_INTERFACE_CHANNEL_PEROPENER) {\n+\t\tPMD_DRV_LOG(ERR, \"Interface channel is not right\");\n+\t\tfree(nfp);\n+\t\treturn NULL;\n+\t}\n+\n+\t/* Probe for all the common NFP devices */\n+\tcpp = nfp_cpp_from_device_name(pci_dev, nfp, driver_lock_needed);\n+\tif (cpp == NULL) {\n+\t\tPMD_DRV_LOG(ERR, \"Get cpp from operation failed\");\n+\t\tfree(nfp);\n+\t\treturn NULL;\n+\t}\n+\n+\treturn cpp;\n+}\ndiff --git a/drivers/net/nfp/nfpcore/nfp6000_pcie.h b/drivers/net/nfp/nfpcore/nfp6000_pcie.h\nindex e126457d45..8847f6f946 100644\n--- a/drivers/net/nfp/nfpcore/nfp6000_pcie.h\n+++ b/drivers/net/nfp/nfpcore/nfp6000_pcie.h\n@@ -6,8 +6,14 @@\n #ifndef __NFP6000_PCIE_H__\n #define __NFP6000_PCIE_H__\n \n+#include <ethdev_pci.h>\n+\n #include \"nfp_cpp.h\"\n+#include \"nfp_dev.h\"\n \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\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 0f36ba0b50..e879c7c920 100644\n--- a/drivers/net/nfp/nfpcore/nfp_cpp.h\n+++ b/drivers/net/nfp/nfpcore/nfp_cpp.h\n@@ -226,40 +226,12 @@ uint32_t nfp_cpp_model_autodetect(struct nfp_cpp *cpp, uint32_t *model);\n \n /* NFP CPP core interface for CPP clients */\n struct nfp_cpp *nfp_cpp_from_device_name(struct rte_pci_device *dev,\n-\t\tint driver_lock_needed);\n+\t\tvoid *priv, bool driver_lock_needed);\n \n void nfp_cpp_free(struct nfp_cpp *cpp);\n \n #define NFP_CPP_MODEL_INVALID 0xffffffff\n \n-/**\n- * Retrieve the chip ID from the model ID\n- *\n- * The chip ID is a 16-bit BCD+A-F encoding for the chip type.\n- *\n- * @param model\n- * NFP CPP model id\n- *\n- * @return\n- * NFP CPP chip id\n- */\n-#define NFP_CPP_MODEL_CHIP_of(model) (((model) >> 16) & 0xffff)\n-\n-/**\n- * Check for the NFP6000 family of devices\n- *\n- * NOTE: The NFP4000 series is considered as a NFP6000 series variant.\n- *\n- * @param model\n- * NFP CPP model id\n- *\n- * @return\n- * true if model is in the NFP6000 family, false otherwise.\n- */\n-#define NFP_CPP_MODEL_IS_6000(model) \\\n-\t\t((NFP_CPP_MODEL_CHIP_of(model) >= 0x3800) && \\\n-\t\t(NFP_CPP_MODEL_CHIP_of(model) < 0x7000))\n-\n uint32_t nfp_cpp_model(struct nfp_cpp *cpp);\n \n /*\n@@ -330,6 +302,12 @@ uint32_t nfp_cpp_model(struct nfp_cpp *cpp);\n */\n #define NFP_CPP_INTERFACE_CHANNEL_of(interface)\t(((interface) >> 0) & 0xff)\n \n+/*\n+ * Use this channel ID for multiple virtual channel interfaces\n+ * (ie ARM and PCIe) when setting up the interface field.\n+ */\n+#define NFP_CPP_INTERFACE_CHANNEL_PEROPENER 255\n+\n uint16_t nfp_cpp_interface(struct nfp_cpp *cpp);\n \n uint32_t nfp_cpp_serial(struct nfp_cpp *cpp, const uint8_t **serial);\ndiff --git a/drivers/net/nfp/nfpcore/nfp_cppcore.c b/drivers/net/nfp/nfpcore/nfp_cppcore.c\nindex bbf2eaa448..8b2d00a6a1 100644\n--- a/drivers/net/nfp/nfpcore/nfp_cppcore.c\n+++ b/drivers/net/nfp/nfpcore/nfp_cppcore.c\n@@ -909,10 +909,13 @@ nfp_xpb_readl(struct nfp_cpp *cpp,\n }\n \n static struct nfp_cpp *\n-nfp_cpp_alloc(struct rte_pci_device *dev,\n-\t\tint driver_lock_needed)\n+nfp_cpp_alloc(struct rte_pci_device *pci_dev,\n+\t\tvoid *priv,\n+\t\tbool driver_lock_needed)\n {\n \tint err;\n+\tsize_t target;\n+\tuint32_t xpb_addr;\n \tstruct nfp_cpp *cpp;\n \tconst struct nfp_cpp_operations *ops;\n \n@@ -925,32 +928,50 @@ nfp_cpp_alloc(struct rte_pci_device *dev,\n \t\treturn NULL;\n \n \tcpp->op = ops;\n+\tcpp->priv = priv;\n \tcpp->driver_lock_needed = driver_lock_needed;\n \n-\tif (cpp->op->init) {\n-\t\terr = cpp->op->init(cpp, dev);\n+\terr = ops->get_interface(pci_dev, &cpp->interface);\n+\tif (err != 0) {\n+\t\tfree(cpp);\n+\t\treturn NULL;\n+\t}\n+\n+\terr = ops->get_serial(pci_dev, cpp->serial, NFP_SERIAL_LEN);\n+\tif (err != 0) {\n+\t\tfree(cpp);\n+\t\treturn NULL;\n+\t}\n+\n+\t/*\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+\tif (err < 0) {\n+\t\tPMD_DRV_LOG(ERR, \"NFP interface initialization failed\");\n+\t\tfree(cpp);\n+\t\treturn NULL;\n+\t}\n+\n+\terr = nfp_cpp_model_autodetect(cpp, &cpp->model);\n+\tif (err < 0) {\n+\t\tPMD_DRV_LOG(ERR, \"NFP model detection failed\");\n+\t\tfree(cpp);\n+\t\treturn NULL;\n+\t}\n+\n+\tfor (target = 0; target < RTE_DIM(cpp->imb_cat_table); target++) {\n+\t\t/* Hardcoded XPB IMB Base, island 0 */\n+\t\txpb_addr = 0x000a0000 + (target * 4);\n+\t\terr = nfp_xpb_readl(cpp, xpb_addr, &cpp->imb_cat_table[target]);\n \t\tif (err < 0) {\n+\t\t\tPMD_DRV_LOG(ERR, \"Can't read CPP mapping from device\");\n \t\t\tfree(cpp);\n \t\t\treturn NULL;\n \t\t}\n \t}\n \n-\tif (NFP_CPP_MODEL_IS_6000(nfp_cpp_model(cpp))) {\n-\t\tuint32_t xpb_addr;\n-\t\tsize_t target;\n-\n-\t\tfor (target = 0; target < RTE_DIM(cpp->imb_cat_table); target++) {\n-\t\t\t/* Hardcoded XPB IMB Base, island 0 */\n-\t\t\txpb_addr = 0x000a0000 + (target * 4);\n-\t\t\terr = nfp_xpb_readl(cpp, xpb_addr,\n-\t\t\t\t\t(uint32_t *)&cpp->imb_cat_table[target]);\n-\t\t\tif (err < 0) {\n-\t\t\t\tfree(cpp);\n-\t\t\t\treturn NULL;\n-\t\t\t}\n-\t\t}\n-\t}\n-\n \terr = nfp_cpp_set_mu_locality_lsb(cpp);\n \tif (err < 0) {\n \t\tPMD_DRV_LOG(ERR, \"Can't calculate MU locality bit offset\");\n@@ -981,6 +1002,8 @@ nfp_cpp_free(struct nfp_cpp *cpp)\n *\n * @param dev\n * PCI device\n+ * @param priv\n+ * Private data of low-level implementation\n * @param driver_lock_needed\n * Driver lock flag\n *\n@@ -991,9 +1014,10 @@ nfp_cpp_free(struct nfp_cpp *cpp)\n */\n struct nfp_cpp *\n nfp_cpp_from_device_name(struct rte_pci_device *dev,\n-\t\tint driver_lock_needed)\n+\t\tvoid *priv,\n+\t\tbool driver_lock_needed)\n {\n-\treturn nfp_cpp_alloc(dev, driver_lock_needed);\n+\treturn nfp_cpp_alloc(dev, priv, driver_lock_needed);\n }\n \n /**\n", "prefixes": [ "v4", "25/26" ] }