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 1CA4345804 for ; Fri, 23 Aug 2024 18:22:04 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 13B634337B; Fri, 23 Aug 2024 18:22:04 +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 897D94337A for ; Fri, 23 Aug 2024 18:22:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724430122; 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=zCVb33y7nb38fwEFsLSvxgoaJwyDqfVXKISyFe+90QE=; b=PABluNyqgZs5P4BiBk7gFwjXwWn7V41DdAmbT3ulXUcnNQFVOPEMN++GmQkXEymcoweqhV FdOKt3PmN9Thf3sveS/A03tdXDVhfBmWCcIUkjwvvPFuYIrANFfl2KQRaB6ITaSnwOmJos OCfA6jsJhOtpKoRrWoZRY/2BSSrLhnk= Received: from mx-prod-mc-03.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-693-S54uhSnKMweOovizygr3BA-1; Fri, 23 Aug 2024 12:22:00 -0400 X-MC-Unique: S54uhSnKMweOovizygr3BA-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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2C0471956048; Fri, 23 Aug 2024 16:22:00 +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 ECFBB1956053; Fri, 23 Aug 2024 16:21:58 +0000 (UTC) From: Kevin Traynor To: Gagandeep Singh Cc: dpdk stable Subject: patch 'common/dpaax/caamflib: fix PDCP-SDAP watchdog error' has been queued to stable release 21.11.8 Date: Fri, 23 Aug 2024 17:18:14 +0100 Message-ID: <20240823161929.1004778-66-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/53fc636f1208dcf2869b7b8e10449e585f86b435 Thanks. Kevin --- >From 53fc636f1208dcf2869b7b8e10449e585f86b435 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 [ 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 07f55b5b40..084392d7cd 100644 --- a/drivers/common/dpaax/caamflib/desc/sdap.h +++ b/drivers/common/dpaax/caamflib/desc/sdap.h @@ -1,4 +1,4 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright 2020-2021 NXP + * Copyright 2020-2023 NXP */ @@ -705,4 +705,8 @@ static inline int pdcp_sdap_insert_no_snoop_op( 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 | @@ -795,4 +799,8 @@ static inline int pdcp_sdap_insert_no_snoop_op( 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 | -- 2.46.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-23 17:18:11.798203793 +0100 +++ 0066-common-dpaax-caamflib-fix-PDCP-SDAP-watchdog-error.patch 2024-08-23 17:18:09.739430172 +0100 @@ -1 +1 @@ -From 6671e82e5c6b4858573f4dae665e7f2442913d93 Mon Sep 17 00:00:00 2001 +From 53fc636f1208dcf2869b7b8e10449e585f86b435 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 6671e82e5c6b4858573f4dae665e7f2442913d93 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index b38c15a24f..d41bacf8f9 100644 +index 07f55b5b40..084392d7cd 100644 @@ -23 +24 @@ -- * Copyright 2020-2022 NXP +- * Copyright 2020-2021 NXP @@ -27 +28 @@ -@@ -629,4 +629,8 @@ static inline int pdcp_sdap_insert_no_snoop_op( +@@ -705,4 +705,8 @@ static inline int pdcp_sdap_insert_no_snoop_op( @@ -36 +37 @@ -@@ -719,4 +723,8 @@ static inline int pdcp_sdap_insert_no_snoop_op( +@@ -795,4 +799,8 @@ static inline int pdcp_sdap_insert_no_snoop_op(