patch 'net/hns3: fix header files includes' has been queued to stable release 20.11.7

[luca.boccassi@gmail.com]

Hi,

FYI, your patch has been queued to stable release 20.11.7

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/05/22. 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

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

Thanks.

Luca Boccassi

---
From c23cc8ba1aec87c5bacf2509cbfa2d6e1a5275aa Mon Sep 17 00:00:00 2001
From: Chengwen Feng <fengchengwen@huawei.com>
Date: Fri, 30 Sep 2022 15:22:11 +0800
Subject: [PATCH] net/hns3: fix header files includes

[ upstream commit 1c757dd5f636d1984326b1919c5356d19d1e4b9d ]

Header files should be self contained and should not be cyclically
dependent.

Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
Signed-off-by: Min Hu (Connor) <humin29@huawei.com>
Signed-off-by: Dongdong Liu <liudongdong3@huawei.com>
---
 drivers/net/hns3/hns3_cmd.h    | 3 +++
 drivers/net/hns3/hns3_dcb.h    | 3 +++
 drivers/net/hns3/hns3_ethdev.c | 2 +-
 drivers/net/hns3/hns3_fdir.h   | 3 +++
 drivers/net/hns3/hns3_intr.c   | 2 +-
 drivers/net/hns3/hns3_mbx.h    | 4 ++++
 drivers/net/hns3/hns3_regs.h   | 2 ++
 drivers/net/hns3/hns3_rss.h    | 2 ++
 drivers/net/hns3/hns3_rxtx.c   | 2 +-
 drivers/net/hns3/hns3_rxtx.h   | 8 ++++++++
 drivers/net/hns3/hns3_stats.h  | 4 ++++
 11 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/drivers/net/hns3/hns3_cmd.h b/drivers/net/hns3/hns3_cmd.h
index 344474db6f..b7eaf924da 100644
--- a/drivers/net/hns3/hns3_cmd.h
+++ b/drivers/net/hns3/hns3_cmd.h
@@ -7,6 +7,9 @@
 
 #include <stdint.h>
 
+#include <rte_byteorder.h>
+#include <rte_spinlock.h>
+
 #define HNS3_CMDQ_TX_TIMEOUT		30000
 #define HNS3_CMDQ_CLEAR_WAIT_TIME	200
 #define HNS3_CMDQ_RX_INVLD_B		0
diff --git a/drivers/net/hns3/hns3_dcb.h b/drivers/net/hns3/hns3_dcb.h
index 0d167e75dc..b141b0f659 100644
--- a/drivers/net/hns3/hns3_dcb.h
+++ b/drivers/net/hns3/hns3_dcb.h
@@ -7,7 +7,10 @@
 
 #include <stdint.h>
 
+#include <rte_ethdev.h>
+
 #include "hns3_cmd.h"
+#include "hns3_ethdev.h"
 
 #define HNS3_ETHER_MAX_RATE		100000
 
diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index be1d9db19d..9cf96f4167 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -8,13 +8,13 @@
 #include <rte_io.h>
 #include <rte_pci.h>
 
-#include "hns3_ethdev.h"
 #include "hns3_logs.h"
 #include "hns3_rxtx.h"
 #include "hns3_intr.h"
 #include "hns3_regs.h"
 #include "hns3_dcb.h"
 #include "hns3_mp.h"
+#include "hns3_ethdev.h"
 
 #define HNS3_DEFAULT_PORT_CONF_BURST_SIZE	32
 #define HNS3_DEFAULT_PORT_CONF_QUEUES_NUM	1
diff --git a/drivers/net/hns3/hns3_fdir.h b/drivers/net/hns3/hns3_fdir.h
index 839fdb3a88..2d533c30ec 100644
--- a/drivers/net/hns3/hns3_fdir.h
+++ b/drivers/net/hns3/hns3_fdir.h
@@ -5,6 +5,8 @@
 #ifndef _HNS3_FDIR_H_
 #define _HNS3_FDIR_H_
 
