[dpdk-stable] patch 'net/ixgbe: fix VF reset HW error handling' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.6

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

Thanks.

Luca Boccassi

---
>From accddf94303af82a223f9289e9ea3ee7751ff4c0 Mon Sep 17 00:00:00 2001
From: Steve Yang <stevex.yang at intel.com>
Date: Tue, 15 Sep 2020 06:46:22 +0000
Subject: [PATCH] net/ixgbe: fix VF reset HW error handling

[ upstream commit 7c6e6aef870848cf887b2115d7c13bfcde6f4627 ]

When start a VF with no initial MAC address assigned by the underlying
Host PF driver, just reuse the MAC address assigned when VF is
initializing.

Fixes: f69166c9a3c9 ("net/ixgbe: fix reset error handling")

Signed-off-by: Steve Yang <stevex.yang at intel.com>
Acked-by: Jeff Guo <jia.guo at intel.com>
---
 drivers/net/ixgbe/ixgbe_ethdev.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index 875d4ee3db..768183e9cb 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -5335,10 +5335,16 @@ ixgbevf_dev_start(struct rte_eth_dev *dev)
 	ixgbe_dev_wait_setup_link_complete(dev, 0);
 
 	err = hw->mac.ops.reset_hw(hw);
-	if (err) {
+
+	/**
+	 * In this case, reuses the MAC address assigned by VF
+	 * initialization.
+	 */
+	if (err != IXGBE_SUCCESS && err != IXGBE_ERR_INVALID_MAC_ADDR) {
 		PMD_INIT_LOG(ERR, "Unable to reset vf hardware (%d)", err);
 		return err;
 	}
+
 	hw->mac.get_link_status = true;
 
 	/* negotiate mailbox API version to use with the PF. */
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:13.977207843 +0000
+++ 0071-net-ixgbe-fix-VF-reset-HW-error-handling.patch	2020-10-28 10:35:11.564830907 +0000
@@ -1,14 +1,15 @@
-From 7c6e6aef870848cf887b2115d7c13bfcde6f4627 Mon Sep 17 00:00:00 2001
+From accddf94303af82a223f9289e9ea3ee7751ff4c0 Mon Sep 17 00:00:00 2001
 From: Steve Yang <stevex.yang at intel.com>
 Date: Tue, 15 Sep 2020 06:46:22 +0000
 Subject: [PATCH] net/ixgbe: fix VF reset HW error handling
 
+[ upstream commit 7c6e6aef870848cf887b2115d7c13bfcde6f4627 ]
+
 When start a VF with no initial MAC address assigned by the underlying
 Host PF driver, just reuse the MAC address assigned when VF is
 initializing.
 
 Fixes: f69166c9a3c9 ("net/ixgbe: fix reset error handling")
-Cc: stable at dpdk.org
 
 Signed-off-by: Steve Yang <stevex.yang at intel.com>
 Acked-by: Jeff Guo <jia.guo at intel.com>
@@ -17,10 +18,10 @@
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
-index c74467e068..8da963a916 100644
+index 875d4ee3db..768183e9cb 100644
 --- a/drivers/net/ixgbe/ixgbe_ethdev.c
 +++ b/drivers/net/ixgbe/ixgbe_ethdev.c
-@@ -5320,10 +5320,16 @@ ixgbevf_dev_start(struct rte_eth_dev *dev)
+@@ -5335,10 +5335,16 @@ ixgbevf_dev_start(struct rte_eth_dev *dev)
  	ixgbe_dev_wait_setup_link_complete(dev, 0);
  
  	err = hw->mac.ops.reset_hw(hw);