Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/130855/?format=api
{ "id": 130855, "url": "http://patchwork.dpdk.org/api/patches/130855/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20230830021457.2064750-18-chaoyong.he@corigine.com/", "project": { "id": 1, "url": "http://patchwork.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-18-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230830021457.2064750-18-chaoyong.he@corigine.com", "date": "2023-08-30T02:14:47", "name": "[v2,17/27] net/nfp: refact the target module", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "aa9d8dc851db32a224fb7f28e80d3134bed79816", "submitter": { "id": 2554, "url": "http://patchwork.dpdk.org/api/people/2554/?format=api", "name": "Chaoyong He", "email": "chaoyong.he@corigine.com" }, "delegate": { "id": 319, "url": "http://patchwork.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20230830021457.2064750-18-chaoyong.he@corigine.com/mbox/", "series": [ { "id": 29363, "url": "http://patchwork.dpdk.org/api/series/29363/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=29363", "date": "2023-08-30T02:14:30", "name": "refact the nfpcore module", "version": 2, "mbox": "http://patchwork.dpdk.org/series/29363/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/130855/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/130855/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 07E9A41FC8;\n\tWed, 30 Aug 2023 04:17:59 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 9AA06402B7;\n\tWed, 30 Aug 2023 04:16:01 +0200 (CEST)", "from NAM10-DM6-obe.outbound.protection.outlook.com\n (mail-dm6nam10on2125.outbound.protection.outlook.com [40.107.93.125])\n by mails.dpdk.org (Postfix) with ESMTP id 65EFA402F1\n for <dev@dpdk.org>; Wed, 30 Aug 2023 04:15:58 +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:57 +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:57 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=VCgQLBnltxIq+Qn8A+89IkF/oJhLNPNh29eRSlHKRtUo0mtKy5MOwCBCTeh5Oeyl84D91OxhLfIIfjivrquZUdkZSzCsPPemy+XVB0cktL7meQm+W8DNA6CpOx+cSf9V/rusK6FMOkVV2SGOjhROF0vcBWDZDXuPWIz4t8F7hObV/kjBvPQwlNCDkEeyOPDwrbVz81Ht7ZULLpOxLp/eGz9+ZIvoo8dPSJ/t8XI/9wPl15rjuFX1PNboJUqltJgVbjECGI7OfQrNIsSyzbJVNiMmoLxUQPHkQBo9kJ0mQhuh9gX2u/X7fZE8JYj9EeTWZkFEFBjwOWcmkngIvNLE1w==", "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=OFe1jHNufXkHcFcKm+we3D7ZENaWQkw9XRHNjnPZwTU=;\n b=NueLjKvxksxknOYMWRbp5QmVsea3lFj+46kx1aXfXukIzTrtof7h9s2O2rnwZihIkc083d93+IezXHjdxT/gJ/TCAYqB2jtKUJZV3DEGh9XtVhyD8WdXg38Zchjq6/tYcA9kZFFvvgHqanNDwsH4oJSHXXFY8VKZVOjrvKw5ZhqdpsIPMpPG1CYs/khvhFI64pFnfgavRhsaHVE3GoSX9jtL46mt89Isr2zQEHYHhxixMJSlcPyRv4emgbYVenyA51DAOIzoBppdVYh8AmKfIqMROYhALaQ69H3RK1ASqImFwtdBLKT1lwWMAQjbbnws1AqhIgyKw6kxWEkHVT9vmw==", "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=OFe1jHNufXkHcFcKm+we3D7ZENaWQkw9XRHNjnPZwTU=;\n b=NRkQVkZZKsq/Fokm0q106MGEX2L6XyCA3b4IZ7mkslqV7yvqRfmRhPinzqn9PSUHmSBps7wFHLs5610Ny21+Cq/6KgxrAfzd7dsH1yVAfZv5Yd5u9v8rS+nLS9KKIVWmyWTF+pIZywnOIvnxZcSMwe8302C5xKtNIYy+M4GBraQ=", "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 17/27] net/nfp: refact the target module", "Date": "Wed, 30 Aug 2023 10:14:47 +0800", "Message-Id": "<20230830021457.2064750-18-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": "db9f7ccf-eb3a-4efa-d248-08dba8ff0b7e", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n FyFV5vhsGq9MLrT86c2OjVHu5J8bGwBZ+Y7cOpLDo5J0ef/G52Bs4NcSyhWL2TY7g40QPDUMMBvRjb6Af/Qp1mKScUOQ3fgTbaYGXwmzYsaw25UaVmrJijYdec2wPi7W4mxWnZy8AW5gpSBAaQMkhDCiRyp8g7MlGP+5hpTa8aD6QLm39d7G3DCCz41/7Tsuexpl7MOlXX2j0HnyAlLMrI6Bf+P6Xl1sKeY9UZ+SprcxyZ2SJN1d5pELH+foqSxwPJ6q7INYt9I22w37YUVIoeOZ5opWxJtHqE5Qzni3vLIj/Ps1v4CKB/oVyPd59DYred8xzQA4/vWQxojMy+SUOZTLXtth6iZF28KkcPAwEG2CMza2PBNyddnuMa6cfmxhcZl3w/PEznh+nQ3TtmZ1OD3Tgk26+OG/Kn7vco38Sr57s5kAepNTnlO9p9NjW3nw8oY5LyCnArqj6JmkeU84VeQCbsGdZJ7rjxmA1c9pRxlWn37+XEBDu12w0ZUyBKdFMB32Ha11BgfNLQpMJuQ/nPhmPUxTaBG96T53K38SSu00WFirE1yKfYWasky3pYQyL3lkUplMrScU5CQCL9OZ2NIRewKjsY/9b3hTVVofJ4SYpB4sGydQ86ltJTFAGTA1hRJ3B8EGIs/ActrJB7QNctnaYfRlHgCdYBZeuHkb56I=", "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?X5gEzpfm9kZYzvfj8/8Z754FK+JC?=\n\t=?utf-8?q?AvDzahqvk6U4YILWUgO1hEnjqgEAEef50OcbwH1bgx6pnb0KqHTIxfGw3Xn4UbyF3?=\n\t=?utf-8?q?KaJ0n23VX0TSCYG+DlbnuW/g4d4CKMzTbsFuSZwLswplsAxOF3N+bRn/cUl6Pnm9f?=\n\t=?utf-8?q?XY02XbLMaHBzO9KvZCeS9MHtJrSplj1SwKpC1sfCfIdOfQyFVbv2SdZ8ywmawg5XG?=\n\t=?utf-8?q?+QUlCB3Q1TqNVO6GpNgp6hI1yE0j4VunrjUxYthSfRG9RIFe884IgABMm2iFIBFRn?=\n\t=?utf-8?q?+OacHo5I96DbJZfmKiGS6G3djXYhW5Agcd0q8/uf+KGEYetIw24rT4M47kEto5F7P?=\n\t=?utf-8?q?CHsmmY5UnADyvuEB3W7faNId3ESBqMOKtpIq5c+CBNk6DrfCLvZYtM3m3QW06z4Up?=\n\t=?utf-8?q?Gmlvsol1MDvQ+yma9oU8OGbofqvhw7motJvuV73R35/xpYYhwVwGOzuKZcphUZyg1?=\n\t=?utf-8?q?TEgnJvEoMo8//Na7hyTHqiinj+PdMvxxkAhF0NNzvnnM/kzpAj/qubmMtoAahs+Iv?=\n\t=?utf-8?q?hiFcr/KqJzc1JiyRizEVJpbRflSBsXpMStssjOiNCduTz4B5mcLtQg9aMWRp9uPN7?=\n\t=?utf-8?q?0BLQC8neOw2xXgr+XnUHAyLfZWbB5xul9xvpdC6rtC/0vuxhX3BBuJVtj7207XvSf?=\n\t=?utf-8?q?Dz0vo2xpqJFjJ4/SAnRmelUYR3H63noYHR2dmYkuEGxV0EG1gcO1yzq2E/OTylvis?=\n\t=?utf-8?q?Qlw966eHAm/c6t8EGI9tJz+sN2gPQKsnb4sqCe14ycYGXunITLBq4I/+7BOCi1sWz?=\n\t=?utf-8?q?P1TqPZlvcJy+lILWWEhGLyiFhmoJw0PADiPckWULgmb3nPB+AqtF6NOhwhBn43KG1?=\n\t=?utf-8?q?WWiwnECloFvAK4GgGajr3mdFtZ29V6ZykfwoED4DMde9AKoUnXOS7wmgDuePOLrf3?=\n\t=?utf-8?q?/DjaCvekQLbdIR4gG6lN+VTbiDn4WhRPb55HBBtp+1UBoeElFlNFe1Kc+D/q7pbGp?=\n\t=?utf-8?q?iv89Aop5FXhylMnSu2WtIkATDNi5MQwxCGeBO61HReuJF3mRn9bQ9/wKltSxKqcUL?=\n\t=?utf-8?q?zvpbPzxyV8CJ+5ymplFkqA6iPH3S4b+jAYHq8jV24j/dI73HXejR4TaVtQSX5GXBX?=\n\t=?utf-8?q?igRrYpRR6CBexeWkbuRGas8rBgUHjwdInEzAHfmy2RaCiP9tENW0pul/C5FbcgDDq?=\n\t=?utf-8?q?aeTEWITPOCTelYtlCe/mAGKkhMtJ+QkJEFtrnPH5X0bmXOIxXin37uHP1m++cVJQ1?=\n\t=?utf-8?q?ElZ0VyJWqDs/ZMy8FlbckVyMncnmykvJW/m75SmrycDdNIR+SErBRGSAvYCY6YsSz?=\n\t=?utf-8?q?0tx+11xTQBAI1UZ9Fi+5Ye436Ai0Cz/AUTtne7eC6dLvJYL9w7Yeb2Tphs5lCV3PH?=\n\t=?utf-8?q?v3DP4XlQMFtAYPrbKajPmJ2rE2gIbJSW3PbxnuRPlDjw2IHcGeXUe++j+ZJj1KvBn?=\n\t=?utf-8?q?OFYLV49YSqfW+3bGJ1Fjdk7DqX70+t9SM9+PjLsaKsa4lAFvyj/XRiPNCHAiAE5ea?=\n\t=?utf-8?q?BAJXZYchodEmf/XvrHwmolE8pglfYc+XYHhPj3q0wIb48hZ2GEwo/Jy1YBObWzLJO?=\n\t=?utf-8?q?WHMPzrBJ5sHNhucsgKHD0tSNzDYtUFWr0w=3D=3D?=", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n db9f7ccf-eb3a-4efa-d248-08dba8ff0b7e", "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:56.9460 (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 6GhIEJR/VZ8puiPsakOedRLr1qyy+iCjKihm0ClWUPUkDMbMkj29b4Zcr9kBxzJtoeu2W8y8FSS/qVGyzVKIRl2pef4gVA89/EQ30anU1Ms=", "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 function declaration into the header file, and sync some\nlogic from kernel driver.\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/nfp6000/nfp6000.h | 20 --------------------\n drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c | 1 +\n drivers/net/nfp/nfpcore/nfp_cppcore.c | 1 +\n drivers/net/nfp/nfpcore/nfp_mutex.c | 2 +-\n drivers/net/nfp/nfpcore/nfp_nsp_eth.c | 1 -\n drivers/net/nfp/nfpcore/nfp_resource.c | 2 +-\n drivers/net/nfp/nfpcore/nfp_rtsym.c | 1 +\n drivers/net/nfp/nfpcore/nfp_target.c | 7 ++++---\n drivers/net/nfp/nfpcore/nfp_target.h | 22 ++++++++++++++++++++++\n 9 files changed, 31 insertions(+), 26 deletions(-)", "diff": "diff --git a/drivers/net/nfp/nfpcore/nfp6000/nfp6000.h b/drivers/net/nfp/nfpcore/nfp6000/nfp6000.h\nindex efaa87c0e5..4c9ac017cc 100644\n--- a/drivers/net/nfp/nfpcore/nfp6000/nfp6000.h\n+++ b/drivers/net/nfp/nfpcore/nfp6000/nfp6000.h\n@@ -6,21 +6,6 @@\n #ifndef __NFP_NFP6000_H__\n #define __NFP_NFP6000_H__\n \n-/* CPP Target IDs */\n-#define NFP_CPP_TARGET_INVALID 0\n-#define NFP_CPP_TARGET_NBI 1\n-#define NFP_CPP_TARGET_QDR 2\n-#define NFP_CPP_TARGET_ILA 6\n-#define NFP_CPP_TARGET_MU 7\n-#define NFP_CPP_TARGET_PCIE 9\n-#define NFP_CPP_TARGET_ARM 10\n-#define NFP_CPP_TARGET_CRYPTO 12\n-#define NFP_CPP_TARGET_ISLAND_XPB 14 /* Shared with CAP */\n-#define NFP_CPP_TARGET_ISLAND_CAP 14 /* Shared with XPB */\n-#define NFP_CPP_TARGET_CT_XPB 14\n-#define NFP_CPP_TARGET_LOCAL_SCRATCH 15\n-#define NFP_CPP_TARGET_CLS NFP_CPP_TARGET_LOCAL_SCRATCH\n-\n #define NFP_ISL_EMEM0 24\n \n #define NFP_MU_ADDR_ACCESS_TYPE_MASK 3ULL\n@@ -52,9 +37,4 @@ nfp_cppat_mu_locality_lsb(int mode, int addr40)\n \t}\n }\n \n-int nfp_target_pushpull(uint32_t cpp_id, uint64_t address);\n-int nfp_target_cpp(uint32_t cpp_island_id, uint64_t cpp_island_address,\n-\t\tuint32_t *cpp_target_id, uint64_t *cpp_target_address,\n-\t\tconst uint32_t *imb_table);\n-\n #endif /* NFP_NFP6000_H */\ndiff --git a/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c b/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c\nindex db15411eb2..310cc691cd 100644\n--- a/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c\n+++ b/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c\n@@ -34,6 +34,7 @@\n \n #include \"nfp_cpp.h\"\n #include \"nfp_logs.h\"\n+#include \"nfp_target.h\"\n #include \"nfp6000/nfp6000.h\"\n #include \"../nfp_logs.h\"\n \ndiff --git a/drivers/net/nfp/nfpcore/nfp_cppcore.c b/drivers/net/nfp/nfpcore/nfp_cppcore.c\nindex d8e57b9075..f33985bec6 100644\n--- a/drivers/net/nfp/nfpcore/nfp_cppcore.c\n+++ b/drivers/net/nfp/nfpcore/nfp_cppcore.c\n@@ -16,6 +16,7 @@\n \n #include \"nfp_cpp.h\"\n #include \"nfp_logs.h\"\n+#include \"nfp_target.h\"\n #include \"nfp6000/nfp6000.h\"\n #include \"nfp6000/nfp_xpb.h\"\n #include \"nfp_nffw.h\"\ndiff --git a/drivers/net/nfp/nfpcore/nfp_mutex.c b/drivers/net/nfp/nfpcore/nfp_mutex.c\nindex 85c33502ca..87a9351ff9 100644\n--- a/drivers/net/nfp/nfpcore/nfp_mutex.c\n+++ b/drivers/net/nfp/nfpcore/nfp_mutex.c\n@@ -9,7 +9,7 @@\n \n #include \"nfp_cpp.h\"\n #include \"nfp_logs.h\"\n-#include \"nfp6000/nfp6000.h\"\n+#include \"nfp_target.h\"\n \n #define MUTEX_LOCKED(interface) ((((uint32_t)(interface)) << 16) | 0x000f)\n #define MUTEX_UNLOCK(interface) (0 | 0x0000)\ndiff --git a/drivers/net/nfp/nfpcore/nfp_nsp_eth.c b/drivers/net/nfp/nfpcore/nfp_nsp_eth.c\nindex eea5cde426..dbabffea9c 100644\n--- a/drivers/net/nfp/nfpcore/nfp_nsp_eth.c\n+++ b/drivers/net/nfp/nfpcore/nfp_nsp_eth.c\n@@ -9,7 +9,6 @@\n #include \"nfp_cpp.h\"\n #include \"nfp_logs.h\"\n #include \"nfp_nsp.h\"\n-#include \"nfp6000/nfp6000.h\"\n \n #define NSP_ETH_NBI_PORT_COUNT 24\n #define NSP_ETH_MAX_COUNT (2 * NSP_ETH_NBI_PORT_COUNT)\ndiff --git a/drivers/net/nfp/nfpcore/nfp_resource.c b/drivers/net/nfp/nfpcore/nfp_resource.c\nindex e4a3a42eea..ee987c4438 100644\n--- a/drivers/net/nfp/nfpcore/nfp_resource.c\n+++ b/drivers/net/nfp/nfpcore/nfp_resource.c\n@@ -7,7 +7,7 @@\n \n #include \"nfp_crc.h\"\n #include \"nfp_logs.h\"\n-#include \"nfp6000/nfp6000.h\"\n+#include \"nfp_target.h\"\n \n #define NFP_RESOURCE_TBL_TARGET NFP_CPP_TARGET_MU\n #define NFP_RESOURCE_TBL_BASE 0x8100000000ULL\ndiff --git a/drivers/net/nfp/nfpcore/nfp_rtsym.c b/drivers/net/nfp/nfpcore/nfp_rtsym.c\nindex 2d4100dda2..022753f98a 100644\n--- a/drivers/net/nfp/nfpcore/nfp_rtsym.c\n+++ b/drivers/net/nfp/nfpcore/nfp_rtsym.c\n@@ -14,6 +14,7 @@\n \n #include \"nfp_logs.h\"\n #include \"nfp_mip.h\"\n+#include \"nfp_target.h\"\n #include \"nfp6000/nfp6000.h\"\n \n enum nfp_rtsym_type {\ndiff --git a/drivers/net/nfp/nfpcore/nfp_target.c b/drivers/net/nfp/nfpcore/nfp_target.c\nindex 540b242a43..ecb45f7928 100644\n--- a/drivers/net/nfp/nfpcore/nfp_target.c\n+++ b/drivers/net/nfp/nfpcore/nfp_target.c\n@@ -3,6 +3,8 @@\n * All rights reserved.\n */\n \n+#include \"nfp_target.h\"\n+\n #include \"nfp_cpp.h\"\n #include \"nfp6000/nfp6000.h\"\n \n@@ -315,8 +317,7 @@ nfp6000_mu(uint32_t cpp_id,\n \t} else if (island == 1 ||\n \t\t\t(island >= 4 && island <= 7) ||\n \t\t\t(island >= 12 && island <= 13) ||\n-\t\t\t(island >= 32 && island <= 47) ||\n-\t\t\t(island >= 48 && island <= 51)) {\n+\t\t\t(island >= 32 && island <= 51)) {\n \t\tpp = nfp6000_mu_ctm(cpp_id);\n \t} else {\n \t\tpp = -EINVAL;\n@@ -510,7 +511,7 @@ nfp_target_pushpull(uint32_t cpp_id,\n \t\treturn nfp6000_cap_xpb(cpp_id);\n \tcase NFP_CPP_TARGET_CLS:\n \t\treturn nfp6000_cls(cpp_id);\n-\tcase 0:\n+\tcase NFP_CPP_TARGET_INVALID:\n \t\treturn target_rw(cpp_id, P32, 4, 4);\n \tdefault:\n \t\treturn -EINVAL;\ndiff --git a/drivers/net/nfp/nfpcore/nfp_target.h b/drivers/net/nfp/nfpcore/nfp_target.h\nindex 2a2f083914..47527b4040 100644\n--- a/drivers/net/nfp/nfpcore/nfp_target.h\n+++ b/drivers/net/nfp/nfpcore/nfp_target.h\n@@ -6,4 +6,26 @@\n #ifndef __NFP_TARGET_H__\n #define __NFP_TARGET_H__\n \n+#include <stdint.h>\n+\n+/* CPP Target IDs */\n+#define NFP_CPP_TARGET_INVALID 0\n+#define NFP_CPP_TARGET_NBI 1\n+#define NFP_CPP_TARGET_QDR 2\n+#define NFP_CPP_TARGET_ILA 6\n+#define NFP_CPP_TARGET_MU 7\n+#define NFP_CPP_TARGET_PCIE 9\n+#define NFP_CPP_TARGET_ARM 10\n+#define NFP_CPP_TARGET_CRYPTO 12\n+#define NFP_CPP_TARGET_ISLAND_XPB 14 /* Shared with CAP */\n+#define NFP_CPP_TARGET_ISLAND_CAP 14 /* Shared with XPB */\n+#define NFP_CPP_TARGET_CT_XPB 14\n+#define NFP_CPP_TARGET_LOCAL_SCRATCH 15\n+#define NFP_CPP_TARGET_CLS NFP_CPP_TARGET_LOCAL_SCRATCH\n+\n+int nfp_target_pushpull(uint32_t cpp_id, uint64_t address);\n+int nfp_target_cpp(uint32_t cpp_island_id, uint64_t cpp_island_address,\n+\t\tuint32_t *cpp_target_id, uint64_t *cpp_target_address,\n+\t\tconst uint32_t *imb_table);\n+\n #endif /* __NFP_TARGET_H__ */\n", "prefixes": [ "v2", "17/27" ] }