Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/131603/?format=api
{ "id": 131603, "url": "http://patchwork.dpdk.org/api/patches/131603/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20230919095440.45445-17-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": "<20230919095440.45445-17-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230919095440.45445-17-chaoyong.he@corigine.com", "date": "2023-09-19T09:54:30", "name": "[v5,16/26] net/nfp: refact the target module", "commit_ref": null, "pull_url": null, "state": "accepted", "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/20230919095440.45445-17-chaoyong.he@corigine.com/mbox/", "series": [ { "id": 29547, "url": "http://patchwork.dpdk.org/api/series/29547/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=29547", "date": "2023-09-19T09:54:14", "name": "refact the nfpcore module", "version": 5, "mbox": "http://patchwork.dpdk.org/series/29547/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/131603/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/131603/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 CB69D42600;\n\tTue, 19 Sep 2023 11:56:41 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id D0FFC40E78;\n\tTue, 19 Sep 2023 11:55:54 +0200 (CEST)", "from NAM02-SN1-obe.outbound.protection.outlook.com\n (mail-sn1nam02on2122.outbound.protection.outlook.com [40.107.96.122])\n by mails.dpdk.org (Postfix) with ESMTP id A921A406BC\n for <dev@dpdk.org>; Tue, 19 Sep 2023 11:55:49 +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:46 +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:46 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=nt0UESNFbjIB1XSevjOLw3TpAFfqZvB5qkyXkWnI0ldl2Dk6AFPZxUMVDCGc9nEAS7LxTC/PLQsGmqMXo4u32m9HsfcAqHfBgwLr6DOQ/7IOaug1zx104xLMQvQE+2KXkfUpKj7srlutuWEFVGWg/GcF4zx/TZosBKzkU6nHKdbcxroJP8/RSVmcr3Gaqea4jtfvEWwercMxeizOKmVRJ7M39rw9OYJ1Y6q/swPl2RA8C24RaNW42SnBSDkBI1sxlh9bySvWABcvPqwkY/BdaoODD1WjiR/908qp3VrYUK7S3QCtzO91WJxBTv8U18AxDsxmNA4XPo2Ho5CZNH8Ceg==", "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=yXSTRgF8Wcy7EkAgHaTEOYXy8l9//W9YE1sBDIFEaEg=;\n b=ZuJ2VeexEMgCaejYlxH9hV5vimtnWuIH7g9EZw04N14G/T7qGE3FOjotdj2FJ4901tM3jXSVXGTD84b85ob/1iUBbRW6K4ujnm1giFXuTrQer4b+aBtMdcgPZcoh3hgVJ9X2mUW8atWusVlRoqTVg+EVwAg7U852YVbHJchtI5MLeBG4guYzUw+j+cD/lwNVbT1CzLhppViaeOfwOlda9VhINF+RK/jmzbVDSYvpqa2Yce1gS2UOjGWb4YyLrlcSwvXTzJznnW+WfciF6VUXvReGRKkMdtwe7inLqZNhqZ+IvkMvoLaGiEBd32fVJz1+q9PchTeeit9E6/WCIq2QPQ==", "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=yXSTRgF8Wcy7EkAgHaTEOYXy8l9//W9YE1sBDIFEaEg=;\n b=HYw64UAjzjsLvgKKLaeFfqJ6AyIRi+bNHQcfbpOYSbYOFUjneonptd+d/mcTG/f42rtzgmyJBeacTgbBk7TjOQW6D70HX05pXEqYENHuKyoh1/GQrITcHS0NMLO0Pt8J7YMP5/q4a3PvevMUqyQVNQ+aRCBF+ijDZw4hlrg3Jsc=", "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 16/26] net/nfp: refact the target module", "Date": "Tue, 19 Sep 2023 17:54:30 +0800", "Message-Id": "<20230919095440.45445-17-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": "098a36d6-7ed8-4189-0eab-08dbb8f69874", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n pd2sn+A134T6K/5/2Z1Dh3eYq03bKRylZf1sYi+ej5X+AwyB69gsaZcIaUZTpjKqGCxR90fLWwnOaUlvV1T7RtN3a3dj7cR6kocI+KYQ6em/+/h11PSJaK51YYvKymTx5B4SbV8rx5b+e1yK0YEl2nq/Y88CFOHVFBSVwSs6ulnZ9nIvUqsluScM65gSqE6iCvJuQg+lIX35Xm8UrIytbPZOpmuQYVOegnfD/Px7P36rsiCeTE9j9Lr71HyFh+1GRpgHhztfjpaxgsVzJVi0ldGr8e1VSX32VM7452hclNcBaAApnscfMwB9rvzn8YGA7MqrWot6qA73rOkqob/LtGJOcYpvABOEAWvLVnTs7YNW9GSdDOopz2sCT2/iZIIxGr2sm36Q/3+irl6KbexXVpCs2smwtNiON1ZiiAMuPZwPG6CzDSrqF+ybDbhxSo3oTPwAmE9t5Vo4pBlciC7zsTsw5oKKh+djWsA1GmoeMpq6hhRJygOYVjYrwQ0vud96k/2a+JNrWGuk8Z1ojoL4N+C9xU5XmyZ+pIBQGu3KbnXUnjuOiPhXM1noD5HgVlYP3bG6V1c9UFcs/m9pVB8IopvdHbTyPax3mCtDOY2p1bBS7zRR25XrJnQaTQf3QFCu18+xq5WbSvDh+xDtNvQq7X2m+1AkA69ihKFVxfY9K7Q=", "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)(346002)(376002)(396003)(39840400004)(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 OJU3LXqwfsuJZo0ZmCqZ6onAhPgbqRKfkIvzUjq9W+qqCwnNoMwjkYxDRHqjLO7xlu3iN8LnX4pcXinH9rUciLCZFvo0hpBH2UbMCjB61VaEPim6ncn40jyCpbj2nu1BzJZbt0ggklA54hEgtwCM+7BByQrP7kg0qzorRQBCq3Lr3N9E3bgwafXH15DwxW/8RMkIKk5BHkkg3jsJ59kJnv4EGlqzzYgElFxBIEeEZGEVrb3YV8WPiN8wVG4pymY2sOpa6/HApa96PXXgsyIYyniQtsjVFiYjVLvgNrfM7BMs/HyEwKnSrsNqL50XxrUWP9oMFf0m384/U4C91zEY9Co3g6NR58iDoI7DZJgPeoL5IGrpyFbpatPyJmLeQGA+sZoQJRyL9MhdF6DLLgSlrLMn8XzgWt2TEB6eBXBDvleXQLFiRS+hkbRaTdYo+NgqKS3NUwANRsHPemyb9tAsvzBd2R69pu9RfqPDDjkmIymnKYBZT5LPFWZd2MzPSL0H83PaK4lb5+Db81YTWeAeAS5+pD5JZYpdCgou+Z2NNqs3M9uJbNurDheHQD7ff+ws21WnixMrZsWIYBHD5lnrsnRGa+CJLiw5tuq+Yc/m4t1W8XYcYkPi3Ic+fgPhfKoYe1GgFAcGkkhNnJ/Bwji7r4lr1F97o15S13O0BP77dH5rBjbPBTZuRBq3syY8+ub4oFlmsKUURZMNS46Kro63II21tYMwCwoWEwr+v/Cc9l2WUbpoUwwwBHGIZIJOsVk0MW5yLjpeK92IuHDSr56rN3q24BTwFfARVUEF+GyeTO6LdjEIMPa2yedsaJO/xB5Vsk68ag7MQmEJ6pbLjTPtUTDydZfGZWsJUdGSiqyeUGiCMgKdbC/wIheJP8lqr3mXepqLT9Rt4BvXHh772vV5UZm0JLC6hfQ/jN/vQ7R9St4x6aqujxTisY4kPYEStsgCq0ykwdhe1gocJzJhEs7BpCs0cRSYn4fsVPnT4h0mZ3FQ4MLRoduSDXtlP8Aa1Gv6uqnNiYTLSG4aMRrk92iz1G7tQ1B/yaN7j7oxk3ZYNe6iPznkkmeC2DZXRsocmabMb9xbygaOVLStMhHKJ4CEmUPo3EqsTdVj1xtQYcreCI9KZZRY/zxBDNzV7Z86XCWT3t6aNFRPu+j5zfTglb7+VQ2R6rD2kUpDuBjmX7YfIH7JW0ZcwPft7gdEmXPAJK7Y1UajpRayZY10HYvD2uVPhRlhQnZNyzgMfK4IvKahD+4IQd2Rd44nSQcGCh3ASB2V8uZG1jNOvrRV+wFXOPr289gswDWfC1YLm2M7VPfiB7PaB6UC4nJt4euQCrKZ2CJzXLukCJp+7/AqSsuzVvUkflC01IBrONkS00IJjGIE2+J/pit4pUnqYerG9Fw8lNOjPDoWMN2/Re68mvLZg3DejcsS96IB4lyc365jS58LsT0Bg0ZqcKuat22dNge51MYbkkXFsEq21E55MPxh0xofWGX6wD+YeyqIjruPz29bwU6mkCpEqH3YLG8t1hKpZIL6TmpKA6atxo//N6yydOyFm6MHfSCGGgpnJTQ5tfQ7i7Phlvz6aZ6HiUStfuMySLqlBji5LgnbfDI1iq325IJm2g==", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 098a36d6-7ed8-4189-0eab-08dbb8f69874", "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:46.5404 (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 93WPq7zVeqPPNm4PxGpkiksvb0QLr56OL0n5C1BbSuH0IXFAcYvokkb4W66j47BmCojJtjXhVywrrteby4TgrSYuPRZlpXqfrOc80E3wQ0k=", "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 function declaration into the header file, and sync some\nlogic from kernel driver.\n\nSigned-off-by: Chaoyong He <chaoyong.he@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 7173b4d8a5..41485b6975 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 82598be7a1..96ba60697c 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 32c1838a40..36bd49d659 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 c0afdbfdd2..539eb69680 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": [ "v5", "16/26" ] }