From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 97FF3433D8 for ; Mon, 11 Dec 2023 11:19:25 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9080D40ED2; Mon, 11 Dec 2023 11:19:25 +0100 (CET) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2085.outbound.protection.outlook.com [40.107.237.85]) by mails.dpdk.org (Postfix) with ESMTP id 31A4940E0F for ; Mon, 11 Dec 2023 11:19:24 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ADpwoO1dY/b12Lxsv4fcNOt5VIfTm8VtY4e0QOnoP+20EV9wJKk3Gcnz4D8u9auupetzv0uwxgeptHC3hv9g2NAzuX2QXPXK9i1lmeBUXV+RNhDNAM6IcW03+Is6n4JwDqBUiaMQUoPoMa+Bw2WV7bIOnpmakEPjbTUlf8usta2LLCaTN0if/pbgnrfZCeC1Y/GQigzvJFMygXzUzfxAEyI4GLp99q8ldnu9nmy50f3E/YTIFh75T6Lr4AH+Zs+dNZUlvb93MKlJDlAGmIx3w5SK2ZTwbBm5zvvzyfsjXp8w215go5v9Zukttlro3m1ovKKUtNIqWCwbAL7hSllvpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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; bh=WVmuadp3WQs/fjMpwjq2vKj18ih43sibIg3YNYlrkhw=; b=RyCYd3x7s4hpcp6HUB5whdfHeFZiIL9p1pvQYvtBZNF1Upw83IAOBbVm0IFLvpMhmojFb5iRhco83n+rvSrToz5v6sA6EqAHCkkW9sb/nmug4y8QsmmXniqWPO3v+oaUKvZYOea1jRrCkxZq9rLcNc610HustbenrI4Irj0YN/ClzP+Qu7PCI4YjiQCBGsTTX893ZLpIqJNGiBs2oYpuXoTkUUFqrOJsQSIXkqxsNGwz9hCkxnGPSxIadB7o0Knrvp8eJp/ujRRri0Ue6h4YoR5B5UIKDGVWU6tg6iHs8Un0bsBvuXSOs7J8HhbyFT1dgeljmH6NcXhz24zMFLBy7Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=marvell.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WVmuadp3WQs/fjMpwjq2vKj18ih43sibIg3YNYlrkhw=; b=Sge16UoIBn4UcORgcHtIvMWXWikHxW4RLEhR5Hfa2pvH+24c70VaCieGHsTl/RQJVpJsw29/Qm+Xn/ov5Ig/wg4hKc+ZygIrR567TtLLX9YlQ9FIt7NiL1JJdxSklodU8scLyHCSKsGRoUgEtw+HFibDMTlRgM6flg1XGPLRcew3pMX8UqHGXt2cLxe0FoOfoPhVTBPzFkfyn+RhNEUHi3b6e976AYATt0BR8s4pyfFOTTMBKlTstROtUHdy2doCPbrMg35gi62fJ3IqBKtaX6wl57C6vLMB2rjRlvxNyXyODxk+LNQP20GObb+XQ5n2YyJ1XmPGnpgoQ+ln2Hhkfg== Received: from CH2PR11CA0006.namprd11.prod.outlook.com (2603:10b6:610:54::16) by CH0PR12MB5203.namprd12.prod.outlook.com (2603:10b6:610:ba::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32; Mon, 11 Dec 2023 10:19:22 +0000 Received: from CY4PEPF0000EE3F.namprd03.prod.outlook.com (2603:10b6:610:54:cafe::c2) by CH2PR11CA0006.outlook.office365.com (2603:10b6:610:54::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.33 via Frontend Transport; Mon, 11 Dec 2023 10:19:21 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CY4PEPF0000EE3F.mail.protection.outlook.com (10.167.242.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.18 via Frontend Transport; Mon, 11 Dec 2023 10:19:21 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 11 Dec 2023 02:19:07 -0800 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 11 Dec 2023 02:19:06 -0800 From: Xueming Li To: Satheesh Paul CC: dpdk stable Subject: patch 'common/cnxk: fix SDP channel mask' has been queued to stable release 22.11.4 Date: Mon, 11 Dec 2023 18:11:38 +0800 Message-ID: <20231211101226.2122-74-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231211101226.2122-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> <20231211101226.2122-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EE3F:EE_|CH0PR12MB5203:EE_ X-MS-Office365-Filtering-Correlation-Id: 92cb9262-2da0-419d-c6e7-08dbfa32a448 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IKpW40O7zC3Rv9uSrZ7PebQVsYesm89orc0ff3//CHGlHjV84Si5a39OZX4U2bTLLE/SZWrq+aZ4aWIYvTYKZ3jYkM7NCl3/kF6j7IV/O9G0Vr/fICJSqY0Uu4f/CI7lhdst268h9G0XbkQwBbbJ9YQA6XmYKjm1CWHRGjlg3U+zCZBNDoe8b7Chtsy0w7IZ3Z3/1WTrLo1KFYZCc37TffG7ji0dA7fKnu9d+nnNz1tsTXA1ObENcGedIQd6YoVRei8lWK0xA5K5pN61DkFhES9tLkl0ziVHRocmJ1CB+RAFwTvXKd9xu41HSyp77Wd33uzpKlC6j8SWG9uoKg1AAkcbAEc1P2uEFGCpSmqc0/tlyLgRtIGlHKiMHPBIQ/ONYAHkUdOBxVw8heGPIYiC6H/JGL+ADOpwV/kMbUUYQSFlLQPwVxa2KDmQf6J2wrq0bLyt3Vle3hFAt6TyeXD5tdQU4ZLbnm+BOZL8ogrKdZPNVt06b62e+UWb0WZGDNdkTowmOIGcf6xh1Tqzo++fGC63cqez6LVle9e84jgV0T600to6MngTrvKdDN530IAH9TDPlUWxlq+miusZM6v7UYw5nTrFiahOEl4km6HBku/2ULIJ8+KuXDZJ3KFZZG8q2XpJzxvI4GVSH3/qKNT3YY8YAOK5q9yoKDNQosLtFLtW/mo1WmPdzW4t7gvcu/BvM4G1MOvK3atYe5Revjf4MlM9xvnvGQrTTr/CvRJQSfpu/GldutFWbjS8cf5AiN2ekC1RWDiuVS/inXoe8I4tI/vWkrq8QLDTyuilFPktJAo= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(376002)(396003)(39860400002)(346002)(136003)(230922051799003)(451199024)(1800799012)(186009)(82310400011)(64100799003)(40470700004)(46966006)(36840700001)(2616005)(26005)(6286002)(16526019)(336012)(1076003)(53546011)(7696005)(478600001)(6666004)(966005)(47076005)(36860700001)(426003)(4001150100001)(83380400001)(5660300002)(2906002)(70586007)(6916009)(70206006)(41300700001)(316002)(4326008)(8676002)(8936002)(356005)(82740400003)(7636003)(86362001)(36756003)(40460700003)(40480700001)(55016003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 10:19:21.3192 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 92cb9262-2da0-419d-c6e7-08dbfa32a448 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000EE3F.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR12MB5203 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 22.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/13/23. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=a998d657f505d103e382eb9aaafca202a287cd9b Thanks. Xueming Li --- >From a998d657f505d103e382eb9aaafca202a287cd9b Mon Sep 17 00:00:00 2001 From: Satheesh Paul Date: Tue, 7 Nov 2023 12:10:09 +0530 Subject: [PATCH] common/cnxk: fix SDP channel mask Cc: Xueming Li [ upstream commit fd4934607097604db949ba1fab30f16861438949 ] Channel mask field is incorrectly for SDP interface and it is returning as 16 bits. Fixing it by truncating to 12 bits. Fixes: 2703f1fa3200 ("common/cnxk: fix setting channel mask for SDP interfaces") Signed-off-by: Satheesh Paul --- drivers/common/cnxk/roc_npc.c | 5 +++-- drivers/common/cnxk/roc_npc.h | 2 ++ drivers/common/cnxk/version.map | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/common/cnxk/roc_npc.c b/drivers/common/cnxk/roc_npc.c index bb478ec55b..a5b5f95dec 100644 --- a/drivers/common/cnxk/roc_npc.c +++ b/drivers/common/cnxk/roc_npc.c @@ -1264,7 +1264,7 @@ npc_vtag_action_program(struct roc_npc *roc_npc, return 0; } -static void +void roc_npc_sdp_channel_get(struct roc_npc *roc_npc, uint16_t *chan_base, uint16_t *chan_mask) { struct roc_nix *roc_nix = roc_npc->roc_nix; @@ -1279,8 +1279,9 @@ roc_npc_sdp_channel_get(struct roc_npc *roc_npc, uint16_t *chan_base, uint16_t * num_bits = (sizeof(uint32_t) * 8) - __builtin_clz(range) - 1; /* Set mask for (15 - numbits) MSB bits */ *chan_mask = (uint16_t)~GENMASK(num_bits, 0); + *chan_mask &= 0xFFF; } else { - *chan_mask = (uint16_t)GENMASK(15, 0); + *chan_mask = (uint16_t)GENMASK(11, 0); } mask = (uint16_t)GENMASK(num_bits, 0); diff --git a/drivers/common/cnxk/roc_npc.h b/drivers/common/cnxk/roc_npc.h index 60f9c5d634..25e916ce08 100644 --- a/drivers/common/cnxk/roc_npc.h +++ b/drivers/common/cnxk/roc_npc.h @@ -385,4 +385,6 @@ int __roc_api roc_npc_mcam_init(struct roc_npc *roc_npc, struct roc_npc_flow *flow, int mcam_id); int __roc_api roc_npc_mcam_move(struct roc_npc *roc_npc, uint16_t old_ent, uint16_t new_ent); +void __roc_api roc_npc_sdp_channel_get(struct roc_npc *roc_npc, uint16_t *chan_base, + uint16_t *chan_mask); #endif /* _ROC_NPC_H_ */ diff --git a/drivers/common/cnxk/version.map b/drivers/common/cnxk/version.map index 17f0ec6b48..ae9eaf360c 100644 --- a/drivers/common/cnxk/version.map +++ b/drivers/common/cnxk/version.map @@ -353,6 +353,7 @@ INTERNAL { roc_npc_mcam_write_entry; roc_npc_mcam_read_counter; roc_npc_profile_name_get; + roc_npc_sdp_channel_get; roc_npc_validate_portid_action; roc_ot_ipsec_inb_sa_init; roc_ot_ipsec_outb_sa_init; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-11 17:56:25.451236900 +0800 +++ 0073-common-cnxk-fix-SDP-channel-mask.patch 2023-12-11 17:56:23.077652300 +0800 @@ -1 +1 @@ -From fd4934607097604db949ba1fab30f16861438949 Mon Sep 17 00:00:00 2001 +From a998d657f505d103e382eb9aaafca202a287cd9b Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit fd4934607097604db949ba1fab30f16861438949 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index f2cf4d8a28..a0d88c0743 100644 +index bb478ec55b..a5b5f95dec 100644 @@ -23,2 +25,2 @@ -@@ -1422,7 +1422,7 @@ npc_inline_dev_ipsec_action_free(struct npc *npc, struct roc_npc_flow *flow) - return 1; +@@ -1264,7 +1264,7 @@ npc_vtag_action_program(struct roc_npc *roc_npc, + return 0; @@ -32,2 +34,2 @@ -@@ -1437,8 +1437,9 @@ roc_npc_sdp_channel_get(struct roc_npc *roc_npc, uint16_t *chan_base, uint16_t * - num_bits = (sizeof(uint32_t) * 8) - plt_clz32(range) - 1; +@@ -1279,8 +1279,9 @@ roc_npc_sdp_channel_get(struct roc_npc *roc_npc, uint16_t *chan_base, uint16_t * + num_bits = (sizeof(uint32_t) * 8) - __builtin_clz(range) - 1; @@ -44 +46 @@ -index 4b387f2a6b..b71ddd1578 100644 +index 60f9c5d634..25e916ce08 100644 @@ -47,4 +49,4 @@ -@@ -440,4 +440,6 @@ int __roc_api roc_npc_validate_portid_action(struct roc_npc *roc_npc_src, - int __roc_api roc_npc_mcam_init(struct roc_npc *roc_npc, struct roc_npc_flow *flow, int mcam_id); - int __roc_api roc_npc_mcam_move(struct roc_npc *roc_npc, uint16_t old_ent, uint16_t new_ent); - void *__roc_api roc_npc_aged_flow_ctx_get(struct roc_npc *roc_npc, uint32_t mcam_id); +@@ -385,4 +385,6 @@ int __roc_api roc_npc_mcam_init(struct roc_npc *roc_npc, + struct roc_npc_flow *flow, int mcam_id); + int __roc_api roc_npc_mcam_move(struct roc_npc *roc_npc, uint16_t old_ent, + uint16_t new_ent); @@ -55 +57 @@ -index fffd2064be..aa884a8fe2 100644 +index 17f0ec6b48..ae9eaf360c 100644 @@ -58 +60,2 @@ -@@ -459,6 +459,7 @@ INTERNAL { +@@ -353,6 +353,7 @@ INTERNAL { + roc_npc_mcam_write_entry; @@ -60 +62,0 @@ - roc_npc_inl_mcam_read_counter;