Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/131548/?format=api
{ "id": 131548, "url": "http://patches.dpdk.org/api/patches/131548/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20230918024612.1600536-15-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-15-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230918024612.1600536-15-chaoyong.he@corigine.com", "date": "2023-09-18T02:46:00", "name": "[v4,14/26] net/nfp: refact the rtsym module", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "686e4fdd6be43dc5ee3a33c92783fcf16d0366c4", "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-15-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/131548/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/131548/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 0B1E9425C9;\n\tMon, 18 Sep 2023 04:49:12 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 81E37410FD;\n\tMon, 18 Sep 2023 04:47:43 +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 D016A40EF0\n for <dev@dpdk.org>; Mon, 18 Sep 2023 04:47:37 +0200 (CEST)", "from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5)\n by PH7PR13MB6435.namprd13.prod.outlook.com (2603:10b6:510:2ea::9)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.26; Mon, 18 Sep\n 2023 02:47:36 +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:36 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=GB9kUQp6ddhW4bU80R7IlzVznPlywnGfXKxnX2LH2OvEwKCHZ2Ef07sCqTlg1cofNvXLhUEd+FkfkK3FwBz7jjwyvFWso+dZSyiRp6hlaEmGPiqn6ivtSZ/5tSARYbIlYp+lsH7vDweAxnOvWq+2kNguDu1Dm2Hz7NtW2mL4v0HgajAJ6C9fZcOv0ZrD7P+2rY/EPjCvEyohpr2ChtoTOCyhF7rg9xL35SNZlkcVRGzJfZ6IfCUEcGoJTG1rfB4KDo5UFjy/5joQ/nsGV09URO8Gubdqax/XKmaJiqbqcgEz4iek6wKK3fwJBESCPuQcKhBy/Y1+fzG0ih1sZt9MfA==", "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=l7Qsyfqub5hXF4fwLc4a2XNdglaq/2V5GE13C+Wm86crmYZQ8YJsNpEyD15pIhXCJHiEpaSSy+0exerDZKnZ3lAWfxo4HNWNR7r3DKjCTtnVJXxGbJb6FYCyf8gLGopW5D1PL6I1Hd4EwftdPxSvcW3Z+rZVK7sVMHLIkdsngBo6sjRqe5tjChmyDFcz44Jd4N80XIF3cUbQsAv8PR7sbfJE+d9fgLVndacByxPOc/gj4Ov643FrZVKIeqaYs0JYAJeXETlKDF9WJWmT2Mkz+AuuaKANl2PG70kcHmxhrKckAadCz0/4T7N8Hkv4k5nWO9/2u510afVnufoP3jkS5g==", "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=mwFBVC+G2ErjLmmTxMCY2hyDgZ808/GYAQ0v72rZ7LzSyL/LprCBJdqIrNy3lEqHLFUCc4Tw27fYzrVzkDdKYYK7KaozBzW2nLtjS4uVsIzBe0KxpB6ALWXbzWkP6Pnr41N5l1eeOfGzLT+HyFyxdCu4ZWgdxJ/xBqYncDU5Moo=", "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 14/26] net/nfp: refact the rtsym module", "Date": "Mon, 18 Sep 2023 10:46:00 +0800", "Message-Id": "<20230918024612.1600536-15-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_|PH7PR13MB6435:EE_", "X-MS-Office365-Filtering-Correlation-Id": "7467605a-7ae9-4b41-eaf3-08dbb7f19d61", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n mtSPadIZdvzK/9IMW0OKh0Y3neP11g5fK0fkYMUQgi9oaCr1HNCZVAtc/cpm7t83zGw917UAFyPNvO+MwmpAoducYKizkpgDldI6ImurvxeepNh4pfRh6260IYGvJqk/6W7ZC5FJb9MgA7e3YJa0A/QSYFCUUUXPPZYkjRX1Ip7JpufD639pE1CzGjmCZxQuR4wCFxizoAOSMsXHSkAYrEP81UQrvnb6iUi01pZWdrGxD7JHdKBu54O4yfJpvoOhmsCNefkNihNegzaDA3y/OgEiTaTfnhbJYseg1JcYuy4+Smi9aqcL062IirMPi3BPq5VZvrFNqohpFTD+8bmqD0G44cDsPjZczP+7gYco2vy1WRCg8tHyrN04sMlu/AjseXSPh2GGS3qOu3QaJL7W03MgYASqAA9Urt8TrfpuAE6ulIEKMZtPcQG6vHdljUxiRRfg8HZCvw2Hu2WO5lUxifM7lAGZzJqZcFlWRXsrYGENq0i2qd/2r4e65t+4A1/29GG4ODHj39PGHvRKiZI6d7fYI37viLKg/I9HgkqKzKUgdZc4GLS3moi7/Zs1QB8snFBgn7kl0EISTcbZUaX+tkWSNa/kjR2q0MHQIwdyxggdb25beOfyBL3m/yqAojfWSRzeiBZYqv3ijufK156sR0apWYbUMU3wIyZkG6JHnFM=", "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)(39830400003)(136003)(346002)(366004)(376002)(396003)(1800799009)(451199024)(186009)(54906003)(66476007)(66946007)(66574015)(41300700001)(6916009)(316002)(8676002)(4326008)(8936002)(52116002)(6506007)(6486002)(6512007)(478600001)(6666004)(83380400001)(26005)(1076003)(2616005)(107886003)(86362001)(2906002)(30864003)(44832011)(38100700002)(38350700002)(5660300002)(36756003)(66556008);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "=?utf-8?q?9dZSVi2fESJdzEEdmm0EYE3oSzlA?=\n\t=?utf-8?q?MCjDWdhsYzcMZvZHKFuFhYtWR5LwPsxdZQD2QmFT6LrhcJceEYzG1CLj0uZpcqNn1?=\n\t=?utf-8?q?Tn7abOpphd7mm48TbfqgaHhTyuuL8EJKeHY5TrvRiY8+QqxOIXzylRM2Xiy06Hap8?=\n\t=?utf-8?q?5eSmqkrV33/emBpL/IuHKzdks7rh2hlAwe2Ri+2xez/ui+GJE2sDMJJz9bPjrpRoP?=\n\t=?utf-8?q?5V8U8dcx7BjoTsKBxbYTLFv09gT8YL4zgqJyKVKC7lZKfA9yeItZb2J9D7AO+XZYT?=\n\t=?utf-8?q?TVzfQvjVov5ilLtfAGNjpL0V9cIB5C4RgZNmLYgI8pjinnHQhyZbbNaD+ZuzSbCNz?=\n\t=?utf-8?q?Afv1EFpNytGSB21Kr4jtrfU1zrZu+DDm8ZvMtT3lo/J5MRdCMZNqD5TjWHT2UKEHi?=\n\t=?utf-8?q?uTbCnd83nrBhWUKROCM/eoTnNE/e+RD4jnVciQYUX0DutKFAn2U44MMU6XZYuJ6Bm?=\n\t=?utf-8?q?kfpXoM5cvJLXj0NGHugpA37sP2h2I0b5w/ix9ypj8clXftLuUpIhALfgaNxhpSmT4?=\n\t=?utf-8?q?0e38RgxuvAps7xUFxTlcaWkbWmIyFjB3sfiI1hAExSfhmo5lEhy0WF7HSArEAL+8/?=\n\t=?utf-8?q?p9flh5pbiYwXf0fEB57cd6BI/yixjRQsv/c8kYa9C5GxG59vzBxNMCrdPrlOxUfL6?=\n\t=?utf-8?q?JEW4JUnNEhtY0GcqJnggtmsTuI+DEM5q0B112XDXm7oPs68B65ow4gClO6qDZUscc?=\n\t=?utf-8?q?2biGSk8rICIILx7VxIPKv/VgrLvnmlnFoHC931vT3/JnUi8VsUaj6BTV9CLLnFdFJ?=\n\t=?utf-8?q?0r3i2+LhwdwEiMTiQC4snKe+qphac64M+pjyMio3YBkHcUfuy2W8Czk0X7cQbgIe7?=\n\t=?utf-8?q?Mx+VDiGXV6n1d+0uaC++txWAN6hfk6e/P8XVgzmxW2m1eTAz8gIzVdku5cq0FYW0F?=\n\t=?utf-8?q?GBh4g+3DeqSZlYrm/wp+v2JKHzwds+9wrLw0SEtoN8DmLW++PRkpX2kfChnaAz3tv?=\n\t=?utf-8?q?CcZfaSelCmKCDP63rT0EfrKGp5YPV4K4pDCSBEtC0cIessXtP1y1HhoU2UJsPeHgf?=\n\t=?utf-8?q?m8NS7wPYHZ76BrxQK/W7Eo00TN4Ru6YKbLnw3+CWK8MgH6o/TYX31rw0CK5zDwga6?=\n\t=?utf-8?q?NL54rIa+391hSEXuQ3brn4AQP0vGoVCyZ0PnbUKF14VsLmY8gI95jFQi38sHzVlt9?=\n\t=?utf-8?q?hEld0t6O0oiCnVrrhjutZ7DW2yZuhSzD7ah7lIsqsCnDfuR95OdYgPEO68cd/pW8m?=\n\t=?utf-8?q?qxbCAQAdlATeDg2T0kYE69EkyZnnBgQ4fUXMUh2KGI0V4QP+Lyxovps/FJ/Pfqrz+?=\n\t=?utf-8?q?OHU71+/lgCf+YiZQozX1ctx7DiEzV0jAVsvG4SfAeCKE1Vg4V2eCHEBQV+b0cZliB?=\n\t=?utf-8?q?bcwm9Gbzbyzo7bbiWl1lojM/ay9ZXTmphfTwAbLF3bAd5ZBUY6dmuBeBPu2IABQol?=\n\t=?utf-8?q?X1ICHrnyXqdHBgJgukFoACTwPX0IScxfA+Olpi5ICh1cwcU9Ol7dkiKNe4aSuAN6q?=\n\t=?utf-8?q?dd0Khtq5tUERFpgi3+4rd07vkhI3dr6zjxxFbPzzskfIA0Gh8OC3YWAortePZJLSg?=\n\t=?utf-8?q?+XgdRljOmLWEA8YBjniQw4P+uFUNsDqSMw=3D=3D?=", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 7467605a-7ae9-4b41-eaf3-08dbb7f19d61", "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:36.1198 (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 Cw9hS1TDiHgpnjiEK2LwE6+SVcfjcs5cvr1y2H8yFIZiv97/nN5ezsxPUpRJy3subZKUXJpSijAF2lgauM8JnNaZ4Tuwh91tqsDRm7E5m7k=", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "PH7PR13MB6435", "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": [ "v4", "14/26" ] }