Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/130864/?format=api
{ "id": 130864, "url": "http://patchwork.dpdk.org/api/patches/130864/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20230830021457.2064750-27-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": "<20230830021457.2064750-27-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230830021457.2064750-27-chaoyong.he@corigine.com", "date": "2023-08-30T02:14:56", "name": "[v2,26/27] net/nfp: refact the cppcore and PCIe module", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "662aa1fc6ef405f1298921cd30b9e4849f00f92e", "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/20230830021457.2064750-27-chaoyong.he@corigine.com/mbox/", "series": [ { "id": 29363, "url": "http://patchwork.dpdk.org/api/series/29363/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=29363", "date": "2023-08-30T02:14:30", "name": "refact the nfpcore module", "version": 2, "mbox": "http://patchwork.dpdk.org/series/29363/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/130864/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/130864/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 C327A41FC8;\n\tWed, 30 Aug 2023 04:19:06 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 80BA240ED6;\n\tWed, 30 Aug 2023 04:16:18 +0200 (CEST)", "from NAM02-BN1-obe.outbound.protection.outlook.com\n (mail-bn1nam02on2126.outbound.protection.outlook.com [40.107.212.126])\n by mails.dpdk.org (Postfix) with ESMTP id D7F1C40E72\n for <dev@dpdk.org>; Wed, 30 Aug 2023 04:16:15 +0200 (CEST)", "from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5)\n by DM6PR13MB3786.namprd13.prod.outlook.com (2603:10b6:5:229::11) with\n Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.18; Wed, 30 Aug\n 2023 02:16:13 +0000", "from SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::c0f3:c2cc:b5bb:4192]) by SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::c0f3:c2cc:b5bb:4192%4]) with mapi id 15.20.6699.034; Wed, 30 Aug 2023\n 02:16:13 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=LBe5d8Qd51V8qF9+sKtOvD6mrVQY/FTGM9s9IcjaEHtjueiQXcWurRJuSLyDuSn8wE6Iz12u6RrLm3Ye2YR9KigcdNlPVIAMMLqgNquOrCgMk8z878KrJBEXMEplyGnhJL4rFbhN369qhlL7UqVlRfVmmTN73bjd/wqlAY/Ow11CBNhw1dbDajDu5aLIZn7lQ0x2Jbtnor8I82mPIX+XfKgHhTjwY9t1j4SM0Wcc/wlVFKBkXfDUjJRLHKw0pKOdEIwTb1L8EJKWLEZPzYMR7BtrB+X5E3qCTM+jkGDRYf5jgsINW5pByMv0bw+199SFqmwjC/1LjRNXw6TdH4sNoA==", "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=O0eui1uCQQGt2N38CMW96vEtZmFfy2Bvr+QxFbQDJtg=;\n b=RY+JfDQMz1q6UnlyQ1lo6usVhhdoBBocyleTzBdbh2J6EslC+LaBReQByCv50MB9VSYaN2AVbNsBLjSu7GRJx2RpZ544UbA1gfhzLyErQ/0C/Tk+vkIqOccsw0cj9Zob1i78lMGhKAZIxFKqsE3+45MpOB8IhaxkpegaHkJ2elnH/OKBDyoPrFc9c4NAxvy37CsqL0Yt7BFNdxP0eEqK9BxqQwfrrVf4U2xCZAtAXfKa0ZfqrEEytgSJmOzu5SskwzDoNGakTrY4VJtk/P/eHehQe4ex4H5ahh3j6DyaCoQVuG9UAhVQlo7MzWho1ph3Jt/8uhIcvyufZJkXp4QJ7Q==", "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=O0eui1uCQQGt2N38CMW96vEtZmFfy2Bvr+QxFbQDJtg=;\n b=GH2o1a3Ligo7OwbLrTb7bCzRsWVJr7lMWeEPRUj0Skh687IkUA2pJ6z5XLTHjrdzsPAM4XWH99xv/no6I+vnsPgXQzNC9uwyUSeuxH8iLocQxL7tuxRMVV3xb6T/Ia2HFldm5tfmqaTt7iK4qfoHzDkTHTRMSy6RSC6RaHtETRY=", "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": "oss-drivers@corigine.com, niklas.soderlund@corigine.com,\n Chaoyong He <chaoyong.he@corigine.com>", "Subject": "[PATCH v2 26/27] net/nfp: refact the cppcore and PCIe module", "Date": "Wed, 30 Aug 2023 10:14:56 +0800", "Message-Id": "<20230830021457.2064750-27-chaoyong.he@corigine.com>", "X-Mailer": "git-send-email 2.39.1", "In-Reply-To": "<20230830021457.2064750-1-chaoyong.he@corigine.com>", "References": "<20230824110956.1943559-1-chaoyong.he@corigine.com>\n <20230830021457.2064750-1-chaoyong.he@corigine.com>", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "X-ClientProxiedBy": "PH0PR07CA0113.namprd07.prod.outlook.com\n (2603:10b6:510:4::28) 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_|DM6PR13MB3786:EE_", "X-MS-Office365-Filtering-Correlation-Id": "d62049b4-9d7e-45a9-652f-08dba8ff1594", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n qPFYYemXmogl2U3B1Cdodsjy7WzROCmhQh7B18WgBTPIKOs6w9f3rosZYRYz/XDH5xsO+kXqtHyBQq3hG1cNzOmWdiFntrallqHUYg9zgbxZv7bMn43U38xNDJuzL5tOsfqR2NdJaGPUv4KIUL1GRKsj2WtW9q/1K676PnNxNI4zp0yEf7Ioy3GAky7ju1XyQJzgrr7m3PR49FrJapu5kpNBjmwUIQL+K1vIc/pWSoPzpzftu1KN6TmZAQx3u+PctlCbcSrC51ndIuFjJsDQ5Aj5ujFeBrzYN906J15RMLfvCMgnJj3qt2cCLyBSceW5dtvBdRXEwRN0bAnbtBGEeJiaBC8KpMPpW35DqtsjkZ+UQ1OsTD8E88Tlg747Nq3Ym2r60bL/IR0CwDjAcUrjO4Tmh0+xb2kd16OoX3Sx/P17BMVCd1Q7cQiJhwgvk9kJvQ7ZN8su62iUaYAgTu0qpLRmVNZ2ulj5yVR2xX6yiqg2QlCkv6GKVBErVvuCjpCSv2MQhqUa9aqALPITYJHjnNfGqQ0SBoc/1MMgCt6XotycJlWNj59lRm1jjkmPCKMqsMwLJYJ/eVffBJYDsJCt3+g16H9pDnmIGHqfUE1Z65OVOsikSdSkGlfk41Qx92yJfGd0XB3QUMP3sb7O3amMVneYuOFSieHIySolgnBvf5M=", "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)(136003)(366004)(376002)(346002)(396003)(39830400003)(451199024)(186009)(1800799009)(6512007)(6916009)(316002)(38100700002)(41300700001)(38350700002)(2906002)(4326008)(66574015)(30864003)(83380400001)(2616005)(86362001)(44832011)(26005)(36756003)(1076003)(8676002)(5660300002)(107886003)(8936002)(6666004)(6506007)(6486002)(66556008)(66946007)(66476007)(52116002)(478600001);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "=?utf-8?q?psQ9GRHct9JrGM5LCYYJj1fBy8fr?=\n\t=?utf-8?q?nuBKqXUUF2kkmU7o8hS3aAG8ddv3FpCF5Sg0+qL7z+HSx4jpmHqwmR1S9j5SqCtDv?=\n\t=?utf-8?q?h914G2r1FYvvW+xsCk2LiDhAe+lpjYx632Xt9uTcIR6ZOANEt90IonsXjxeBcDPB6?=\n\t=?utf-8?q?XcCT+LGLAiCiA/pz2JPDdma5svwhVbrJUUjbA6yeSaSkdf19BLFWaEY3uB2FjeFTX?=\n\t=?utf-8?q?t+xyld72ptBs+mFBb4UbsYcoq2nJVz5taQv0MCmWmMgi8YUp1vwJW8zbg4yWjZKO5?=\n\t=?utf-8?q?1CqhFrxRjpCFYRtnpm0vdh0SEU/agDagFPDCUOrYjnqA75nrWlBQ40z9x12lAHLco?=\n\t=?utf-8?q?ths0Q1EtrqT3iXMfi4SJiLICzo3SpFos8evzieO+me2DYrtcVD+f6LpDfoeee1/E0?=\n\t=?utf-8?q?Jrg/z57IooEjzB/4U1XzpLwjZb51fLkoBX3rZnX+GyzAWOuJrWwkMmDP2pzDYqG6p?=\n\t=?utf-8?q?T9Cd4L8plbKCKjmydB7QEDI7Zt/x4LNg6HbeDpPP5rluu77pexUy9lvGs7rE3+Tjt?=\n\t=?utf-8?q?VWDsRnuoDDXZ4Frpc92tWr3PBZ5a6zxUG2m79vBzlhZyN+4p+I+mf8/XZfRBdeUYJ?=\n\t=?utf-8?q?3i6oBpTc30NKty0Qpgj6ujvaJsxTf0MqRWectLh6s2e6SrF+st4YTcexZLPqWBAxX?=\n\t=?utf-8?q?SI4G0ccRbu+Ts6iTWx5BCJ9ig7ocXjWW8BiF/rieh1xlXlIN5dAgh2Tn0Ih9N0B+Y?=\n\t=?utf-8?q?jTTp0aV5t32R30/rNKo3CvuL8saF481izVpiOO4R3LxIzmYtvR7IT+txkzqBIJgeg?=\n\t=?utf-8?q?PeNIXxua5V6TJanA6IK+PBVDQsgTK3I79QO5ixQEQ/oYEbVY9+gdk8IRe1vB701Ku?=\n\t=?utf-8?q?ERp52eOrFcgU84Q1vv0FGD7OZW8vX2yLBRiQ3hOIZ5GM8/fBZj7TqkyTQ9qQNsQPL?=\n\t=?utf-8?q?Q2kdvmIx47ZvVZrvVWo239iRLXl8zM49LpDFQFo0VEa4NJGt7KRPUfBPVPZtQW/7D?=\n\t=?utf-8?q?OpYT4dP7fqwC2B+vchpkmzB4GD/uDE/1Odb+oCK4rQN4SCGkvDgn3uNO4vzGr03HN?=\n\t=?utf-8?q?tUT9Jh2JPxSvkxaOY7Glk3HFve4oywJe/6g2fuOMF3YHuRbtxSleoPUbyNzvyJDeD?=\n\t=?utf-8?q?qPo2xkMWLjrBstaFofP9BhGK/36EA/2l3zEKoRfjE7vS1DWkpv0eoRyjrfztZa5Qw?=\n\t=?utf-8?q?xEM981Nvgwpk/MdtXmyf5msM9q9X63BWe5XYexf1BVrvg7x32ZMIIIaVwT5zdYDt6?=\n\t=?utf-8?q?uvfdGNr+Vb/NJIeUai3mI6suaHvvq0wuw/R66xBpI8U4i4XJ64KcKGO7wdUYugTiQ?=\n\t=?utf-8?q?NucYIhC9m5/NZk8tlGeweONxSGANbtfvNT2g9uOMETAXszbafMhGrUujLjx6rkYMJ?=\n\t=?utf-8?q?s+iLzStF/Ni+PwjkBZE8ZeC+p31LFwIwGEld53IHvl+OKrX2E1vJ7TGJ3XTE9nph8?=\n\t=?utf-8?q?nXW+2L1c3n+ehbRx7wmgKhqCRG9epMMHH4c6XAhy/ik0qBNdtxfUfKBiAHq2YDEde?=\n\t=?utf-8?q?D070KQm9J5e9H+McZbdzsFrDjw5lqzDXq3+7HbSIZPpQKd3gyynKwpt/eog518oPu?=\n\t=?utf-8?q?hppY7Kq2/wC1nfI/CwoO7Nci02HHVfrnzg=3D=3D?=", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n d62049b4-9d7e-45a9-652f-08dba8ff1594", "X-MS-Exchange-CrossTenant-AuthSource": "SJ0PR13MB5545.namprd13.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Internal", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "30 Aug 2023 02:16:13.8594 (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 yhV1fR2E/m4cnBHAW7lGYZdqxXvAqqpWtUoRcwFiC+Ojxc98+cM5VSklouW/TDie/MchVTlbd6UcNpVWGItHSxpjILX1ca6o+TLMbzBYWAo=", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "DM6PR13MB3786", "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, 141 insertions(+), 175 deletions(-)", "diff": "diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c\nindex 5d129d0ad3..6eefec3836 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..e32ac1107c 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@@ -848,7 +750,7 @@ nfp6000_free(struct nfp_cpp *cpp)\n \tif (nfp_cpp_driver_need_lock(cpp))\n \t\tclose(desc->lock);\n \tclose(desc->device);\n-\tfree(desc);\n+\trte_free(desc);\n }\n \n static const struct nfp_cpp_operations nfp6000_pcie_ops = {\n@@ -873,3 +775,58 @@ 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 = rte_zmalloc(NULL, sizeof(*nfp), 0);\n+\tif (nfp == NULL)\n+\t\treturn NULL;\n+\n+\tret = nfp6000_get_interface(pci_dev, &interface);\n+\tif (ret != 0) {\n+\t\tPMD_DRV_LOG(ERR, \"Get interface failed.\");\n+\t\trte_free(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\trte_free(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\trte_free(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\trte_free(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 209d0b5160..6f46dbf5b7 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\trte_free(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\trte_free(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\trte_free(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\trte_free(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\trte_free(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\trte_free(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": [ "v2", "26/27" ] }