[dpdk-stable] patch 'crypto/caam_jr: fix device tree parsing for SEC_ERA' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.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 10/30/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 88abf42899163beb1f7a5b54360d6da851a19670 Mon Sep 17 00:00:00 2001
From: Gagandeep Singh <g.singh at nxp.com>
Date: Mon, 19 Oct 2020 17:48:01 +0800
Subject: [PATCH] crypto/caam_jr: fix device tree parsing for SEC_ERA

[ upstream commit c6887eca58ac0aeb2aa54b58d881d1bbf5543d96 ]

Previously, SEC_ERA was hardcoded and it was removed in [1].
Now when that hardcoded was removed, it is supposed to be
read from the device tree but it is not done correctly.
This patch calls a necessary API of_init() before using any
of_* APIs to retrieve information from the device tree and
if reading integer value that must be converted to cpu endianness
before using it.

[1] eef9e0412a84 ("drivers/crypto: fix build with -fno-common")

Fixes: 1d678de329ab ("crypto/caam_jr: add basic job ring routines")

Signed-off-by: Gagandeep Singh <g.singh at nxp.com>
Acked-by: Akhil Goyal <akhil.goyal at nxp.com>
---
 drivers/crypto/caam_jr/caam_jr.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/drivers/crypto/caam_jr/caam_jr.c b/drivers/crypto/caam_jr/caam_jr.c
index 86aa9a103e..d6fa8cf7e8 100644
--- a/drivers/crypto/caam_jr/caam_jr.c
+++ b/drivers/crypto/caam_jr/caam_jr.c
@@ -2398,6 +2398,8 @@ init_error:
 static int
 cryptodev_caam_jr_probe(struct rte_vdev_device *vdev)
 {
+	int ret;
+
 	struct rte_cryptodev_pmd_init_params init_params = {
 		"",
 		sizeof(struct sec_job_ring_t),
@@ -2414,6 +2416,12 @@ cryptodev_caam_jr_probe(struct rte_vdev_device *vdev)
 	input_args = rte_vdev_device_args(vdev);
 	rte_cryptodev_pmd_parse_input_args(&init_params, input_args);
 
+	ret = of_init();
+	if (ret) {
+		RTE_LOG(ERR, PMD,
+		"of_init failed\n");
+		return -EINVAL;
+	}
 	/* if sec device version is not configured */
 	if (!rta_get_sec_era()) {
 		const struct device_node *caam_node;
@@ -2424,7 +2432,7 @@ cryptodev_caam_jr_probe(struct rte_vdev_device *vdev)
 					NULL);
 			if (prop) {
 				rta_set_sec_era(
-					INTL_SEC_ERA(cpu_to_caam32(*prop)));
+					INTL_SEC_ERA(rte_be_to_cpu_32(*prop)));
 				break;
 			}
 		}
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:17.857654307 +0000
+++ 0199-crypto-caam_jr-fix-device-tree-parsing-for-SEC_ERA.patch	2020-10-28 10:35:11.808834498 +0000
@@ -1,8 +1,10 @@
-From c6887eca58ac0aeb2aa54b58d881d1bbf5543d96 Mon Sep 17 00:00:00 2001
+From 88abf42899163beb1f7a5b54360d6da851a19670 Mon Sep 17 00:00:00 2001
 From: Gagandeep Singh <g.singh at nxp.com>
 Date: Mon, 19 Oct 2020 17:48:01 +0800
 Subject: [PATCH] crypto/caam_jr: fix device tree parsing for SEC_ERA
 
+[ upstream commit c6887eca58ac0aeb2aa54b58d881d1bbf5543d96 ]
+
 Previously, SEC_ERA was hardcoded and it was removed in [1].
 Now when that hardcoded was removed, it is supposed to be
 read from the device tree but it is not done correctly.
@@ -14,7 +16,6 @@
 [1] eef9e0412a84 ("drivers/crypto: fix build with -fno-common")
 
 Fixes: 1d678de329ab ("crypto/caam_jr: add basic job ring routines")
-Cc: stable at dpdk.org
 
 Signed-off-by: Gagandeep Singh <g.singh at nxp.com>
 Acked-by: Akhil Goyal <akhil.goyal at nxp.com>
@@ -23,10 +24,10 @@
  1 file changed, 9 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/crypto/caam_jr/caam_jr.c b/drivers/crypto/caam_jr/caam_jr.c
-index c004ec4077..3fb3fe0f8a 100644
+index 86aa9a103e..d6fa8cf7e8 100644
 --- a/drivers/crypto/caam_jr/caam_jr.c
 +++ b/drivers/crypto/caam_jr/caam_jr.c
-@@ -2388,6 +2388,8 @@ init_error:
+@@ -2398,6 +2398,8 @@ init_error:
  static int
  cryptodev_caam_jr_probe(struct rte_vdev_device *vdev)
  {
@@ -35,7 +36,7 @@
  	struct rte_cryptodev_pmd_init_params init_params = {
  		"",
  		sizeof(struct sec_job_ring_t),
-@@ -2404,6 +2406,12 @@ cryptodev_caam_jr_probe(struct rte_vdev_device *vdev)
+@@ -2414,6 +2416,12 @@ cryptodev_caam_jr_probe(struct rte_vdev_device *vdev)
  	input_args = rte_vdev_device_args(vdev);
  	rte_cryptodev_pmd_parse_input_args(&init_params, input_args);
  
@@ -48,7 +49,7 @@
  	/* if sec device version is not configured */
  	if (!rta_get_sec_era()) {
  		const struct device_node *caam_node;
-@@ -2414,7 +2422,7 @@ cryptodev_caam_jr_probe(struct rte_vdev_device *vdev)
+@@ -2424,7 +2432,7 @@ cryptodev_caam_jr_probe(struct rte_vdev_device *vdev)
  					NULL);
  			if (prop) {
  				rta_set_sec_era(