Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/131546/?format=api
{ "id": 131546, "url": "https://patches.dpdk.org/api/patches/131546/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20230918024612.1600536-13-chaoyong.he@corigine.com/", "project": { "id": 1, "url": "https://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-13-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230918024612.1600536-13-chaoyong.he@corigine.com", "date": "2023-09-18T02:45:58", "name": "[v4,12/26] net/nfp: refact the nffw module", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "74db11e1bed72301d90bda0282c415d3d66c7e9f", "submitter": { "id": 2554, "url": "https://patches.dpdk.org/api/people/2554/?format=api", "name": "Chaoyong He", "email": "chaoyong.he@corigine.com" }, "delegate": { "id": 319, "url": "https://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20230918024612.1600536-13-chaoyong.he@corigine.com/mbox/", "series": [ { "id": 29531, "url": "https://patches.dpdk.org/api/series/29531/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=29531", "date": "2023-09-18T02:45:46", "name": "refact the nfpcore module", "version": 4, "mbox": "https://patches.dpdk.org/series/29531/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/131546/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/131546/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 E2417425C9;\n\tMon, 18 Sep 2023 04:48:57 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 32060410EE;\n\tMon, 18 Sep 2023 04:47:40 +0200 (CEST)", "from NAM12-MW2-obe.outbound.protection.outlook.com\n (mail-mw2nam12on2104.outbound.protection.outlook.com [40.107.244.104])\n by mails.dpdk.org (Postfix) with ESMTP id 440A0406B6\n for <dev@dpdk.org>; Mon, 18 Sep 2023 04:47:34 +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:32 +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:32 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=jNudfTBTVYCwKzIramuCOZgd+wFfK5VYCLa6gEEkyctPe3tITg2TdfoaJNYt3hL49ZcyIyKa+y/AJrke6/oRVYwPCPjp3+PWZ/gzIZtR641sJYMLiQ+nZ85M+Srsq3my+jxjUZ7z5ZkPM6j7mI21HXb9+5YQ2JTIgdZktYBg4he9/ahRR1NwO8MaYxa6N486KMXfFE1jNnUJbOIKpyE635vKnslfDAOcoTmYxsuFPl50iBhLpAwSNEB8IoyolcJonmt8f8CV2JIC9dtlJcOvMB2oSQP2LJuJGsCj1CRXF3L3q5X5y0yip+2gyAieSxBmcs5iY7O0x/FMhsJw6pbX4A==", "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=iFBLGRqxQPGyfRCx7SSgwF7jhSgNxLPpetz+N024eXs=;\n b=AIZDs1XPhvu3emqeuroV8aAQlybkJ36F37pOxRPxItoFAQR86zy73uDhJpmMfLPBz+ihJMradL2uNQYjW2IIIH7408CchpL5dELjpzqYMzU+3u1z796ypDa90tR/fpQ/x93zG9iHFP9zbbkouKESbhG7CugF+QL9hHa45s1pKXm5+O8QxVKYxrZtqBxIrH+4maN6TSE88hHlB2rAO4uTB9pFCFX7D56iR+fywdvZcS9l2/IcK2m80DAjQN4N0hq6SMAiJGsCXt9oobs7s4EOMRKhiPKQ/1CX7QVvi1Tfku50D5ju21MKFc5XWOqme+aWe3kfT+1eNYDMTup2D9dXTQ==", "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=iFBLGRqxQPGyfRCx7SSgwF7jhSgNxLPpetz+N024eXs=;\n b=Ip60F4S3czNklOwmqvTkd2dGaJvafHvtEWUqXAli+dj9vdlLQFZIfDUiEd7QEgbdtCGn8JfPlehr9S7siQfMxJESfse/01FkblLL463WXcF8NrLWxCtQV1deWkBEmsZfcYP1dMnuF6ITJnQcZ96Ic7m0DtTxQY+JAXWlCh1Stp8=", "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 12/26] net/nfp: refact the nffw module", "Date": "Mon, 18 Sep 2023 10:45:58 +0800", "Message-Id": "<20230918024612.1600536-13-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": "fddd9042-9411-4f6f-57d0-08dbb7f19b6d", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n EV0/pEmlm7s9eOeI2vug/kx2KzQaPkrm+BCBGoXzAeYET09uAHJJQW5ekNGWTDhKg6F5/5N1OMd8OuQoQwpza0op9KfzQDLMZ5yzyOixSCDYQ9rtcMZECBwRaxJIxjnc0+Ib2cTkEwutRR3B1QzAUpiOIGSPEBBybjgDo9ptzxe1a4t2JtlXdDD8uKI52uqxG7MSsmYt1TMyeCdU9IzgjRJGKoHfCdTsBECLsYPLMbDwLbx/d8Zeoyh2nu65QIoykBniGr5psnnhu/PlvfHJiC6ZQYty0y0X/CF7pb6oa9mxeoyHmTEpEJEx/ConA93d2lF98MlEP8xWsD1kjTf+M/8LHvOpuZL/ZMs+Sp6rl3YPjXTKE5y8REbfwnrHdvBXIbhz8NapeNnWbtJfh+jGPerb7foJ0BpvBiUNknkdkDBzBTQfi3VuuQWJ+l8vHwvdGo535j2AVZBMlt6KCUZ5N7wRuUYgdV59kEf0F1IjYjbvpoUOJMIOHngbNocdwjH/RlxxXX/7todG1KECGkKRO45/zcaF48yu9bVZe5F30VU7lzW6L8sA/mOCBoq0iCAWnu0Z0CXOo5mJptqIvEefxAjqXAm4DLMWFsIkV6LFbrs6NFB6/tZvY2CB+rl4XKU2PY+V47ojsX/LN3PwPswoXS/CdHJb1CbCbSTL1X6mxeo=", "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)(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?dfo3pzHDFHvcYcnwFgXyEpCRWjS4?=\n\t=?utf-8?q?2mxck+EQSuHDnj9nV99LALvFODRMDGyuFkFgqatLz0FHIrlUFX+DStiLFCsG799Go?=\n\t=?utf-8?q?bwZ3QW3zQoglE9FZw1nlNAx3XnQS9eHfF+aiah+jDgwtDk/10RFmXGMo/DI4Y8x1P?=\n\t=?utf-8?q?2cSfMwsYWDJH7PmMgvBysuSWYnMyoQgiotexcExlurAzKLO+QnlnRMYL4wipSec9p?=\n\t=?utf-8?q?sYrf3G/NJboV6zVbggZVxk0eHklv/wVLrFS2X/X42NwzT86YtTcURwV02DBC0LfkW?=\n\t=?utf-8?q?x1JOH1KtolFZTblQKP5gNzC8IL8hPgyGNjUIPmbGgnQvO1BDLj7H2it/ce7xh1t5w?=\n\t=?utf-8?q?ctnW7Zxq+UiNXEFoNE33vRy5HO0rYrGVqqWwcbdj4Obgk7GXsw66mlgKeMGqtkeI4?=\n\t=?utf-8?q?eOAXKFufJEtdti5sZJHKkbKs/HBnWerd+rIALcFB1IiziumpgHW6VnBMDhmu1n/cR?=\n\t=?utf-8?q?FvmCPtXpsBQwY2mXMFRRkOyFbNleAujyShuB7DEFOXvOxtxMiMwHAi2Ld4ECPd29m?=\n\t=?utf-8?q?BYmtFrWejuQ7nEHMqBKI2SKa9ZmCmzEXixE8ANufjvxAfZ4BNxvDvkEHPgVjGZUhf?=\n\t=?utf-8?q?/G0lhtuOtLZbUso5Z+uJjIi8DaOeEfNbyi2s++4o/3d68IGRqT2VxJ8/5TjF0S08V?=\n\t=?utf-8?q?IxPhJFg9DeOwhNTwHSyppSAu+xM9JykFQHSH9Y3wv/yA2sSDvnt1Nzo3A/4zTOu5G?=\n\t=?utf-8?q?8EGB62lI+jEge4HC/3EpTUzOcMLOJPLYBeczD7Zsi5Hp/VVBycXkAMURSV1d33nps?=\n\t=?utf-8?q?jwzG/8ZD5Ol5pvTFxZUr2hh7eigz8laUCpnSgSTbb2Dx4ktpLApqRvRpxOCnQLK2Z?=\n\t=?utf-8?q?fRh/b3jdkqekgkjuTi/pfK6xd8/1sF6SRxMDX8BauCQBSxLRNyhJ33OJoXcaBZBtW?=\n\t=?utf-8?q?GVX95ym3JlAhhpcpPmqxvJb3azI7niKwlmQ3+jo+ZCywcUwqpr2vhZ6E7Kol2HBXD?=\n\t=?utf-8?q?bUAYllP2r8kL1Uk1lLSkiLwOjOaDMO/7HmBSu00eLYcZEgoDtXZUB6Np/xUQUnd0b?=\n\t=?utf-8?q?vJxgFFbZMWijEYpcj+GmOBYXL83CduCWIMhZsev2ePNl0r3to5tJ/Jx8v8QvEXoJ5?=\n\t=?utf-8?q?OZX5ncCkd42oJuxnuH5o8xiLeRxnk5s0Bt7kULKKxXFclWOdQEgh7dHc6K7wzrZ+p?=\n\t=?utf-8?q?c2IxpC9IUu95yRxQKLbwJkflLURu7FqYQOMQrfdqS7ITGb6O2HuTzZ3yhLTSwSh9q?=\n\t=?utf-8?q?cvIp3hBX9Rr2xp8wo5Vx2LevRo1nA+1Et3GCKXzqmRIRFOLnUDMGJefZ9umDR5Ntk?=\n\t=?utf-8?q?4oBfPsAK+UFD5vY5NaLptDq9+oEv+ff9UHQZH9I3fcxTd2vzTEuLtWMAlSotHvCoh?=\n\t=?utf-8?q?tEIGuo4OZ4FaUsxBctpvIn8QDo1HJ0Y0cIbYauFm9Nk0r28U5HQvMZuatrZdKlADT?=\n\t=?utf-8?q?lPPbE+frUu+ytUSzL/fj/VhvYtrSVdgPX0j+l95BKheAXy02wwKY4Dmy8Kxo7gQ8j?=\n\t=?utf-8?q?GyH1x9TP36q4Og4KRnZgz+wo5lM6iPuRgdT1RaMcuDIdlvDZ+m6XAgMgUDC/jehfT?=\n\t=?utf-8?q?HK84QboaMPMsjkSALFaUdTFbIhHR7gR+NA=3D=3D?=", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n fddd9042-9411-4f6f-57d0-08dbb7f19b6d", "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:32.7497 (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 4zuOzHGfHQ0r0mi2WaYt7zj6h4Z8pA5xVbvsx3oa3pO7k8wzKs0kmRyB4VRtYzv6UOFUeM2PuZATT2UBhxAOeQwnRFreH7gtGMpFMW1dmqo=", "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": "Move the definition of data structure and macro into the implement file.\nAlso sync the logic from kernel driver 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_mip.h | 4 +-\n drivers/net/nfp/nfpcore/nfp_nffw.c | 105 +++++++++++++++++++----------\n drivers/net/nfp/nfpcore/nfp_nffw.h | 66 +-----------------\n 3 files changed, 72 insertions(+), 103 deletions(-)", "diff": "diff --git a/drivers/net/nfp/nfpcore/nfp_mip.h b/drivers/net/nfp/nfpcore/nfp_mip.h\nindex 7fa09ee575..dbd9af31ed 100644\n--- a/drivers/net/nfp/nfpcore/nfp_mip.h\n+++ b/drivers/net/nfp/nfpcore/nfp_mip.h\n@@ -6,7 +6,7 @@\n #ifndef __NFP_MIP_H__\n #define __NFP_MIP_H__\n \n-#include \"nfp_nffw.h\"\n+#include \"nfp_cpp.h\"\n \n struct nfp_mip;\n \n@@ -16,7 +16,5 @@ void nfp_mip_close(struct nfp_mip *mip);\n const char *nfp_mip_name(const struct nfp_mip *mip);\n void nfp_mip_symtab(const struct nfp_mip *mip, uint32_t *addr, uint32_t *size);\n void nfp_mip_strtab(const struct nfp_mip *mip, uint32_t *addr, uint32_t *size);\n-int nfp_nffw_info_mip_first(struct nfp_nffw_info *state, uint32_t *cpp_id,\n-\t\tuint64_t *offset);\n \n #endif /* __NFP_MIP_H__ */\ndiff --git a/drivers/net/nfp/nfpcore/nfp_nffw.c b/drivers/net/nfp/nfpcore/nfp_nffw.c\nindex df6292e909..2f07fcd6c1 100644\n--- a/drivers/net/nfp/nfpcore/nfp_nffw.c\n+++ b/drivers/net/nfp/nfpcore/nfp_nffw.c\n@@ -3,12 +3,76 @@\n * All rights reserved.\n */\n \n-#include \"../nfp_logs.h\"\n-#include \"nfp_cpp.h\"\n #include \"nfp_nffw.h\"\n+\n+#include \"../nfp_logs.h\"\n #include \"nfp_mip.h\"\n-#include \"nfp6000/nfp6000.h\"\n #include \"nfp_resource.h\"\n+#include \"nfp6000/nfp6000.h\"\n+\n+/*\n+ * Init-CSR owner IDs for firmware map to firmware IDs which start at 4.\n+ * Lower IDs are reserved for target and loader IDs.\n+ */\n+#define NFFW_FWID_EXT 3 /* For active MEs that we didn't load. */\n+#define NFFW_FWID_BASE 4\n+\n+#define NFFW_FWID_ALL 255\n+\n+/*\n+ * NFFW_INFO_VERSION history:\n+ * 0: This was never actually used (before versioning), but it refers to\n+ * the previous struct which had FWINFO_CNT = MEINFO_CNT = 120 that later\n+ * changed to 200.\n+ * 1: First versioned struct, with\n+ * FWINFO_CNT = 120\n+ * MEINFO_CNT = 120\n+ * 2: FWINFO_CNT = 200\n+ * MEINFO_CNT = 200\n+ */\n+#define NFFW_INFO_VERSION_CURRENT 2\n+\n+/* Enough for all current chip families */\n+#define NFFW_MEINFO_CNT_V1 120\n+#define NFFW_FWINFO_CNT_V1 120\n+#define NFFW_MEINFO_CNT_V2 200\n+#define NFFW_FWINFO_CNT_V2 200\n+\n+/* nfp.nffw meinfo */\n+struct nffw_meinfo {\n+\tuint32_t ctxmask_fwid_meid;\n+};\n+\n+struct nffw_fwinfo {\n+\tuint32_t loaded_mu_da_mip_off_hi;\n+\tuint32_t mip_cppid; /**< 0 means no MIP */\n+\tuint32_t mip_offset_lo;\n+};\n+\n+struct nfp_nffw_info_v1 {\n+\tstruct nffw_meinfo meinfo[NFFW_MEINFO_CNT_V1];\n+\tstruct nffw_fwinfo fwinfo[NFFW_FWINFO_CNT_V1];\n+};\n+\n+struct nfp_nffw_info_v2 {\n+\tstruct nffw_meinfo meinfo[NFFW_MEINFO_CNT_V2];\n+\tstruct nffw_fwinfo fwinfo[NFFW_FWINFO_CNT_V2];\n+};\n+\n+struct nfp_nffw_info_data {\n+\tuint32_t flags[2];\n+\tunion {\n+\t\tstruct nfp_nffw_info_v1 v1;\n+\t\tstruct nfp_nffw_info_v2 v2;\n+\t} info;\n+};\n+\n+struct nfp_nffw_info {\n+\tstruct nfp_cpp *cpp;\n+\tstruct nfp_resource *res;\n+\n+\tstruct nfp_nffw_info_data fwinf;\n+};\n \n /*\n * flg_info_version = flags[0]<27:16>\n@@ -61,32 +125,6 @@ nffw_fwinfo_mip_offset_get(const struct nffw_fwinfo *fi)\n \treturn (mip_off_hi & 0xFF) << 32 | fi->mip_offset_lo;\n }\n \n-#define NFP_IMB_TGTADDRESSMODECFG_MODE_of(_x) (((_x) >> 13) & 0x7)\n-#define NFP_IMB_TGTADDRESSMODECFG_ADDRMODE RTE_BIT32(12)\n-#define NFP_IMB_TGTADDRESSMODECFG_ADDRMODE_32_BIT 0\n-#define NFP_IMB_TGTADDRESSMODECFG_ADDRMODE_40_BIT RTE_BIT32(12)\n-\n-static int\n-nfp_mip_mu_locality_lsb(struct nfp_cpp *cpp)\n-{\n-\tint err;\n-\tuint32_t mode;\n-\tuint32_t addr40;\n-\tuint32_t xpbaddr;\n-\tuint32_t imbcppat;\n-\n-\t/* Hardcoded XPB IMB Base, island 0 */\n-\txpbaddr = 0x000a0000 + NFP_CPP_TARGET_MU * 4;\n-\terr = nfp_xpb_readl(cpp, xpbaddr, &imbcppat);\n-\tif (err < 0)\n-\t\treturn err;\n-\n-\tmode = NFP_IMB_TGTADDRESSMODECFG_MODE_of(imbcppat);\n-\taddr40 = !!(imbcppat & NFP_IMB_TGTADDRESSMODECFG_ADDRMODE);\n-\n-\treturn nfp_cppat_mu_locality_lsb(mode, addr40);\n-}\n-\n static uint32_t\n nffw_res_fwinfos(struct nfp_nffw_info_data *fwinf,\n \t\tstruct nffw_fwinfo **arr)\n@@ -239,14 +277,7 @@ nfp_nffw_info_mip_first(struct nfp_nffw_info *state,\n \t*offset = nffw_fwinfo_mip_offset_get(fwinfo);\n \n \tif (nffw_fwinfo_mip_mu_da_get(fwinfo) != 0) {\n-\t\tint locality_off;\n-\n-\t\tif (NFP_CPP_ID_TARGET_of(*cpp_id) != NFP_CPP_TARGET_MU)\n-\t\t\treturn 0;\n-\n-\t\tlocality_off = nfp_mip_mu_locality_lsb(state->cpp);\n-\t\tif (locality_off < 0)\n-\t\t\treturn locality_off;\n+\t\tint locality_off = nfp_cpp_mu_locality_lsb(state->cpp);\n \n \t\t*offset &= ~(NFP_MU_ADDR_ACCESS_TYPE_MASK << locality_off);\n \t\t*offset |= NFP_MU_ADDR_ACCESS_TYPE_DIRECT << locality_off;\ndiff --git a/drivers/net/nfp/nfpcore/nfp_nffw.h b/drivers/net/nfp/nfpcore/nfp_nffw.h\nindex 52e25c090a..fd46009d37 100644\n--- a/drivers/net/nfp/nfpcore/nfp_nffw.h\n+++ b/drivers/net/nfp/nfpcore/nfp_nffw.h\n@@ -8,71 +8,11 @@\n \n #include \"nfp_cpp.h\"\n \n-/*\n- * Init-CSR owner IDs for firmware map to firmware IDs which start at 4.\n- * Lower IDs are reserved for target and loader IDs.\n- */\n-#define NFFW_FWID_EXT 3 /* For active MEs that we didn't load. */\n-#define NFFW_FWID_BASE 4\n-\n-#define NFFW_FWID_ALL 255\n-\n-/*\n- * NFFW_INFO_VERSION history:\n- * 0: This was never actually used (before versioning), but it refers to\n- * the previous struct which had FWINFO_CNT = MEINFO_CNT = 120 that later\n- * changed to 200.\n- * 1: First versioned struct, with\n- * FWINFO_CNT = 120\n- * MEINFO_CNT = 120\n- * 2: FWINFO_CNT = 200\n- * MEINFO_CNT = 200\n- */\n-#define NFFW_INFO_VERSION_CURRENT 2\n-\n-/* Enough for all current chip families */\n-#define NFFW_MEINFO_CNT_V1 120\n-#define NFFW_FWINFO_CNT_V1 120\n-#define NFFW_MEINFO_CNT_V2 200\n-#define NFFW_FWINFO_CNT_V2 200\n-\n-/* nfp.nffw meinfo */\n-struct nffw_meinfo {\n-\tuint32_t ctxmask_fwid_meid;\n-};\n-\n-struct nffw_fwinfo {\n-\tuint32_t loaded_mu_da_mip_off_hi;\n-\tuint32_t mip_cppid; /* 0 means no MIP */\n-\tuint32_t mip_offset_lo;\n-};\n-\n-struct nfp_nffw_info_v1 {\n-\tstruct nffw_meinfo meinfo[NFFW_MEINFO_CNT_V1];\n-\tstruct nffw_fwinfo fwinfo[NFFW_FWINFO_CNT_V1];\n-};\n-\n-struct nfp_nffw_info_v2 {\n-\tstruct nffw_meinfo meinfo[NFFW_MEINFO_CNT_V2];\n-\tstruct nffw_fwinfo fwinfo[NFFW_FWINFO_CNT_V2];\n-};\n-\n-struct nfp_nffw_info_data {\n-\tuint32_t flags[2];\n-\tunion {\n-\t\tstruct nfp_nffw_info_v1 v1;\n-\t\tstruct nfp_nffw_info_v2 v2;\n-\t} info;\n-};\n-\n-struct nfp_nffw_info {\n-\tstruct nfp_cpp *cpp;\n-\tstruct nfp_resource *res;\n-\n-\tstruct nfp_nffw_info_data fwinf;\n-};\n+struct nfp_nffw_info;\n \n struct nfp_nffw_info *nfp_nffw_info_open(struct nfp_cpp *cpp);\n void nfp_nffw_info_close(struct nfp_nffw_info *state);\n+int nfp_nffw_info_mip_first(struct nfp_nffw_info *state, uint32_t *cpp_id,\n+\t\tuint64_t *offset);\n \n #endif /* __NFP_NFFW_H__ */\n", "prefixes": [ "v4", "12/26" ] }