Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/131492/?format=api
{ "id": 131492, "url": "http://patchwork.dpdk.org/api/patches/131492/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20230915091551.1459606-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": "<20230915091551.1459606-18-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230915091551.1459606-18-chaoyong.he@corigine.com", "date": "2023-09-15T09:15:41", "name": "[v3,17/27] net/nfp: refact the target module", "commit_ref": null, "pull_url": null, "state": "changes-requested", "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/20230915091551.1459606-18-chaoyong.he@corigine.com/mbox/", "series": [ { "id": 29520, "url": "http://patchwork.dpdk.org/api/series/29520/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=29520", "date": "2023-09-15T09:15:24", "name": "refact the nfpcore module", "version": 3, "mbox": "http://patchwork.dpdk.org/series/29520/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/131492/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/131492/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 4817A425A3;\n\tFri, 15 Sep 2023 11:18:37 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 4E68B41109;\n\tFri, 15 Sep 2023 11:16:52 +0200 (CEST)", "from NAM11-DM6-obe.outbound.protection.outlook.com\n (mail-dm6nam11on2090.outbound.protection.outlook.com [40.107.223.90])\n by mails.dpdk.org (Postfix) with ESMTP id E05DE41109\n for <dev@dpdk.org>; Fri, 15 Sep 2023 11:16:50 +0200 (CEST)", "from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5)\n by CO1PR13MB4773.namprd13.prod.outlook.com (2603:10b6:303:fb::6) with\n Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.21; Fri, 15 Sep\n 2023 09:16:48 +0000", "from SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::c05c:6915:1628:70c4]) by SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::c05c:6915:1628:70c4%7]) with mapi id 15.20.6768.029; Fri, 15 Sep 2023\n 09:16:48 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=Ly7UfoIUJt/oH5W+3CYOKfBDmk16gpgFXOztjeXhpl6JmpYtl0/Dai+NPRd+/Qn46LfSmUjvvjsYopBr/9baqvmUXEG6KLZwJFh/qhuZkr9wCPK/eZvcrVoI/GJAka6yRAdfhFzyGysP8VdQIbNYh0lu28TwBsEf051yFWrqut95LsvKhlppOeJhzA3t9ubBfhPl9vUh8QulHAWvdI48FjGqnfFu28x1xeGfqphAfDzfD+Eb3qNIgRszo3CyEHTf5oKa0oxxhYcANSCouj5Vpw7ySJ6ng1GEADURzLfjhC9WXUzm/ZclQeQlowQltLffAvoiv5OeazKxbTYhZHmwkg==", "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=ZvzfA0mMpS/MLb37C8xF4KSMhtvvTvq5ICf91NBqI+w=;\n b=npUef1FUOcIjw7TTl5OiwjDuOYq5QMVx8DKEQMLBeq/usqQFhLq4qVAT0Ci3zr9rB7NZPSWfPRO9O//yCjeD/ubAIv2Q3HAyH09fi4wGnqWs58awpFuRWvRCJCBHG1sA3lJ9Y0cENcYyqQyH5gqQHXitPn6EgtGdk9U5wvf9evQJFdIIR2/IE/R29iqAvNikQdUHjhs7HSkcUcirlSg55B8jhsamfTDWgFAfLHgnBojOs/IL0K7vS3Zvf1vVenUk99exPaZclYWcTfCQuooJMyw5CvjPzgWa+96eXx9S3WbinxSMTPCY7P+2+wGJtTbh1mOE7k0lwAF3JNcEDlSEIg==", "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=ZvzfA0mMpS/MLb37C8xF4KSMhtvvTvq5ICf91NBqI+w=;\n b=oa94iz/0JiIIUXFzsDWV973aYQrP2BMsDCwA5FFGgk7KUWU4VynQcq7eQzxuAVerHXTSqRhDfkqOhI0I1AKdgP/a7pejJVm5LFjLn5elYC/lJrdauRcoka+9IwkSQe8ZZih1ev0DtTSsPfTR9sLf6jXFGMkUYQisP5vSVNcT374=", "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, Chaoyong He <chaoyong.he@corigine.com>,\n\t=?utf-8?q?Niklas_S=C3=B6derlund?= <niklas.soderlund@corigine.com>", "Subject": "[PATCH v3 17/27] net/nfp: refact the target module", "Date": "Fri, 15 Sep 2023 17:15:41 +0800", "Message-Id": "<20230915091551.1459606-18-chaoyong.he@corigine.com>", "X-Mailer": "git-send-email 2.39.1", "In-Reply-To": "<20230915091551.1459606-1-chaoyong.he@corigine.com>", "References": "<20230830021457.2064750-1-chaoyong.he@corigine.com>\n <20230915091551.1459606-1-chaoyong.he@corigine.com>", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "X-ClientProxiedBy": "PH7PR10CA0017.namprd10.prod.outlook.com\n (2603:10b6:510:23d::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_|CO1PR13MB4773:EE_", "X-MS-Office365-Filtering-Correlation-Id": "81f75f21-fbfc-4016-a7d1-08dbb5cc7d4e", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n CR52s6VWzbOBhB8ON4QhIBIyCDHHv5ebzyYCNhyYbzP1Y7spPjSBNr/dFTaGW7ySH7Cw3CNv6nGO1cXF3cDSrMARinifgpsqaDoFsD+Ma6wrLA4NHcA7VYSmyD1qcrbQykXANYLVJp3RAvFDSX8A+gVcwCE8sKjwHUleznIpLrRf47X8hByA1E1C+nM+WmvnXNT9btXEvB87dKKKvppPiHdMkX+jPRxFHYFFB5dO5PWbNZ9tbUPK/xbMgLF6uaR+368/nLiXf/rDl7h9OkoDkU4NCukKB8WwQy6ecFMN9bjHEPhEJ0tfLnztFuKmI3s8TE81uQVH8coe5c+FPstiosFGErYKmTNalGlu4jjYQApxmmYE6Iod6JND2b4j95sNTW6fYcJNUOeBdpK+ZVw/V2oNAKE8gxYHoSmKXTXlAy9F8IRFW7oB9gEnp8wt5DOdx1unsxtlgSwKqQ0UNMuBBfwKLKPo0q6VPWcz/VBW7c9Wnx1rflGGnKR06f0q+KmOuhVQ4XyOEowtmnaTUlle6K3u78+EmL/W/5w3Q+DUcgux5bJp/o0WvecH3YoDWgTipnyT70couclt8KoGk5kCFWsFiL/J2lsrjzNCyRQrD/lvf68qXjJhSkAagDdYmDlxEJ681Fv+SOcwJxiVlE6Xm9zAJaC/W3GRmMKmvwPAafY=", "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)(39840400004)(346002)(136003)(376002)(396003)(366004)(451199024)(186009)(1800799009)(6512007)(107886003)(1076003)(2616005)(6666004)(52116002)(6506007)(6486002)(66946007)(26005)(316002)(41300700001)(66476007)(66556008)(6916009)(54906003)(5660300002)(4326008)(8676002)(38350700002)(8936002)(38100700002)(478600001)(66574015)(83380400001)(36756003)(44832011)(86362001)(2906002);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "=?utf-8?q?Hve6lkYi73uWV3kWfOTiy7DZCbek?=\n\t=?utf-8?q?ZTMoCbGzrTY0IcmEVsRRhh/GErhBDxqytZVentNB0OAdxI9q5GYY6U7F9hiciURbA?=\n\t=?utf-8?q?ZvLawYBhS304j+jg/JUkfQFlMv6ratqPpQ2kA2Px2Dcfy7sTctsJDNros1sDC8OgM?=\n\t=?utf-8?q?qvoNlZur0A2dOUT6hRVLuI13RIc5Rc7hgH0dJWk5jEIwK9tGysBtf4Fl6QHxaXeq2?=\n\t=?utf-8?q?YC6limqa5y+AGNyAKwFcTZZvsRqCaMu87Mj2pMBvN7a3jZ6SryqazSXWkiOhWt1zj?=\n\t=?utf-8?q?0oOtcCK0SD/nils1ljzNwMUTBU1BBhKd6QiG9QkcceCyPyCfiZThy8s3FIafHwwPL?=\n\t=?utf-8?q?tQOR6S2FDFgNUs7NG5fyHfQgdINso9+ZLZuLMXRZ4Wq7ks+hDHY6HSCpXVYc4HQN6?=\n\t=?utf-8?q?cSie+pYggpDNdDrqd/NcHmItbxqvBDL4opzrkeRUiK1ruQnjyQd5KRJzsGqjgLk4z?=\n\t=?utf-8?q?BmscfmC5MgpB+h2LfLUjjfnSoIXtVkeX8hlXmqYNBdmhYzek5YPGpopUby+kjMVNJ?=\n\t=?utf-8?q?hfRiHTjoZpcktmY2kBIIEXm6/sVXqBMh3zs2ukvAYCVyE8HEcjnw13+oN/fcm8GM3?=\n\t=?utf-8?q?re1R+8AMhbwKP73E/FWIS1Uyd/5VyXx1TsTEyDbafSw+5xM4u8Yi53PcT2a3ULxl1?=\n\t=?utf-8?q?dncv/LqkJd98UY3O0SZjYL8LWGKeAU8vQeWWhVm4Ahr+NU/Rq+8dHEwK6Afa7qM3A?=\n\t=?utf-8?q?TyDpe9HKJfyrrPiY7HyexZZcH5zmTGC5DpvqiPzzsGvp9+HVEBnfjIrYqEfvDqoZa?=\n\t=?utf-8?q?zB+xjrOaRfxsHb5DGG2yL5d60R5VK1R6wquceVZUvHUzJ2UTykgfpV0Mpv1dW7IHj?=\n\t=?utf-8?q?jw9KNZJS2vjG+ceTsAp5ZZxkTHUeFWZYDTH3Ijy/kU/LWC8VMRZFs+PhHJR1h8tn7?=\n\t=?utf-8?q?TJXrWFmGgj5T25f3eKJunPWMz232qqn+Rt3GzSmqDHrc8/neM6QeZFO4jZBEhKpYA?=\n\t=?utf-8?q?uMegbUraUvbqRcMchoom7k5r3zv/Xnjgd+F3Pwv1xcaZVWFuXe7zR/slclGacN9nG?=\n\t=?utf-8?q?SUkmUdzN/2q2x8LdWQo3j46ZokoNftcxBxJxY/9ycyAAv6m00fBsVwk2SqDzAMvE3?=\n\t=?utf-8?q?fuTOpTjvaw7eyACXpIQyUNyXabxVtuewWr/dbA3BKBbgov4mIN3Hbm2+INfugpC9i?=\n\t=?utf-8?q?HR/jhty1L+rLmHG3IqPa2FT3ftfzDvt5ZcctfG6GamIKX5fyZ4h3XHr4qu9Fh9jyH?=\n\t=?utf-8?q?S0boPc1lZL7g+4c9xC7v61oRnJLaHpm+UTfcic3lcKYyc60WwOhwxqXFUV5+lAQSy?=\n\t=?utf-8?q?o5TJeQSw/KEunhO2fs4Fsa+tNJh69yqEjm08xAsG/wIkdz6ve/UiIecyz6me0cP7K?=\n\t=?utf-8?q?0Jxx0eICznWC3z8YW7bus1yauljIjINGTffQqPUNxzJ9J082Nv5zDhqi25B3zQDUw?=\n\t=?utf-8?q?sUWfgqPkVjv7s/bK6xO2D1za+jIIoImCcOzX7QYQ+qiO2cro3tj53xTpibKXS6Ns/?=\n\t=?utf-8?q?U/+jp6RhxOREdKsBW7aAu7D32FNyvvbvBycU6SJnrCCF/km4Zdo9KfXORh2SbEMLE?=\n\t=?utf-8?q?hB2yVaKrSljktQn6EN4YxK+TdtOiMuIpWg=3D=3D?=", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 81f75f21-fbfc-4016-a7d1-08dbb5cc7d4e", "X-MS-Exchange-CrossTenant-AuthSource": "SJ0PR13MB5545.namprd13.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Internal", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "15 Sep 2023 09:16:48.6315 (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 KXkgm5mgWyH7wVefZH/iYNBZgjdXHeJrHaspDMzJZ5Xt/QMmem+5GoRQXrD7ZlO1JvaGkqLUNQ/+Yhj4gDDNgEEndMjurN7w7B9a6p8CBaY=", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "CO1PR13MB4773", "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 0f68c5d667..b7eb53697f 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 fba7a1dc12..7d8d35e3dd 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": [ "v3", "17/27" ] }