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 2C17C457A1 for ; Mon, 12 Aug 2024 14:53:48 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2731E40668; Mon, 12 Aug 2024 14:53:48 +0200 (CEST) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2062.outbound.protection.outlook.com [40.107.100.62]) by mails.dpdk.org (Postfix) with ESMTP id B87E740654 for ; Mon, 12 Aug 2024 14:53:46 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=UcTBjB5fQUpFMzwZO9WcgtyT3znUUh3H/LNq7CgcdDdS/CPWIG0Y+zqk7jIbL9vk7Dk0S3UB6YD3Ks8KAFvg3PwsnJCm3UpMETKylteMUwTqB352RlgWq5ADsEl44xcGrZ/Bg9b+ub7Kc8forpnvu1wPzo1924laau5A4SdET/fRKzftYiGdk6uWOgaaVMh38SMUVKB7Fihi393smKCI+De4MnVEcsSPQzazuEm04ALQwqV5x0SvVYOvNPep68eJrG+LaiBsbxBarLGX0AAExX9BL5riamxwiqh/bZdgdKRYI2rJcXEUGaxBMpiLtAHOTO4xbIFcw5RGOppGfDYMiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=pFoF1046yqr3gHuuetIyPHFj7Ap7nfQOxs6kS46vOrs=; b=YOa4pcks80Jqp/Sd2RNMeTUJoWXICb8tEd/7L7na2+IffgoXXGCYsOWTbRk9CK6+UHYSwMG2cvAVvNZLP4Zc0L4c/bFPxKIQt/4EVL4YnAkRM64P39zcs16Pt02lB/iiPpD0rnaEKSCdh6l8/8skYEPq3N9W1Fl4B1N39AnvXrq8wMNpIKvW0V8Kqk0tfhMCC9LA/W3aCK9MJYlgutPxuRKghnmk69+NTjeGiMVgkBjEu7Uf9BYX1PtXYJ5HWOjpgzByvyBO9DIPQaQdXwCOlt8UCIZwjxJsSLHlPGzErmQUkvCVFlSgtinDk/T1a3PGlOd47zIL1IOi4MtaOVm/cg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=nxp.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=pFoF1046yqr3gHuuetIyPHFj7Ap7nfQOxs6kS46vOrs=; b=ktjMo6Wwu+UWYncbwQ8+aR9a0cGnQ3K07YzVnvJP3DK5RicQP9eJqVW4RAqahFRsY+RUhLWbUiKc4/8Pvp7sVv5BBvl5amlUtj/c4uSM/JeFISTOwsuvZNZpOGrKh6JcRoqYy09YmNBjgx6Dem7tgBh2ILjDLlnQ82Rl+5Bg8jWqBJhZxz3LnM5/UAsD6mDmF4Me6dGa55y5hjRu0RdJdKQUv1OdYAnwmQ0cdV+Ur3yjJInFqy8B2308Q/gelHw3WDJmfTR0Kr12mNJQ/i90sWeRK7qyAfaPu4p24pAbKD8yucKAcchlU24v4efZRjmgcZbNOSjXPwq2dgQo1HE8Xw== Received: from DS7PR03CA0328.namprd03.prod.outlook.com (2603:10b6:8:2b::30) by CH2PR12MB4040.namprd12.prod.outlook.com (2603:10b6:610:ac::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.22; Mon, 12 Aug 2024 12:53:42 +0000 Received: from DS1PEPF00017090.namprd03.prod.outlook.com (2603:10b6:8:2b:cafe::ed) by DS7PR03CA0328.outlook.office365.com (2603:10b6:8:2b::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.33 via Frontend Transport; Mon, 12 Aug 2024 12:53:42 +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 DS1PEPF00017090.mail.protection.outlook.com (10.167.17.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.19 via Frontend Transport; Mon, 12 Aug 2024 12:53:42 +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.1544.4; Mon, 12 Aug 2024 05:53:29 -0700 Received: from nvidia.com (10.126.230.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.1544.4; Mon, 12 Aug 2024 05:53:28 -0700 From: Xueming Li To: Gagandeep Singh CC: , dpdk stable Subject: patch 'common/dpaax/caamflib: fix PDCP-SDAP watchdog error' has been queued to stable release 23.11.2 Date: Mon, 12 Aug 2024 20:48:26 +0800 Message-ID: <20240812125035.389667-30-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240812125035.389667-1-xuemingl@nvidia.com> References: <20240712110153.309690-23-xuemingl@nvidia.com> <20240812125035.389667-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.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: DS1PEPF00017090:EE_|CH2PR12MB4040:EE_ X-MS-Office365-Filtering-Correlation-Id: 00ea9aae-c6ba-417a-5dc0-08dcbacdcb67 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|82310400026|376014|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?4HxKe8khD5x7p5PQAzUiD79n+kILzYz6Y6kMI3GD7m5VHQ4+UNFfWhCBWS6Z?= =?us-ascii?Q?akuOz6+qPvgUvis9UVktGHReStfNsr2hokgE6LWlU2zIDnc/1gg85NXVZk+L?= =?us-ascii?Q?UphsyxCWgyz9oXOShIBMvHydaDoCPibkuN2+XHYi3wFnUOjW4Ac6sjN+Lb4H?= =?us-ascii?Q?1nL60iPG0uK+Zzuu1iJ2jI1RanPvtlbAM3oy+SLinOT1WkcTYsc6gDZWELcj?= =?us-ascii?Q?1rlcfuur/6KEn9xSQD8n4zUXai9aSVVkqXMsz6TRDIv02UIHrHd5BZKMpYVY?= =?us-ascii?Q?fdCoUJXUtUlUNOYO5uotf/V3RECUnu1TTht49rwDLKOFRc7PTqudyyUh6DUF?= =?us-ascii?Q?K73J303h+uj7Yk7wKYsDvW4sqwBOW8nPsRdG3xke7/w5mahhCXOmYjblFVZB?= =?us-ascii?Q?rG2kjpo9SOM0S/CUkNMQdmhhyl6nOHGe9A6nG3Stu+xoWi9BCOEbLkrPBpJ4?= =?us-ascii?Q?Nc40SpyAGbphc2OM40bIwlYwgJZ8b/iFpdQ/VP8OtJlTBVnF2AaiRMxd/NaI?= =?us-ascii?Q?OO4D3rJfNWqrGLbclSsicLgngfqaextWCozJkWoWUjo3VkVk/9OZf4Tn6j9v?= =?us-ascii?Q?sMDuu1OaeJErx5RlNaZ9YsLDpf0reHR5secrO5PGap0sjBv151a3+EKLSjBi?= =?us-ascii?Q?nhF52KnU77JTnYBxv6Dlya1r5aTNRD+RzRlNLYCh+m0/DNcCbW6NGNHWqzK+?= =?us-ascii?Q?x/uoegN08hRTDNofaqiyRkT9764slClu2JI2PcAWIW4+MeWi9XVa9+K/Nq1l?= =?us-ascii?Q?pMHiX5gdymZ2pWdAQmS9D47InIWGsJNRuEqMJR7/PdHw9049gBW1Orl2Y1Sb?= =?us-ascii?Q?CgKJMgNDfYdnGEw8NRHupcEQtZePACCRQ6BKrfmuDkY7ytg9lcuKJd5aAJDC?= =?us-ascii?Q?vUJzRnc6X5ucaCxD0AN7a7Y/efW3yn2amsUqA8ExaXi3VoqoJiLJM5V/Sv5D?= =?us-ascii?Q?jn7U+iyHrf4Jb5ppMKFGMFWDblwwncd2uXSt4egrKx3idX8WkGzKIOt/AGa/?= =?us-ascii?Q?RiEZnaLfEYEvNfIMcGvROQ1+hf7GwqpmXsvz8aPFfqXvdUw0NCKKeH7rrRyk?= =?us-ascii?Q?ZYMaeZVA/F0wgUV7CvEPYigC7w6iJ9MyS+IFTK4PTf5VEHnGGWFIvb/efdvW?= =?us-ascii?Q?dyKl4U9HLnehAxBaznOZAREfrpeRkvIO/sGDAPG7vSnt0yf1JxKKUNFT5+Ee?= =?us-ascii?Q?dBdQbkw+9VSlW7cjGasjgrxH/v6Yqfc8sE8v9sVfgNw3f+/L4LmM3F7gT7BI?= =?us-ascii?Q?QD/v0jp0SCRQ69VB1C5nX4cJK9cOYvilY9bgyMwKBfu9ADGO0MkrM8dmo3c1?= =?us-ascii?Q?Ptr2YxQy4xSG+7NUo5doVkwBuD0oxFDPygiEo5hqvL4dBMDXKQjnqaaQaEN5?= =?us-ascii?Q?te7YDAbGJ98VKO6r6RcqB5qLLOLwQ+pExb7cZ94DmVeYHuhcrg=3D=3D?= 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:(13230040)(1800799024)(82310400026)(376014)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2024 12:53:42.1972 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 00ea9aae-c6ba-417a-5dc0-08dcbacdcb67 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: DS1PEPF00017090.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4040 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 23.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/14/24. 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=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=5089ef6c28185cd2b451251e3b749d072ba625fe Thanks. Xueming Li --- >From 5089ef6c28185cd2b451251e3b749d072ba625fe Mon Sep 17 00:00:00 2001 From: Gagandeep Singh Date: Wed, 3 Jul 2024 15:56:39 +0530 Subject: [PATCH] common/dpaax/caamflib: fix PDCP-SDAP watchdog error Cc: Xueming Li [ upstream commit 6671e82e5c6b4858573f4dae665e7f2442913d93 ] Adding a Jump instruction with CALM flag to ensure previous processing has been completed. Fixes: 3ba2e519eafa ("common/dpaax/caamflib: support PDCP-SDAP") Signed-off-by: Gagandeep Singh --- drivers/common/dpaax/caamflib/desc/sdap.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/common/dpaax/caamflib/desc/sdap.h b/drivers/common/dpaax/caamflib/desc/sdap.h index b38c15a24f..d41bacf8f9 100644 --- a/drivers/common/dpaax/caamflib/desc/sdap.h +++ b/drivers/common/dpaax/caamflib/desc/sdap.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright 2020-2022 NXP + * Copyright 2020-2023 NXP */ #ifndef __DESC_SDAP_H__ @@ -628,6 +628,10 @@ static inline int pdcp_sdap_insert_no_snoop_op( /* Save the ICV generated */ MOVEB(p, CONTEXT1, 0, MATH3, 0, 4, WAITCOMP | IMMED); + /* conditional jump with calm added to ensure that the + * previous processing has been completed + */ + JUMP(p, 1, LOCAL_JUMP, ALL_TRUE, CALM); /* The CHA will be reused so we need to clear it */ LOAD(p, CLRW_RESET_CLS1_CHA | CLRW_CLR_C1KEY | @@ -718,6 +722,10 @@ static inline int pdcp_sdap_insert_no_snoop_op( /* Save the ICV which is stalling in output FIFO to MATH3 */ MOVEB(p, OFIFO, 0, MATH3, 0, 4, IMMED); + /* conditional jump with calm added to ensure that the + * previous processing has been completed + */ + JUMP(p, 1, LOCAL_JUMP, ALL_TRUE, CALM); /* Reset class 1 CHA */ LOAD(p, CLRW_RESET_CLS1_CHA | CLRW_CLR_C1KEY | -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-12 20:44:03.491991122 +0800 +++ 0029-common-dpaax-caamflib-fix-PDCP-SDAP-watchdog-error.patch 2024-08-12 20:44:01.975069271 +0800 @@ -1 +1 @@ -From 6671e82e5c6b4858573f4dae665e7f2442913d93 Mon Sep 17 00:00:00 2001 +From 5089ef6c28185cd2b451251e3b749d072ba625fe Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 6671e82e5c6b4858573f4dae665e7f2442913d93 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org