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 C422345BB6 for ; Wed, 23 Oct 2024 23:17:17 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BE3CE4325B; Wed, 23 Oct 2024 23:17:17 +0200 (CEST) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mails.dpdk.org (Postfix) with ESMTP id 3DDCF40261 for ; Wed, 23 Oct 2024 23:17:16 +0200 (CEST) Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-43161c0068bso2118145e9.1 for ; Wed, 23 Oct 2024 14:17:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729718236; x=1730323036; 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=dOzcjc3zRvXhok0v4goJkfbPciHx2XmkS0IqTNIfWm4=; b=VGaWQxDItSpNakAO5cjGMBzIrYbfrsVWJ0ukFgsZ0DDOlRnvI0sT2XN4sn8NiAvf/v aZUZayRCxZn8RiYafah//sI7RR1K/BvXnO7nWRgE3VAM5ln0kAfQfarIIbyXEVygr73b RlRDEMpH+qAJD3nPe5UzGiqhdbeY+9PQNSaemqWqQCHoff+UaG6yGexlKZ9HyxF83XV+ fRcHsCz7cwbx9hndFUNzbAnprCZLfKK7IT5RYkalnlSItv+YE1j+PLWve4z+jr+Br+h1 P6qkgGuYTot8hcDMtKZxQi+RT0wChOIa9xhAa3gU8lzRiAAxioinOwho7kWTzniReMqp Cqfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729718236; x=1730323036; 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=dOzcjc3zRvXhok0v4goJkfbPciHx2XmkS0IqTNIfWm4=; b=DgbJwg/Lp849Fmzq2aKaLWRDRg1A4D4xmCwbHfLISEpwUukiGij6QLmDBOZ0kLYZ4N LDkCiZdXWNYZTn/W4tWOBAoJZoq+Vs9dMdMRMFgVCVJyj+pL8VBo8EeWMlhuE/ghofl2 49vJOIYZwwn1xBEs99Q1TeF/BtF4/7QO93XVw5kCCAGoHNdg+MZ2t4nzmdhFZPQxEmhP cj7ouqiJHzSxNpoTc3EhWOn1gDoPJFAQC++H32Gr3CAXbjXZl9f5Gkw7Ko7sqGyDNnsz BD18eiRTTs0fVps6+Dkm4wE5yZjLiUUO67mZd8+KK6TA2THFfF5/rSqxDoxgyq57vina S5Qg== X-Forwarded-Encrypted: i=1; AJvYcCW3rSUgAtDnVWE/TU9K/OyQLJ2AoZgkoXsjBopAXiBZ2CPcz45zOteGbLGchnDuzg9c4ZkW+Rc=@dpdk.org X-Gm-Message-State: AOJu0YyEatNvtvf5IEBLjnc++i1LhEoSBybcbmf/4sYWardNllGCiDLp 1MMRVLH45SKRRx8wEwGUse9zLaJmYg8TOWbqG1D+DaoDH15OfZY/ X-Google-Smtp-Source: AGHT+IFQ7p5ZGEK1UnBqVTxAj42YeNdwN2k3XT+FQ4dqPCxyJXuyOHwcLGA2ieWraFUD+RT9bspRAA== X-Received: by 2002:a05:600c:4ecd:b0:431:612f:189b with SMTP id 5b1f17b1804b1-431841fdademr36489975e9.12.1729718235571; Wed, 23 Oct 2024 14:17:15 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:21cd:def0:a01d:d2aa]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4317ddec611sm30064375e9.1.2024.10.23.14.17.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2024 14:17:15 -0700 (PDT) From: luca.boccassi@gmail.com 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 22.11.7 Date: Wed, 23 Oct 2024 22:15:45 +0100 Message-ID: <20241023211704.1216956-5-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241023211704.1216956-1-luca.boccassi@gmail.com> References: <20241023211704.1216956-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.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/25/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/09002419181d5dd1eea71e04de674c7c76fff910 Thanks. Luca Boccassi --- >From 09002419181d5dd1eea71e04de674c7c76fff910 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 070cad0147..328b307ae9 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.45.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-10-23 22:16:40.748840317 +0100 +++ 0005-common-dpaax-caamflib-fix-PDCP-SNOW-ZUC-watchdog.patch 2024-10-23 22:16:40.435940252 +0100 @@ -1 +1 @@ -From 2369bc1343fa5aac2890b2a3e12d65a2f1a2fd31 Mon Sep 17 00:00:00 2001 +From 09002419181d5dd1eea71e04de674c7c76fff910 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 070cad0147..328b307ae9 100644