[dpdk-stable] patch 'fix global variable issues' has been queued to stable release 18.08.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 18.08.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/29/18. 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. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Kevin Traynor

---
>From 5e60edf80f1b1170da5cdb6b6ab05115e250a209 Mon Sep 17 00:00:00 2001
From: Ferruh Yigit <ferruh.yigit at intel.com>
Date: Sun, 28 Oct 2018 23:57:40 +0000
Subject: [PATCH] fix global variable issues

[ upstream commit 9757358342a089e9d3e770cc3e4b4b1289d65abe ]

Various fixes related to the global variable usage.

Fixes: 43e610bb8565 ("compress/octeontx: introduce octeontx zip PMD")
Fixes: c378f084d6e3 ("compress/octeontx: add device setup ops")
Fixes: b43ebc65aada ("compress/octeontx: create private xform")
Fixes: b1ce8ebd97ba ("eventdev: add PMD callbacks for eth Rx adapter")
Fixes: 3810ae435783 ("eventdev: add interrupt driven queues to Rx adapter")
Fixes: fefed3d1e62c ("enic: new driver")

Signed-off-by: Ferruh Yigit <ferruh.yigit at intel.com>
Reviewed-by: Nikhil Rao <nikhil.rao at intel.com>
Acked-by: Jerin Jacob <jerin.jacob at caviumnetworks.com>
---
 drivers/compress/octeontx/include/zip_regs.h   | 4 ++--
 drivers/compress/octeontx/otx_zip.h            | 6 +++---
 drivers/event/octeontx/ssovf_evdev.c           | 3 +--
 drivers/net/enic/enic_ethdev.c                 | 1 -
 lib/librte_eventdev/rte_event_eth_rx_adapter.c | 1 -
 lib/librte_eventdev/rte_eventdev_pmd.h         | 4 ++--
 6 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/drivers/compress/octeontx/include/zip_regs.h b/drivers/compress/octeontx/include/zip_regs.h
index 1e74db433..04c3d75e9 100644
--- a/drivers/compress/octeontx/include/zip_regs.h
+++ b/drivers/compress/octeontx/include/zip_regs.h
@@ -13,10 +13,10 @@
  * Enumerates ZIP_INST_S[CC].
  */
-enum {
+enum zip_cc {
 	ZIP_CC_DEFAULT = 0,
 	ZIP_CC_DYN_HUFF,
 	ZIP_CC_FIXED_HUFF,
 	ZIP_CC_LZS
-} zip_cc;
+};
 
 /**
diff --git a/drivers/compress/octeontx/otx_zip.h b/drivers/compress/octeontx/otx_zip.h
index 99a38d005..3abefd1dc 100644
--- a/drivers/compress/octeontx/otx_zip.h
+++ b/drivers/compress/octeontx/otx_zip.h
@@ -80,5 +80,5 @@ int octtx_zip_logtype_driver;
 
 /* resources required to process stream */
-enum {
+enum NUM_BUFS_PER_STREAM {
 	RES_BUF = 0,
 	CMD_BUF,
@@ -89,5 +89,5 @@ enum {
 	HISTORY_DATA_BUF,
 	MAX_BUFS_PER_STREAM
-} NUM_BUFS_PER_STREAM;
+};
 
 struct zip_stream;
@@ -107,5 +107,5 @@ struct zip_stream {
 	/* function to process comp operation */
 	void *bufs[MAX_BUFS_PER_STREAM];
-} _rte_cache_aligned;
+} __rte_cache_aligned;
 
 
diff --git a/drivers/event/octeontx/ssovf_evdev.c b/drivers/event/octeontx/ssovf_evdev.c
index 16a3a04b8..44243e0fc 100644
--- a/drivers/event/octeontx/ssovf_evdev.c
+++ b/drivers/event/octeontx/ssovf_evdev.c
@@ -455,5 +455,4 @@ ssovf_eth_rx_adapter_queue_del(const struct rte_eventdev *dev,
 	pki_del_qos_t pki_qos;
 	RTE_SET_USED(dev);
-	RTE_SET_USED(rx_queue_id);
 
 	ret = strncmp(eth_dev->data->name, "eth_octeontx", 12);
@@ -467,5 +466,5 @@ ssovf_eth_rx_adapter_queue_del(const struct rte_eventdev *dev,
 	if (ret < 0)
 		ssovf_log_err("Failed to delete QOS port=%d, q=%d",
-				nic->port_id, queue_conf->ev.queue_id);
+				nic->port_id, rx_queue_id);
 	return ret;
 }
diff --git a/drivers/net/enic/enic_ethdev.c b/drivers/net/enic/enic_ethdev.c
index fa2f4709a..4cb17dfc7 100644
--- a/drivers/net/enic/enic_ethdev.c
+++ b/drivers/net/enic/enic_ethdev.c
@@ -1021,5 +1021,4 @@ static int enic_check_devargs(struct rte_eth_dev *dev)
 }
 
-struct enic *enicpmd_list_head = NULL;
 /* Initialize the driver
  * It returns 0 on success.
diff --git a/lib/librte_eventdev/rte_event_eth_rx_adapter.c b/lib/librte_eventdev/rte_event_eth_rx_adapter.c
index 870ac8c3b..71d008cd1 100644
--- a/lib/librte_eventdev/rte_event_eth_rx_adapter.c
+++ b/lib/librte_eventdev/rte_event_eth_rx_adapter.c
@@ -1126,5 +1126,4 @@ rxa_poll(struct rte_event_eth_rx_adapter *rx_adapter)
 	max_nb_rx = rx_adapter->max_nb_rx;
 	buf = &rx_adapter->event_enqueue_buffer;
-	stats = &rx_adapter->stats;
 
 	/* Iterate through a WRR sequence */
