[dpdk-stable] patch 'net/avf: fix build with debug enabled' 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/28/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 d15bfa4ffedc8d694f804c0d85d7ff66b641e9db Mon Sep 17 00:00:00 2001
From: Haiyue Wang <haiyue.wang at intel.com>
Date: Sun, 14 Oct 2018 10:34:05 +0800
Subject: [PATCH] net/avf: fix build with debug enabled

[ upstream commit a710ceb1728497774408225d9327bbf512e9ba16 ]

DEBUG_DUMP_DESC flag is enabled/disabled from Makefile and enabling it
causing the build issue.

Add the missed 'volatile' keyword to avoid the warning for type
mismatch, which will be treated as compiler error if WERROR_FLAGS
is enabled.

Fixes: bfd38e4d708b ("net/avf: fix missing compiler error flags")

Signed-off-by: Haiyue Wang <haiyue.wang at intel.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 drivers/net/avf/avf_rxtx.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/net/avf/avf_rxtx.h b/drivers/net/avf/avf_rxtx.h
index c4120f8a4..898d2f387 100644
--- a/drivers/net/avf/avf_rxtx.h
+++ b/drivers/net/avf/avf_rxtx.h
@@ -202,9 +202,9 @@ int avf_txq_vec_setup(struct avf_tx_queue *txq);
 static inline
 void avf_dump_rx_descriptor(struct avf_rx_queue *rxq,
-			    const void *desc,
+			    const volatile void *desc,
 			    uint16_t rx_id)
 {
 #ifdef RTE_LIBRTE_AVF_16BYTE_RX_DESC
-	const union avf_16byte_rx_desc *rx_desc = desc;
+	const volatile union avf_16byte_rx_desc *rx_desc = desc;
 
 	printf("Queue %d Rx_desc %d: QW0: 0x%016"PRIx64" QW1: 0x%016"PRIx64"\n",
@@ -212,5 +212,5 @@ void avf_dump_rx_descriptor(struct avf_rx_queue *rxq,
 	       rx_desc->read.hdr_addr);
 #else
-	const union avf_32byte_rx_desc *rx_desc = desc;
+	const volatile union avf_32byte_rx_desc *rx_desc = desc;
 
 	printf("Queue %d Rx_desc %d: QW0: 0x%016"PRIx64" QW1: 0x%016"PRIx64
@@ -226,8 +226,8 @@ void avf_dump_rx_descriptor(struct avf_rx_queue *rxq,
 static inline
 void avf_dump_tx_descriptor(const struct avf_tx_queue *txq,
-			    const void *desc, uint16_t tx_id)
+			    const volatile void *desc, uint16_t tx_id)
 {
 	const char *name;
-	const struct avf_tx_desc *tx_desc = desc;
+	const volatile struct avf_tx_desc *tx_desc = desc;
 	enum avf_tx_desc_dtype_value type;
 
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-22 16:47:32.460447319 +0000
+++ 0007-net-avf-fix-build-with-debug-enabled.patch	2018-11-22 16:47:32.000000000 +0000
@@ -1,8 +1,10 @@
-From a710ceb1728497774408225d9327bbf512e9ba16 Mon Sep 17 00:00:00 2001
+From d15bfa4ffedc8d694f804c0d85d7ff66b641e9db Mon Sep 17 00:00:00 2001
 From: Haiyue Wang <haiyue.wang at intel.com>
 Date: Sun, 14 Oct 2018 10:34:05 +0800
 Subject: [PATCH] net/avf: fix build with debug enabled
 
+[ upstream commit a710ceb1728497774408225d9327bbf512e9ba16 ]
+
 DEBUG_DUMP_DESC flag is enabled/disabled from Makefile and enabling it
 causing the build issue.
 
@@ -11,7 +13,6 @@
 is enabled.
 
 Fixes: bfd38e4d708b ("net/avf: fix missing compiler error flags")
-CC: stable at dpdk.org
 
 Signed-off-by: Haiyue Wang <haiyue.wang at intel.com>
 Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>