[dpdk-stable] patch 'crypto/dpaa2_sec: fix HFN override' has been queued to stable release 19.11.4

[luca.boccassi at gmail.com]

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 <akhil.goyal at nxp.com>
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 <akhil.goyal at nxp.com>
Acked-by: Hemant Agrawal <hemant.agrawal at nxp.com>
---
 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 <akhil.goyal at nxp.com>
 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 at dpdk.org
 
 Signed-off-by: Akhil Goyal <akhil.goyal at nxp.com>
 Acked-by: Hemant Agrawal <hemant.agrawal at nxp.com>
@@ -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) {