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 952BB45DB9 for ; Wed, 27 Nov 2024 18:19:40 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8F485402DE; Wed, 27 Nov 2024 18:19:40 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id CBEF54067C for ; Wed, 27 Nov 2024 18:19:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732727978; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CGKeim8qe1DRMdfkakELHpVnvFTfilHcXRMt048nbto=; b=VkORDEZOxObQTbmONj6KhmfhO+oozP3rUsptYKXLgk3LHh8aSf67gB25JmsvVgCZJ6bZik dqfJMhlsvjtSQWA2Pu798c80OGcD4RVAvlvbAkyRhBqLA5N/g898csno7fywXNCDatyNQW S3X9RQoSbCDSmxfuzX1Sm66yUdVs444= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-160-DYwG8diwMiWERzlpF7x-_g-1; Wed, 27 Nov 2024 12:19:35 -0500 X-MC-Unique: DYwG8diwMiWERzlpF7x-_g-1 X-Mimecast-MFC-AGG-ID: DYwG8diwMiWERzlpF7x-_g Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 27FD51954233; Wed, 27 Nov 2024 17:19:34 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.52]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 61291300019E; Wed, 27 Nov 2024 17:19:32 +0000 (UTC) From: Kevin Traynor 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 21.11.9 Date: Wed, 27 Nov 2024 17:17:12 +0000 Message-ID: <20241127171916.690404-5-ktraynor@redhat.com> In-Reply-To: <20241127171916.690404-1-ktraynor@redhat.com> References: <20241127171916.690404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: o26IRHM3N341ndVtHJzf2byhoPD0T9q_ylpeQEXWo4U_1732727974 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.9 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/02/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://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/1ecb687439e02dda013cba5f83849a2aa8454db2 Thanks. Kevin --- >From 1ecb687439e02dda013cba5f83849a2aa8454db2 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 [ 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 73af1141b6..fc2db208ac 100644 --- a/drivers/common/dpaax/caamflib/desc/pdcp.h +++ b/drivers/common/dpaax/caamflib/desc/pdcp.h @@ -1575,4 +1575,9 @@ pdcp_insert_cplane_snow_aes_op(struct program *p, CLRW, 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); + if (rta_sec_era <= RTA_SEC_ERA_3) LOAD(p, CCTRL_RESET_CHA_ALL, CCTRL, 0, 4, IMMED); @@ -2420,4 +2425,9 @@ 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 | -- 2.47.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-27 17:17:38.505180782 +0000 +++ 0005-common-dpaax-caamflib-fix-PDCP-SNOW-ZUC-watchdog.patch 2024-11-27 17:17:38.156269015 +0000 @@ -1 +1 @@ -From 2369bc1343fa5aac2890b2a3e12d65a2f1a2fd31 Mon Sep 17 00:00:00 2001 +From 1ecb687439e02dda013cba5f83849a2aa8454db2 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2369bc1343fa5aac2890b2a3e12d65a2f1a2fd31 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index bc35114cf4..9ada3905c5 100644 +index 73af1141b6..fc2db208ac 100644 @@ -23,2 +24,2 @@ -@@ -1221,4 +1221,9 @@ pdcp_insert_cplane_snow_aes_op(struct program *p, - MOVEB(p, CONTEXT1, 0, MATH3, 0, 4, WAITCOMP | IMMED); +@@ -1575,4 +1575,9 @@ pdcp_insert_cplane_snow_aes_op(struct program *p, + CLRW, 0, 4, IMMED); @@ -31,3 +32,3 @@ - LOAD(p, CLRW_RESET_CLS1_CHA | - CLRW_CLR_C1KEY | -@@ -1922,4 +1927,9 @@ pdcp_insert_cplane_zuc_aes_op(struct program *p, + if (rta_sec_era <= RTA_SEC_ERA_3) + LOAD(p, CCTRL_RESET_CHA_ALL, CCTRL, 0, 4, IMMED); +@@ -2420,4 +2425,9 @@ pdcp_insert_cplane_zuc_aes_op(struct program *p,