[dpdk-stable] patch 'net/i40e: fix send admin queue command before init' has been queued to LTS release 17.11.5

[Yongseok Koh]

Hi,

FYI, your patch has been queued to LTS release 17.11.5

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

Yongseok

---
>From e0794e91afa05bd2c22e99dedb8fcf7870a69ace Mon Sep 17 00:00:00 2001
From: Qi Zhang <qi.z.zhang at intel.com>
Date: Fri, 28 Sep 2018 11:20:01 +0800
Subject: [PATCH] net/i40e: fix send admin queue command before init

[ upstream commit 0a1b657838c2c0546ebc6469ed2840c5a9a796f4 ]

We should not issue Admin Queue command before Admin Queue is initialized.
But this happened in i40e_hw_init and i40e_filter_input_set_init.

The patch fixes the issue by proper reordering.

Fixes: b6a0ec418274 ("i40e: use AQ for Rx control register read/write")

Reported-by: Anand Rawat <anand.rawat at intel.com>
Signed-off-by: Qi Zhang <qi.z.zhang at intel.com>
Acked-by: Beilei Xing <beilei.xing at intel.com>
---
 drivers/net/i40e/i40e_ethdev.c | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 711c6e7b6..9d99e841e 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -1224,9 +1224,6 @@ eth_i40e_dev_init(struct rte_eth_dev *dev)
 	/* Make sure all is clean before doing PF reset */
 	i40e_clear_hw(hw);
 
-	/* Initialize the hardware */
-	i40e_hw_init(dev);
-
 	/* Reset here to make sure all is clean for each PF */
 	ret = i40e_pf_reset(hw);
 	if (ret) {
@@ -1241,6 +1238,23 @@ eth_i40e_dev_init(struct rte_eth_dev *dev)
 		return ret;
 	}
 
+	/* Initialize the parameters for adminq */
+	i40e_init_adminq_parameter(hw);
+	ret = i40e_init_adminq(hw);
+	if (ret != I40E_SUCCESS) {
+		PMD_INIT_LOG(ERR, "Failed to init adminq: %d", ret);
+		return -EIO;
+	}
+	PMD_INIT_LOG(INFO, "FW %d.%d API %d.%d NVM %02d.%02d.%02d eetrack %04x",
+		     hw->aq.fw_maj_ver, hw->aq.fw_min_ver,
+		     hw->aq.api_maj_ver, hw->aq.api_min_ver,
+		     ((hw->nvm.version >> 12) & 0xf),
+		     ((hw->nvm.version >> 4) & 0xff),
+		     (hw->nvm.version & 0xf), hw->nvm.eetrack);
+
+	/* Initialize the hardware */
+	i40e_hw_init(dev);
+
 	i40e_config_automask(pf);
 
 	i40e_set_default_pctype_table(dev);
@@ -1257,20 +1271,6 @@ eth_i40e_dev_init(struct rte_eth_dev *dev)
 	/* Initialize the input set for filters (hash and fd) to default value */
 	i40e_filter_input_set_init(pf);
 
-	/* Initialize the parameters for adminq */
-	i40e_init_adminq_parameter(hw);
-	ret = i40e_init_adminq(hw);
-	if (ret != I40E_SUCCESS) {
-		PMD_INIT_LOG(ERR, "Failed to init adminq: %d", ret);
-		return -EIO;
-	}
-	PMD_INIT_LOG(INFO, "FW %d.%d API %d.%d NVM %02d.%02d.%02d eetrack %04x",
-		     hw->aq.fw_maj_ver, hw->aq.fw_min_ver,
-		     hw->aq.api_maj_ver, hw->aq.api_min_ver,
-		     ((hw->nvm.version >> 12) & 0xf),
-		     ((hw->nvm.version >> 4) & 0xff),
-		     (hw->nvm.version & 0xf), hw->nvm.eetrack);
-
 	/* initialise the L3_MAP register */
 	if (!pf->support_multi_driver) {
 		ret = i40e_aq_debug_write_register(hw, I40E_GLQF_L3_MAP(40),
-- 
2.11.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-29 15:01:46.965643032 -0800
+++ 0039-net-i40e-fix-send-admin-queue-command-before-init.patch	2018-11-29 15:01:45.068959000 -0800
@@ -1,15 +1,16 @@
-From 0a1b657838c2c0546ebc6469ed2840c5a9a796f4 Mon Sep 17 00:00:00 2001
+From e0794e91afa05bd2c22e99dedb8fcf7870a69ace Mon Sep 17 00:00:00 2001
 From: Qi Zhang <qi.z.zhang at intel.com>
 Date: Fri, 28 Sep 2018 11:20:01 +0800
 Subject: [PATCH] net/i40e: fix send admin queue command before init
 
+[ upstream commit 0a1b657838c2c0546ebc6469ed2840c5a9a796f4 ]
+
 We should not issue Admin Queue command before Admin Queue is initialized.
 But this happened in i40e_hw_init and i40e_filter_input_set_init.
 
 The patch fixes the issue by proper reordering.
 
 Fixes: b6a0ec418274 ("i40e: use AQ for Rx control register read/write")
-Cc: stable at dpdk.org
 
 Reported-by: Anand Rawat <anand.rawat at intel.com>
 Signed-off-by: Qi Zhang <qi.z.zhang at intel.com>
@@ -19,10 +20,10 @@
  1 file changed, 17 insertions(+), 17 deletions(-)
 
 diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
-index de25de650..9225333d0 100644
+index 711c6e7b6..9d99e841e 100644
 --- a/drivers/net/i40e/i40e_ethdev.c
 +++ b/drivers/net/i40e/i40e_ethdev.c
-@@ -1332,9 +1332,6 @@ eth_i40e_dev_init(struct rte_eth_dev *dev, void *init_params __rte_unused)
+@@ -1224,9 +1224,6 @@ eth_i40e_dev_init(struct rte_eth_dev *dev)
  	/* Make sure all is clean before doing PF reset */
  	i40e_clear_hw(hw);
  
@@ -32,7 +33,7 @@
  	/* Reset here to make sure all is clean for each PF */
  	ret = i40e_pf_reset(hw);
  	if (ret) {
-@@ -1349,6 +1346,23 @@ eth_i40e_dev_init(struct rte_eth_dev *dev, void *init_params __rte_unused)
+@@ -1241,6 +1238,23 @@ eth_i40e_dev_init(struct rte_eth_dev *dev)
  		return ret;
  	}
  
@@ -56,7 +57,7 @@
  	i40e_config_automask(pf);
  
  	i40e_set_default_pctype_table(dev);
-@@ -1364,20 +1378,6 @@ eth_i40e_dev_init(struct rte_eth_dev *dev, void *init_params __rte_unused)
+@@ -1257,20 +1271,6 @@ eth_i40e_dev_init(struct rte_eth_dev *dev)
  	/* Initialize the input set for filters (hash and fd) to default value */
  	i40e_filter_input_set_init(pf);
  
@@ -76,7 +77,7 @@
 -
  	/* initialise the L3_MAP register */
  	if (!pf->support_multi_driver) {
- 		ret = i40e_aq_debug_write_global_register(hw,
+ 		ret = i40e_aq_debug_write_register(hw, I40E_GLQF_L3_MAP(40),
 -- 
 2.11.0