Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/125879/?format=api
{ "id": 125879, "url": "https://patches.dpdk.org/api/patches/125879/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20230410110015.2973660-4-chaoyong.he@corigine.com/", "project": { "id": 1, "url": "https://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": "<20230410110015.2973660-4-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230410110015.2973660-4-chaoyong.he@corigine.com", "date": "2023-04-10T11:00:05", "name": "[03/13] net/nfp: remove the redundant macro about CPP target", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "2acfd92f4fa2b3ce4ee637c548510cd9ef79c2bf", "submitter": { "id": 2554, "url": "https://patches.dpdk.org/api/people/2554/?format=api", "name": "Chaoyong He", "email": "chaoyong.he@corigine.com" }, "delegate": { "id": 319, "url": "https://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20230410110015.2973660-4-chaoyong.he@corigine.com/mbox/", "series": [ { "id": 27651, "url": "https://patches.dpdk.org/api/series/27651/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=27651", "date": "2023-04-10T11:00:02", "name": "Sync the kernel driver logic", "version": 1, "mbox": "https://patches.dpdk.org/series/27651/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/125879/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/125879/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 6AA4642910;\n\tMon, 10 Apr 2023 13:01:18 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 3D3EE42BFE;\n\tMon, 10 Apr 2023 13:00:59 +0200 (CEST)", "from NAM12-DM6-obe.outbound.protection.outlook.com\n (mail-dm6nam12on2128.outbound.protection.outlook.com [40.107.243.128])\n by mails.dpdk.org (Postfix) with ESMTP id 827EA40DDC\n for <dev@dpdk.org>; Mon, 10 Apr 2023 13:00:56 +0200 (CEST)", "from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5)\n by DM6PR13MB3882.namprd13.prod.outlook.com (2603:10b6:5:22a::22) with\n Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.31; Mon, 10 Apr\n 2023 11:00:54 +0000", "from SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::baa6:b49:d2f4:c60e]) by SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::baa6:b49:d2f4:c60e%4]) with mapi id 15.20.6277.036; Mon, 10 Apr 2023\n 11:00:54 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=dDb9Aw1m38uGaAD5U70lIyfdweVkdfBLqYl9LsCyRIOibtQgOlc5aHFHoeNofSL1TGn/S+ifAfxU2rrXPGMIi7MVAjWQa/56kitKCATAea4jNaLDeTS++0mSHSbxUz9f7ClzfDu6stItapKd6F8CVtIDtXVsvWhJMD/o/AMePbY+TL3oPhLr4n3NL+DCKzSJGj3HXI4BX3ek9xixkM9RYUmwKQ4Wqla9aFnDTC737dfJiQc3N4I/PB17RQo/JZ7GUnilTEHZaVckzwjQVPYfb9xMiV3ef6QtnX3/Coab1NqNUALJkzg9Ma325AswopoUC4Ewo+elupIIS9mnHs8WZQ==", "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=SR/BNmdhwtj+WJF//xgMhM/cNvNtL2SBlFGCX2Znr2o=;\n b=FGdKOl3I9j35a15cBR/ATUeoFb9NJ9gcy1W5J6xrM4E6vrfGAhfPPfcsQtFGJG5UBUEZFippAME7E6fgWiqkhZoFUlOkYJu97B4H7q3zOA0K7uU7FduvXpU1qi3oTmRHgdmflGvFKtfBAWt1FZSqYOkmtHPHRhuHOsQQHVsiLzYxq3O/USfkgAnBbyXGbqfJlhLE28UxzXrpaHeKFB9oV2YrfM8ih/d4EySNUaEY8gBcJMlmkR2J5TQC+DM8Wcp3y3XwBOTPecOkTECN5gdMkC9VUmq4vKk4geBLWZrzzRUIUUBDztDLN2pLuOMnHz/FQiiNp3A4ByPusKvf5OLlRA==", "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=SR/BNmdhwtj+WJF//xgMhM/cNvNtL2SBlFGCX2Znr2o=;\n b=v3PE5dFqpOXHO9Bkkk1WGwAsKI2M5yyy/xMzeqTD1sGAtgLrR7NPffVspr6MddgUWnVzYS2DnUbsrXZV9irnWP/RH/4bOm5JA6PRoEEzNrbLg3S43WMedGTxxzIFtxG/vr7dcOlsTsegjxAUO+2tdV63uLuPQjnU2/XQJ/SaKEA=", "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 03/13] net/nfp: remove the redundant macro about CPP target", "Date": "Mon, 10 Apr 2023 19:00:05 +0800", "Message-Id": "<20230410110015.2973660-4-chaoyong.he@corigine.com>", "X-Mailer": "git-send-email 2.39.1", "In-Reply-To": "<20230410110015.2973660-1-chaoyong.he@corigine.com>", "References": "<20230410110015.2973660-1-chaoyong.he@corigine.com>", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "X-ClientProxiedBy": "SI2PR01CA0040.apcprd01.prod.exchangelabs.com\n (2603:1096:4:193::14) 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_|DM6PR13MB3882:EE_", "X-MS-Office365-Filtering-Correlation-Id": "4e1e19bf-76df-453d-bf28-08db39b2dad9", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n uHK0e+LMyZCqrOes7QuU5+v/0dOBW3+/43gDNcD32KPm1TeiYm0YvkscDhiBkZMOO5QwV1aKNnu0jfAYImYo0qVSqX9Td3cLlJMhrkFtOdqf0ils2GspcVFdZnJkdwYUM1MkC05RNRXkYBqL7dDtf4y3YjYaarr+rDZhw3t6bjPtVqYLZbVawuykZ+e1ys1d806wcLvPFYUlVRVvb1c8MJVgqjYP8gBvZGyXvY357LCKj6qSQxG+3ba+9tNruwVE9KfvyN5xrRsUo3s1z9bZg9vtTXKm8Sq30L/s8nXBfCSU6Xo8yV1888WPNJ1XaAnxm2EgMQO1FS3bMcEJSVGZqhGUW4tj1KYWnUCwnbNZ+7143Qhss/nGtJXQpnmEmmXKN0TyKhNkKWCKT5l6omU6GWnNKTjQaAIJJsHr/099d/qGUklvin3PJHHY3EJJiw8pxtmKtk53F/zzyAB0tY/X52Ey8RNIQfuzgY9pwJCn+ccVkcU4Qv40CgFon55faD3WwZ+IIJBLXxQ6NjjSeSqQcu25Fb9dINLA4ldqmfuG4we2Na7Z9m3aDOC2ktB3q25rfL1OrF2tUcA0y2cI7dNApjz44g8pJHN0Ldnhep1I1BLfEefuKCk1Bs1myjMoqFtG", "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:(13230028)(4636009)(396003)(39840400004)(366004)(376002)(136003)(346002)(451199021)(316002)(86362001)(66556008)(66574015)(66476007)(478600001)(83380400001)(66946007)(38100700002)(38350700002)(36756003)(186003)(6512007)(4326008)(8676002)(2616005)(6916009)(41300700001)(2906002)(1076003)(6506007)(26005)(107886003)(8936002)(52116002)(6666004)(5660300002)(6486002)(44832011);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "=?utf-8?q?FJCtbeT3RCpk7xhIZDtjKEb3WCFN?=\n\t=?utf-8?q?NrydWXvOK/5DHHirWjItQKRNlMUXDKIwARqQBnJNuv7dGHPGlChF2+2Qj9cJcb76e?=\n\t=?utf-8?q?uWFeeDercSYdO8oCL5egUbDyUL912sEMdmtcuI26axaMa6L0ZoxemKueMMz4CW8/F?=\n\t=?utf-8?q?NoroMPZ2UZreuivvCF6NLIfUl53+nSCtLxleZJx27cd7EPhDs5yl8lTvDOKwUxBJK?=\n\t=?utf-8?q?NwpmQTac0u5sx3pI3JpEre79P+//6INysE4IejE0WVi2pYM4uecv6GUbDJpnJZ/P+?=\n\t=?utf-8?q?9293xA8bZi6u+CutXtqNw3kVYge96iIDNHl4cyKSC9YJXVKpNqC67ksTlrg37V8xc?=\n\t=?utf-8?q?Jt5zEQAEqYruXw/utEGYF2ZdqzczkwDtFC6q6WDnmsIICfWSE0TsPIK18ECj3cPsU?=\n\t=?utf-8?q?RgBXse9trCLv2vMJ972BsXFwLu02WXLwx3dOzbJ9YCgrR3ILn3rRRWxVlF/sUpRR1?=\n\t=?utf-8?q?lI0S9bAw0QZKNmyyLf+n1BaXCxzoJPiJq7zt339/UqgkYjwZRXaFQyG90yIDRwtLr?=\n\t=?utf-8?q?PvgshryZhcE7Z0GgHOyZZHjGrjf82KaQzCB1KA2oCSkQEfHTzDLPtr3uLsQ5ObrCl?=\n\t=?utf-8?q?oZgqKBoZ11cOLlRwTlm2UFOfvrcEUcRiHqsg5aqJhyj5Yjc8cFZaS8EA2FDudlghs?=\n\t=?utf-8?q?8bqS/iRBh0Scencjs0W94YYeBRiVi1rBU1WpDv+NXgzihC7ueK4jOc6UqEZL0ggP7?=\n\t=?utf-8?q?Lj+dmGf2V0HVtg9XAp+Iz2ifqkixEvL5/AZApmN2A8XVnEujXfEMrPNSsT0s95fLz?=\n\t=?utf-8?q?LtxN6VqHBi39EOHZMPKzI8MaUTHsN0pb0s1pf98iN9CvplInDpMwWYi93FxA6mrAp?=\n\t=?utf-8?q?dQyumMa52UgKOXI8rK6EwaGGaWckbAKxle3gZ7IKtPGE6y7S1uQd46D/K7dIiY1fe?=\n\t=?utf-8?q?RyNIM/AoKxbZSpHC0u6c5rU1SECyk8lGWg4nw7/RWFaRRmV0qw+SvocuYuC4Kr5O+?=\n\t=?utf-8?q?xmrVo4uFguUAJZYMkBiIQfVdGt7Q6nEFh0xem/kXqiu52wlVk60g5mkG5+1v5ZAr3?=\n\t=?utf-8?q?lc6msNi/7pbIol4DV/LCej0llID76Br9AOHZxLUfJjCgWcJJ2U5+EcaJJV7J1wcSS?=\n\t=?utf-8?q?f523eN5FmAjUEKobEepqXxZ9Am7goRIrHmkxOHQFDq83OqDqqpyXxjv4CYKPlR9Sm?=\n\t=?utf-8?q?/G+p2NlWJzBgyuGCz1qbOmBa8zXheeIaTLILLo6pubXroEH6XeA3W9qZbqWHCKEWX?=\n\t=?utf-8?q?LPQLbXQg6EUU3iuXU9OjM5xMIBkVWDCkdK2zr96b5Oy7zrwVhrOw5BxPBQapEoDG0?=\n\t=?utf-8?q?XiOSqKPt/xn1GsK6CvUefbT+nlWHQffQs3iQzoxsawjmHnTpd0xn/ZDBgs9SKgd2l?=\n\t=?utf-8?q?zIA0jSFguYzDe/8dRBEGv42ncAUCLM68hVXYdtwrYPK6Y6gTOX+Ikhv8zJrzr107L?=\n\t=?utf-8?q?d9yMIoDQ4Z3ZId9a//qZ2Ipkrnmi3KIKVm7xVacgnMa+BaBPqgscMInujpshx3fl6?=\n\t=?utf-8?q?yy7MfRdz2IC+piRZ+MkvlbVF+nXzkukdG/5z/zNxsfxywvBv7j55hc/PdK5c7mSLw?=\n\t=?utf-8?q?YK23/rzNpGE4iB9ZriEg5TG5wqGURoE+Uw=3D=3D?=", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 4e1e19bf-76df-453d-bf28-08db39b2dad9", "X-MS-Exchange-CrossTenant-AuthSource": "SJ0PR13MB5545.namprd13.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Internal", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "10 Apr 2023 11:00:54.3834 (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 te6nfiuHYBvvlCQDYfWHL+GkCe74ZvnDG8puQMrGkOWzXD8iep0jBF7jBIzHHYSMyyObCloLBs2He/dDivmsK+nOi7iJpxy8vz6pXpb/Ltg=", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "DM6PR13MB3882", "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": "Remove the redundancy define NFP6000_CPPTGT_ in nfp_resid.h,\nthe same define NFP_CPP_TARGET_ are exist in nfp6000.h, we\nchoose to keep them to sync with the kernel driver.\n\nSigned-off-by: Chaoyong He <chaoyong.he@corigine.com>\nReviewed-by: Niklas Söderlund <niklas.soderlund@corigine.com>\n---\n .../net/nfp/nfpcore/nfp-common/nfp_resid.h | 11 -----\n drivers/net/nfp/nfpcore/nfp_target.c | 44 +++++++++----------\n 2 files changed, 22 insertions(+), 33 deletions(-)", "diff": "diff --git a/drivers/net/nfp/nfpcore/nfp-common/nfp_resid.h b/drivers/net/nfp/nfpcore/nfp-common/nfp_resid.h\nindex 394a7628e0..ac2bf0335d 100644\n--- a/drivers/net/nfp/nfpcore/nfp-common/nfp_resid.h\n+++ b/drivers/net/nfp/nfpcore/nfp-common/nfp_resid.h\n@@ -48,17 +48,6 @@\n #define NFP_CHIP_REVISION_C0 0x20\n #define NFP_CHIP_REVISION_PF 0xff /* Maximum possible revision */\n \n-/* CPP Targets for each chip architecture */\n-#define NFP6000_CPPTGT_NBI 1\n-#define NFP6000_CPPTGT_VQDR 2\n-#define NFP6000_CPPTGT_ILA 6\n-#define NFP6000_CPPTGT_MU 7\n-#define NFP6000_CPPTGT_PCIE 9\n-#define NFP6000_CPPTGT_ARM 10\n-#define NFP6000_CPPTGT_CRYPTO 12\n-#define NFP6000_CPPTGT_CTXPB 14\n-#define NFP6000_CPPTGT_CLS 15\n-\n /*\n * Wildcard indicating a CPP read or write action\n *\ndiff --git a/drivers/net/nfp/nfpcore/nfp_target.c b/drivers/net/nfp/nfpcore/nfp_target.c\nindex 3f7ddfb5e9..611848e233 100644\n--- a/drivers/net/nfp/nfpcore/nfp_target.c\n+++ b/drivers/net/nfp/nfpcore/nfp_target.c\n@@ -489,26 +489,26 @@ nfp_target_pushpull(uint32_t cpp_id,\n \t\tuint64_t address)\n {\n \tswitch (NFP_CPP_ID_TARGET_of(cpp_id)) {\n-\tcase NFP6000_CPPTGT_NBI:\n+\tcase NFP_CPP_TARGET_NBI:\n \t\treturn nfp6000_nbi(cpp_id, address);\n-\tcase NFP6000_CPPTGT_VQDR:\n+\tcase NFP_CPP_TARGET_QDR:\n \t\treturn target_rw(cpp_id, P32, 24, 4);\n-\tcase NFP6000_CPPTGT_ILA:\n+\tcase NFP_CPP_TARGET_ILA:\n \t\treturn nfp6000_ila(cpp_id);\n-\tcase NFP6000_CPPTGT_MU:\n+\tcase NFP_CPP_TARGET_MU:\n \t\treturn nfp6000_mu(cpp_id, address);\n-\tcase NFP6000_CPPTGT_PCIE:\n+\tcase NFP_CPP_TARGET_PCIE:\n \t\treturn nfp6000_pci(cpp_id);\n-\tcase NFP6000_CPPTGT_ARM:\n+\tcase NFP_CPP_TARGET_ARM:\n \t\tif (address < 0x10000)\n \t\t\treturn target_rw(cpp_id, P64, 1, 1);\n \t\telse\n \t\t\treturn target_rw(cpp_id, P32, 1, 1);\n-\tcase NFP6000_CPPTGT_CRYPTO:\n+\tcase NFP_CPP_TARGET_CRYPTO:\n \t\treturn nfp6000_crypto(cpp_id);\n-\tcase NFP6000_CPPTGT_CTXPB:\n+\tcase NFP_CPP_TARGET_CT_XPB:\n \t\treturn nfp6000_cap_xpb(cpp_id);\n-\tcase NFP6000_CPPTGT_CLS:\n+\tcase NFP_CPP_TARGET_CLS:\n \t\treturn nfp6000_cls(cpp_id);\n \tcase 0:\n \t\treturn target_rw(cpp_id, P32, 4, 4);\n@@ -719,7 +719,7 @@ nfp_encode_basic(uint64_t *addr,\n \n \tswitch (mode) {\n \tcase 0:\n-\t\tif (cpp_tgt == NFP6000_CPPTGT_VQDR && addr40 == 0) {\n+\t\tif (cpp_tgt == NFP_CPP_TARGET_QDR && addr40 == 0) {\n \t\t\t/*\n \t\t\t * In this specific mode we'd rather not modify the\n \t\t\t * address but we can verify if the existing contents\n@@ -737,7 +737,7 @@ nfp_encode_basic(uint64_t *addr,\n \t\t*addr |= (((uint64_t)dest_island) << iid_lsb) & value;\n \t\treturn 0;\n \tcase 1:\n-\t\tif (cpp_tgt == NFP6000_CPPTGT_VQDR && addr40 == 0) {\n+\t\tif (cpp_tgt == NFP_CPP_TARGET_QDR && addr40 == 0) {\n \t\t\treturn nfp_encode_basic_qdr(*addr, cpp_tgt, dest_island,\n \t\t\t\t\tmode, addr40, isld1, isld0);\n \t\t}\n@@ -757,7 +757,7 @@ nfp_encode_basic(uint64_t *addr,\n \n \t\treturn -ENODEV;\n \tcase 2:\n-\t\tif (cpp_tgt == NFP6000_CPPTGT_VQDR && addr40 == 0) {\n+\t\tif (cpp_tgt == NFP_CPP_TARGET_QDR && addr40 == 0) {\n \t\t\t/* iid<0> = addr<30> = channel<0> */\n \t\t\t/* channel<1> = addr<31> = Index */\n \t\t\treturn nfp_encode_basic_qdr(*addr, cpp_tgt, dest_island,\n@@ -777,7 +777,7 @@ nfp_encode_basic(uint64_t *addr,\n \t\treturn nfp_encode_basic_search(addr, dest_island, isld,\n \t\t\t\tiid_lsb, idx_lsb, 2);\n \tcase 3:\n-\t\tif (cpp_tgt == NFP6000_CPPTGT_VQDR && addr40 == 0) {\n+\t\tif (cpp_tgt == NFP_CPP_TARGET_QDR && addr40 == 0) {\n \t\t\t/*\n \t\t\t * iid<0> = addr<29> = data\n \t\t\t * iid<1> = addr<30> = channel<0>\n@@ -924,19 +924,19 @@ nfp_cppat_addr_encode(uint64_t *addr,\n \tuint64_t value;\n \n \tswitch (cpp_tgt) {\n-\tcase NFP6000_CPPTGT_NBI:\n-\tcase NFP6000_CPPTGT_VQDR:\n-\tcase NFP6000_CPPTGT_ILA:\n-\tcase NFP6000_CPPTGT_PCIE:\n-\tcase NFP6000_CPPTGT_ARM:\n-\tcase NFP6000_CPPTGT_CRYPTO:\n-\tcase NFP6000_CPPTGT_CLS:\n+\tcase NFP_CPP_TARGET_NBI:\n+\tcase NFP_CPP_TARGET_QDR:\n+\tcase NFP_CPP_TARGET_ILA:\n+\tcase NFP_CPP_TARGET_PCIE:\n+\tcase NFP_CPP_TARGET_ARM:\n+\tcase NFP_CPP_TARGET_CRYPTO:\n+\tcase NFP_CPP_TARGET_CLS:\n \t\treturn nfp_encode_basic(addr, dest_island, cpp_tgt, mode,\n \t\t\t\taddr40, isld1, isld0);\n-\tcase NFP6000_CPPTGT_MU:\n+\tcase NFP_CPP_TARGET_MU:\n \t\treturn nfp_encode_mu(addr, dest_island, mode, addr40,\n \t\t\t\tisld1, isld0);\n-\tcase NFP6000_CPPTGT_CTXPB:\n+\tcase NFP_CPP_TARGET_CT_XPB:\n \t\tif (mode != 1 || addr40 != 0)\n \t\t\treturn -EINVAL;\n \n", "prefixes": [ "03/13" ] }