Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/130863/?format=api
{ "id": 130863, "url": "http://patchwork.dpdk.org/api/patches/130863/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20230830021457.2064750-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": "<20230830021457.2064750-26-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230830021457.2064750-26-chaoyong.he@corigine.com", "date": "2023-08-30T02:14:55", "name": "[v2,25/27] net/nfp: refact the PCIe module", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "1e22d98e39ad3dc9e9b08224e2a19cd3c56637a3", "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-26-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/130863/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/130863/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 6244C41FC8;\n\tWed, 30 Aug 2023 04:18:56 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id AE38C406BC;\n\tWed, 30 Aug 2023 04:16:15 +0200 (CEST)", "from NAM10-DM6-obe.outbound.protection.outlook.com\n (mail-dm6nam10on2107.outbound.protection.outlook.com [40.107.93.107])\n by mails.dpdk.org (Postfix) with ESMTP id 9A8EC406BA\n for <dev@dpdk.org>; Wed, 30 Aug 2023 04:16:13 +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:12 +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:12 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=AhT8BCSDawe+DHaf/wmT2X68HSPzMqjyrdJzZTVC/z1/fK3jzcWsh1x3fx7aoU81dbfh2sForCZqhtIfdd87AHQAyGgXEXyseM98kPbjpvTEwoN35y6AprEq2oVk9CiwNXUyqpkCTxkKad5QO95u4RuO4yD8sTVqxPPR6oIrapVcWpyihz72vIce6mQHf+Zg+tCw0BJmlsVM5tJC/dVPo60l7EGLZ98a9zC1ZhDoeTcW5kznsb2gBkNCpmZf47PzkkeF4nP2nMjBuNUSBwAkJCYiMOWjZw3Rfe6nxCPCEQj4twti1srnkE9Wo6HTz9OPi0yy20fT1LEE2o/tB4TujQ==", "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=e/8aeLVLMVTDcuNqDNkKXYdCRfzmvR365YWr5EAApwg=;\n b=HE+qr4wHw9LrPeLgPBHGLkebw4xzZlnT89gyTVh0CKoXAG5UF4TfvNhbnolqoa7e4REEq20CCop1tFwoF1kWz7M28DPCthH4FlCqMLPuFj1MwI9FhwmA6ZdJIArytSexwgTfeVcAldD3DRJ+HKJHmi1fMb4TJWhw7ovUm5wLAoyE7RSDqjmGaofkOhUfy4jclF5VWzz7VgwhBHdqEcUxnxHNFFnm6tJImCPIrqLWhVE2nE/SrfuFohM5PkBLUvLC7ySyuEYEJlFCJtfo2TW04tq2+2z2JM8M54kF029FMcbjZtFCkZixvLj0z+xfnYxKTuKIGOZb7HD4HmWRQUUAZQ==", "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=e/8aeLVLMVTDcuNqDNkKXYdCRfzmvR365YWr5EAApwg=;\n b=i72UpfCubSF+X7b5KZuJKTpp4wWlnDBijP1D7FLuDaPEqLTUqAqj72UNE5Zvw7DVLTvCYlS5Tbw+BhM6mGQHiknHvfEkImWV/Fgs3qLTCOnrY6CTrEvNYOEOddWW2wpnEeehPa1iuHHjG9KkmpVD4VO7BQujyyGa/VqT0h108Og=", "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 25/27] net/nfp: refact the PCIe module", "Date": "Wed, 30 Aug 2023 10:14:55 +0800", "Message-Id": "<20230830021457.2064750-26-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": "1f5e4ddb-0653-4583-b964-08dba8ff1478", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n 2psF/5xQ9i9UOant5lISNnYPJ7zG09kO0H/ady8FYmuArg5+kRuC7WuQ3OCbvtMxwg5Borg8gXkE2DHxWa+2kVeQxucGdvJstDyDdg+yOaeybPYZ3vwI7gtixipHwop9bVf81cInmgznlAPyAvgS6+S2jevV7MnFL3GgUUl/eePaZ6/khGvfkR0GVzOJvrPMfCqgREjlkR4YXr62qjwuMuUn6xAP+uHF2p7/YP8XQrxNkVFxegJUD8APk2ccNkevtT97rd6p4HgYK0fhNms41Bf4Daj5CFWqB3h16TgshA+SF4Qc9ghuJ1vJDUMt6luanok9CLEA/3yJuZvYuVWKg9A7gUHdh3aU9EOuPPO8yienstvHYy9cqKOAL0+jKJHlFNRp/3wZNVmILoAxC2pCknTZoRqD+67NWWrTHAsIWGvjCWnXabvbkAdiafXGU2Tyfav0E5tupv8emlvvYxmB8LUC8v6K2WyQJznG9RkrO2nacC4o4ADoM0MwWv8EYy+Luwq1CEixwtituiYwRHwsO1QnoQWwPVHGQ4W085U5kdxu5W5FsSiAGKdR7USvh3TvzauA/IHbWY7GwjDvyxGJx00YLxHVTtE/PDfp9vJJY5SMlDWjWqbHgLUOdH3QWsa73TegqUDSNYIeW3hWEOkFHShDNg9kD8gaiaKQj7XIQYg=", "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)(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?UxLm3VZWicQZfipZcsPhPZmpPD7V?=\n\t=?utf-8?q?Hge4JdwmdOJolkHSscFAe7PgoJvH7nQ0x8B0yiZM3YlDSuv8UbOZgHBV7v1urKi+h?=\n\t=?utf-8?q?gYfuXg+dzx8eOHGzVqWAGWGP4Ng0N+3sZ+yF6Y6IgLcVZJxEY6jFAWapYSVnlxYYh?=\n\t=?utf-8?q?t2ceqVuYkvBuj5ofiD79Tns68wCz4B7iXeYUrbWoT3RstvYy3JMmxtmKzg79p7Tg3?=\n\t=?utf-8?q?l6WmmfGeHqM2ewssIk4B3rPKKOmHB3Hsro6K9GD/ihqw2qOnzalZbyhF24bUSCko1?=\n\t=?utf-8?q?Vq5dfmjnRH/FzUxvK/U3q3of4Emre8vsrLX6/273eXO7Wufsy7aXg8NW+EcUlXndy?=\n\t=?utf-8?q?H/Q69Zyd7HyGmhEn6xlKXcrOqURou6ccc60LgJWQtSlG6uC8upnzx2htsq3DTkBJa?=\n\t=?utf-8?q?EGgEf77OPJxX5vlDTYSGEV6gdC4NhNc16JXP/IJbu6RRdCoAUWVZpuzua3yqed9Si?=\n\t=?utf-8?q?zRAMMpyXF+TgNgF9gyuZCbwGFuqRZaeWa4tkBhSq8NGyMINV/ZpxfB5xsYYwHvKHH?=\n\t=?utf-8?q?gz8xH5iILy4IYdz374V2GB/e+x4TS6fOWUIgH+gMlTOH9F0yUXlEiiAl+ID9Nq/cw?=\n\t=?utf-8?q?W2D11kbmgrOHWzNS1Pg2k2T4dqTXonq2joWpM/eygLR2quHuQq+auxUi7JdcwzdlH?=\n\t=?utf-8?q?jRyCqAXS/0LR6btrwA5h8J6kbjLgez0eplpl//flnQj03UA4/jbOwPKhbhH/GJAlu?=\n\t=?utf-8?q?MEIH/MlUvr1N4IAI+/zsNJ63sMPEYcKgzdSh+36sG/F+4I6ntf7n0BnEcPJzSdl8w?=\n\t=?utf-8?q?DkrdCcy8+CAs/+N+TZyk69075gtQxe7wB4I9D8vUfnwfbDOUHO953yhAf409eFubM?=\n\t=?utf-8?q?PlKFWThT4VrlpdeutCn/4/2tUnw6tc3d9Mj3bVMeQlAhW0UjV3EUdVoPaW+V/Uq6H?=\n\t=?utf-8?q?D8h2algRrh8QVR1PAER92I/qwXVO/wdBigskVpaeKjK8lagh7qXQ4dNMoCEumCqKy?=\n\t=?utf-8?q?uNkrvSjDDGBFtHeifWDppMltmZQT3kQMxUUd+nx5jO9+l6T5+G3RO7TxrWOpWfF7T?=\n\t=?utf-8?q?gbUKNI95+HyuuqbNj2x3FEfJhrmJwKgtKHw+ss/l6xXFFyWr/TWEBJ6vI8aJmwAs6?=\n\t=?utf-8?q?vCbMLONMpDIlGRAI2g2VJ6tlQQGxC5VV8zazBKXnv10oWCUEkEPFRFEp4auVd0C4P?=\n\t=?utf-8?q?urmLsXGIZOeCFhs+Ys0UveE7WlbvNEveiFuBpis8SrSA2WGLigMp7W1tTkyhy1poH?=\n\t=?utf-8?q?vL+6EJBtwJvz92uaVPahdQ43qvxbZyMrBvr4AGfKaUhrNmNjy1KyETrWX4lkDP0l4?=\n\t=?utf-8?q?TK4W1TxK2uAvh19pf1PtHDUJgMJfxLUmuAjN9jeig+i/8TIC3aD0pExTkhFyQeFM/?=\n\t=?utf-8?q?NYT8KONIjqCOiksARZFpTOmP+VOpF/HihDXSEXPvrEl3hJSGXfXUdKnFqGXs0lu0l?=\n\t=?utf-8?q?3nJ79azxxjFSF7NNfRuDy5b66fYopK748RtSNC3sNJkHLMwdn0QdCxDEFVZNnGQhK?=\n\t=?utf-8?q?k8az5xRZk/vGDHXDCHXPCDbV6aDEubl/nV8RxrhuQfFSxWtutShMP3Z1jjGTaUQj8?=\n\t=?utf-8?q?wogdwIasi9qBHJlrNpVeaMMddwG3RQcjBg=3D=3D?=", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 1f5e4ddb-0653-4583-b964-08dba8ff1478", "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:12.0107 (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 mfi5ynbxjlsZktsp5bMX9j/CYwSDaG4OSrquMPoI3IEUaoeG0qubGDBfjl/NEQkwrgLo1K3RQfeUs/cdWA1m+q93dn3XGlPEYKS+VNy+DuA=", "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 and remove the unneeded header\nfile include statements.\n\nSigned-off-by: Chaoyong He <chaoyong.he@corigine.com>\nReviewed-by: Niklas Söderlund <niklas.soderlund@corigine.com>\n---\n drivers/net/nfp/nfpcore/nfp6000_pcie.c | 211 +++++++++++++++++--------\n drivers/net/nfp/nfpcore/nfp_cpp.h | 9 ++\n 2 files changed, 150 insertions(+), 70 deletions(-)", "diff": "diff --git a/drivers/net/nfp/nfpcore/nfp6000_pcie.c b/drivers/net/nfp/nfpcore/nfp6000_pcie.c\nindex 45645e04f8..4f453f19a9 100644\n--- a/drivers/net/nfp/nfpcore/nfp6000_pcie.c\n+++ b/drivers/net/nfp/nfpcore/nfp6000_pcie.c\n@@ -16,23 +16,8 @@\n \n #include \"nfp6000_pcie.h\"\n \n-#include <assert.h>\n-#include <stdio.h>\n-#include <stdlib.h>\n #include <unistd.h>\n-#include <stdint.h>\n-#include <stdbool.h>\n #include <fcntl.h>\n-#include <string.h>\n-#include <errno.h>\n-#include <dirent.h>\n-#include <libgen.h>\n-\n-#include <sys/mman.h>\n-#include <sys/file.h>\n-#include <sys/stat.h>\n-\n-#include <ethdev_pci.h>\n \n #include \"nfp_cpp.h\"\n #include \"nfp_logs.h\"\n@@ -43,8 +28,11 @@\n #define NFP_PCIE_BAR(_pf) (0x30000 + ((_pf) & 7) * 0xc0)\n \n #define NFP_PCIE_BAR_PCIE2CPP_ACTION_BASEADDRESS(_x) (((_x) & 0x1f) << 16)\n+#define NFP_PCIE_BAR_PCIE2CPP_ACTION_BASEADDRESS_OF(_x) (((_x) >> 16) & 0x1f)\n #define NFP_PCIE_BAR_PCIE2CPP_BASEADDRESS(_x) (((_x) & 0xffff) << 0)\n+#define NFP_PCIE_BAR_PCIE2CPP_BASEADDRESS_OF(_x) (((_x) >> 0) & 0xffff)\n #define NFP_PCIE_BAR_PCIE2CPP_LENGTHSELECT(_x) (((_x) & 0x3) << 27)\n+#define NFP_PCIE_BAR_PCIE2CPP_LENGTHSELECT_OF(_x) (((_x) >> 27) & 0x3)\n #define NFP_PCIE_BAR_PCIE2CPP_LENGTHSELECT_32BIT 0\n #define NFP_PCIE_BAR_PCIE2CPP_LENGTHSELECT_64BIT 1\n #define NFP_PCIE_BAR_PCIE2CPP_LENGTHSELECT_0BYTE 3\n@@ -55,7 +43,9 @@\n #define NFP_PCIE_BAR_PCIE2CPP_MAPTYPE_TARGET 2\n #define NFP_PCIE_BAR_PCIE2CPP_MAPTYPE_GENERAL 3\n #define NFP_PCIE_BAR_PCIE2CPP_TARGET_BASEADDRESS(_x) (((_x) & 0xf) << 23)\n+#define NFP_PCIE_BAR_PCIE2CPP_TARGET_BASEADDRESS_OF(_x) (((_x) >> 23) & 0xf)\n #define NFP_PCIE_BAR_PCIE2CPP_TOKEN_BASEADDRESS(_x) (((_x) & 0x3) << 21)\n+#define NFP_PCIE_BAR_PCIE2CPP_TOKEN_BASEADDRESS_OF(_x) (((_x) >> 21) & 0x3)\n \n /*\n * Minimal size of the PCIe cfg memory we depend on being mapped,\n@@ -132,7 +122,7 @@ nfp_compute_bar(const struct nfp_bar *bar,\n \tuint32_t newcfg;\n \tuint32_t bitsize;\n \n-\tif (target >= 16)\n+\tif (target >= NFP_CPP_NUM_TARGETS)\n \t\treturn -EINVAL;\n \n \tswitch (width) {\n@@ -182,10 +172,6 @@ nfp_compute_bar(const struct nfp_bar *bar,\n \t\toffset &= mask;\n \t\tbitsize = 40 - 21;\n \t}\n-\n-\tif (bar->bitsize < bitsize)\n-\t\treturn -EINVAL;\n-\n \tnewcfg |= offset >> bitsize;\n \n \tif (bar_base != NULL)\n@@ -434,7 +420,7 @@ nfp6000_area_acquire(struct nfp_cpp_area *area)\n \n \t/* Must have been too big. Sub-allocate. */\n \tif (priv->bar->iomem == NULL)\n-\t\treturn (-ENOMEM);\n+\t\treturn -ENOMEM;\n \n \tpriv->iomem = priv->bar->iomem + priv->bar_offset;\n \n@@ -464,9 +450,9 @@ nfp6000_area_read(struct nfp_cpp_area *area,\n \t\tuint32_t offset,\n \t\tsize_t length)\n {\n+\tint ret;\n \tsize_t n;\n \tint width;\n-\tbool is_64;\n \tuint32_t *wrptr32 = address;\n \tuint64_t *wrptr64 = address;\n \tstruct nfp6000_area_priv *priv;\n@@ -484,47 +470,54 @@ nfp6000_area_read(struct nfp_cpp_area *area,\n \tif (width <= 0)\n \t\treturn -EINVAL;\n \n+\t/* MU reads via a PCIe2CPP BAR support 32bit (and other) lengths */\n+\tif (priv->target == (NFP_CPP_TARGET_MU & NFP_CPP_TARGET_ID_MASK) &&\n+\t\t\tpriv->action == NFP_CPP_ACTION_RW &&\n+\t\t\t(offset % sizeof(uint64_t) == 4 ||\n+\t\t\tlength % sizeof(uint64_t) == 4))\n+\t\twidth = TARGET_WIDTH_32;\n+\n \t/* Unaligned? Translate to an explicit access */\n \tif (((priv->offset + offset) & (width - 1)) != 0) {\n \t\tPMD_DRV_LOG(ERR, \"aread_read unaligned!!!\");\n \t\treturn -EINVAL;\n \t}\n \n-\tis_64 = width == TARGET_WIDTH_64;\n-\n-\t/* MU reads via a PCIe2CPP BAR supports 32bit (and other) lengths */\n-\tif (priv->target == (NFP_CPP_TARGET_ID_MASK & NFP_CPP_TARGET_MU) &&\n-\t\t\tpriv->action == NFP_CPP_ACTION_RW) {\n-\t\tis_64 = false;\n-\t}\n+\tif (priv->bar == NULL)\n+\t\treturn -EFAULT;\n \n-\tif (is_64) {\n-\t\tif (offset % sizeof(uint64_t) != 0 ||\n-\t\t\t\tlength % sizeof(uint64_t) != 0)\n-\t\t\treturn -EINVAL;\n-\t} else {\n+\tswitch (width) {\n+\tcase TARGET_WIDTH_32:\n \t\tif (offset % sizeof(uint32_t) != 0 ||\n \t\t\t\tlength % sizeof(uint32_t) != 0)\n \t\t\treturn -EINVAL;\n-\t}\n \n-\tif (priv->bar == NULL)\n-\t\treturn -EFAULT;\n+\t\tfor (n = 0; n < length; n += sizeof(uint32_t)) {\n+\t\t\t*wrptr32 = *rdptr32;\n+\t\t\twrptr32++;\n+\t\t\trdptr32++;\n+\t\t}\n+\n+\t\tret = n;\n+\t\tbreak;\n+\tcase TARGET_WIDTH_64:\n+\t\tif (offset % sizeof(uint64_t) != 0 ||\n+\t\t\t\tlength % sizeof(uint64_t) != 0)\n+\t\t\treturn -EINVAL;\n \n-\tif (is_64)\n \t\tfor (n = 0; n < length; n += sizeof(uint64_t)) {\n \t\t\t*wrptr64 = *rdptr64;\n \t\t\twrptr64++;\n \t\t\trdptr64++;\n \t\t}\n-\telse\n-\t\tfor (n = 0; n < length; n += sizeof(uint32_t)) {\n-\t\t\t*wrptr32 = *rdptr32;\n-\t\t\twrptr32++;\n-\t\t\trdptr32++;\n-\t\t}\n \n-\treturn n;\n+\t\tret = n;\n+\t\tbreak;\n+\tdefault:\n+\t\treturn -EINVAL;\n+\t}\n+\n+\treturn ret;\n }\n \n static int\n@@ -533,9 +526,9 @@ nfp6000_area_write(struct nfp_cpp_area *area,\n \t\tuint32_t offset,\n \t\tsize_t length)\n {\n+\tint ret;\n \tsize_t n;\n \tint width;\n-\tbool is_64;\n \tuint32_t *wrptr32;\n \tuint64_t *wrptr64;\n \tstruct nfp6000_area_priv *priv;\n@@ -553,47 +546,53 @@ nfp6000_area_write(struct nfp_cpp_area *area,\n \tif (width <= 0)\n \t\treturn -EINVAL;\n \n+\t/* MU reads via a PCIe2CPP BAR support 32bit (and other) lengths */\n+\tif (priv->target == (NFP_CPP_TARGET_MU & NFP_CPP_TARGET_ID_MASK) &&\n+\t\t\tpriv->action == NFP_CPP_ACTION_RW &&\n+\t\t\t(offset % sizeof(uint64_t) == 4 ||\n+\t\t\tlength % sizeof(uint64_t) == 4))\n+\t\twidth = TARGET_WIDTH_32;\n+\n \t/* Unaligned? Translate to an explicit access */\n \tif (((priv->offset + offset) & (width - 1)) != 0)\n \t\treturn -EINVAL;\n \n-\tis_64 = width == TARGET_WIDTH_64;\n-\n-\t/* MU writes via a PCIe2CPP BAR supports 32bit (and other) lengths */\n-\tif (priv->target == (NFP_CPP_TARGET_ID_MASK & NFP_CPP_TARGET_MU) &&\n-\t\t\tpriv->action == NFP_CPP_ACTION_RW)\n-\t\tis_64 = false;\n+\tif (priv->bar == NULL)\n+\t\treturn -EFAULT;\n \n-\tif (is_64) {\n-\t\tif (offset % sizeof(uint64_t) != 0 ||\n-\t\t\t\tlength % sizeof(uint64_t) != 0)\n-\t\t\treturn -EINVAL;\n-\t} else {\n+\tswitch (width) {\n+\tcase TARGET_WIDTH_32:\n \t\tif (offset % sizeof(uint32_t) != 0 ||\n \t\t\t\tlength % sizeof(uint32_t) != 0)\n \t\t\treturn -EINVAL;\n-\t}\n \n-\tif (priv->bar == NULL)\n-\t\treturn -EFAULT;\n+\t\tfor (n = 0; n < length; n += sizeof(uint32_t)) {\n+\t\t\t*wrptr32 = *rdptr32;\n+\t\t\twrptr32++;\n+\t\t\trdptr32++;\n+\t\t}\n+\n+\t\tret = n;\n+\t\tbreak;\n+\tcase TARGET_WIDTH_64:\n+\t\tif (offset % sizeof(uint64_t) != 0 ||\n+\t\t\t\tlength % sizeof(uint64_t) != 0)\n+\t\t\treturn -EINVAL;\n \n-\tif (is_64)\n \t\tfor (n = 0; n < length; n += sizeof(uint64_t)) {\n \t\t\t*wrptr64 = *rdptr64;\n \t\t\twrptr64++;\n \t\t\trdptr64++;\n \t\t}\n-\telse\n-\t\tfor (n = 0; n < length; n += sizeof(uint32_t)) {\n-\t\t\t*wrptr32 = *rdptr32;\n-\t\t\twrptr32++;\n-\t\t\trdptr32++;\n-\t\t}\n \n-\treturn n;\n-}\n+\t\tret = n;\n+\t\tbreak;\n+\tdefault:\n+\t\treturn -EINVAL;\n+\t}\n \n-#define PCI_DEVICES \"/sys/bus/pci/devices\"\n+\treturn ret;\n+}\n \n static int\n nfp_acquire_process_lock(struct nfp_pcie_user *desc)\n@@ -706,6 +705,74 @@ nfp6000_set_serial(struct rte_pci_device *dev,\n \treturn 0;\n }\n \n+static int\n+nfp6000_get_dsn(struct rte_pci_device *pci_dev,\n+\t\tuint64_t *dsn)\n+{\n+\toff_t pos;\n+\tsize_t len;\n+\tuint64_t tmp = 0;\n+\n+\tpos = rte_pci_find_ext_capability(pci_dev, RTE_PCI_EXT_CAP_ID_DSN);\n+\tif (pos <= 0) {\n+\t\tPMD_DRV_LOG(ERR, \"PCI_EXT_CAP_ID_DSN not found\");\n+\t\treturn -ENODEV;\n+\t}\n+\n+\tpos += 4;\n+\tlen = sizeof(tmp);\n+\n+\tif (rte_pci_read_config(pci_dev, &tmp, len, pos) < 0) {\n+\t\tPMD_DRV_LOG(ERR, \"nfp get device serial number failed\");\n+\t\treturn -ENOENT;\n+\t}\n+\n+\t*dsn = tmp;\n+\n+\treturn 0;\n+}\n+\n+static int\n+nfp6000_get_interface(struct rte_pci_device *dev,\n+\t\tuint16_t *interface)\n+{\n+\tint ret;\n+\tuint64_t dsn = 0;\n+\n+\tret = nfp6000_get_dsn(dev, &dsn);\n+\tif (ret != 0)\n+\t\treturn ret;\n+\n+\t*interface = dsn & 0xffff;\n+\n+\treturn 0;\n+}\n+\n+static int\n+nfp6000_get_serial(struct rte_pci_device *dev,\n+\t\tuint8_t *serial,\n+\t\tsize_t length)\n+{\n+\tint ret;\n+\tuint64_t dsn = 0;\n+\n+\tif (length < NFP_SERIAL_LEN)\n+\t\treturn -ENOMEM;\n+\n+\tret = nfp6000_get_dsn(dev, &dsn);\n+\tif (ret != 0)\n+\t\treturn ret;\n+\n+\tserial[0] = (dsn >> 56) & 0xff;\n+\tserial[1] = (dsn >> 48) & 0xff;\n+\tserial[2] = (dsn >> 40) & 0xff;\n+\tserial[3] = (dsn >> 32) & 0xff;\n+\tserial[4] = (dsn >> 24) & 0xff;\n+\tserial[5] = (dsn >> 16) & 0xff;\n+\n+\treturn 0;\n+}\n+\n static int\n nfp6000_set_barsz(struct rte_pci_device *dev,\n \t\tstruct nfp_pcie_user *desc)\n@@ -789,6 +856,10 @@ static const struct nfp_cpp_operations nfp6000_pcie_ops = {\n \t.free = nfp6000_free,\n \n \t.area_priv_size = sizeof(struct nfp6000_area_priv),\n+\n+\t.get_interface = nfp6000_get_interface,\n+\t.get_serial = nfp6000_get_serial,\n+\n \t.area_init = nfp6000_area_init,\n \t.area_acquire = nfp6000_area_acquire,\n \t.area_release = nfp6000_area_release,\ndiff --git a/drivers/net/nfp/nfpcore/nfp_cpp.h b/drivers/net/nfp/nfpcore/nfp_cpp.h\nindex 34ed50ceca..0f36ba0b50 100644\n--- a/drivers/net/nfp/nfpcore/nfp_cpp.h\n+++ b/drivers/net/nfp/nfpcore/nfp_cpp.h\n@@ -16,6 +16,8 @@ struct nfp_cpp_area;\n \n #define NFP_SERIAL_LEN 6\n \n+#define NFP_CPP_NUM_TARGETS 16\n+\n /*\n * NFP CPP operations structure\n */\n@@ -33,6 +35,13 @@ struct nfp_cpp_operations {\n \t */\n \tvoid (*free)(struct nfp_cpp *cpp);\n \n+\tint (*get_interface)(struct rte_pci_device *dev,\n+\t\t\tuint16_t *interface);\n+\n+\tint (*get_serial)(struct rte_pci_device *dev,\n+\t\t\tuint8_t *serial,\n+\t\t\tsize_t length);\n+\n \t/*\n \t * Initialize a new NFP CPP area\n \t * NOTE: This is _not_ serialized\n", "prefixes": [ "v2", "25/27" ] }