Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/130851/?format=api
{ "id": 130851, "url": "http://patches.dpdk.org/api/patches/130851/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20230830021457.2064750-14-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": "<20230830021457.2064750-14-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230830021457.2064750-14-chaoyong.he@corigine.com", "date": "2023-08-30T02:14:43", "name": "[v2,13/27] net/nfp: refact the nffw module", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "05e7e53051679f9566dd23290c139b3627419600", "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/20230830021457.2064750-14-chaoyong.he@corigine.com/mbox/", "series": [ { "id": 29363, "url": "http://patches.dpdk.org/api/series/29363/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=29363", "date": "2023-08-30T02:14:30", "name": "refact the nfpcore module", "version": 2, "mbox": "http://patches.dpdk.org/series/29363/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/130851/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/130851/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 A44BE41FC8;\n\tWed, 30 Aug 2023 04:17:30 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 5E4A7402E4;\n\tWed, 30 Aug 2023 04:15:54 +0200 (CEST)", "from NAM10-DM6-obe.outbound.protection.outlook.com\n (mail-dm6nam10on2094.outbound.protection.outlook.com [40.107.93.94])\n by mails.dpdk.org (Postfix) with ESMTP id C2680402D8\n for <dev@dpdk.org>; Wed, 30 Aug 2023 04:15:51 +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:48 +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:48 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=ZWEOhMu2lHZ0H0w9IumyiFotB06oNEQZfyTd0KjtUdW0fdKtlJuDGzsKOUaqK6CUZsK8nzFMAZr+aAbtI4PDE6jJO+IJGoP4d01yhTEkQcfm6NGLdiKg0vvpbSBF1QXJdxehjkJaqg2MoCREpk9Q3Em/y57VEetJR/QFBCfRx9SkXX/Qxe0s1AfLxcwWKi5OnJNaC9UVPd/zjbpTZAKVQ2T5oPtTTXR+8cuZhqC7evolM+dRXNrRw5x9Vdkx/qQzqwsH9cuYbelCzqm+20lOOYyajiDU4LaaipRvpWHQlqIC2EBJf8sgb7+2ZWkoOZXn+LMuM/k4mJH+I2edi0ULJg==", "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=wYci63y3qVXDFD7YNNplZ+coGeGQ2oodavJXdk/t9jw=;\n b=LyEdMXGwxkWV7ILVn/HSh66TNDwofZdcxCtH9MmpUCHFC/K7GTLfT/l+aX4v/+pnpYlGZnfNDzyh9urAg08Sk3pn5GYVbDSCGz7h8pRwkWSyeZyTMWeOGrmsswtqLHE8eunteExEXZWD6IPA+YeyIBppB8hduWGd4NRNkdpM0D8u1tBIyNBQZfrGyqPpFKGEgiU0ywR8SZ1mZwQ0Pu9adkrER6zEwmbNvoJ7iWX9AtVZfVTGFqaAwiq+QTVu+JYXtwCCHQ7PZR73hu7Y24ii7hra62wP5kEXz/5nKQNiO1UZltwpKsgv2O0ahiDl5vICgvkIA7BA72QvIwmXac6Ztg==", "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=wYci63y3qVXDFD7YNNplZ+coGeGQ2oodavJXdk/t9jw=;\n b=t/gqoc57vJQ/sFcFLnVCLPzXFpo1uphqXGFFIhFPZLGE6jjS+xknfBK/LLTOpfZL7HlG01XfojU75dlYMDPcWgVRGt2Yx8UIY3cWR2MIpD4qVIHD80kQCSUZMqIte8yGdDOV1z72OkJyQG5O78VeikjJorqO/AGdnz0liPSHM8c=", "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 13/27] net/nfp: refact the nffw module", "Date": "Wed, 30 Aug 2023 10:14:43 +0800", "Message-Id": "<20230830021457.2064750-14-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": "6034c235-fa8f-4384-d05b-08dba8ff06b0", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n lWGXYYAjwt/xEafQUk6fWz/54myHfwnNGtAgQY5mrnxyyYIj1CGSAb7AcaxGEWE1WShx/ILBl0Y2zq9oKTq8FS+ApEsWdfuypcsREHYLkSIuo1+qBldKU5mMVfrKDFhbVLaqwJCz4poPnHtVGZWK6B+e8qbpVT5nm1Ke+XbxSQELjbxfwhiuk4DSSso617jEBN44KOSnY8xsp3B9ZxlGpakMhob7TYAvzjBOYDS/BJ4c1g5aXhpXJmcGKXzFG7t+rpSz0A/8jDGlRsmR3n8E0BXq2xQVl2iuoDg672Vz/8b4EbAeVzwkH8jmgGtswCVl2XOprBPinc7fnBGzEPp3fSLm2ejkIXfN2BWu1zkvQ8giTw8BUK6AQ8wTxx1abTv7BhZs9yMldFfA4I9yR0IPPBwmkVUE745FMx2HdXXsanav5LwjXa1zKFja9IrtBbvpngn2upIgWkQZsGTnfGiDmEXdJ3g3wL3khTRx/vdT4FUVCKL2jGuBoo19mxGzacRb7dPs7R7oJeYTRCJQ0AmLcN7O0T4SYqW0OSrT34moQ6iWQKEeMVP8bYszeiK30n+bgjn9Ht3NDEkpptY8dnLgdU3/vBdl9lvvz3SFbAV0Bl4BELpnwEo8HF2x9bUcaG73zZRFFBqnCqa2dwFob5h++mYl3s53jRnl/tYPIKBCdWg=", "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)(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?up9r5HhsfjPZ23gyfCNWT7cSh78V?=\n\t=?utf-8?q?t2cd7RQq+7xoTq16tQWZ+h8C0l0m8TqpQLHnBQ/7LT4CLhkU1DXaIoKckVe5gaMYp?=\n\t=?utf-8?q?gIi7fWKYn+QTBgFLp2H6Zz57rsGFYgGk7dbnOY6MqFXHDAw7cUjBrLFr2Sfv73aDo?=\n\t=?utf-8?q?/6kSCKAHwFfP0b8Mglzi1b3Hl068jsdIVfLNQpEkxEBHULKs1uggnX5lGwdGRX8c+?=\n\t=?utf-8?q?wMXc//5zOZSITFaLdXSvGxoUNAcpE2YcG0y+3J4W+cpyg4p9MLd6Ks33FkfaG0XSq?=\n\t=?utf-8?q?Vv0WzWjLE97BBfOZxt0JK/1yAc3FsvBLOgr3BArX861bbX41eXtjG3IAHSd3VhhMR?=\n\t=?utf-8?q?xi82BwK+/zJJp/No0DBPW+JAslJE4bD317bIqp+dMTD+ia4H4C43E3TytIEQqVjcQ?=\n\t=?utf-8?q?9zQnkX9ffpQuyZlaT2ABoepqbyOZirgva4MH2nDSqEwP1h/RDneQU/m9X8EQI2Kz/?=\n\t=?utf-8?q?G7A8bIuP6sTxOPFoCzxaLRFbqBnCjC/soxQ7eu0YwHf1jZQxbMpZGy2mgcoiMiiOV?=\n\t=?utf-8?q?XufYfLaIXSdjBwkEIQ/t6JMRNvAjyDRP2JYpcLpxJPoxdd0z+tgJiXovJcXy983+7?=\n\t=?utf-8?q?43iMsIsvZYyF6gK6H3ATOWHJA1qimenYe6igaMhzkfjNYly6ApnClWumBSHf6g7CW?=\n\t=?utf-8?q?v5oHuTF1P9cVqXk958Wee4DKENeSim+LhCxSRzHzgB8+Pm35ZVry7ZU6vRMcbnanA?=\n\t=?utf-8?q?0A3F0S/3mbaesSq/YxFuEVgCA0pf4aIZnBcLR8DV46JmT1gdhyglOCWnLn63QgeWh?=\n\t=?utf-8?q?UXYZTKIf6UQPUMjyYBI3Nyf9EvLkZi6EXvpseHzffVVSZwO/cpWrucDh4axSQLIi/?=\n\t=?utf-8?q?hRB/LcQokPYbVpfKVGhZw+FctVY6bEemRt1PPYdwVLWJwEALlfGt8BB7hIJpXJ6Rt?=\n\t=?utf-8?q?95cXLHe11mGJBJF8XtwOeuy3///NtHTyhfQhSv1sJjJn2inzHDEi5TAjLPzEMLwvE?=\n\t=?utf-8?q?zycKapToLi0QviioEq7rzirbcDIwcWX7HsSzXuN6CS+j2JxlZy4xGvfCgWRzHTwSm?=\n\t=?utf-8?q?sLWM5ogW9LEj8QNR+38C/x/9Wq+6nFY9okztpeSvchwQ8GVwf2PTmiDVaA7Atjtvm?=\n\t=?utf-8?q?ZRhFRqUvw4bPANjUnb8buE0IZNmXcWS8San/Sy3LSOP5iyAhnHeoKqAljbc8MjAEr?=\n\t=?utf-8?q?QGfwTzlG3qmXNS2xdMSz8yXd7lZmLrnblFyne1iiGZbeNc6W6wmDTUJ8EUUS+8Q95?=\n\t=?utf-8?q?pSvO/PkfRpVwhdXeKxt9QTtKlST735N9KMgrmz5/8QpkH169ITbnA79dAmS7g50j2?=\n\t=?utf-8?q?pHOX/r1ibTFXGEM1IM10dCSaeaFfePfHFo1ZR17DX8BHl/jq7pUL4T0enqj3CAOgN?=\n\t=?utf-8?q?Gw5bLGo7/mTd08n9ER43RgFWRPbcDt5yio5Gy3RD82yEsCbeaCxFVm2lAzUKYhgdj?=\n\t=?utf-8?q?K3Uur6YpGnEY7K/BkAObYCFT1QF7fdLLxMW9fbJlEz9nsurb7Y57ogaPTzmLLEQdN?=\n\t=?utf-8?q?4akZeFxS7Dk5ME5zquyo5+9cyxO7SuRJkWw39JRxnmCDV+mHowRqngT976UGDMm26?=\n\t=?utf-8?q?OFeaSVt7bfHhC8r8Vtd87culx4kcuDF7CQ=3D=3D?=", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 6034c235-fa8f-4384-d05b-08dba8ff06b0", "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:48.8859 (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 d5/YkAzAHfqpmDaPx15EMch1DYAweElXurPs6vjIouz0gLmkxlymdw7iQ46K3IFOS+4nJPcM1xdNAGoW4JvSIpo4Y7XXxC4rnF+/ZWIuqw4=", "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": "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 b27a9fbaa7..895c71afdd 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, struct nffw_fwinfo **arr)\n {\n@@ -236,14 +274,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": [ "v2", "13/27" ] }