[dpdk-stable] patch 'crypto/octeontx: fix build with gcc 10' 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/19/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/bb5bca6083c1f6fe7f2797e5e54dc67c7d2ca61d

Thanks.

Kevin.

---
>From bb5bca6083c1f6fe7f2797e5e54dc67c7d2ca61d Mon Sep 17 00:00:00 2001
From: Timothy Redaelli <tredaelli at redhat.com>
Date: Tue, 16 Jun 2020 11:18:40 +0100
Subject: [PATCH] crypto/octeontx: fix build with gcc 10

[ upstream commit 983ab2b5d05c40a7b1a4da2200fd028e99796ee7 ]

GCC 10 defaults to -fno-common, this means a linker error will now be
reported if the same global variable is defined in more than one
compilation unit.

Fixes: 2f8a1b963eb7 ("crypto/octeontx2: add PMD skeleton")

Signed-off-by: Timothy Redaelli <tredaelli at redhat.com>
Acked-by: Anoob Joseph <anoobj at marvell.com>
---
 drivers/crypto/octeontx/otx_cryptodev.c | 2 ++
 drivers/crypto/octeontx/otx_cryptodev.h | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/crypto/octeontx/otx_cryptodev.c b/drivers/crypto/octeontx/otx_cryptodev.c
index c3076487f7..d48fd1971c 100644
--- a/drivers/crypto/octeontx/otx_cryptodev.c
+++ b/drivers/crypto/octeontx/otx_cryptodev.c
@@ -18,4 +18,6 @@
 static int otx_cryptodev_logtype;
 
+uint8_t otx_cryptodev_driver_id;
+
 static struct rte_pci_id pci_id_cpt_table[] = {
 	{
diff --git a/drivers/crypto/octeontx/otx_cryptodev.h b/drivers/crypto/octeontx/otx_cryptodev.h
index 6c2871d712..0b204320a2 100644
--- a/drivers/crypto/octeontx/otx_cryptodev.h
+++ b/drivers/crypto/octeontx/otx_cryptodev.h
@@ -16,5 +16,5 @@
  * Crypto device driver ID
  */
-uint8_t otx_cryptodev_driver_id;
+extern uint8_t otx_cryptodev_driver_id;
 
 #endif /* _OTX_CRYPTODEV_H_ */
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-16 14:31:16.073361563 +0100
+++ 0003-crypto-octeontx-fix-build-with-gcc-10.patch	2020-06-16 14:31:15.915226629 +0100
@@ -1 +1 @@
-From 983ab2b5d05c40a7b1a4da2200fd028e99796ee7 Mon Sep 17 00:00:00 2001
+From bb5bca6083c1f6fe7f2797e5e54dc67c7d2ca61d Mon Sep 17 00:00:00 2001
@@ -3,2 +3,4 @@
-Date: Wed, 5 Feb 2020 13:50:41 +0100
-Subject: [PATCH] crypto/octeontx2: fix build with gcc 10
+Date: Tue, 16 Jun 2020 11:18:40 +0100
+Subject: [PATCH] crypto/octeontx: fix build with gcc 10
+
+[ upstream commit 983ab2b5d05c40a7b1a4da2200fd028e99796ee7 ]
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -16,4 +17,3 @@
- drivers/crypto/octeontx2/otx2_cryptodev.c     | 2 ++
- drivers/crypto/octeontx2/otx2_cryptodev.h     | 2 +-
- drivers/crypto/octeontx2/otx2_cryptodev_ops.h | 2 +-
- 3 files changed, 4 insertions(+), 2 deletions(-)
+ drivers/crypto/octeontx/otx_cryptodev.c | 2 ++
+ drivers/crypto/octeontx/otx_cryptodev.h | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
@@ -21,6 +21,6 @@
-diff --git a/drivers/crypto/octeontx2/otx2_cryptodev.c b/drivers/crypto/octeontx2/otx2_cryptodev.c
-index 7b8add1bfc..417eda6de6 100644
---- a/drivers/crypto/octeontx2/otx2_cryptodev.c
-+++ b/drivers/crypto/octeontx2/otx2_cryptodev.c
-@@ -25,4 +25,6 @@
- int otx2_cpt_logtype;
+diff --git a/drivers/crypto/octeontx/otx_cryptodev.c b/drivers/crypto/octeontx/otx_cryptodev.c
+index c3076487f7..d48fd1971c 100644
+--- a/drivers/crypto/octeontx/otx_cryptodev.c
++++ b/drivers/crypto/octeontx/otx_cryptodev.c
+@@ -18,4 +18,6 @@
+ static int otx_cryptodev_logtype;
@@ -28 +28 @@
-+uint8_t otx2_cryptodev_driver_id;
++uint8_t otx_cryptodev_driver_id;
@@ -32,5 +32,5 @@
-diff --git a/drivers/crypto/octeontx2/otx2_cryptodev.h b/drivers/crypto/octeontx2/otx2_cryptodev.h
-index 8e0ebc292a..c0aa661b3b 100644
---- a/drivers/crypto/octeontx2/otx2_cryptodev.h
-+++ b/drivers/crypto/octeontx2/otx2_cryptodev.h
-@@ -39,5 +39,5 @@ extern int otx2_cpt_logtype;
+diff --git a/drivers/crypto/octeontx/otx_cryptodev.h b/drivers/crypto/octeontx/otx_cryptodev.h
+index 6c2871d712..0b204320a2 100644
+--- a/drivers/crypto/octeontx/otx_cryptodev.h
++++ b/drivers/crypto/octeontx/otx_cryptodev.h
+@@ -16,5 +16,5 @@
@@ -39,13 +39,2 @@
--uint8_t otx2_cryptodev_driver_id;
-+extern uint8_t otx2_cryptodev_driver_id;
- 
- #endif /* _OTX2_CRYPTODEV_H_ */
-diff --git a/drivers/crypto/octeontx2/otx2_cryptodev_ops.h b/drivers/crypto/octeontx2/otx2_cryptodev_ops.h
-index a2724f7227..f83e36b486 100644
---- a/drivers/crypto/octeontx2/otx2_cryptodev_ops.h
-+++ b/drivers/crypto/octeontx2/otx2_cryptodev_ops.h
-@@ -17,5 +17,5 @@ enum otx2_cpt_egrp {
- };
- 
--struct rte_cryptodev_ops otx2_cpt_ops;
-+extern struct rte_cryptodev_ops otx2_cpt_ops;
+-uint8_t otx_cryptodev_driver_id;
++extern uint8_t otx_cryptodev_driver_id;
@@ -53 +42 @@
- #endif /* _OTX2_CRYPTODEV_OPS_H_ */
+ #endif /* _OTX_CRYPTODEV_H_ */