+#include <stdint.h>
+
 #include <rte_flow.h>
 
 struct hns3_fd_key_cfg {
@@ -205,6 +207,7 @@ struct rte_flow {
 	uint32_t counter_id;
 };
 struct hns3_adapter;
+struct hns3_hw;
 
 int hns3_init_fd_config(struct hns3_adapter *hns);
 int hns3_fdir_filter_init(struct hns3_adapter *hns);
diff --git a/drivers/net/hns3/hns3_intr.c b/drivers/net/hns3/hns3_intr.c
index a54f23ea45..7e945ba2e3 100644
--- a/drivers/net/hns3/hns3_intr.c
+++ b/drivers/net/hns3/hns3_intr.c
@@ -10,9 +10,9 @@
 
 #include "hns3_ethdev.h"
 #include "hns3_logs.h"
-#include "hns3_intr.h"
 #include "hns3_regs.h"
 #include "hns3_rxtx.h"
+#include "hns3_intr.h"
 
 #define SWITCH_CONTEXT_US	10
 
diff --git a/drivers/net/hns3/hns3_mbx.h b/drivers/net/hns3/hns3_mbx.h
index 3f2e10c513..c61afc2f8e 100644
--- a/drivers/net/hns3/hns3_mbx.h
+++ b/drivers/net/hns3/hns3_mbx.h
@@ -5,6 +5,10 @@
 #ifndef _HNS3_MBX_H_
 #define _HNS3_MBX_H_
 
+#include <stdint.h>
+
+#include <rte_spinlock.h>
+
 enum HNS3_MBX_OPCODE {
 	HNS3_MBX_RESET = 0x01,          /* (VF -> PF) assert reset */
 	HNS3_MBX_ASSERTING_RESET,       /* (PF -> VF) PF is asserting reset */
diff --git a/drivers/net/hns3/hns3_regs.h b/drivers/net/hns3/hns3_regs.h
index cfdd208c7b..05cb8d25c0 100644
--- a/drivers/net/hns3/hns3_regs.h
+++ b/drivers/net/hns3/hns3_regs.h
@@ -5,6 +5,8 @@
 #ifndef _HNS3_REGS_H_
 #define _HNS3_REGS_H_
 
+#include <rte_dev_info.h>
+
 /* bar registers for cmdq */
 #define HNS3_CMDQ_TX_ADDR_L_REG		0x27000
 #define HNS3_CMDQ_TX_ADDR_H_REG		0x27004
diff --git a/drivers/net/hns3/hns3_rss.h b/drivers/net/hns3/hns3_rss.h
index 4fe7363916..82c19b6b00 100644
--- a/drivers/net/hns3/hns3_rss.h
+++ b/drivers/net/hns3/hns3_rss.h
@@ -4,6 +4,7 @@
 
 #ifndef _HNS3_RSS_H_
 #define _HNS3_RSS_H_
+
 #include <rte_ethdev.h>
 #include <rte_flow.h>
 
@@ -91,6 +92,7 @@ static inline uint32_t roundup_pow_of_two(uint32_t x)
 extern const uint8_t hns3_hash_key[HNS3_RSS_KEY_SIZE];
 
 struct hns3_adapter;
+struct hns3_hw;
 
 int hns3_dev_rss_hash_update(struct rte_eth_dev *dev,
 			     struct rte_eth_rss_conf *rss_conf);
diff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c
index daf74696c8..fadec9c7e2 100644
--- a/drivers/net/hns3/hns3_rxtx.c
+++ b/drivers/net/hns3/hns3_rxtx.c
@@ -16,9 +16,9 @@
 #endif
 
 #include "hns3_ethdev.h"
-#include "hns3_rxtx.h"
 #include "hns3_regs.h"
 #include "hns3_logs.h"
+#include "hns3_rxtx.h"
 
 #define HNS3_CFG_DESC_NUM(num)	((num) / 8 - 1)
 #define HNS3_RX_RING_PREFETCTH_MASK	3
diff --git a/drivers/net/hns3/hns3_rxtx.h b/drivers/net/hns3/hns3_rxtx.h
index aa128a345a..b18c3f1165 100644
--- a/drivers/net/hns3/hns3_rxtx.h
+++ b/drivers/net/hns3/hns3_rxtx.h
@@ -6,7 +6,15 @@
 #define _HNS3_RXTX_H_
 
 #include <stdint.h>
+
 #include <rte_mbuf_core.h>
+#include <rte_ethdev.h>
+#include <rte_ethdev_core.h>
+#include <rte_io.h>
+#include <rte_mempool.h>
+#include <rte_memzone.h>
+
+#include "hns3_ethdev.h"
 
 #define	HNS3_MIN_RING_DESC	64
 #define	HNS3_MAX_RING_DESC	32768
diff --git a/drivers/net/hns3/hns3_stats.h b/drivers/net/hns3/hns3_stats.h
index 47dce14190..9876e7d0cc 100644
--- a/drivers/net/hns3/hns3_stats.h
+++ b/drivers/net/hns3/hns3_stats.h
@@ -5,6 +5,8 @@
 #ifndef _HNS3_STATS_H_
 #define _HNS3_STATS_H_
 
+#include <rte_ethdev.h>
+
 /* TQP stats */
 struct hns3_tqp_stats {
 	uint64_t rcb_tx_ring_pktnum_rcd; /* Total num of transmitted packets */
@@ -128,6 +130,8 @@ struct hns3_reset_stats;
 #define HNS3_TX_ERROR_STATS_FIELD_OFFSET(f) \
 	(offsetof(struct hns3_tx_queue, f))
 
+struct hns3_hw;
+
 int hns3_stats_get(struct rte_eth_dev *eth_dev,
 		   struct rte_eth_stats *rte_stats);
 int hns3_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats,
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-03 09:27:30.482857508 +0000
+++ 0084-net-hns3-fix-header-files-includes.patch	2022-11-03 09:27:25.545425770 +0000
@@ -1 +1 @@
-From 1c757dd5f636d1984326b1919c5356d19d1e4b9d Mon Sep 17 00:00:00 2001
+From c23cc8ba1aec87c5bacf2509cbfa2d6e1a5275aa Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 1c757dd5f636d1984326b1919c5356d19d1e4b9d ]
+
@@ -14,2 +16 @@
- drivers/net/hns3/hns3_common.c | 2 +-
- drivers/net/hns3/hns3_dcb.h    | 4 ++++
+ drivers/net/hns3/hns3_dcb.h    | 3 +++
@@ -17,2 +18 @@
- drivers/net/hns3/hns3_fdir.h   | 5 +++++
- drivers/net/hns3/hns3_flow.h   | 3 +++
+ drivers/net/hns3/hns3_fdir.h   | 3 +++
@@ -21,2 +21 @@
- drivers/net/hns3/hns3_mp.h     | 2 ++
- drivers/net/hns3/hns3_regs.h   | 3 +++
+ drivers/net/hns3/hns3_regs.h   | 2 ++
@@ -25,4 +24,3 @@
- drivers/net/hns3/hns3_rxtx.h   | 9 +++++++++
- drivers/net/hns3/hns3_stats.h  | 5 +++++
- drivers/net/hns3/hns3_tm.h     | 2 ++
- 15 files changed, 46 insertions(+), 4 deletions(-)
+ drivers/net/hns3/hns3_rxtx.h   | 8 ++++++++
+ drivers/net/hns3/hns3_stats.h  | 4 ++++
+ 11 files changed, 32 insertions(+), 3 deletions(-)
@@ -31 +29 @@
-index 82c999061d..bee96c1e46 100644
+index 344474db6f..b7eaf924da 100644
@@ -44,16 +41,0 @@
-diff --git a/drivers/net/hns3/hns3_common.c b/drivers/net/hns3/hns3_common.c
-index e732f68238..14291193cb 100644
---- a/drivers/net/hns3/hns3_common.c
-+++ b/drivers/net/hns3/hns3_common.c
-@@ -7,10 +7,10 @@
- #include <ethdev_pci.h>
- #include <rte_pci.h>
- 
--#include "hns3_common.h"
- #include "hns3_logs.h"
- #include "hns3_regs.h"
- #include "hns3_rxtx.h"
-+#include "hns3_common.h"
- 
- int
- hns3_fw_version_get(struct rte_eth_dev *eth_dev, char *fw_version,
@@ -61 +43 @@
-index e06ec177c8..9d9e7684c1 100644
+index 0d167e75dc..b141b0f659 100644
@@ -64 +46 @@
-@@ -7,7 +7,11 @@
+@@ -7,7 +7,10 @@
@@ -68 +49,0 @@
-+#include <ethdev_driver.h>
@@ -77 +58 @@
-index a1348f93a7..60e933998a 100644
+index be1d9db19d..9cf96f4167 100644
@@ -80,3 +61,3 @@
-@@ -6,7 +6,6 @@
- #include <bus_pci_driver.h>
- #include <ethdev_pci.h>
+@@ -8,13 +8,13 @@
+ #include <rte_io.h>
+ #include <rte_pci.h>
@@ -85,2 +65,0 @@
- #include "hns3_common.h"
- #include "hns3_dump.h"
@@ -88 +67,3 @@
-@@ -16,6 +15,7 @@
+ #include "hns3_rxtx.h"
+ #include "hns3_intr.h"
+ #include "hns3_regs.h"
@@ -91 +71,0 @@
- #include "hns3_flow.h"
@@ -94,2 +74,2 @@
- #define HNS3_SERVICE_INTERVAL		1000000 /* us */
- #define HNS3_SERVICE_QUICK_INTERVAL	10
+ #define HNS3_DEFAULT_PORT_CONF_BURST_SIZE	32
+ #define HNS3_DEFAULT_PORT_CONF_QUEUES_NUM	1
@@ -97 +77 @@
-index d81f04a3f3..1a14f1eceb 100644
+index 839fdb3a88..2d533c30ec 100644
@@ -100 +80 @@
-@@ -5,6 +5,10 @@
+@@ -5,6 +5,8 @@
@@ -106,2 +86,2 @@
-+#include <rte_flow.h>
-+
+ #include <rte_flow.h>
+ 
@@ -109,3 +89,2 @@
- 	uint8_t key_sel;
- 	uint8_t inner_sipv6_word_en;
-@@ -177,6 +181,7 @@ struct hns3_fdir_info {
+@@ -205,6 +207,7 @@ struct rte_flow {
+ 	uint32_t counter_id;
@@ -113 +91,0 @@
- 
@@ -119,14 +96,0 @@
-diff --git a/drivers/net/hns3/hns3_flow.h b/drivers/net/hns3/hns3_flow.h
-index 854fbb7ff0..ec94510152 100644
---- a/drivers/net/hns3/hns3_flow.h
-+++ b/drivers/net/hns3/hns3_flow.h
-@@ -6,6 +6,9 @@
- #define _HNS3_FLOW_H_
- 
- #include <rte_flow.h>
-+#include <ethdev_driver.h>
-+
-+#include "hns3_rss.h"
- 
- struct hns3_flow_counter {
- 	LIST_ENTRY(hns3_flow_counter) next; /* Pointer to the next counter. */
@@ -134 +98 @@
-index 4bdcd6070b..57679254ee 100644
+index a54f23ea45..7e945ba2e3 100644
@@ -139 +103 @@
- #include "hns3_common.h"
+ #include "hns3_ethdev.h"
@@ -149 +113 @@
-index 0172a2e288..97f704426c 100644
+index 3f2e10c513..c61afc2f8e 100644
@@ -163,13 +126,0 @@
-diff --git a/drivers/net/hns3/hns3_mp.h b/drivers/net/hns3/hns3_mp.h
-index a74221d086..230230bbfe 100644
---- a/drivers/net/hns3/hns3_mp.h
-+++ b/drivers/net/hns3/hns3_mp.h
-@@ -5,6 +5,8 @@
- #ifndef _HNS3_MP_H_
- #define _HNS3_MP_H_
- 
-+#include <ethdev_driver.h>
-+
- /* Local data for primary or secondary process. */
- struct hns3_process_local_data {
- 	bool init_done; /* Process action register completed flag. */
@@ -177 +128 @@
-index 5812eb39db..2636429844 100644
+index cfdd208c7b..05cb8d25c0 100644
@@ -180 +131 @@
-@@ -5,6 +5,9 @@
+@@ -5,6 +5,8 @@
@@ -184 +134,0 @@
-+#include <ethdev_driver.h>
@@ -191 +141 @@
-index 1589c67c59..6cae5f8634 100644
+index 4fe7363916..82c19b6b00 100644
@@ -211 +161 @@
-index 0a342ed9a2..f1163ce8a9 100644
+index daf74696c8..fadec9c7e2 100644
@@ -214 +164 @@
-@@ -17,10 +17,10 @@
+@@ -16,9 +16,9 @@
@@ -217 +167 @@
- #include "hns3_common.h"
+ #include "hns3_ethdev.h"
@@ -221 +170,0 @@
- #include "hns3_mp.h"
@@ -227 +176 @@
-index 455f8b9419..f2d73043b7 100644
+index aa128a345a..b18c3f1165 100644
@@ -230 +179 @@
-@@ -6,7 +6,16 @@
+@@ -6,7 +6,15 @@
@@ -235 +183,0 @@
-+#include <ethdev_driver.h>
@@ -248 +196 @@
-index 9d84072205..9a360f8870 100644
+index 47dce14190..9876e7d0cc 100644
@@ -251 +199 @@
-@@ -5,6 +5,9 @@
+@@ -5,6 +5,8 @@
@@ -255 +202,0 @@
-+#include <ethdev_driver.h>
@@ -261,3 +208,3 @@
-@@ -145,6 +148,8 @@ struct hns3_reset_stats;
- #define HNS3_IMISSED_STATS_FIELD_OFFSET(f) \
- 	(offsetof(struct hns3_rx_missed_stats, f))
+@@ -128,6 +130,8 @@ struct hns3_reset_stats;
+ #define HNS3_TX_ERROR_STATS_FIELD_OFFSET(f) \
+ 	(offsetof(struct hns3_tx_queue, f))
@@ -270,13 +216,0 @@
-diff --git a/drivers/net/hns3/hns3_tm.h b/drivers/net/hns3/hns3_tm.h
-index 83e9cc8ba9..47345eeed1 100644
---- a/drivers/net/hns3/hns3_tm.h
-+++ b/drivers/net/hns3/hns3_tm.h
-@@ -105,6 +105,8 @@ hns3_tm_calc_node_tc_no(struct hns3_tm_conf *conf, uint32_t node_id)
- 		return 0;
- }
- 
-+struct hns3_hw;
-+
- void hns3_tm_conf_init(struct rte_eth_dev *dev);
- void hns3_tm_conf_uninit(struct rte_eth_dev *dev);
- int hns3_tm_ops_get(struct rte_eth_dev *dev __rte_unused, void *arg);