Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/130716/?format=api
{ "id": 130716, "url": "http://patches.dpdk.org/api/patches/130716/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20230824110956.1943559-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": "<20230824110956.1943559-14-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230824110956.1943559-14-chaoyong.he@corigine.com", "date": "2023-08-24T11:09:42", "name": "[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/20230824110956.1943559-14-chaoyong.he@corigine.com/mbox/", "series": [ { "id": 29333, "url": "http://patches.dpdk.org/api/series/29333/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=29333", "date": "2023-08-24T11:09:29", "name": "refact the nfpcore module", "version": 1, "mbox": "http://patches.dpdk.org/series/29333/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/130716/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/130716/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 CD26C430EF;\n\tThu, 24 Aug 2023 13:12:47 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 8CDAB432AB;\n\tThu, 24 Aug 2023 13:11:13 +0200 (CEST)", "from NAM10-DM6-obe.outbound.protection.outlook.com\n (mail-dm6nam10on2133.outbound.protection.outlook.com [40.107.93.133])\n by mails.dpdk.org (Postfix) with ESMTP id 364444326D\n for <dev@dpdk.org>; Thu, 24 Aug 2023 13:11:11 +0200 (CEST)", "from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5)\n by PH7PR13MB6116.namprd13.prod.outlook.com (2603:10b6:510:2b7::20)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.20; Thu, 24 Aug\n 2023 11:11:09 +0000", "from SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::51fe:5846:af8b:bace]) by SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::51fe:5846:af8b:bace%3]) with mapi id 15.20.6699.020; Thu, 24 Aug 2023\n 11:11:09 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=jBOSbCxKGfMirU6oa/ZRDb8yhrng/7PAlZGYVnZQGthZ66cYy8Keoqwm49HXpTVWBe+z0go/nLjuqyegJlHDGmT3qNI/JMyvv6w0VEsnL1SquJMMhxgS+7zmSnif0xiL8D9wb2avbPQcNttOst8NJzBzbgeFg21kV/VjQmr2VNMIY4xcWjj1yTgaMkEvRj+c+e7RZhiNlBPT7Xon0Tnv7ZZNeNMsNjHTLOaMaWVT2V+7ewRRy4ogtda8yeqasovmTc1JkQA2lGYPVieGODSpGboX9kg+nyXAaGj0zYDjyITbyaLtoS6soH/bXsTGUXPgOlbyeapm+l5FE5Lsyp0eVQ==", "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=fYdnRSDUZ+Qx7yPyQkGk43pIFy7cBaVlRbZHPbHKcSVDdxBVqKzEQ4mOmlThiwS8sVwfFdQT/datB0pqh04Nhj5YyDj3SnAS/6cnHVaWqkIFFYbjf65vIn9GGBejQyLJQPo7Y9pRe5RoZbW02/3efnmBAf9eqCeAYbDYpwXBPabPsWLZlGbXaYnqFNZXrP1cCnGUNn+hWWGTlESC1RW5DGT0uOu9bdfYOfL/2OokBqCu+I45KtRYnrBWY9g3q60ccDFuismMDnFGg2rQC9eyn/fN1iTKlYCP5/c2WyV9HBToK6N8cTaHacImtZ1hbxx3Td2IW96+ymMMwSENnzRmSg==", "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=WUtRiMZB5pOKWo+8kl4d0/u6fQHaGWxugE9fgrMYc1AiM2dsgd5n4uSh1gomKO6/5ayMTOFchhyGNeI4FZUCVfhtxTqLIPt+/xrKMvxBEAaeVkSPEvtdI++NxPjV6lcpE4W9Zs/Hm69M74U6i1fcWYBgBglH8opRTjQaj9L+xyo=", "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 13/27] net/nfp: refact the nffw module", "Date": "Thu, 24 Aug 2023 19:09:42 +0800", "Message-Id": "<20230824110956.1943559-14-chaoyong.he@corigine.com>", "X-Mailer": "git-send-email 2.39.1", "In-Reply-To": "<20230824110956.1943559-1-chaoyong.he@corigine.com>", "References": "<20230824110956.1943559-1-chaoyong.he@corigine.com>", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "X-ClientProxiedBy": "SJ0PR05CA0005.namprd05.prod.outlook.com\n (2603:10b6:a03:33b::10) 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_|PH7PR13MB6116:EE_", "X-MS-Office365-Filtering-Correlation-Id": "7a97ed60-cd4e-474a-9b60-08dba492d194", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n 0OFJqsNyTLOjQufFBC9hdS5uiUA1fRwrwuhUQgTH7KeUbLVypc94qfPR/bSTrgPd4rRsXo8fJ1bocw4Frl+CBCeNX46VbKxBgqo6yrZp+Nw8L+Gae9VCUlTubpXqXPWFwATaM4RwB2sffXCcSgH2OmxjrPdYn5+DjGuh1U1fyQd1vCw97SQT8euAaGYwwpoOsaqHIKvQXs1u9ILB4kMZikTpBG5RQHJr77BV4qrVGcz0j8+UEyflP9LK1g5SE11jJLCcauJF9KmU4v6MSeAwm1zNWoIOnZXZE7kydgIk83a9cNea4ODLN10AFsnK5cQcYupfBZ0vzoAersHMmXZlUyLp+eLZ0lZ0ZCQzsCf9jDLuo4Y3Sd0v60Tb5FiXmjKwBQTkm6YhA/HeJqnSlGi9f8QkpYfoglb6BEXdwWM4b/khJ4bbt5eQ/tFaUfAlEmSB9YNDkqhcGKeFv8xEgUKIrhZ4EJDw51+QQ2YEjKeY7xzcEkv2cVVr19pIDSeS9+4WU30k5hb9HmQdHRrpgqSjPZ5z/zLNHTG3xyNj16NI73LPJ7B5+MfXkAmCUylinGwnleUm/z10hn/Cq2LkNqzaFdPM9z6vJT1wjpIrxRKRifdwVroCpK7sP//avjIV+dFMOUJLCl/B+giiibsp3r61FudI8lGW7zISEpeUnCJ8U1SzArVLk6QFd7QWxG9GHIDy", "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)(366004)(39830400003)(346002)(396003)(136003)(376002)(1800799009)(186009)(451199024)(6506007)(26005)(1076003)(2616005)(107886003)(52116002)(12101799020)(6512007)(66574015)(6486002)(83380400001)(38100700002)(8676002)(8936002)(36756003)(316002)(4326008)(41300700001)(2906002)(86362001)(5660300002)(44832011)(38350700002)(6666004)(6916009)(478600001)(66476007)(66946007)(66556008);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "=?utf-8?q?hn3bUrNq1Y7bo1Np9dWQ7MbbdtAO?=\n\t=?utf-8?q?SWJiD7wudqthljWzBNpf/FSjbx4FaLV3WHM3yA15nJx5+4DfthRlXom5NG2kpzVIT?=\n\t=?utf-8?q?uVRX1Gj7VsPVMYtHZFuggjED6RPLL0OayzXsQ16e6c8UBos/QF/2VWLKAZUqOglUr?=\n\t=?utf-8?q?gyny+Xtzuk5zSEg6RL+OI4YlDpzieNg8/nCRSM19lqmMzcolRrAxg8sEP61KcsUkc?=\n\t=?utf-8?q?aVjUf4lE1Qfuos0lUcEe1IJB9FFuKcYmarrl5TZ21Gjis2s1oR398v8AJow0v6IzA?=\n\t=?utf-8?q?rFOFPiJ3kCAvSS6PME9X6qr6xGzKKhQ/VCddUY+kqh3OB467LGO5Rs8M33YQpEGFr?=\n\t=?utf-8?q?slNMGS96XSEwj+SaINQ4IxxbtptgFM+/wicWZZ3/G8pF79T4I2MJ3FULIM/D117Od?=\n\t=?utf-8?q?gZJdmmna5ufSx3ygfjsgsC5ukprxnWXA5UX/irDy99Ie+ZQLpg/vjqdxqUXYx1hX/?=\n\t=?utf-8?q?MJBJCp/xMZPfrg7xvaExaIEI5lUYmmkD5pkRFCnwUWVEfGO7+/soyYC+h5al2YXhr?=\n\t=?utf-8?q?fs27p8HrwJ7qdEsP+xNoHzoIduwUqdOigUxXlC62AK3FESZyE1HDToVTQTGYjOPBF?=\n\t=?utf-8?q?ZZXu40m6jAz7J+qhRgM/kITPhz43+zHbfU34IBXYSwBMP9v31fWf24nqc2hOoEIN0?=\n\t=?utf-8?q?ITq9eFAnU3lIBlVjMo+2BMxzvSsgkHMtFNbdRM9BV8Q/EWSpKaukXArdDS+qVICLM?=\n\t=?utf-8?q?avIpTrDEDA+h6vhyfQRHf3aV4vTkeU6yccdOFBIP9OpArjDv30uxl9TH5uaDY96Om?=\n\t=?utf-8?q?KX4vBv/kkwI4wcOvGPSSIOLgDNebi5CSrbE/WGeIaCgzwaW6nO3OPs+flqS9OJSE1?=\n\t=?utf-8?q?WGZpZjFXZlYnfuHAQNO1bJn3WPFsTSILBTYJmzeab5BdMEfL5ef8VWKsNatRXYGjT?=\n\t=?utf-8?q?CufgXpS9yBsHO4e6vCpQX0POIIXxbPZmDbgaww0s6IH2J1SAtzQzSEDJSMaj+zadJ?=\n\t=?utf-8?q?dS1T/GLMYay9aK+XEyizknNobi+PCD1/GrZOH/QiERyUeQY6I/No22Rjmz0I8ZTDc?=\n\t=?utf-8?q?O9trnGqnYrdnl2D91kCsuJHpwX3t/lbLiks3KWA8iZlK8RpU/1Jdp5Vb+GtYSXy75?=\n\t=?utf-8?q?hsC+aKWENlykZffHGyLrOrF5g3EKNoW4wWCZ4jIUZIDMi6H+pHNzibS9+GjndFL6z?=\n\t=?utf-8?q?WhnrC9TUr4FgAfZ+PzKIeiFti7fbS9IbPc/bPWPWEvHcNrej83KJ09mXPdyY0C7Wo?=\n\t=?utf-8?q?ZYoYJH+xHpbbqjAX17jR3Su83TfMQxChhNWesegQP2reQGGLGgWLFy3eGJB+doF5P?=\n\t=?utf-8?q?or1WXZwWMW8lVggda2QnCGoGXBEaU41xvkmOnb/slux+tqSPtTl2h03UwfGMakp8V?=\n\t=?utf-8?q?2/5GFFFJibSAB3x9mafw+tlr1t9GEILcqP1/mDuOn9Fuwz933nb2/bu1ZJOOq4s0E?=\n\t=?utf-8?q?QCLda/tRTyAbJYJw9LXabC6smoj/eqg5MuuHicWW15XdrIHVP4w23SOcvyT0LyQnO?=\n\t=?utf-8?q?iIaW3awywhens4bLbkYDFOryp9NPcPcDxmG+X7bOUCzqUMsgGD7pJHty1BZZyO+hE?=\n\t=?utf-8?q?XyHaGgm/ypCpAPqqiNHTdxXHN2rHLm2WBA=3D=3D?=", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 7a97ed60-cd4e-474a-9b60-08dba492d194", "X-MS-Exchange-CrossTenant-AuthSource": "SJ0PR13MB5545.namprd13.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Internal", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "24 Aug 2023 11:11:09.4852 (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 7j72SnYT5x9/BP28XVHSpNs0I9czn9uuHkZ0luEXlFodqDUv7E8Qw7JhbzKXFfbz5pKrTYYpceom/KJGNOk8f4P4aEtYTdfvjxMt+2iW1I0=", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "PH7PR13MB6116", "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": [ "13/27" ] }