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 613FB457A1 for ; Mon, 12 Aug 2024 14:54:06 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5735940654; Mon, 12 Aug 2024 14:54:06 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2076.outbound.protection.outlook.com [40.107.92.76]) by mails.dpdk.org (Postfix) with ESMTP id EA137402C3 for ; Mon, 12 Aug 2024 14:54:04 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=rScLNdYhnGQ/Du7YbokMPY71+FTC7h9SE2LJQxASdM3BV4PGP7B8cYOqh7c3gBANk/1BdT4MEjZCd8N6l/ILneLm4xDZNfY/xZlwNj6S4/EbQgLVD+04QSfV44V3xAq5rEHPDcjso3aW4Sbg0P1bG/qxJOuyPAnGkp4Ef4BVhhsJCL4PRgFK8jLrp7+h9Qr+fVPgQ5rfPVwqxNj7EfcGwP3euZh3C1p3qOvXpiWLvh0DruehnPtb1Z78lPToBT+uIeXL2VihWBhoW1m3MxVLxJYqV5nQZiFL0S0bxmEN3yJNpd1hKoJWHtPrY105XrTd+0wLbbvWjLHOncE/R41bKw== 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=23DjW5YMdb03hHH0TZKGCU16dioG666JnIkBOvnTMJY=; b=OoOUX9C4GH1miRF3eC5mTH4CBIhSl9IcM24VX97Db+5XdhnmMrVZzK00tgV+jOr1FRS98yq+uuYih2iMsnfJB2APDUCLzKug6hNECnpvWZYyOmjkzZ+cNH1qoQM+S4cN81Yp59JplkMlF1EGs5XG6U2dCLoZKlPbv8Tk0lZVGJid2YaWJ1JuhHM7TZzBA544mFAq5cW69u3Eb8WLQhWy3uhgDxtlaGzg9RcsHESWNeb32wl3LxbQwUevBYu8IDJoWNoXhdwK8az14HXoAybI7EtwytKs3kxq/PnSajAnlncIdADVbyg4DG+EM2QLYssNpd5vD2vpAAMgiae8HfFnhw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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=23DjW5YMdb03hHH0TZKGCU16dioG666JnIkBOvnTMJY=; b=ac9Ew6Hy7icuyAfeAm0+ogCIL3hVI77T4PJson+F8p3xsU6S43FCA6FxENm2yCv3TCnlQSatngsCz+AcLZzm08ha7aKhRrUUjYHX61gbyS0a5eKKm1kAWgsuu2f7u0O6QcDJeuxUfIPDHWV+cIX1Ff6/X7KaLJQvG9xd0c7hhMcILO4ikRC9YVi7SkgxnrCiLzgaO3Oeq2Pbs0Q8lfo/OYEfcdfc8OeH2vJ06oWZ+4m/JvAgLIUotuZp1XdzkrzmgfXX3aQPA1aspIm4zUIa4Gq6wSfNJjiNOFQCY7nhotM1W7MsG2H18Mn/QnxL68KIItB1wB1zAV869Hgnhe+quA== Received: from SA1P222CA0019.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:22c::20) by LV8PR12MB9407.namprd12.prod.outlook.com (2603:10b6:408:1f9::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.20; Mon, 12 Aug 2024 12:54:02 +0000 Received: from SA2PEPF00003F62.namprd04.prod.outlook.com (2603:10b6:806:22c:cafe::d0) by SA1P222CA0019.outlook.office365.com (2603:10b6:806:22c::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.22 via Frontend Transport; Mon, 12 Aug 2024 12:54:02 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by SA2PEPF00003F62.mail.protection.outlook.com (10.167.248.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.8 via Frontend Transport; Mon, 12 Aug 2024 12:54:02 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) 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:49 -0700 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.1544.4; Mon, 12 Aug 2024 05:53:47 -0700 From: Xueming Li To: Varun Sethi CC: , Gagandeep Singh , dpdk stable Subject: patch 'common/dpaax/caamflib: fix PDCP AES-AES watchdog error' has been queued to stable release 23.11.2 Date: Mon, 12 Aug 2024 20:48:27 +0800 Message-ID: <20240812125035.389667-31-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.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: SA2PEPF00003F62:EE_|LV8PR12MB9407:EE_ X-MS-Office365-Filtering-Correlation-Id: b4146a04-4dae-45bf-9449-08dcbacdd745 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|36860700013|82310400026|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?mmL6q3Ve6EihrpKcsER+PbYrTNSicCQmzM1ahTl58IPbWINGp4TShT/aECBX?= =?us-ascii?Q?b6fI5NcTG8AXzQtDmdRKaNUHhGsZAug/zgq/W9xj3bG0z5TzPKcaxMj7/DIn?= =?us-ascii?Q?ReYI3xUhnJIoSOYJBpo4IHjCYGFQj4qhqdK6fldjEI8ReIztDQG16abaFHpf?= =?us-ascii?Q?uES/JG2tAN/Y1Ls0Nr2X1c7A9taZbXdDNhkAwLAvOIy2F0c62fIaMgQINprF?= =?us-ascii?Q?L8BY3+uRI6QGb0Ia0W+9YiAtt6UUXYMDBL88AZp7KVvmjVj5d/JrmBvImzQn?= =?us-ascii?Q?eL0PX+gdq8laicAcqfFtcY46pTV85UlPpRi89AiNVXlHgL732P6Qse6B8YOO?= =?us-ascii?Q?KSk27s2wH5omPRJXVygwjUFvedoRVd/smnuMg0psNxQaPoinoJDuyjwvIqFi?= =?us-ascii?Q?ifrOzqGOYX/DLlmfSvSY/Uq0FQldDzPemZ3E+8MLTlNmCykPxqiomfMZTlPU?= =?us-ascii?Q?PWKNhhSXyZPJtXTGUQ581YC/+/3w3V3E+bJqdqzMZCtkrIBq8g7KgHuh+cQJ?= =?us-ascii?Q?7sqmbAZKsI6v3UusUq50keeos3BYl6Tk9nCOKmmZy7UMC+YNH6id9jxd26rc?= =?us-ascii?Q?pmuMz/uzI/f7bYK8uG8aA1pUgh9NecxAaj5bFhFAAecT/nf3Dnmzisi5vPdw?= =?us-ascii?Q?t/trhAyynVOxHgX8tYcE30rMXhaFM4BZKhKkDub/O6OdJyeT7+f0G8rScY9h?= =?us-ascii?Q?CzP0RoOo2S+RoDj/RwCi3IT2XPAZu1itKuT/z0+xskl5mXi1DFH2N9lUPdPV?= =?us-ascii?Q?f2FjYLuYvnYo69a2MOgN+5xY8G6cJnpgcl0VMoXT/fUCNQnkU2Iqa5/0ycSC?= =?us-ascii?Q?Ys0dIkAVS/6tRZSWvYKS2FxFOI/3i3aQgRy3CPLZG76vBuFmBvvetvI6w5ma?= =?us-ascii?Q?dyI57Fl2k0HpcfXOeGXj6CKMvGQGLXHS3ClBTtiS+r5bWFfYAx25zslhVj8i?= =?us-ascii?Q?R6H35vZm60wGVb4Tn1BXuaIwa1RnbTGDHtb64SVuE/convaFn0V3xhSVGn6J?= =?us-ascii?Q?AuOL9nde2fOLuvClP58QEErg7SvJBKU3c+j9CH9jsLx7p5p+4332cNII/jWZ?= =?us-ascii?Q?7NGIsAlKSUm7zXfebpyayh4i48OoizWJtJfJUs67nESDO1JBbXUBUe/kH39i?= =?us-ascii?Q?XMEA2R3KPClyHtTOFThA0AelocE75ZR+YjFKY7ynVKNSrZcbIrnMv0JXkk7B?= =?us-ascii?Q?mn66aGLBRn7G5C0cabyT/lumy/sr38U/gKYVLungyXQBbyUkk736K1beKLl6?= =?us-ascii?Q?/6rbfjy0kfiYxAXScEkjnI8mGvLqMIaRSr7VF8m5KxGao3TwZzQRH0gg2SBH?= =?us-ascii?Q?HSTa01iW/0sTZyHn4V44HGMlfVJA49F4nGyzqnjTApPz8XwZKJS2VWoLdPAL?= =?us-ascii?Q?z86/VhxVhZ9TcIg+qF3tjzIBO9E1jr6A51YhtPFc2kdXIfsMPH6kUwiLIgPE?= =?us-ascii?Q?HeUrDT6G4XUDbr19L41jV2lP/qHCmGfL?= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230040)(1800799024)(36860700013)(82310400026)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2024 12:54:02.1553 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b4146a04-4dae-45bf-9449-08dcbacdd745 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.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SA2PEPF00003F62.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV8PR12MB9407 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=b977583692a9b52073c56141dd8f93c31922b34a Thanks. Xueming Li --- >From b977583692a9b52073c56141dd8f93c31922b34a Mon Sep 17 00:00:00 2001 From: Varun Sethi Date: Wed, 3 Jul 2024 15:56:40 +0530 Subject: [PATCH] common/dpaax/caamflib: fix PDCP AES-AES watchdog error Cc: Xueming Li [ upstream commit ed5ea9e3e7f30cb8d7b45035a40ab75efaa38584 ] Adding a Jump instruction with CALM flag to ensure previous processing has been completed. Fixes: 8827d94398f1 ("crypto/dpaa2_sec/hw: support AES-AES 18-bit PDCP") Signed-off-by: Gagandeep Singh Signed-off-by: Varun Sethi --- .mailmap | 1 + drivers/common/dpaax/caamflib/desc/pdcp.h | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/.mailmap b/.mailmap index 8827687e19..8e5ee34a2f 100644 --- a/.mailmap +++ b/.mailmap @@ -1480,6 +1480,7 @@ Vadim Suraev Vakul Garg Vamsi Attunuru Vanshika Shukla +Varun Sethi Vasily Philipov Veerasenareddy Burru Venkata Suresh Kumar P diff --git a/drivers/common/dpaax/caamflib/desc/pdcp.h b/drivers/common/dpaax/caamflib/desc/pdcp.h index 7d16c66d79..0ed9eec816 100644 --- a/drivers/common/dpaax/caamflib/desc/pdcp.h +++ b/drivers/common/dpaax/caamflib/desc/pdcp.h @@ -1023,6 +1023,11 @@ pdcp_insert_uplane_aes_aes_op(struct program *p, SEQFIFOLOAD(p, MSG1, 0, VLF | LAST1 | FLUSH1); 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); + LOAD(p, CLRW_RESET_CLS1_CHA | CLRW_CLR_C1KEY | CLRW_CLR_C1CTX | @@ -1070,6 +1075,11 @@ pdcp_insert_uplane_aes_aes_op(struct program *p, 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); + LOAD(p, CLRW_RESET_CLS1_CHA | CLRW_CLR_C1KEY | CLRW_CLR_C1CTX | -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-12 20:44:03.519236419 +0800 +++ 0030-common-dpaax-caamflib-fix-PDCP-AES-AES-watchdog-erro.patch 2024-08-12 20:44:01.975069271 +0800 @@ -1 +1 @@ -From ed5ea9e3e7f30cb8d7b45035a40ab75efaa38584 Mon Sep 17 00:00:00 2001 +From b977583692a9b52073c56141dd8f93c31922b34a Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit ed5ea9e3e7f30cb8d7b45035a40ab75efaa38584 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index 502791e0bc..74739ec9be 100644 +index 8827687e19..8e5ee34a2f 100644 @@ -23 +25,2 @@ -@@ -1503,6 +1503,7 @@ Vakul Garg +@@ -1480,6 +1480,7 @@ Vadim Suraev + Vakul Garg @@ -25 +27,0 @@ - Vamsi Krishna Atluri