From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 498D0A0518 for ; Fri, 24 Jul 2020 14:07:14 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 418CB1BFE7; Fri, 24 Jul 2020 14:07:14 +0200 (CEST) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by dpdk.org (Postfix) with ESMTP id BA15E1BFE7 for ; Fri, 24 Jul 2020 14:07:13 +0200 (CEST) Received: by mail-wm1-f65.google.com with SMTP id p14so7385800wmg.1 for ; Fri, 24 Jul 2020 05:07:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ATiTHR0oCXNOYT42IFnwtoPYsTCwGYSjWjlMdxdLoN0=; b=c/v6Dg99/QB2fhThoN3q5R4E0h1WKeLM9DE1J5SoTW/p8QNYtVypubGHcLbp5kk/pt DC4wkVExCkIvkjTcA89ELlN/3zO44ZCoMV3LsN9PhWbuK9QpXNRgc+aR2rt8HGmfklB2 e+FtV2nd4KzPuXl+BW21UIyg/lm53w8I3YT3X8/vS4Rn8wF9AvQeLVQTB95St7VM64vD yUfCr92FWOmRv0DCYA0xhcJFgZpGLMG7KEVPkA2VtcDb8vWWtX+ANCN1dZFqqXdPYUcJ v6df/gdy1mQxfXplRqN7vENyRXewrSnSneFHP0MdEblVfURtyh5tJwgzo5LxalI0dvCC x0uA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ATiTHR0oCXNOYT42IFnwtoPYsTCwGYSjWjlMdxdLoN0=; b=ELTBR4OybtnXQgirkvRTxWXta1OcWYfLlP4xH169MyIcv1mRX7cKV5H34oP6xu2WgO TLWuWHx9o9NAqQmQ2BtS8zWs6GSt7YJAQ8VsJxDA/X/TE/TWOMG7G7NW2WufOxCQ1r2b G7rFKaUqNKbPM4/6+J0TOv99/EDBeh31aRnDHM1RvvtJ4meaT8duvtN8iGP7k/+JfGIO RUkPKaNdeW94artAmEidXdgC9fM/mmTlU0Py1PgQV82Mc+2wtkJdXnuIQ1qAk0lMw/3p EKp/JqdMOXM1aciAn2S6f/L4MqkAgvZS3IIov+rvadQy8XNqWtCvB3Bu36XVzKQ3gnEn p31w== X-Gm-Message-State: AOAM532YgTUMb1N+afz6iccUq75uVIbHACKRUatX5uxNphqpwRICGCs5 e0fTOERtYwq5AJs1VRh/c1U= X-Google-Smtp-Source: ABdhPJwNfhRr+/6WfGRoa+h17GoCouyUUhdiOFWrjrOxei86laUxe3be1m4mIqB25lWxQo4zRg1ktQ== X-Received: by 2002:a1c:2:: with SMTP id 2mr8651888wma.79.1595592433491; Fri, 24 Jul 2020 05:07:13 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id j11sm1199750wrq.69.2020.07.24.05.07.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:07:12 -0700 (PDT) From: luca.boccassi@gmail.com To: Akhil Goyal Cc: Hemant Agrawal , dpdk stable Date: Fri, 24 Jul 2020 12:58:56 +0100 Message-Id: <20200724120030.1863487-98-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724120030.1863487-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'crypto/dpaa2_sec: fix HFN override' has been queued to stable release 19.11.4 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.4 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/26/20. 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. Thanks. Luca Boccassi --- >From a11062d5d3a0ead9c215621f5b78d7ca502cf8d8 Mon Sep 17 00:00:00 2001 From: Akhil Goyal Date: Fri, 14 Feb 2020 15:35:18 +0530 Subject: [PATCH] crypto/dpaa2_sec: fix HFN override [ upstream commit 91d581dc1b6f5164c63cc7a3f857a1d72b231d47 ] HFN is set as a uint32_t but the value retrieved is uint8_t. Fixed the type casting to get the correct value. Fixes: bef594ec5cc8 ("crypto/dpaa2_sec: support PDCP offload") Fixes: af61f0750948 ("crypto/dpaa2_sec: support scatter gather for proto offloads") Signed-off-by: Akhil Goyal Acked-by: Hemant Agrawal --- drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c index 9f8399e2b..0cc98b3c2 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: BSD-3-Clause * * Copyright (c) 2016 Freescale Semiconductor, Inc. All rights reserved. - * Copyright 2016-2019 NXP + * Copyright 2016-2020 NXP * */ @@ -168,7 +168,8 @@ build_proto_compound_sg_fd(dpaa2_sec_session *sess, * mbuf priv after sym_op. */ if (sess->ctxt_type == DPAA2_SEC_PDCP && sess->pdcp.hfn_ovd) { - uint32_t hfn_ovd = *((uint8_t *)op + sess->pdcp.hfn_ovd_offset); + uint32_t hfn_ovd = *(uint32_t *)((uint8_t *)op + + sess->pdcp.hfn_ovd_offset); /*enable HFN override override */ DPAA2_SET_FLE_INTERNAL_JD(ip_fle, hfn_ovd); DPAA2_SET_FLE_INTERNAL_JD(op_fle, hfn_ovd); @@ -243,7 +244,8 @@ build_proto_compound_fd(dpaa2_sec_session *sess, * mbuf priv after sym_op. */ if (sess->ctxt_type == DPAA2_SEC_PDCP && sess->pdcp.hfn_ovd) { - uint32_t hfn_ovd = *((uint8_t *)op + sess->pdcp.hfn_ovd_offset); + uint32_t hfn_ovd = *(uint32_t *)((uint8_t *)op + + sess->pdcp.hfn_ovd_offset); /*enable HFN override override */ DPAA2_SET_FLE_INTERNAL_JD(ip_fle, hfn_ovd); DPAA2_SET_FLE_INTERNAL_JD(op_fle, hfn_ovd); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:52.332640773 +0100 +++ 0098-crypto-dpaa2_sec-fix-HFN-override.patch 2020-07-24 12:53:48.339007429 +0100 @@ -1,14 +1,15 @@ -From 91d581dc1b6f5164c63cc7a3f857a1d72b231d47 Mon Sep 17 00:00:00 2001 +From a11062d5d3a0ead9c215621f5b78d7ca502cf8d8 Mon Sep 17 00:00:00 2001 From: Akhil Goyal Date: Fri, 14 Feb 2020 15:35:18 +0530 Subject: [PATCH] crypto/dpaa2_sec: fix HFN override +[ upstream commit 91d581dc1b6f5164c63cc7a3f857a1d72b231d47 ] + HFN is set as a uint32_t but the value retrieved is uint8_t. Fixed the type casting to get the correct value. Fixes: bef594ec5cc8 ("crypto/dpaa2_sec: support PDCP offload") Fixes: af61f0750948 ("crypto/dpaa2_sec: support scatter gather for proto offloads") -Cc: stable@dpdk.org Signed-off-by: Akhil Goyal Acked-by: Hemant Agrawal @@ -17,7 +18,7 @@ 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c -index c56fb2152..109e61ae1 100644 +index 9f8399e2b..0cc98b3c2 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c @@ -1,7 +1,7 @@ @@ -29,7 +30,7 @@ * */ -@@ -164,7 +164,8 @@ build_proto_compound_sg_fd(dpaa2_sec_session *sess, +@@ -168,7 +168,8 @@ build_proto_compound_sg_fd(dpaa2_sec_session *sess, * mbuf priv after sym_op. */ if (sess->ctxt_type == DPAA2_SEC_PDCP && sess->pdcp.hfn_ovd) { @@ -39,7 +40,7 @@ /*enable HFN override override */ DPAA2_SET_FLE_INTERNAL_JD(ip_fle, hfn_ovd); DPAA2_SET_FLE_INTERNAL_JD(op_fle, hfn_ovd); -@@ -239,7 +240,8 @@ build_proto_compound_fd(dpaa2_sec_session *sess, +@@ -243,7 +244,8 @@ build_proto_compound_fd(dpaa2_sec_session *sess, * mbuf priv after sym_op. */ if (sess->ctxt_type == DPAA2_SEC_PDCP && sess->pdcp.hfn_ovd) {