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 18E1745CE3 for ; Mon, 11 Nov 2024 07:30:13 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0E68F4067A; Mon, 11 Nov 2024 07:30:13 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2086.outbound.protection.outlook.com [40.107.93.86]) by mails.dpdk.org (Postfix) with ESMTP id 5B3FA40E19 for ; Mon, 11 Nov 2024 07:30:11 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Ot6uK3gMIOCoJjqhj+JTgDUFjw8FrzEtYDSaXnEYpiwDZsd0FFAGggdS0T0qRrUSHjtjqfOJQnj79V/RY2izGSfyMbCX3lancbRu7nL71p8NDzcy6exfGZVGUPgiilMOs8yVVSMjcQ9k5t7Zrs3l3sdd0QamcssaUC/CCmAzTrXEHIGEkf8rYw3xkOpS03cQXhVmYqGyDZW7ny5BVnnObWxn5QCz2eYaNGC7VaigHOstmTXEmAFEUaIYFSCT9+tU2Q9v4mj/RVE0ypRfBT0uuRtdYB0MoZEwj8zn8GKOzFC/qcKsxAMcZPDYtTAkoev6h4eLXGvqIXtD2+izCdBa0Q== 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=v3Oj8T3CuzbC+TKAsTDfQAhm6LzwGkF4GyJXc0HId18=; b=K4/JrDSIw2NIl+kjvegmBfVu3F0nbSqyRdscs4kL/yBkdCruYXv/Z+j80yjebqTtwh/SBC3RuTlufx7UxeAaEjcksBmf1v6INjhKdmhzcaiypce6jy+yrDZVozKit8lbJF8heXVJIWYSlSNL4fHo0vRdD5HSVCR8Pj8Xekw7sr02VdPVJGCS3MxnqSMoF/xpHddkp2Fr4k44yFZJtJsH+LBKA12JBNWRn9fXUH9yJm19XP51ybZNDn2EVzcNwZkcJipHU/G1FYBkDuLYMDT+6MfxibvzPvgpythuI+oEnhQpwjNsQ2VMEaLZO/dodWko/Er4lrVKAmYGeSrHw+82PQ== 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=v3Oj8T3CuzbC+TKAsTDfQAhm6LzwGkF4GyJXc0HId18=; b=R06sIpAZ3hJCtRmmBjc49XWb0r8/ghMbFGoBHB/NlcVyHBgOV2oNLfm6md017njtUJklKAcg7g3931CMM3YaofUb+/Qi2mEDBSojELZdvLGs9ypr3b5mkW+K7JxB+e9bVTD97T3eiq4P2GZtUVTCsEqBQf+7Mq13kDrvSOuz3+IZZcILouSSBlLcnbPxNrilz3/r1YBj5ooY9tojeUqlAydyTXgEZ8zZ4s+fXArCJszRc0MbAn8m5y8f/PVP0p2RnqOrMSlP6Qvt/wzJW6c5IKMecS8S3Ra/tZx8agpreQdYegJ/GPzxWqrkDaguO4g6AdrLxBkopZXw+624aCE+xw== Received: from DM5PR07CA0086.namprd07.prod.outlook.com (2603:10b6:4:ae::15) by PH7PR12MB8156.namprd12.prod.outlook.com (2603:10b6:510:2b5::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.29; Mon, 11 Nov 2024 06:30:06 +0000 Received: from DS1PEPF00017091.namprd03.prod.outlook.com (2603:10b6:4:ae:cafe::93) by DM5PR07CA0086.outlook.office365.com (2603:10b6:4:ae::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.28 via Frontend Transport; Mon, 11 Nov 2024 06:30:05 +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 DS1PEPF00017091.mail.protection.outlook.com (10.167.17.133) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8158.14 via Frontend Transport; Mon, 11 Nov 2024 06:30:05 +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; Sun, 10 Nov 2024 22:29:49 -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.1544.4; Sun, 10 Nov 2024 22:29:47 -0800 From: Xueming Li To: Varun Sethi CC: , Gagandeep Singh , Hemant Agrawal , dpdk stable Subject: patch 'common/dpaax/caamflib: fix PDCP SNOW-ZUC watchdog' has been queued to stable release 23.11.3 Date: Mon, 11 Nov 2024 14:26:55 +0800 Message-ID: <20241111062847.216344-10-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241111062847.216344-1-xuemingl@nvidia.com> References: <20241111062847.216344-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: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS1PEPF00017091:EE_|PH7PR12MB8156:EE_ X-MS-Office365-Filtering-Correlation-Id: a1b037a1-5fff-4a47-8665-08dd021a480a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|82310400026|1800799024|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?6jcU7lCdi+jTvk72IaKOLw3eufFcRiMZO3bQTd0T1uRZbS8PQmNTPV/6ItrH?= =?us-ascii?Q?zF4Udr+iD0q3tDNxMQTsDf4/L8cjMMDyhj4SfxbDGlbLsHn5gUm7lmt8bGQv?= =?us-ascii?Q?L69ZSEA7HJ8BBX7KWWGzrL1dOIl3nlYOpe/hhsQGISEolMa3FzvcU9qxFEOb?= =?us-ascii?Q?8xrTTp/PI7m/bqTJRpM2o+Tce3jtmEGvcFhIAQJ0xr+3vbBmqUYXl03AWFJ5?= =?us-ascii?Q?hGyEhvdgJSrFbUGLKT7vwTjuc04cgeTH+I7V5/22vMkc/SvzvWYcC6yH/adh?= =?us-ascii?Q?Ixx/5Hjt3mGVKuf/zeAoOgbZlZEKO5WKV81X+mETPAK4IC5O5j2uUhSj0yAG?= =?us-ascii?Q?xz8IOVz/Bp5XQUCkTu0/YFHrn5I5UYlUu0qYmgU9gHvftBtkp+38Hdvyoixk?= =?us-ascii?Q?G5hMDdAKR75x1oyDZFcZqs9U2pCWdpWW2Cwa5JqwKPtkEFfDGzJbmJYOBkUy?= =?us-ascii?Q?sjrU5nX0d7qN89mFH2gxNxdKSUzuMmzCuY+P464vzGTa2kNxKuRtvGDzKKaw?= =?us-ascii?Q?exysjoyPrKs9I4rqkxha7bgDj/8Tb+2pda66/VmoJiXFy3d27SnRw8IuJ5Vv?= =?us-ascii?Q?m1T7RFXz8/w6bBz+489CgMg8XTxDPHvHSkWNW67orji8FizdJXIkEQGXq1Xj?= =?us-ascii?Q?GGcdpTcm41PvjvkmIIZ3SxxaaZ+1WFAf8VKZEM5C4y51QZ3F954SowQ6Yj87?= =?us-ascii?Q?O2t12tJaNx5KlH9+CRGtQBGR89WMK+KDijHjC/XuGf27PGGfqwkFZ0XiDot3?= =?us-ascii?Q?PUV49eaNS5p9FBARfVAZ7N3+mxb50zXmAp8Yyb0ZEnhnJOHcxOS5sQ075TM3?= =?us-ascii?Q?Ukgzgf2C3TjFmtcMd9q/fAgT9z1VXaxZxkONSBHR729su0e5eZozazYipJWE?= =?us-ascii?Q?msH1f9WgDU0mY5oBDD0BVmZ3X+Vg62J1mVs3A91E1ybslZYa4rKRraYaCWd9?= =?us-ascii?Q?bFpQljc6pR2aP+7yB0KrDArf+OkSDjhWzmjWz1sPfxV5ldzXl0TQIxUe02eR?= =?us-ascii?Q?XJNIW0gJLBmsyLup5FstXuxoxQo22yl35qKqYV1eusbBR0qyWlO52eAdtgRf?= =?us-ascii?Q?c2+60BGPytuik4y3OL2GnsiQkU2fAzIbtwDr645/3U6qXFRm7N+2NbScC28b?= =?us-ascii?Q?l+HJBCzqWTdneFATtmxedVg7xiYfZLXC4Q8r8Uz9NY2MH7vezDgaBodjrxI+?= =?us-ascii?Q?YOUo9mwufduSuCFKcV7yo1eW2eM0ZD3h8T3XtDr9QzlXKBENz5OrFH/YD4v+?= =?us-ascii?Q?P6TDEuKzbTb/+I6BHHwuDlHpe4NgTx1l1akz+53l94CgKmToYKIfsdRqAqOe?= =?us-ascii?Q?l8EvHQMN4WpcIDqYxTTP4VEZHodwpMZyNG4zhisa44kBVmJkALyRty48jqAe?= =?us-ascii?Q?CfRIfogEluLWqoRVZE77kPgQGT4WJSTvIHiYMljSe6qfR7dGsA=3D=3D?= 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)(36860700013)(82310400026)(1800799024)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2024 06:30:05.5970 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a1b037a1-5fff-4a47-8665-08dd021a480a 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: DS1PEPF00017091.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB8156 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/30/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=5b8d264d559366660fcf5db9bf31db47f41708f0 Thanks. Xueming Li --- >From 5b8d264d559366660fcf5db9bf31db47f41708f0 Mon Sep 17 00:00:00 2001 From: Varun Sethi Date: Tue, 6 Aug 2024 15:57:27 +0530 Subject: [PATCH] common/dpaax/caamflib: fix PDCP SNOW-ZUC watchdog Cc: Xueming Li [ upstream commit 2369bc1343fa5aac2890b2a3e12d65a2f1a2fd31 ] 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 Acked-by: Hemant Agrawal --- drivers/common/dpaax/caamflib/desc/pdcp.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/common/dpaax/caamflib/desc/pdcp.h b/drivers/common/dpaax/caamflib/desc/pdcp.h index 0ed9eec816..27dd5c4347 100644 --- a/drivers/common/dpaax/caamflib/desc/pdcp.h +++ b/drivers/common/dpaax/caamflib/desc/pdcp.h @@ -1220,6 +1220,11 @@ pdcp_insert_cplane_snow_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 | @@ -1921,6 +1926,11 @@ pdcp_insert_cplane_zuc_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-11-11 14:23:05.912654224 +0800 +++ 0009-common-dpaax-caamflib-fix-PDCP-SNOW-ZUC-watchdog.patch 2024-11-11 14:23:05.022192842 +0800 @@ -1 +1 @@ -From 2369bc1343fa5aac2890b2a3e12d65a2f1a2fd31 Mon Sep 17 00:00:00 2001 +From 5b8d264d559366660fcf5db9bf31db47f41708f0 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 2369bc1343fa5aac2890b2a3e12d65a2f1a2fd31 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index bc35114cf4..9ada3905c5 100644 +index 0ed9eec816..27dd5c4347 100644