[dpdk-stable] patch 'crypto/caam_jr: fix IRQ functions return type' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/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.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/8e297725dcdfc086dd7704040369429238514eb3

Thanks.

Kevin.

---
>From 8e297725dcdfc086dd7704040369429238514eb3 Mon Sep 17 00:00:00 2001
From: Yunjian Wang <wangyunjian at huawei.com>
Date: Thu, 14 May 2020 19:00:07 +0800
Subject: [PATCH] crypto/caam_jr: fix IRQ functions return type

[ upstream commit c40b4fcd98933749a41f7b8e9b66368f920038f6 ]

The caam_jr_enable_irqs() and caam_jr_disable_irqs() methods maybe return a
negative error. So use int instead of uint32_t int the functions.

Fixes: e7a45f3cc245 ("crypto/caam_jr: add UIO specific operations")

Signed-off-by: Yunjian Wang <wangyunjian at huawei.com>
Acked-by: Gagandeep Singh <g.singh at nxp.com>
---
 drivers/crypto/caam_jr/caam_jr_pvt.h | 4 ++--
 drivers/crypto/caam_jr/caam_jr_uio.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/crypto/caam_jr/caam_jr_pvt.h b/drivers/crypto/caam_jr/caam_jr_pvt.h
index 7997a1d45c..579aacbb38 100644
--- a/drivers/crypto/caam_jr/caam_jr_pvt.h
+++ b/drivers/crypto/caam_jr/caam_jr_pvt.h
@@ -275,5 +275,5 @@ static inline rte_iova_t caam_jr_dma_vtop(void *ptr)
  * @retval -1 value for error
  */
-uint32_t caam_jr_enable_irqs(int uio_fd);
+int caam_jr_enable_irqs(int uio_fd);
 
 /** @brief Request to SEC kernel driver to disable interrupts for descriptor
@@ -288,5 +288,5 @@ uint32_t caam_jr_enable_irqs(int uio_fd);
  *
  */
-uint32_t caam_jr_disable_irqs(int uio_fd);
+int caam_jr_disable_irqs(int uio_fd);
 
 #endif
diff --git a/drivers/crypto/caam_jr/caam_jr_uio.c b/drivers/crypto/caam_jr/caam_jr_uio.c
index 8eaa8ae467..913f5f10a1 100644
--- a/drivers/crypto/caam_jr/caam_jr_uio.c
+++ b/drivers/crypto/caam_jr/caam_jr_uio.c
@@ -207,5 +207,5 @@ sec_uio_send_command(int uio_fd, int32_t uio_command)
  * @retval -1 value for error
  */
-uint32_t
+int
 caam_jr_enable_irqs(int uio_fd)
 {
@@ -238,5 +238,5 @@ caam_jr_enable_irqs(int uio_fd)
  *
  */
-uint32_t
+int
 caam_jr_disable_irqs(int uio_fd)
 {
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:53.675942036 +0100
+++ 0052-crypto-caam_jr-fix-IRQ-functions-return-type.patch	2020-06-05 19:20:50.859039700 +0100
@@ -1 +1 @@
-From c40b4fcd98933749a41f7b8e9b66368f920038f6 Mon Sep 17 00:00:00 2001
+From 8e297725dcdfc086dd7704040369429238514eb3 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c40b4fcd98933749a41f7b8e9b66368f920038f6 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index d6b3dafaa6..552d6b9b1b 100644
+index 7997a1d45c..579aacbb38 100644
@@ -23 +24 @@
-@@ -281,5 +281,5 @@ static inline rte_iova_t caam_jr_dma_vtop(void *ptr)
+@@ -275,5 +275,5 @@ static inline rte_iova_t caam_jr_dma_vtop(void *ptr)
@@ -30 +31 @@
-@@ -294,5 +294,5 @@ uint32_t caam_jr_enable_irqs(int uio_fd);
+@@ -288,5 +288,5 @@ uint32_t caam_jr_enable_irqs(int uio_fd);
@@ -38 +39 @@
-index 30837c1164..e4ee102344 100644
+index 8eaa8ae467..913f5f10a1 100644
@@ -41 +42 @@
-@@ -202,5 +202,5 @@ sec_uio_send_command(int uio_fd, int32_t uio_command)
+@@ -207,5 +207,5 @@ sec_uio_send_command(int uio_fd, int32_t uio_command)
@@ -48 +49 @@
-@@ -233,5 +233,5 @@ caam_jr_enable_irqs(int uio_fd)
+@@ -238,5 +238,5 @@ caam_jr_enable_irqs(int uio_fd)