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 AE38F455AD for ; Mon, 15 Jul 2024 17:28:19 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A83B240A7D; Mon, 15 Jul 2024 17:28:19 +0200 (CEST) Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mails.dpdk.org (Postfix) with ESMTP id DEC77402B0 for ; Mon, 15 Jul 2024 17:28:17 +0200 (CEST) Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-367a3d1a378so4014730f8f.1 for ; Mon, 15 Jul 2024 08:28:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721057297; x=1721662097; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=oUuMDb26Ek9sUKtp+P0Hp4ap54x0NwnxQU9Xfv8JL9w=; b=fPoeauEipoOZXFRoPz8NVenXM56iJLXTQBI1UrgQ9biVX1CJvjsxCFNS7WmhZ0pFkF fJ1e0q3xakxnU9/KsEP/dswnlvSTYVVwIQ1GHYlF3N1Q0idv34oCDK3WxfZIxY4DyzxJ KdZsWlvcRoOStOIvg1V7gM+/ZOCqeEWvsLeZkQlqJkfsc/r3KJZ3VnB8kWHqs70lDjzA ek+lfGAOaXoxcKgm1hvpI6PSHUabILldQyxWl19ksvDxAS/Zkj3ySD5Lgk5rkH3YxtxI 0EF8Z2vZn5GxgDVvoXtrmmZZKLL4v6pl+NRAYRpX/Y5gUFcLHTGkHyNQ7tMYrJOGLzYt esHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721057297; x=1721662097; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oUuMDb26Ek9sUKtp+P0Hp4ap54x0NwnxQU9Xfv8JL9w=; b=rPn8c5w4aAoeSY7eIkCoXpWdbqSvyUcocGWppo+Q0KNdX2/TKe9aSKlxqZgtofXRBU B6lBMyHUnjEZASD09m/8RTaG68ZlZPF1Idcyj2nLG1mMz14gjPPq8BjmoLFg8df/YOlb OcwTeEBmsxjC2chqhxMQQxc+naQvHjhtluBLJ8YjFaxfmib9Id/UM1LoguF1rYp/5/fq 3eKPAZGsTJpFQqvjTc96YqQXY0IDXcrDY4k2PZc13GiaeYpxkjLLKM5OjU9BVy6ErZL0 31O67q49Tbjx0FUpw7fO4wnkGA7hMf5hiyCN7DVjrPkOhXCEMTmeEPuQfD21vbtoMayt 611A== X-Gm-Message-State: AOJu0YwyowRjDcgeKh/olNwQfr4DuI6b/vykkhTELNQWyJR4cE5WQ1jw qAm2dxboswhiyFbr+T9Z6IiMNV97FGkYMxa7ArD2o5QBJD9B9tyZ X-Google-Smtp-Source: AGHT+IEBNqcGpLXTo53YUkjKLv7XBoOc8sbl7js6TsvvhlVs9/530zjjafivxIzPengrgJ21Snlc2Q== X-Received: by 2002:a05:6000:e0d:b0:367:418d:d4d with SMTP id ffacd0b85a97d-368240c1cf9mr59244f8f.60.1721057297529; Mon, 15 Jul 2024 08:28:17 -0700 (PDT) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3680dabf416sm6663122f8f.45.2024.07.15.08.28.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jul 2024 08:28:17 -0700 (PDT) From: luca.boccassi@gmail.com To: Gagandeep Singh Cc: dpdk stable Subject: patch 'common/dpaax/caamflib: fix PDCP-SDAP watchdog error' has been queued to stable release 22.11.6 Date: Mon, 15 Jul 2024 16:26:00 +0100 Message-Id: <20240715152704.2229503-22-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240715152704.2229503-1-luca.boccassi@gmail.com> References: <20240624235907.885628-81-luca.boccassi@gmail.com> <20240715152704.2229503-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/17/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/09ca25c2931d2860c9533d298230768dfee2a03a Thanks. Luca Boccassi --- >From 09ca25c2931d2860c9533d298230768dfee2a03a 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 b38c15a24f..d41bacf8f9 100644 --- a/drivers/common/dpaax/caamflib/desc/sdap.h +++ b/drivers/common/dpaax/caamflib/desc/sdap.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright 2020-2022 NXP + * Copyright 2020-2023 NXP */ #ifndef __DESC_SDAP_H__ @@ -628,6 +628,10 @@ static inline int pdcp_sdap_insert_no_snoop_op( /* Save the ICV generated */ 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 | CLRW_CLR_C1KEY | @@ -718,6 +722,10 @@ static inline int pdcp_sdap_insert_no_snoop_op( /* Save the ICV which is stalling in output FIFO to MATH3 */ 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 | CLRW_CLR_C1KEY | -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-15 16:19:35.880050277 +0100 +++ 0022-common-dpaax-caamflib-fix-PDCP-SDAP-watchdog-error.patch 2024-07-15 16:19:34.496204926 +0100 @@ -1 +1 @@ -From 6671e82e5c6b4858573f4dae665e7f2442913d93 Mon Sep 17 00:00:00 2001 +From 09ca25c2931d2860c9533d298230768dfee2a03a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 6671e82e5c6b4858573f4dae665e7f2442913d93 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org