diff --git a/lib/librte_eventdev/rte_eventdev_pmd.h b/lib/librte_eventdev/rte_eventdev_pmd.h
index 3fbb4d2b2..2e9dd494b 100644
--- a/lib/librte_eventdev/rte_eventdev_pmd.h
+++ b/lib/librte_eventdev/rte_eventdev_pmd.h
@@ -451,5 +451,5 @@ typedef int (*eventdev_eth_rx_adapter_caps_get_t)
 					uint32_t *caps);
 
-struct rte_event_eth_rx_adapter_queue_conf *queue_conf;
+struct rte_event_eth_rx_adapter_queue_conf;
 
 /**
@@ -576,5 +576,5 @@ typedef int (*eventdev_eth_rx_adapter_stop_t)
 					const struct rte_eth_dev *eth_dev);
 
-struct rte_event_eth_rx_adapter_stats *stats;
+struct rte_event_eth_rx_adapter_stats;
 
 /**
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-23 10:22:54.529207337 +0000
+++ 0011-fix-global-variable-issues.patch	2018-11-23 10:22:54.000000000 +0000
@@ -1,8 +1,10 @@
-From 9757358342a089e9d3e770cc3e4b4b1289d65abe Mon Sep 17 00:00:00 2001
+From 5e60edf80f1b1170da5cdb6b6ab05115e250a209 Mon Sep 17 00:00:00 2001
 From: Ferruh Yigit <ferruh.yigit at intel.com>
 Date: Sun, 28 Oct 2018 23:57:40 +0000
 Subject: [PATCH] fix global variable issues
 
+[ upstream commit 9757358342a089e9d3e770cc3e4b4b1289d65abe ]
+
 Various fixes related to the global variable usage.
 
 Fixes: 43e610bb8565 ("compress/octeontx: introduce octeontx zip PMD")
@@ -11,7 +13,6 @@
 Fixes: b1ce8ebd97ba ("eventdev: add PMD callbacks for eth Rx adapter")
 Fixes: 3810ae435783 ("eventdev: add interrupt driven queues to Rx adapter")
 Fixes: fefed3d1e62c ("enic: new driver")
-Cc: stable at dpdk.org
 
 Signed-off-by: Ferruh Yigit <ferruh.yigit at intel.com>
 Reviewed-by: Nikhil Rao <nikhil.rao at intel.com>
@@ -68,16 +69,16 @@
  
  
 diff --git a/drivers/event/octeontx/ssovf_evdev.c b/drivers/event/octeontx/ssovf_evdev.c
-index c5e891cdb..a273d4c96 100644
+index 16a3a04b8..44243e0fc 100644
 --- a/drivers/event/octeontx/ssovf_evdev.c
 +++ b/drivers/event/octeontx/ssovf_evdev.c
-@@ -456,5 +456,4 @@ ssovf_eth_rx_adapter_queue_del(const struct rte_eventdev *dev,
+@@ -455,5 +455,4 @@ ssovf_eth_rx_adapter_queue_del(const struct rte_eventdev *dev,
  	pki_del_qos_t pki_qos;
  	RTE_SET_USED(dev);
 -	RTE_SET_USED(rx_queue_id);
  
  	ret = strncmp(eth_dev->data->name, "eth_octeontx", 12);
-@@ -468,5 +467,5 @@ ssovf_eth_rx_adapter_queue_del(const struct rte_eventdev *dev,
+@@ -467,5 +466,5 @@ ssovf_eth_rx_adapter_queue_del(const struct rte_eventdev *dev,
  	if (ret < 0)
  		ssovf_log_err("Failed to delete QOS port=%d, q=%d",
 -				nic->port_id, queue_conf->ev.queue_id);
@@ -85,10 +86,10 @@
  	return ret;
  }
 diff --git a/drivers/net/enic/enic_ethdev.c b/drivers/net/enic/enic_ethdev.c
-index 1a129f414..996bb5542 100644
+index fa2f4709a..4cb17dfc7 100644
 --- a/drivers/net/enic/enic_ethdev.c
 +++ b/drivers/net/enic/enic_ethdev.c
-@@ -1031,5 +1031,4 @@ static int enic_check_devargs(struct rte_eth_dev *dev)
+@@ -1021,5 +1021,4 @@ static int enic_check_devargs(struct rte_eth_dev *dev)
  }
  
 -struct enic *enicpmd_list_head = NULL;
@@ -105,17 +106,17 @@
  
  	/* Iterate through a WRR sequence */
 diff --git a/lib/librte_eventdev/rte_eventdev_pmd.h b/lib/librte_eventdev/rte_eventdev_pmd.h
-index 792fb3a23..aa6e52c63 100644
+index 3fbb4d2b2..2e9dd494b 100644
 --- a/lib/librte_eventdev/rte_eventdev_pmd.h
 +++ b/lib/librte_eventdev/rte_eventdev_pmd.h
-@@ -468,5 +468,5 @@ typedef int (*eventdev_eth_rx_adapter_caps_get_t)
+@@ -451,5 +451,5 @@ typedef int (*eventdev_eth_rx_adapter_caps_get_t)
  					uint32_t *caps);
  
 -struct rte_event_eth_rx_adapter_queue_conf *queue_conf;
 +struct rte_event_eth_rx_adapter_queue_conf;
  
  /**
-@@ -593,5 +593,5 @@ typedef int (*eventdev_eth_rx_adapter_stop_t)
+@@ -576,5 +576,5 @@ typedef int (*eventdev_eth_rx_adapter_stop_t)
  					const struct rte_eth_dev *eth_dev);
  
 -struct rte_event_eth_rx_adapter_stats *stats;