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 E04B6455AD for ; Mon, 15 Jul 2024 17:28:20 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D882040A75; Mon, 15 Jul 2024 17:28:20 +0200 (CEST) Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) by mails.dpdk.org (Postfix) with ESMTP id 72D09402B0 for ; Mon, 15 Jul 2024 17:28:19 +0200 (CEST) Received: by mail-lf1-f46.google.com with SMTP id 2adb3069b0e04-52ea5dc3c79so6235452e87.1 for ; Mon, 15 Jul 2024 08:28:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721057299; x=1721662099; 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=46+XirLPw2ihgGbSAXr07n0f2T7srtaYdRCrQ5Pqt/o=; b=BI8sGRR8fOMXJxzuesJK0sAwDPWA0dBaJhTKvhem6/xCpi41gyqODwxdNTUThx0xQl eBtFXsUpHY0EK9u75Xw9s9CiJuV3jA4XoZ71raDZjyrgJtiQ0DBZdd5Syd/avMH9jeKw cjzMXWAv2ayJAjpK4xxT86uKQhZoJxIRBziOKTf2AYjmmofxJJVE8Ju7BF4wNaIVDI8x MTkgWgvHlUliL2auuFmfySAZQMz1Y/FbPF0MHmfodgr+hbLx4c1m9XvMUCnp38roqEQz w8ardfO2j0naRrCaUyc0Um8Iiilh7oNmyQLUnnxAKW9vJVIUYIfcrMRKHQjRxxrUL3xu rejg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721057299; x=1721662099; 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=46+XirLPw2ihgGbSAXr07n0f2T7srtaYdRCrQ5Pqt/o=; b=abXcyAZB2U4vJzqNh9cmsntadikCnXYaSM7eIugcCYtzgNS/0JvtHbh0+G55qPoVK/ KMHpUQi/IQBlLkyiKFSEaOAAIti3OUOk4pPZIMr1LnIKDsjqWEoiITLoVZ7UHdTp8KOt fLAzAoEYrCPWie0WKUf2iJKxBUOGjeSX6FsT7uBJimb3R8cnzQjwdQbmZ1wmVEwe2Y1E adWd11AcazWdXI3dJbK42/hF8XqeJoshzLomd8m/3P98K/NsCu+A4Wf4yCkMmqpAl1lg g/Os50v1eFWfLngOVXwWiE4gydNJaLKjdjugICB9s6p1GgeW2CL7sTSW48A8bMvOlzFk ucOg== X-Forwarded-Encrypted: i=1; AJvYcCVqoHX4MlhKKlI7wWodVafc/xzEjDvcTlrMKkAuXRyiOBr8/X634m5Nyd+tI5MLQocd0VhpX5puYHNhlEuwgtQ= X-Gm-Message-State: AOJu0YyHRSVvo5HHXDZPuNYx++wZ1wvManlQJ1jlt2G0S9vJn5grod4w 6WSTwbza3Dq74q7Ih4Ixn8rlPWtK1qn9mU6wYySXl2/GBKbXSthl X-Google-Smtp-Source: AGHT+IEVKXvKMd4d+EZwn1cya2TMGeq+nAmtzvmDvuMF/DMbjQ4X8KJhwCDVVlcXQLwGpl4hmkj1DQ== X-Received: by 2002:a05:6512:3d02:b0:52c:da18:618c with SMTP id 2adb3069b0e04-52eb99d330bmr14277686e87.45.1721057298748; Mon, 15 Jul 2024 08:28:18 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:7aef:1aaa:3dff:d546]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-427a5edb449sm90717165e9.35.2024.07.15.08.28.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jul 2024 08:28:18 -0700 (PDT) From: luca.boccassi@gmail.com 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 22.11.6 Date: Mon, 15 Jul 2024 16:26:01 +0100 Message-Id: <20240715152704.2229503-23-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/6182babbe7ba38a0da6482c5573a69513771faba Thanks. Luca Boccassi --- >From 6182babbe7ba38a0da6482c5573a69513771faba 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 5941400f42..0798312a63 100644 --- a/.mailmap +++ b/.mailmap @@ -1418,6 +1418,7 @@ Vadim Suraev Vakul Garg Vamsi Attunuru Vanshika Shukla +Varun Sethi Vasily Philipov Veerasenareddy Burru Venkata Suresh Kumar P diff --git a/drivers/common/dpaax/caamflib/desc/pdcp.h b/drivers/common/dpaax/caamflib/desc/pdcp.h index 289ee2a7d5..070cad0147 100644 --- a/drivers/common/dpaax/caamflib/desc/pdcp.h +++ b/drivers/common/dpaax/caamflib/desc/pdcp.h @@ -1023,6 +1023,11 @@ pdcp_insert_uplane_aes_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 | @@ -1070,6 +1075,11 @@ 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 | CLRW_CLR_C1CTX | -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-15 16:19:35.923678443 +0100 +++ 0023-common-dpaax-caamflib-fix-PDCP-AES-AES-watchdog-erro.patch 2024-07-15 16:19:34.500205011 +0100 @@ -1 +1 @@ -From ed5ea9e3e7f30cb8d7b45035a40ab75efaa38584 Mon Sep 17 00:00:00 2001 +From 6182babbe7ba38a0da6482c5573a69513771faba 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 5941400f42..0798312a63 100644 @@ -23 +24,2 @@ -@@ -1503,6 +1503,7 @@ Vakul Garg +@@ -1418,6 +1418,7 @@ Vadim Suraev + Vakul Garg @@ -25 +26,0 @@ - Vamsi Krishna Atluri @@ -32 +33 @@ -index 7d16c66d79..0ed9eec816 100644 +index 289ee2a7d5..070cad0147 100644