Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/131599/?format=api
{ "id": 131599, "url": "http://patches.dpdk.org/api/patches/131599/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20230919095440.45445-13-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": "<20230919095440.45445-13-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230919095440.45445-13-chaoyong.he@corigine.com", "date": "2023-09-19T09:54:26", "name": "[v5,12/26] net/nfp: refact the nffw module", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "74db11e1bed72301d90bda0282c415d3d66c7e9f", "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/20230919095440.45445-13-chaoyong.he@corigine.com/mbox/", "series": [ { "id": 29547, "url": "http://patches.dpdk.org/api/series/29547/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=29547", "date": "2023-09-19T09:54:14", "name": "refact the nfpcore module", "version": 5, "mbox": "http://patches.dpdk.org/series/29547/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/131599/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/131599/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 74B3742600;\n\tTue, 19 Sep 2023 11:55:59 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 639CD40A7D;\n\tTue, 19 Sep 2023 11:55:46 +0200 (CEST)", "from NAM02-SN1-obe.outbound.protection.outlook.com\n (mail-sn1nam02on2090.outbound.protection.outlook.com [40.107.96.90])\n by mails.dpdk.org (Postfix) with ESMTP id BCE1840A6C\n for <dev@dpdk.org>; Tue, 19 Sep 2023 11:55:43 +0200 (CEST)", "from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5)\n by PH7PR13MB5868.namprd13.prod.outlook.com (2603:10b6:510:15a::6)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.26; Tue, 19 Sep\n 2023 09:55:40 +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; Tue, 19 Sep 2023\n 09:55:40 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=gUE8dDiY+efc0qwSHbLCRhXRQBax9I4ULoOKSCx3AWthM3NL4IdzllU3vifH9cMeVOPgnrlvsLqux5zuRokOc3L7Crk8S8nhKFy5TobNJo7BObLsR4M96Ivdq3Vd+706O2ZJX1yhwFuHugceB358mZsa29tW5pOmO6s2gx/YHhefqO96afF6C1zhgRLJjfbcxLPBcx95O5SkjiEyKXgweH9jBsMtuDDdkD88A/6uBsM+kYxTFaixqAs1fBFpnSR1sPxtZ2gViz31hB6Zr6K5r9PZ7gzK+g/gMBJpAG4znABByuOaVcyCLV5efTlpI3Kdg6oTiQM8eevabvtI1yTddw==", "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=9RaAR0u1CrKW8F7nMsWWUYiZP90uqq6koH/kanjCHR0=;\n b=AJLHLDAq6l6a+F5Afux52J9Yxw4lCFcF2aBNGXfS94vpIGEseSzjnszMrglhHrRXPThk+uKI6S3nktH23DxZLaRWd9E0qMeal7KeztlGRo6BpDxAOd+oHPC3A55ecLq8GsJyg5NVkyUJV4Xzd0LZL1p8JCYUuUjdL6DkU7O5HYTQu/SNS0X2fysD+Rqig2gfG3nwI310JiprCUyeOWS23PIKtAQqguKukQgUhvZ3VokvC/NoYp4XCua0gfPv4op3uhnYiSw1z2mhugjzMjm1yY1LlFsFUcw+7NUBxascz/O5wP7GU9UR1YM9eJa/JK2hLuuNN1eum5n9LfIfLwcXBg==", "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=9RaAR0u1CrKW8F7nMsWWUYiZP90uqq6koH/kanjCHR0=;\n b=iGjFnN82HiEnAImkeILzBcLSQKIsHjX7HMBcw9yvzWSnyTpo38W0UoqcsIYmqCEVDxZ41wAJtY4huLp/LVYQqe3+yiNFQ+/w9Fg0OnMShoMGjWywz0Kthx6zkrTfNCHaphqa8fU9F62pClK9hQv++Kc6QH/euMCfG1wy6C0l3Hw=", "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,\n\tChaoyong He <chaoyong.he@corigine.com>", "Subject": "[PATCH v5 12/26] net/nfp: refact the nffw module", "Date": "Tue, 19 Sep 2023 17:54:26 +0800", "Message-Id": "<20230919095440.45445-13-chaoyong.he@corigine.com>", "X-Mailer": "git-send-email 2.39.1", "In-Reply-To": "<20230919095440.45445-1-chaoyong.he@corigine.com>", "References": "<20230918024612.1600536-1-chaoyong.he@corigine.com>\n <20230919095440.45445-1-chaoyong.he@corigine.com>", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-ClientProxiedBy": "BY5PR04CA0014.namprd04.prod.outlook.com\n (2603:10b6:a03:1d0::24) 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_|PH7PR13MB5868:EE_", "X-MS-Office365-Filtering-Correlation-Id": "8700e895-8a4c-48e1-ffc3-08dbb8f694ee", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n yskHu9RrgfRtPRZBGRq5vJqG9v4h8LdM5BOwqkbq4bMgAtj7j3rYUQmobTbA73rBEcrl/3ig8L9SqsgP3sc+LNxiWKSIj2Iixwr4n69Arw/2KTPVfZ/uGneAfpt/AqHAtjfaI9QgiZts4od2v/bIv0QvoaFXZg8w/Ux8z6mRGVasMuq3HupT7zmV6rSGCPYojCHVnD2eSp+9xnO0DLBZjB2WF4jpSIfZriD293hKrSH+Z1B8RW/gfOAHWt3H23v7D3e39YYxhoPvqG/J1Jrv3ewtzmhZSeFJxMt9OEJETxG5j0sTSM28w5JBS9dcc0eAYGfik8d0rQdEGSRq5eGdmQOo29VaHWgCkyZBSyvSn/vFLZuzGXIow43R6AYAwEp/PHMfB614WPhT9iDyTIteF9Z5zC8Cr5MnPm4Pc/mLFw3u2F5Q+F0ate3vRTQudD5xbVUxg6q4iuWiUJC9Ufwy+2gogxW75AT0G/iPi/2iBCm2SUYEmjUUbKwIgMXggm2IT44EGHKgUu+WCuR5aE2b/3wiF7iuSLobrGkBTRwlRLyhgcgURtwLXSxuBfMD0QOnubgp6KPa7OsL2EWhEfnzUARA+C+gmP+Bqwo1On3ECeVlcs9aFde5soXsG6AiJYclQ7qryl9L5jWhZCO0jBbC/MQ6Hu6V57DQ5nM0L/CkREo=", "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)(39830400003)(366004)(346002)(376002)(396003)(1800799009)(186009)(451199024)(26005)(8936002)(2616005)(1076003)(8676002)(4326008)(107886003)(83380400001)(2906002)(36756003)(44832011)(86362001)(52116002)(6506007)(6486002)(478600001)(5660300002)(6666004)(6916009)(316002)(6512007)(38100700002)(66946007)(66476007)(41300700001)(66556008)(38350700002);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "\n ooaj7jXNeIU6vIru+ir8TmlIZy43PM5zAuKsUTeW8BuGkGX5W7X7Tn/DP7fcKoog3+SlH/I0pQHB5z/RULpERjC+O2nQ5Tvcux8CjKVmrNTPVZ1sPrEdiMiCa3bHyXr2cJ8p90G0Y129H4FcARw0GgUdnuNET+5VSUumUb1D4XU3krrZc3ijcZwk5o0Qogfh8+e4Pmulz3SGH0rlX1FZ1X/sk/h4bCZNaOsEFzUC2+GwcA2u8HfqIticnLpWFf4LObNCwR7ZropF18N+u7kV6Q1MYAVitu3HRFqVSXAj0Rn6UsK1aF5gCeK1Uqi+zFurxh1zJZBRBqxh6C880ySk9D2Nf4YfheWjpoWwNvnybbzNZExRkpEPGPR8Po4LAcMa+Tk8V3TBlKpsqTJd/hQjw31cTrTKL0eLrZxdK7YmauYG502KuQ0vSoW+BZJt0NTbMfYwW0VgUXG8DtPYM8vrmP3S6gkTeTfSpYzyMlI8R6qFBOneXUGkjmE0t1jBrzh+crifaA5AB630W5w17bNrkwITphEMbfd8t5WcKmsH45GyYy5ExDFK6K+uyrE0g0C78lT/VnjwDil3l6YQ6Aj3NtNt2FVjQj+7ld7PjgIYako7KLM++iKOyO8Qp6r+NptrwbgQFGOuR3l2pBoqa49b6feThpNF+YkjAA4iyJZJbbAJ9U4M090Oep/6eyG11T9F2jL3FU+b12X/oR+TWaUjnLePambcZ8r5nX1seqveKBFv7jmj0FVomRoniCTpzc6r4elOGhcec9KFYmoNXCMaIs1xZ22c6gxtLopbI2dLKB/7vb9/TuUTIkAUUo78r+HjFB+zLDXbUCzpLI0pRujFeBv7orYPJW9RwqLDiPw98nGPDp7AZS3hM5rYWgJn+EPAhzogRa6EQNr+1O9s5NIXQLPS74Y5eJxf9Typ4WkHv3zGkNVE5ce9J5Xa8oQYRLNbaf7NAcK7fzRmAJ8NQkPI8TEpYZMuSIFd2+KrdEaEoWc8vJ/IujfzRoWzyHmNdWyLi5A4a4PCPDBb1gSTnGWxHVzzflfTD1x9mYRGzn6HlW4TOuTMp7QZvKQ9r44e/BkR2Cq2d5jwzAh+b+MLEU/M4VmgGYoYz4m5zu/7qp+Y9iFgrSt9DMJ1k+2pNPgqRXK6q9I2y+Em+2afce66onuJzULoFid+VOP2uBOwAUkmz4yb30XXDuFZ0r+amnbcoKOLqGdPK332yZ4ArhPSIATTGoukIaCVBy4XbueOD/rDvR8hithupLGjke7TKzBIIFTSBAvflNpDjvgPouzu1NKTUYEsiCkzL5/oN34i0BoTwuBK10Y5y/4TXYDMOUp44Qf+mK13yvLR9v4FiXpUQmDSscJlQOVjUAqUglVl6Y/P2eNeoqXXjv0nmCo03qjBw+YyACY8gnxJ9F2ryikVm+kZYynEf1nbkcREcY8kMWJTrqVJyK300jkH0N5ku/6rOWoXmJ1G3/uwjAm4pApWLWR10WMmsSU0+55ML++/3prhgLm4uNqft4yAJimXKDLtbNsNaOaIio8mvtcizCvYG5ScmhwR9l5ztS34RN/fLCl3xCIVdyLugEMH6hkdogUHLDsCw7PJ5wrMm1hpsjij3finAw==", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 8700e895-8a4c-48e1-ffc3-08dbb8f694ee", "X-MS-Exchange-CrossTenant-AuthSource": "SJ0PR13MB5545.namprd13.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Internal", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "19 Sep 2023 09:55:40.6095 (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 o74jDEKKx3n8IB4CMiC4321WcWOs966HxVpwtXjcRIyyeZQVJGOCTlx9XdveScy+bYQ5Rm32VT1KG0vOlZyj1AqnUa0aCTYn0VxCL5yNWwA=", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "PH7PR13MB5868", "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>\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": [ "v5", "12/26" ] }