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 6146D45804 for ; Fri, 23 Aug 2024 18:22:06 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5C81F4337B; Fri, 23 Aug 2024 18:22:06 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id F0E7B4337A for ; Fri, 23 Aug 2024 18:22:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724430124; 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=N5gZY91suWs28SDESm20c+rPEwXoRY0mAeAQRP8ow+o=; b=ZYr1Fa2a7ZukKkfwaEyBf476s959V/CURq87gBnbJFVvSIPt4aaIoYIoyDAFSl0t0/XzM4 WDD+sXUvTGVgd0zmah6KDx1UBL41ZFgUBfkGWgyb2xNMpZLmlqApl/mYmyuz67//26ldxy E1/CcjvJvyxj8cRVcsrAtNYusI2h2kU= 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-189-xnniEunYNrGDEfwS-1zSzA-1; Fri, 23 Aug 2024 12:22:03 -0400 X-MC-Unique: xnniEunYNrGDEfwS-1zSzA-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 0723F19560B7; Fri, 23 Aug 2024 16:22:02 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.193.224]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 94AB21955F44; Fri, 23 Aug 2024 16:22:00 +0000 (UTC) From: Kevin Traynor 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 21.11.8 Date: Fri, 23 Aug 2024 17:18:15 +0100 Message-ID: <20240823161929.1004778-67-ktraynor@redhat.com> In-Reply-To: <20240823161929.1004778-1-ktraynor@redhat.com> References: <20240823161929.1004778-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 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.8 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/28/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/b9e0305984199d12350f93c408f8391f12e85df0 Thanks. Kevin --- >From b9e0305984199d12350f93c408f8391f12e85df0 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 [ 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 ed99e606d5..82e0e35a7d 100644 --- a/.mailmap +++ b/.mailmap @@ -1419,4 +1419,5 @@ Vakul Garg Vamsi Attunuru Vanshika Shukla +Varun Sethi Vasily Philipov Veerasenareddy Burru diff --git a/drivers/common/dpaax/caamflib/desc/pdcp.h b/drivers/common/dpaax/caamflib/desc/pdcp.h index 2c9c631cfd..73af1141b6 100644 --- a/drivers/common/dpaax/caamflib/desc/pdcp.h +++ b/drivers/common/dpaax/caamflib/desc/pdcp.h @@ -1304,4 +1304,9 @@ pdcp_insert_uplane_aes_aes_op(struct program *p, 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 | @@ -1351,4 +1356,9 @@ 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 | -- 2.46.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-23 17:18:11.821700511 +0100 +++ 0067-common-dpaax-caamflib-fix-PDCP-AES-AES-watchdog-erro.patch 2024-08-23 17:18:09.742430182 +0100 @@ -1 +1 @@ -From ed5ea9e3e7f30cb8d7b45035a40ab75efaa38584 Mon Sep 17 00:00:00 2001 +From b9e0305984199d12350f93c408f8391f12e85df0 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ed5ea9e3e7f30cb8d7b45035a40ab75efaa38584 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 502791e0bc..74739ec9be 100644 +index ed99e606d5..82e0e35a7d 100644 @@ -23,2 +24,2 @@ -@@ -1504,4 +1504,5 @@ Vamsi Attunuru - Vamsi Krishna Atluri +@@ -1419,4 +1419,5 @@ Vakul Garg + Vamsi Attunuru @@ -30 +31 @@ -index 7d16c66d79..0ed9eec816 100644 +index 2c9c631cfd..73af1141b6 100644 @@ -33 +34 @@ -@@ -1024,4 +1024,9 @@ pdcp_insert_uplane_aes_aes_op(struct program *p, +@@ -1304,4 +1304,9 @@ pdcp_insert_uplane_aes_aes_op(struct program *p, @@ -43 +44 @@ -@@ -1071,4 +1076,9 @@ pdcp_insert_uplane_aes_aes_op(struct program *p, +@@ -1351,4 +1356,9 @@ pdcp_insert_uplane_aes_aes_op(struct program *p,