Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/131550/?format=api
{ "id": 131550, "url": "http://patches.dpdk.org/api/patches/131550/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20230918024612.1600536-17-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": "<20230918024612.1600536-17-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230918024612.1600536-17-chaoyong.he@corigine.com", "date": "2023-09-18T02:46:02", "name": "[v4,16/26] net/nfp: refact the target module", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "aa9d8dc851db32a224fb7f28e80d3134bed79816", "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/20230918024612.1600536-17-chaoyong.he@corigine.com/mbox/", "series": [ { "id": 29531, "url": "http://patches.dpdk.org/api/series/29531/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=29531", "date": "2023-09-18T02:45:46", "name": "refact the nfpcore module", "version": 4, "mbox": "http://patches.dpdk.org/series/29531/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/131550/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/131550/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 906CD425C9;\n\tMon, 18 Sep 2023 04:49:24 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 486444161A;\n\tMon, 18 Sep 2023 04:47:46 +0200 (CEST)", "from NAM12-MW2-obe.outbound.protection.outlook.com\n (mail-mw2nam12on2136.outbound.protection.outlook.com [40.107.244.136])\n by mails.dpdk.org (Postfix) with ESMTP id C5C2B410E6\n for <dev@dpdk.org>; Mon, 18 Sep 2023 04:47:40 +0200 (CEST)", "from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5)\n by PH7PR13MB6435.namprd13.prod.outlook.com (2603:10b6:510:2ea::9)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.26; Mon, 18 Sep\n 2023 02:47:39 +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; Mon, 18 Sep 2023\n 02:47:39 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=ZnEWaG1dahJy/ray2V54oVcF89XgY3Ws7zcRn3Zqvl9pnCsI74GLOoLGSUUclnDY3OmSIQA0a6TflsbagaSTGuxFnBkO3mknZa1o8xgkLR1tMv90J6bEgQINjGHWHgnTUu3D+myM95woMKEi/g5GUQZSuZULOTAzKrb9XJ5g3YT3++D+IYMhMdC32w97Ll9CgirOHjjzVQyRCbwojff0KqxJqSJ4WNpJtPdEwyn/0eb2VOuDTYMlxOrUd1nLkqIK+9GKC13eGsr0r51p35Ma8/IHPPWhlGbx2yI0G1wbHylJS/2BQ4vxu6iaYcr44AXQHKo2FTQoXACe4x+l4IR3yQ==", "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=ovzO09qnU3ugkHVloS6A9tqijTDU6yrMEANCNhrdoJs=;\n b=d2mcIzseDyRJPHgK4O4/3lR3omrSinwnpNrLiRqpNt67iVD5zZXd5d6g+jz1lBSiVlYnQTPjXaKplXgjdZCYWd5DPC7bWdlySMrChdJqaQi/ICuEBJTTLAfbGHrzp1pdV8aXLnF/JZXLBobd/kCd55o93E6vejXb/slWGsQtU19j2kPwesXBW1lfitP8ARwR6WDJMPwrLeHds4mxfuIym9yMizD1i4n8PmP3ahA30MuQM4v/B3V1YkxML0D2rsPMlEb7LcUHlcaq9vNzscfuJCXkYm3Pf7gcUiebMuFKFLLPVNjHCy2oSNKhepzMUN5gjz3xlIiXS22exvqU6EXW1A==", "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=ovzO09qnU3ugkHVloS6A9tqijTDU6yrMEANCNhrdoJs=;\n b=vRVPHwnr4ENhEtRbm04DgCfW7RxMyFJxgkkbF6QN/VzO3r66OsuH1u7Ap50IM6ssXeA/G1Db0ak8AWwrc4bOj0JnrdvbwiB1oFal/qjF3KsNP2PAg1CjBiH+D8Ccg6EzMPaIqBP+z0Hv7FNM44G84F3ktbo7YaGH1X4j4HD1gNk=", "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": "Chaoyong He <chaoyong.he@corigine.com>,\n =?utf-8?q?Niklas_S=C3=B6derlund?= <niklas.soderlund@corigine.com>", "Subject": "[PATCH v4 16/26] net/nfp: refact the target module", "Date": "Mon, 18 Sep 2023 10:46:02 +0800", "Message-Id": "<20230918024612.1600536-17-chaoyong.he@corigine.com>", "X-Mailer": "git-send-email 2.39.1", "In-Reply-To": "<20230918024612.1600536-1-chaoyong.he@corigine.com>", "References": "<20230915091551.1459606-1-chaoyong.he@corigine.com>\n <20230918024612.1600536-1-chaoyong.he@corigine.com>", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "X-ClientProxiedBy": "SE2P216CA0016.KORP216.PROD.OUTLOOK.COM\n (2603:1096:101:114::20) 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_|PH7PR13MB6435:EE_", "X-MS-Office365-Filtering-Correlation-Id": "6c356d68-7f41-4518-4421-08dbb7f19f5b", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n PI+BCZgdJCx5xGoVCaYVv4EkoAXeLsbPk1UoFjmawpSHV03NAQGVvNgS74JNcaIIeikA9uedMKFcjF1ACZ19ilVMX4reUymiARDDcy8tm13rbYk+sZnFObOXzfeQ2LDuPjh2rhKubc7YSxRiThz5Q9RWq4j5O62ZdbngpmY3RTxk0Ql4YSZsNRsMvRT9G7MoJcvH9OyKJMbsPdRTHiBDnd96+W67KruM28dYWuYnfoNTV4U5D8zraTm4Icrp1QiQGlmlTwgfPEQwmVHRIVRugVyzKfDwSgGkqNsozh4j6zwjpY3Ym+iihcValjKf3LSX2fwVErC0Z2+UUe8oTmTRTPFufHFErsh7X3ttywllJsWo9MhpyN4/Zm9hK9Ph+OMJwLPrf41i0vUG1UoisSX4Su0UbEsAYNNyJLopMGCqrFh6reCOf9URYOBGRFGnJgvfiRLx94ka8nR2zJJcNMfnO+vD5mHqPOC469g5vmbqtIWr0fN4YUZVnX0LAOfTp++MMCLxwl2ZX/na4JZYT3OFR0hT7bfSzXCQawX3Sq07zB5tW2BiPGh0OLtpuSLYwIa5H1Cb5m18Jzv+FE6vJKbCndKYEP9R8ALuwKyUmXMuH/jo1QYm2hdqlX9CbMsBxIjENEvUy1SS31VjGgqCihvB8cTNSdRfx0Rxvn6KQ5LZE50=", "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)(39830400003)(136003)(346002)(366004)(376002)(396003)(1800799009)(451199024)(186009)(54906003)(66476007)(66946007)(66574015)(41300700001)(6916009)(316002)(8676002)(4326008)(8936002)(52116002)(6506007)(6486002)(6512007)(478600001)(6666004)(83380400001)(26005)(1076003)(2616005)(107886003)(86362001)(2906002)(44832011)(38100700002)(38350700002)(5660300002)(36756003)(66556008);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "=?utf-8?q?wrYcEbmk/SlHPrudoB3/7SkYGnts?=\n\t=?utf-8?q?xoAVWuDpirG3FLSvaxDjdVDAm0rp+WCo70RV0iOyREvu9AyWD/4trZgKv9nYVbaOL?=\n\t=?utf-8?q?M2YDSSpzwPsAMO6iKSpR4TRCL0uAitwWy+pV7/C4ikce+mEFe03JoUPCSOnvsx4UD?=\n\t=?utf-8?q?RK0QXigHfdvCH/PJ69lc5DKDNo/PuEgeF/MG4zN1CLaY1CJVAW8i01MJjkTwdnIdt?=\n\t=?utf-8?q?63+FuOZfUOuF3Np9x3ZKLSDtAExUQiE7XaLDACog7xUcOm5RNVlKFnkUCwUE5yRkj?=\n\t=?utf-8?q?+3E4mq2XvihuM/T5i6yiKT9O4ahrBvdA4gDutlS2aGe9lorGxSSDzqs6o8wNH1B9T?=\n\t=?utf-8?q?U8qTiKxfnKZ1DeNVunUKpj1Q0Y/57kTNgdTHVArdqrRyvrR3GmK5+HukzZqTbsh8k?=\n\t=?utf-8?q?/JJ29bB8AepJJgWtB+hq+EGBf96SCKk0iGgAVyn6iqNlHFQILOPw5ONIwDd7U69Cr?=\n\t=?utf-8?q?nw+9la84rExDemVVAp3kwYJFUIiGrvw4gvE0+R4yihe2SkE9Nkp3TSGcGm/I0eMkh?=\n\t=?utf-8?q?VZRr83nfAQw7mXTyOWR1KzT+fKUrYWdPaLC/yHK4/4VHfRJvm8HWn8OjSC5YkHOBE?=\n\t=?utf-8?q?IJAEAKdHBfsgnvkW/hhv0ge16Ew0Cobw8xSU0/YMaaEsD15jqyJKG6KelmJ1xGSP/?=\n\t=?utf-8?q?i0+R9L9EJPiQbJiTNSYDZqOA66z6tob2U3fM1GdwRNSTXchfdck17DNgx3IoymUFz?=\n\t=?utf-8?q?a+HdEEcvKt+Kc4pUiRGbxZ+eWtAvl30HTz8DWEBgEKhONQ+4N8qxEJ+WQkRmKKYkC?=\n\t=?utf-8?q?z29GlFilCz8BVoukHYUjQu9k2o/ShZ2zA8HFx6z8hNJqxxb03wwtkGGjwixx10vG3?=\n\t=?utf-8?q?w2QpMsJcxWDqutp4WXJ78sPlx/IQZZgeSxuvcEXYwR7ez7dx6ZVyh3DgHkv0i+BMs?=\n\t=?utf-8?q?e4Nrnurofw3jHH9C9FKs0s/Lp771sOHeRZFAEwZ1QB5yN5G5pGAyYyl6xZRIc2gPb?=\n\t=?utf-8?q?jCQkcB24woKtP7Z0wFK0hClWXwKqy3oTqRNTQs6tzQciiHVTW8u4acjdI12v4P99o?=\n\t=?utf-8?q?lMnvbfCNHUmTi/mpJ9JzYvx9XcP59D7mmHOg0s4F77vLR7323+X1evghswaZ+XQZO?=\n\t=?utf-8?q?NMAyqhzf+P5D9s0VfPzZ8L9gXE3vkDnHsWikEfvae1Q3ABYYQs0ximmKEq028H2OB?=\n\t=?utf-8?q?qS2zy+sI/aa3gxW94PEkBRWiZccyvM7ho0Idl95IQxLWMXTYEkXWlzWQLqwg+dJsO?=\n\t=?utf-8?q?p7JQun3WBwkEw5/ieTFDBEwWtFi9mOd6b6HD5t+BvEfj2MdbmikHdbIXcQpJ4m9kt?=\n\t=?utf-8?q?uhe3Aph0dcS/BXXDNUu9g5E0TAaLgNrA9oB3v7IUmtis3EN9LomARGmbYPc9KzGw9?=\n\t=?utf-8?q?OAEx+WoV/kQg8xj/umyCvP4sxDmvREi+CnqhbYlc14q1CrYkEMPPmzYZycfKAycHG?=\n\t=?utf-8?q?6FvytrEuimbf25TJzr2CeExcqjHJdS9R+96g2TQKwzbHjkCD/Oqnv3+u1Jo/6yPV+?=\n\t=?utf-8?q?EhQGk/gclSJi1t44PEybuNaYGQObWkBbSb0UPqi1cWl7cY0QJ/LhP46V2zu2K77Lv?=\n\t=?utf-8?q?JsLxuCQUS4Q2VyjAuVO7oBZAaDuhNBxoWA=3D=3D?=", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 6c356d68-7f41-4518-4421-08dbb7f19f5b", "X-MS-Exchange-CrossTenant-AuthSource": "SJ0PR13MB5545.namprd13.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Internal", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "18 Sep 2023 02:47:39.3272 (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 cBWnYyBGDTXnPbbG103UGglCP6EjM41fBTZNjrtWJdhzp314Ju2vTxF4Ec5DiUXmkIZuf7vstZbsXP7k+qEawjP/xjdCTigwPioUU/tBgxQ=", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "PH7PR13MB6435", "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 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": [ "v4", "16/26" ] }