Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/131558/?format=api
{ "id": 131558, "url": "http://patches.dpdk.org/api/patches/131558/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20230918024612.1600536-25-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-25-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230918024612.1600536-25-chaoyong.he@corigine.com", "date": "2023-09-18T02:46:10", "name": "[v4,24/26] net/nfp: refact the PCIe module", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "1e22d98e39ad3dc9e9b08224e2a19cd3c56637a3", "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-25-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/131558/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/131558/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 DAF7E425C9;\n\tMon, 18 Sep 2023 04:50:11 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 4AB6642D87;\n\tMon, 18 Sep 2023 04:47:57 +0200 (CEST)", "from NAM12-MW2-obe.outbound.protection.outlook.com\n (mail-mw2nam12on2122.outbound.protection.outlook.com [40.107.244.122])\n by mails.dpdk.org (Postfix) with ESMTP id 135EA427E9\n for <dev@dpdk.org>; Mon, 18 Sep 2023 04:47:55 +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:52 +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:52 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=Q+SuMn6agM4zUPEo4ctJEYye9oOqAExPInKRIIDAATdhicKwIFcAQX1rYl9fhroJex8w1rDaIuTpl2bvOpuuw0nYo4I9pURTcA0tm/VrCd8a/odRM/M3ELWDRen9d64ZVzS3GpN881V9Gz0w6eRUVgXJ6o0QD25xyU1lsBILaqzxl8JrBxGodSLocSV/+fqGt6RfpT0nGiC+4GckML06zAFgu7y/sgzUpx8K3JYs11RUtUwXsubARbXq9cGZOJ1BmuGBY3yzoSLMR3CBIyQQo6CbBkrPDuWUekOKTSOjLHA7bUNlc0BEwP3xjUU+HT1beuY0JviLzK2uKUA/35J8UA==", "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=ZZn8Iw4lBphT2XvoPHAk2CBv7uVnPRDradcSjnvgxB0xdgyif8sOqX2EVL8HsWLvrXdZPJ0OPvi4DJICvJazabvedFrPwK2+gRqMNTgbrIa8MIS46eH44PEzlwkIP26zYt+lWr7JVgmJsg0W+ae/SNMkE1h08li85QZgEOKKxP6/0i796SLN711a4lywi3PDfvwsrBC9bM+7DAP/tSouiCBNfDx7L1SEnkOx0eKRA4MldE/5MOd0+4aEHWvAq9qqjORQ+YIl519kW9EIbPpgRWVjyp8bNrua4lB1vzkRq8deF4cQAHRPym/5eMkzLKJpW80q4N2KGfAj48IAbjIAqw==", "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=lwGetzxDdiX9fZFUp76mn74QufRhzv0i3vGqLfXcpxoNj/DD6h37f239YQuea2Jwyi4uylMI2TfZp9cMBmqhCsiKUWDVsrSxEUdGIxtlEInuIGWxdan/Geb46F5E6zNliupxRrx6QCjgg1eZxsKBZ7Cemlm1RNuqMlvaUfxWGVE=", "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 24/26] net/nfp: refact the PCIe module", "Date": "Mon, 18 Sep 2023 10:46:10 +0800", "Message-Id": "<20230918024612.1600536-25-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": "e430aa88-a77d-4e58-ded7-08dbb7f1a779", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n Po5aAG3CZnuhDbLF/qgncB0rnvHw1Q+HvU1Jvcz9gErAVJVW7su3DT0IBUt7eezAYZ5CVh4v81/+HV7KyxtccK/R4eZl5UHPE4IKMhTFuhUoA659tWh9eRWfv/43bCNkUrHOjCdVlkgn+dVymmVGSUhYTwzhXrtMDe+ZszmlcmWd+izAUozYDn0tnXg1wl4m00PpzhBLfuJ8usZcMkAZcYS88Z9fR6DNzTRciPj+J8GIEP2QzohaWvtfpVE2o4f80bMvKvftiK9JXIZrBV/QTGtP2YqbPb82Lb6rlmcvgDF1+R0UwgzhS00S1V9imogKcSEaJxf6u/JfUJeVP0JdtPh9fPepEQjU2sHvMh/1N02v2FtQPWfOm4QCssS236qRghs+6boJvla+YjDnkPArrYbT43yj7j0RBY0cMqFCMZMsIRH2p6VP+KqYy5haEk1JrE2Ay0zUqad4ngAsnLA9KJHxAcuoAUbFEBBo5ye/E9Cu5EgMJSCjQQbr+RGuv1KHkpnTdNEMRn0oOuSwQ3NZCPw7uPRlNg/uF8MRuw5XmPxLlcJo7GjuKx3Cx+ctTb5ldyMQ2a2CKENds0v3kayHbmbItL+i2SMSws+75bKw9EmigioPnS9toquARMLk3a8VfQOH1TF+dtsvi/FzjLHmDPZ0s4os6RXu8mVobPgeZrw=", "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)(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?l7YvhhxVq2QiMAaRzdibitsrrfLd?=\n\t=?utf-8?q?PP635MR8vfbQJ2PBUec2LqYVLmDIMv+fYMEmxiV9p3xh7V0mq8kOZFRTpN31mgLSm?=\n\t=?utf-8?q?43mHcuaNVV0AAcU9HGNZAOURys+pveQuiwrhWqEcz1vYbki3sr63S8/5qbEUi+9CJ?=\n\t=?utf-8?q?PU2adm0Z5/efmYAqZjB0RDrrs0RDc2wt1JC2NVm+OEWWjNwe1rl3DNM1em1bRWdon?=\n\t=?utf-8?q?BMkPpLw2Hk9ZVpwv3Ra7Hxx3gu+OVyFhBLKNLDa1wn0krShelh6rFJCQAiGwO6Mr8?=\n\t=?utf-8?q?khL7TLhvylfe+haU5TCRwwRTiZakPABUZnsDTkWema/Z+PThqbG/uKJWZqOu24dse?=\n\t=?utf-8?q?4Jwi7qK9AV7lehvUvNOL1NTRZ4oMJ/U7s9kMnK0VqzUeFNzuefYa82fFjZQ/4yh4i?=\n\t=?utf-8?q?psag6e6csY/8dK2xoKhNvaypmuw80n37TdslVTf5Bl9turksW8dDfGa3C7A/bN8GU?=\n\t=?utf-8?q?UBfGA3eGtbB+EuipK6bPBMdt0Vfg4Es92FJQoxBlvnRy3xjbTc4ynIBcKDgef7Yrx?=\n\t=?utf-8?q?adEefpjkjDamTLpJYispvNmA//HiDW8X1iHs+JKMyKGqxFbvOlTTwcuLZHOFqFmae?=\n\t=?utf-8?q?bPMiyI+ZdabQmbIUdRGVnAuYXfwoggcLSgK4K27ARm8VwuVjgG73XtYIi98A98DUS?=\n\t=?utf-8?q?yJHIfKokYs2no6AXNzL8pCNKu4a8Vha+aaDUuVEbnVUYMb63apgh8iVQ0x6cim1JF?=\n\t=?utf-8?q?s/a4j4adG0SAPD89YZzdTczE73mka2q/W14ZvPBCzeZ1CK0f3TU9Wrh4ovxZsrh7j?=\n\t=?utf-8?q?WDp0heO6iwrEd8o1EKODrqiIR2r9gFZHmpndQLrS73vthyqqyvkqS+q4NWdWUOdGL?=\n\t=?utf-8?q?ZdfL1N+h105LqlyTyeP/fTQFw/Ngp7gWwONO9mm3d+7n94ugF+0fz5I9y9cDVE9UZ?=\n\t=?utf-8?q?9yfAYHbPQcg0THZ9reEWgoZ5XuiuJqdYjd1tXg5clpTl+8+3CMf6Mj6AeCbAlbMt9?=\n\t=?utf-8?q?ZOs4hmtAXp5m75pqUDhd2fetQ+WJRYgKqbpHolE2hdacV7X2yXd5T9yGkvwS2rw7K?=\n\t=?utf-8?q?hYhvXadN0CMHfMK/bzv7JsTAz9PgSthvw6bDvWlSyUTTbft3TbXavXLFMXWqNFgTw?=\n\t=?utf-8?q?VO2xin7SU++W8RZ+KlN85tta2SLOhcNp10icdWnUTsXeLrn9q/S0F1Kig5UYUKq2w?=\n\t=?utf-8?q?s16Hh8iD+PPICWIAUgKOOPoZNgi8rmWjYzc6otFbkbXu19SgzOPvbjeSbxE9p021U?=\n\t=?utf-8?q?M4NEO5Ybc5PgdyxuJB9eTOooJ5dxVDTCA8YtGKRnuj9GRrtinDBOWaTyysoxvnP0j?=\n\t=?utf-8?q?Mk8KZA9Usl6ZDSvzByer4K4xV3SdNug4BvkAcYH5nF/PY7w4VgoMISXK/SfpokjLz?=\n\t=?utf-8?q?3yvY2NjXFDgrebhp3wpwda/gvoGTLBRFB2GiPuqubeOLaZr+M4OP63LcrU9EEjfNg?=\n\t=?utf-8?q?8RJBM/x+rlV2/JOVR9/UIhppyjNKS5EoJZakWzXe2zuOCYAdNapkWVuy6AbksWZpZ?=\n\t=?utf-8?q?Fh2HMtcnVwa4J7raymKrwROgQcYh81q95suP3Y58hLTmjhNYH+1/W49iMarDXcAej?=\n\t=?utf-8?q?Fj4OeMK7+Lw9NA88BoSCA0z8Vnj1p/70TQ=3D=3D?=", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n e430aa88-a77d-4e58-ded7-08dbb7f1a779", "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:52.8464 (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 +A17sGXAsliLAM4bWihUTY1mhSoAiPt8TRZqtgrTlpOG1/xF/3GlnbCylDGqrs23Nkbl0V5sKA7NqnQJh+0Aft3cRYum1TcQvk2SmFixFpk=", "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 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": [ "v4", "24/26" ] }