Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/130853/?format=api
{ "id": 130853, "url": "http://patchwork.dpdk.org/api/patches/130853/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20230830021457.2064750-16-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-16-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230830021457.2064750-16-chaoyong.he@corigine.com", "date": "2023-08-30T02:14:45", "name": "[v2,15/27] net/nfp: refact the rtsym module", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "686e4fdd6be43dc5ee3a33c92783fcf16d0366c4", "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-16-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/130853/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/130853/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 B9B1441FC8;\n\tWed, 30 Aug 2023 04:17:45 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 4252C402E2;\n\tWed, 30 Aug 2023 04:15:58 +0200 (CEST)", "from NAM10-DM6-obe.outbound.protection.outlook.com\n (mail-dm6nam10on2132.outbound.protection.outlook.com [40.107.93.132])\n by mails.dpdk.org (Postfix) with ESMTP id 4CF9B402E0\n for <dev@dpdk.org>; Wed, 30 Aug 2023 04:15:54 +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:15:52 +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:15:52 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=C3UMUWRqQHGh85X8u7PW45toSTFBvY7ujNreCH4ReILMz2NSooPIGbixHQwSOgH/ynjRFTDd4fND1TOwmnJp5n/vbYyAfOtkzxFtHPJQ/USLUPh3BhwmkS5hV2/uAxlqUbJdhf0zZbfqvEa13qjAtWPLkv4ZhFPzJJsO5dqcNXhsKLdTCXl+mDa6FH06f/pG2bTxMQFHpG7TIRQNGDYbDv6aroA9LCyZBAZRXfkOJQchHDjBtKm2fHdyRSkZgXKf4xcQMOddpGobk3SNL+QQyUNNAl7rdf+J3feeFh6KVA8T/N55tIm3KtCA9xDVOqNZqSHUSpGMhyi7zuKmLr1B9w==", "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=OdpEP/UyAGqz4oxHPFVDbYOKsAIafOJKB5CG4krDax0=;\n b=SlScyUKvwSgZx4G2HAPT5PUCULQmKIVFXxFmJVm46IZq58NFMDyRvM63yap/XhuvllIFWKWs8Gdc9SdObRdK55IZps+oi6pXwJxtduHnQRDVX++szSSjSb7/9hSd6FdGl/p4bRTEKQ0SRx3SxeBzHsAtLPLebH2PAxeGqhRIPO75/cQtZwCuAoOhD4ojs93CigXvOWY7twyhwqyK4WxiKfJixrXa+UBR/q5+W51if5OjGothWjEqfZGJnHKcHP771SN/0J27CsyqnBAA8TOOM+MRtv8iFFcaPk8CFLAMo/dYj+yBFfAThzxYNQGXjRVW/9p9CZEHJPOafXcdzS+THw==", "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=OdpEP/UyAGqz4oxHPFVDbYOKsAIafOJKB5CG4krDax0=;\n b=pApZyDs/PACa32A12NN0E2+CTzRMbxW4OkWo0VoXMUsYqxC8E7x82/dpyZxEMgmcRzWpE0XVvXHW1/e4VaF3SEi7hkLCaCgmOh1gyzu7mGP2RfKxMzJZzcR29LjGwyF+9StppT40rB4jQDaaqCnc95l0orE2EUOKHVU4tBiAP94=", "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 15/27] net/nfp: refact the rtsym module", "Date": "Wed, 30 Aug 2023 10:14:45 +0800", "Message-Id": "<20230830021457.2064750-16-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": "e67b4cff-0cc9-4b1b-fd1a-08dba8ff08e0", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n MacPnVBlmHCxqmZcsy0VquUWuCDO0D25f1A49wQrHR9aRwnHIBuaOShnWtm7ejxKmW5c3eIoe5mfGLH8hWOF2fAmB3qCs+sVsZuWTvdH5/K0H0abzD4f6So8efrN7QrV3Swys23H2PHa19y1HB2SH2n4NtSrlanwLFACA1S6H0+pyQmPKpWqL6BVqHWljEZxrzKLSo2CCouwVrYXCYA/A2SzG8G2r/LTPvHuShnuGkAaYK833cSyl9AI7Iy2+8TxrWrm1r7I0f6oN06GhxYy1DGwI/hchPuMdHzMgTev+OYD5wzHBpZYHMQY129ej+U4q7bXnme5EPjJQNzdvw8XlR8Ev6gokqXWXOjqKUjmpLeX8CETSmRVt7KcPb7XBCSsc4jz10KJtf3w6TKzkTxs9HnnXysV13NfJTjwXWsiCQu9Tj6DFdFCaLAZUM1vwyCwYqeHWWymleB9yGwuAxdeuCl2CVumF0GMHOQ7CDGqnM3MiM+wMlWgs/5LFI7ltdQWLBatnbcCBecQI3TKtUU9akh7N1CqGaLIyYvtuEIQf2XMROFUaN8fLDhjgOKu1/AhFATfBtVeM2ochFVuRc68sRG8px3Jgbbk5n7doIrObiMsgRDfgRT97zREVxb1NHJycoRA5mCZbBreVNk76zMV5xRxNLh0KC3nOZ6Wv2O8HeM=", "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?hTMAT4l4eD4IXTIrdiv4TSnzRxRB?=\n\t=?utf-8?q?b3zokoflw/SEKH3kyE4ziO7mqfT79KoRAX//3HyW+Irp9+JV2awDM2weCh7N20l3J?=\n\t=?utf-8?q?HHAi9JybIni7RfecjXrn5GkF7JKqCD1d7tZeh9TMPVtroi0cIIFKtWgwsdISmtMJJ?=\n\t=?utf-8?q?IsuSZg/Fq+oOyvLP7/bw3ZMq2ZTt1dlUkN2KKAbvkfJQRFJ8wK1fYSLjjrpA0eaXL?=\n\t=?utf-8?q?wxeYbZr74bxWOWocuTTg776NmaVjfGFzJMD3C2pXUJuPZor0xm/8l+ujEkvP9hWnO?=\n\t=?utf-8?q?g90rxBxwwHNkgSvGRLCkQYhALJTs9ldOffhtb9pDvCiAUnuiKjpf8EQYq2Px4Pc+6?=\n\t=?utf-8?q?men2ccG4H19Oj+6FaI/5gIixHGLRpdai9jpUXv9aqDdLM6hq3od1CKWZ7L42Gcm+6?=\n\t=?utf-8?q?BLsBKSXXGaWY0pNdkAqBswncddGPcDF9RknJYQvVTxNxqGf94uKqeP7Pa2u+ClfFN?=\n\t=?utf-8?q?ruN5zejgNdGu0ISPAkB7KRA8PEvQJDMfM5lSx7XOLJWlqOaeVNn5XTBFjIIQRsj1s?=\n\t=?utf-8?q?tSNNK0JRawih/nOfi134ulvl5u0ULgz5edu8X47UPrRFys8Qgl2bHJGIVZMrDMPMp?=\n\t=?utf-8?q?akx4B99PzH7vbQdNuLrOV593wB3q10gY5GFDtlizHWDC/xZca19BibfeMFjheawsY?=\n\t=?utf-8?q?mNai741cqfdc/6WOgCmzezZnTqNbd7KZzURr6y/Ke4lxTvoGilRolmHhY+ykJ3dC2?=\n\t=?utf-8?q?3/bTWgKqqS9PBXXmdGRNgJoDfOg8WSBYgetdXpzkC5fwOrVSU7HbsDI84U1w4mnXw?=\n\t=?utf-8?q?l/ddFtutYfLgwr4gB5obRBrUIlBgab1kQnwpGUiZ8FebxJwJZLUXQAYR3iL/CoRBl?=\n\t=?utf-8?q?Imcwm/XCCIIyGZAkyHPQz9NjiDi4sOFl5YTOIMPcGUlassHdMKllCy+foVFUiUYA0?=\n\t=?utf-8?q?39nRXj1aKTW1QosvIUY2ZXWTk/9zkO170fBjGxBwMz5uwoOy3w2K9zU0g3fT2VUVY?=\n\t=?utf-8?q?bDEXiYPRW2b0kZ3TPjRllHzI1eOrDdcMwhf9k8/6sNtvAKL9cTsC+0rTE6OqLogxd?=\n\t=?utf-8?q?3pSU02E33uIHGiqcsPOL3ZzAVpZ5yA7aJ/CygyplikLh2zW28eT/XcEsOu+NlUqLl?=\n\t=?utf-8?q?R+/UypVXfRnDUyH5D2DG6fgxM3h0gLvzR0Zncoeq4gMDRATfZr6qNpkrZPGZMkYCl?=\n\t=?utf-8?q?w8UHKnUN5P4V8DEOaHcaHhrXq6n30H+urQ+2BtcG62++05wL9rw3bmsHg4TGpoP0G?=\n\t=?utf-8?q?0RlSKGUqiK2LH0YggBo7ZFVqzky0Kf/yuqdl/9yc1R5e/8SWEjq8ZJhld1EK5iWmn?=\n\t=?utf-8?q?267D3yIeqZlrfSe7M/RO2xXtB8MYA00RXNRpiM/zCiYUo9NhT0l9l9130AG4WbLgC?=\n\t=?utf-8?q?C3WUFjL6v1s9GKV86ux2WV6MvA2/qeUyttPrl4+EFLp3OMpUV0tpbOrSUnorA0sOC?=\n\t=?utf-8?q?HRyFPtLyZrbq35yicThPURyNtzYQ2QVMNOlMmp3OcPkRaXpi6p0gR5lBG6gDu+2FI?=\n\t=?utf-8?q?wnvaIQfLpY2DfjP8QXaIzAXRI+WjGmY0wHl1VoR981BcKH5UyObVdue+RpXemLJmH?=\n\t=?utf-8?q?tkjYCaggnmTB1gOTFfdgQAJD359fwxbHFQ=3D=3D?=", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n e67b4cff-0cc9-4b1b-fd1a-08dba8ff08e0", "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:15:52.5729 (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 CkqI+e9MCfsJwLgnRpFtDoiCo0OvnWJyie8IPDuyGqjuP88evqR0qhOzWU4hWOlajOAWoAvs+gfzXFK5AXakg6IajWdtP5/xtzowcFp/rMw=", "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": "Add several read/write APIs and remove the unneeded header file\ninclude 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/nfp_rtsym.c | 305 +++++++++++++++++++++++++---\n drivers/net/nfp/nfpcore/nfp_rtsym.h | 53 ++---\n 2 files changed, 299 insertions(+), 59 deletions(-)", "diff": "diff --git a/drivers/net/nfp/nfpcore/nfp_rtsym.c b/drivers/net/nfp/nfpcore/nfp_rtsym.c\nindex 37811ceaeb..2d4100dda2 100644\n--- a/drivers/net/nfp/nfpcore/nfp_rtsym.c\n+++ b/drivers/net/nfp/nfpcore/nfp_rtsym.c\n@@ -8,14 +8,25 @@\n * Interface for accessing run-time symbol table\n */\n \n-#include <stdio.h>\n+#include \"nfp_rtsym.h\"\n+\n #include <rte_byteorder.h>\n-#include \"nfp_cpp.h\"\n+\n #include \"nfp_logs.h\"\n #include \"nfp_mip.h\"\n-#include \"nfp_rtsym.h\"\n #include \"nfp6000/nfp6000.h\"\n \n+enum nfp_rtsym_type {\n+\tNFP_RTSYM_TYPE_NONE,\n+\tNFP_RTSYM_TYPE_OBJECT,\n+\tNFP_RTSYM_TYPE_FUNCTION,\n+\tNFP_RTSYM_TYPE_ABS,\n+};\n+\n+#define NFP_RTSYM_TARGET_NONE 0\n+#define NFP_RTSYM_TARGET_LMEM -1\n+#define NFP_RTSYM_TARGET_EMU_CACHE -7\n+\n /* These need to match the linker */\n #define SYM_TGT_LMEM 0\n #define SYM_TGT_EMU_CACHE 0x17\n@@ -32,6 +43,30 @@ struct nfp_rtsym_entry {\n \tuint32_t size_lo;\n };\n \n+/*\n+ * Structure describing a run-time NFP symbol.\n+ *\n+ * The memory target of the symbol is generally the CPP target number and can be\n+ * used directly by the nfp_cpp API calls. However, in some cases (i.e., for\n+ * local memory or control store) the target is encoded using a negative number.\n+ *\n+ * When the target type can not be used to fully describe the location of a\n+ * symbol the domain field is used to further specify the location (i.e., the\n+ * specific ME or island number).\n+ *\n+ * For ME target resources, 'domain' is an MEID.\n+ * For Island target resources, 'domain' is an island ID, with the one exception\n+ * of \"sram\" symbols for backward compatibility, which are viewed as global.\n+ */\n+struct nfp_rtsym {\n+\tconst char *name; /**< Symbol name */\n+\tuint64_t addr; /**< Address in the domain/target's address space */\n+\tuint64_t size; /**< Size (in bytes) of the symbol */\n+\tenum nfp_rtsym_type type; /**< NFP_RTSYM_TYPE_* of the symbol */\n+\tint target; /**< CPP target identifier, or NFP_RTSYM_TARGET_* */\n+\tint domain; /**< CPP target domain */\n+};\n+\n struct nfp_rtsym_table {\n \tstruct nfp_cpp *cpp;\n \tint num;\n@@ -80,21 +115,8 @@ nfp_rtsym_sw_entry_init(struct nfp_rtsym_table *cache,\n \t\tsw->domain = -1;\n }\n \n-struct nfp_rtsym_table *\n-nfp_rtsym_table_read(struct nfp_cpp *cpp)\n-{\n-\tstruct nfp_mip *mip;\n-\tstruct nfp_rtsym_table *rtbl;\n-\n-\tmip = nfp_mip_open(cpp);\n-\trtbl = __nfp_rtsym_table_read(cpp, mip);\n-\tnfp_mip_close(mip);\n-\n-\treturn rtbl;\n-}\n-\n-struct nfp_rtsym_table *\n-__nfp_rtsym_table_read(struct nfp_cpp *cpp,\n+static struct nfp_rtsym_table *\n+nfp_rtsym_table_read_real(struct nfp_cpp *cpp,\n \t\tconst struct nfp_mip *mip)\n {\n \tint n;\n@@ -162,6 +184,19 @@ __nfp_rtsym_table_read(struct nfp_cpp *cpp,\n \treturn NULL;\n }\n \n+struct nfp_rtsym_table *\n+nfp_rtsym_table_read(struct nfp_cpp *cpp)\n+{\n+\tstruct nfp_mip *mip;\n+\tstruct nfp_rtsym_table *rtbl;\n+\n+\tmip = nfp_mip_open(cpp);\n+\trtbl = nfp_rtsym_table_read_real(cpp, mip);\n+\tnfp_mip_close(mip);\n+\n+\treturn rtbl;\n+}\n+\n /**\n * Get the number of RTSYM descriptors\n *\n@@ -287,7 +322,59 @@ nfp_rtsym_to_dest(struct nfp_cpp *cpp,\n }\n \n static int\n-nfp_rtsym_readl(struct nfp_cpp *cpp,\n+nfp_rtsym_read_real(struct nfp_cpp *cpp,\n+\t\tconst struct nfp_rtsym *sym,\n+\t\tuint8_t action,\n+\t\tuint8_t token,\n+\t\tuint64_t offset,\n+\t\tvoid *buf,\n+\t\tsize_t len)\n+{\n+\tint err;\n+\tuint64_t addr;\n+\tuint32_t cpp_id;\n+\tsize_t length = len;\n+\tuint64_t sym_size = nfp_rtsym_size(sym);\n+\n+\tif (offset > sym_size) {\n+\t\tPMD_DRV_LOG(ERR, \"rtsym '%s' read out of bounds\", sym->name);\n+\t\treturn -ENXIO;\n+\t}\n+\n+\tif (length > sym_size - offset)\n+\t\tlength = sym_size - offset;\n+\n+\tif (sym->type == NFP_RTSYM_TYPE_ABS) {\n+\t\tunion {\n+\t\t\tuint64_t value_64;\n+\t\t\tuint8_t value_8[8];\n+\t\t} tmp;\n+\n+\t\ttmp.value_64 = sym->addr;\n+\t\tmemcpy(buf, &tmp.value_8[offset], length);\n+\n+\t\treturn length;\n+\t}\n+\n+\terr = nfp_rtsym_to_dest(cpp, sym, action, token, offset, &cpp_id, &addr);\n+\tif (err != 0)\n+\t\treturn err;\n+\n+\treturn nfp_cpp_read(cpp, cpp_id, addr, buf, length);\n+}\n+\n+int\n+nfp_rtsym_read(struct nfp_cpp *cpp,\n+\t\tconst struct nfp_rtsym *sym,\n+\t\tuint64_t offset,\n+\t\tvoid *buf,\n+\t\tsize_t len)\n+{\n+\treturn nfp_rtsym_read_real(cpp, sym, NFP_CPP_ACTION_RW, 0, offset, buf, len);\n+}\n+\n+static int\n+nfp_rtsym_readl_real(struct nfp_cpp *cpp,\n \t\tconst struct nfp_rtsym *sym,\n \t\tuint8_t action,\n \t\tuint8_t token,\n@@ -310,8 +397,17 @@ nfp_rtsym_readl(struct nfp_cpp *cpp,\n \treturn nfp_cpp_readl(cpp, cpp_id, addr, value);\n }\n \n+int\n+nfp_rtsym_readl(struct nfp_cpp *cpp,\n+\t\tconst struct nfp_rtsym *sym,\n+\t\tuint64_t offset,\n+\t\tuint32_t *value)\n+{\n+\treturn nfp_rtsym_readl_real(cpp, sym, NFP_CPP_ACTION_RW, 0, offset, value);\n+}\n+\n static int\n-nfp_rtsym_readq(struct nfp_cpp *cpp,\n+nfp_rtsym_readq_real(struct nfp_cpp *cpp,\n \t\tconst struct nfp_rtsym *sym,\n \t\tuint8_t action,\n \t\tuint8_t token,\n@@ -339,6 +435,121 @@ nfp_rtsym_readq(struct nfp_cpp *cpp,\n \treturn nfp_cpp_readq(cpp, cpp_id, addr, value);\n }\n \n+int\n+nfp_rtsym_readq(struct nfp_cpp *cpp,\n+\t\tconst struct nfp_rtsym *sym,\n+\t\tuint64_t offset,\n+\t\tuint64_t *value)\n+{\n+\treturn nfp_rtsym_readq_real(cpp, sym, NFP_CPP_ACTION_RW, 0, offset, value);\n+}\n+\n+static int\n+nfp_rtsym_write_real(struct nfp_cpp *cpp,\n+\t\tconst struct nfp_rtsym *sym,\n+\t\tuint8_t action,\n+\t\tuint8_t token,\n+\t\tuint64_t offset,\n+\t\tvoid *buf,\n+\t\tsize_t len)\n+{\n+\tint err;\n+\tuint64_t addr;\n+\tuint32_t cpp_id;\n+\tsize_t length = len;\n+\tuint64_t sym_size = nfp_rtsym_size(sym);\n+\n+\tif (offset > sym_size) {\n+\t\tPMD_DRV_LOG(ERR, \"rtsym '%s' write out of bounds\", sym->name);\n+\t\treturn -ENXIO;\n+\t}\n+\n+\tif (length > sym_size - offset)\n+\t\tlength = sym_size - offset;\n+\n+\terr = nfp_rtsym_to_dest(cpp, sym, action, token, offset, &cpp_id, &addr);\n+\tif (err != 0)\n+\t\treturn err;\n+\n+\treturn nfp_cpp_write(cpp, cpp_id, addr, buf, length);\n+}\n+\n+int\n+nfp_rtsym_write(struct nfp_cpp *cpp,\n+\t\tconst struct nfp_rtsym *sym,\n+\t\tuint64_t offset,\n+\t\tvoid *buf,\n+\t\tsize_t len)\n+{\n+\treturn nfp_rtsym_write_real(cpp, sym, NFP_CPP_ACTION_RW, 0, offset, buf, len);\n+}\n+\n+static int\n+nfp_rtsym_writel_real(struct nfp_cpp *cpp,\n+\t\tconst struct nfp_rtsym *sym,\n+\t\tuint8_t action,\n+\t\tuint8_t token,\n+\t\tuint64_t offset,\n+\t\tuint32_t value)\n+{\n+\tint err;\n+\tuint64_t addr;\n+\tuint32_t cpp_id;\n+\n+\tif (offset + 4 > nfp_rtsym_size(sym)) {\n+\t\tPMD_DRV_LOG(ERR, \"rtsym '%s' write out of bounds\", sym->name);\n+\t\treturn -ENXIO;\n+\t}\n+\n+\terr = nfp_rtsym_to_dest(cpp, sym, action, token, offset, &cpp_id, &addr);\n+\tif (err != 0)\n+\t\treturn err;\n+\n+\treturn nfp_cpp_writel(cpp, cpp_id, addr, value);\n+}\n+\n+int\n+nfp_rtsym_writel(struct nfp_cpp *cpp,\n+\t\tconst struct nfp_rtsym *sym,\n+\t\tuint64_t offset,\n+\t\tuint32_t value)\n+{\n+\treturn nfp_rtsym_writel_real(cpp, sym, NFP_CPP_ACTION_RW, 0, offset, value);\n+}\n+\n+static int\n+nfp_rtsym_writeq_real(struct nfp_cpp *cpp,\n+\t\tconst struct nfp_rtsym *sym,\n+\t\tuint8_t action,\n+\t\tuint8_t token,\n+\t\tuint64_t offset,\n+\t\tuint64_t value)\n+{\n+\tint err;\n+\tuint64_t addr;\n+\tuint32_t cpp_id;\n+\n+\tif (offset + 8 > nfp_rtsym_size(sym)) {\n+\t\tPMD_DRV_LOG(ERR, \"rtsym '%s' write out of bounds\", sym->name);\n+\t\treturn -ENXIO;\n+\t}\n+\n+\terr = nfp_rtsym_to_dest(cpp, sym, action, token, offset, &cpp_id, &addr);\n+\tif (err != 0)\n+\t\treturn err;\n+\n+\treturn nfp_cpp_writeq(cpp, cpp_id, addr, value);\n+}\n+\n+int\n+nfp_rtsym_writeq(struct nfp_cpp *cpp,\n+\t\tconst struct nfp_rtsym *sym,\n+\t\tuint64_t offset,\n+\t\tuint64_t value)\n+{\n+\treturn nfp_rtsym_writeq_real(cpp, sym, NFP_CPP_ACTION_RW, 0, offset, value);\n+}\n+\n /**\n * Read a simple unsigned scalar value from symbol\n *\n@@ -374,11 +585,11 @@ nfp_rtsym_read_le(struct nfp_rtsym_table *rtbl,\n \n \tswitch (sym->size) {\n \tcase 4:\n-\t\terr = nfp_rtsym_readl(rtbl->cpp, sym, NFP_CPP_ACTION_RW, 0, 0, &val32);\n+\t\terr = nfp_rtsym_readl(rtbl->cpp, sym, 0, &val32);\n \t\tval = val32;\n \t\tbreak;\n \tcase 8:\n-\t\terr = nfp_rtsym_readq(rtbl->cpp, sym, NFP_CPP_ACTION_RW, 0, 0, &val);\n+\t\terr = nfp_rtsym_readq(rtbl->cpp, sym, 0, &val);\n \t\tbreak;\n \tdefault:\n \t\tPMD_DRV_LOG(ERR, \"rtsym '%s' unsupported size: %#lx\",\n@@ -387,8 +598,6 @@ nfp_rtsym_read_le(struct nfp_rtsym_table *rtbl,\n \t\tbreak;\n \t}\n \n-\tif (err)\n-\t\terr = -EIO;\n exit:\n \tif (error != NULL)\n \t\t*error = err;\n@@ -399,6 +608,54 @@ nfp_rtsym_read_le(struct nfp_rtsym_table *rtbl,\n \treturn val;\n }\n \n+/**\n+ * Write an unsigned scalar value to a symbol\n+ *\n+ * Lookup a symbol and write a value to it. Symbol can be 4 or 8 bytes in size.\n+ * If 4 bytes then the lower 32-bits of 'value' are used. Value will be\n+ * written as simple little-endian unsigned value.\n+ *\n+ * @param rtbl\n+ * NFP RTSYM table\n+ * @param name\n+ * Symbol name\n+ * @param value\n+ * Value to write\n+ *\n+ * @return\n+ * 0 on success or error code.\n+ */\n+int\n+nfp_rtsym_write_le(struct nfp_rtsym_table *rtbl,\n+\t\tconst char *name,\n+\t\tuint64_t value)\n+{\n+\tint err;\n+\tuint64_t sym_size;\n+\tconst struct nfp_rtsym *sym;\n+\n+\tsym = nfp_rtsym_lookup(rtbl, name);\n+\tif (sym == NULL)\n+\t\treturn -ENOENT;\n+\n+\tsym_size = nfp_rtsym_size(sym);\n+\tswitch (sym_size) {\n+\tcase 4:\n+\t\terr = nfp_rtsym_writel(rtbl->cpp, sym, 0, value);\n+\t\tbreak;\n+\tcase 8:\n+\t\terr = nfp_rtsym_writeq(rtbl->cpp, sym, 0, value);\n+\t\tbreak;\n+\tdefault:\n+\t\tPMD_DRV_LOG(ERR, \"rtsym '%s' unsupported size: %#lx\",\n+\t\t\t\tname, sym_size);\n+\t\terr = -EINVAL;\n+\t\tbreak;\n+\t}\n+\n+\treturn err;\n+}\n+\n uint8_t *\n nfp_rtsym_map(struct nfp_rtsym_table *rtbl,\n \t\tconst char *name,\ndiff --git a/drivers/net/nfp/nfpcore/nfp_rtsym.h b/drivers/net/nfp/nfpcore/nfp_rtsym.h\nindex fdde1eb75b..f79637ac50 100644\n--- a/drivers/net/nfp/nfpcore/nfp_rtsym.h\n+++ b/drivers/net/nfp/nfpcore/nfp_rtsym.h\n@@ -6,46 +6,13 @@\n #ifndef __NFP_RTSYM_H__\n #define __NFP_RTSYM_H__\n \n-#define NFP_RTSYM_TYPE_NONE 0\n-#define NFP_RTSYM_TYPE_OBJECT 1\n-#define NFP_RTSYM_TYPE_FUNCTION 2\n-#define NFP_RTSYM_TYPE_ABS 3\n-\n-#define NFP_RTSYM_TARGET_NONE 0\n-#define NFP_RTSYM_TARGET_LMEM -1\n-#define NFP_RTSYM_TARGET_EMU_CACHE -7\n-\n-/*\n- * Structure describing a run-time NFP symbol.\n- *\n- * The memory target of the symbol is generally the CPP target number and can be\n- * used directly by the nfp_cpp API calls. However, in some cases (i.e., for\n- * local memory or control store) the target is encoded using a negative number.\n- *\n- * When the target type can not be used to fully describe the location of a\n- * symbol the domain field is used to further specify the location (i.e., the\n- * specific ME or island number).\n- *\n- * For ME target resources, 'domain' is an MEID.\n- * For Island target resources, 'domain' is an island ID, with the one exception\n- * of \"sram\" symbols for backward compatibility, which are viewed as global.\n- */\n-struct nfp_rtsym {\n-\tconst char *name; /**< Symbol name */\n-\tuint64_t addr; /**< Address in the domain/target's address space */\n-\tuint64_t size; /**< Size (in bytes) of the symbol */\n-\tint type; /**< NFP_RTSYM_TYPE_* of the symbol */\n-\tint target; /**< CPP target identifier, or NFP_RTSYM_TARGET_* */\n-\tint domain; /**< CPP target domain */\n-};\n+#include \"nfp_cpp.h\"\n \n+struct nfp_rtsym;\n struct nfp_rtsym_table;\n \n struct nfp_rtsym_table *nfp_rtsym_table_read(struct nfp_cpp *cpp);\n \n-struct nfp_rtsym_table *__nfp_rtsym_table_read(struct nfp_cpp *cpp,\n-\t\tconst struct nfp_mip *mip);\n-\n int nfp_rtsym_count(struct nfp_rtsym_table *rtbl);\n \n const struct nfp_rtsym *nfp_rtsym_get(struct nfp_rtsym_table *rtbl, int idx);\n@@ -53,8 +20,24 @@ const struct nfp_rtsym *nfp_rtsym_get(struct nfp_rtsym_table *rtbl, int idx);\n const struct nfp_rtsym *nfp_rtsym_lookup(struct nfp_rtsym_table *rtbl,\n \t\tconst char *name);\n \n+int nfp_rtsym_read(struct nfp_cpp *cpp, const struct nfp_rtsym *sym,\n+\t\tuint64_t offset, void *buf, size_t len);\n+int nfp_rtsym_readl(struct nfp_cpp *cpp, const struct nfp_rtsym *sym,\n+\t\tuint64_t offset, uint32_t *value);\n+int nfp_rtsym_readq(struct nfp_cpp *cpp, const struct nfp_rtsym *sym,\n+\t\tuint64_t offset, uint64_t *value);\n+\n+int nfp_rtsym_write(struct nfp_cpp *cpp, const struct nfp_rtsym *sym,\n+\t\tuint64_t offset, void *buf, size_t len);\n+int nfp_rtsym_writel(struct nfp_cpp *cpp, const struct nfp_rtsym *sym,\n+\t\tuint64_t offset, uint32_t value);\n+int nfp_rtsym_writeq(struct nfp_cpp *cpp, const struct nfp_rtsym *sym,\n+\t\tuint64_t offset, uint64_t value);\n+\n uint64_t nfp_rtsym_read_le(struct nfp_rtsym_table *rtbl, const char *name,\n \t\tint *error);\n+int nfp_rtsym_write_le(struct nfp_rtsym_table *rtbl, const char *name,\n+\t\tuint64_t value);\n uint8_t *nfp_rtsym_map(struct nfp_rtsym_table *rtbl, const char *name,\n \t\tuint32_t min_size, struct nfp_cpp_area **area);\n \n", "prefixes": [ "v2", "15/27" ] }