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

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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/10/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.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

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

Thanks.

Kevin.

---
>From 74e62043df46239c96d67a7624ae6c58915374dd 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 0ef3e01165..ac6f5f7def 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -5233,8 +5233,14 @@ ixgbevf_dev_start(struct rte_eth_dev *dev)
 
 	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;
 
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:54.727536381 +0000
+++ 0025-net-ixgbe-fix-VF-reset-HW-error-handling.patch	2020-11-05 12:38:54.202895990 +0000
@@ -1 +1 @@
-From 7c6e6aef870848cf887b2115d7c13bfcde6f4627 Mon Sep 17 00:00:00 2001
+From 74e62043df46239c96d67a7624ae6c58915374dd Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 7c6e6aef870848cf887b2115d7c13bfcde6f4627 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index c74467e068..8da963a916 100644
+index 0ef3e01165..ac6f5f7def 100644
@@ -23 +24 @@
-@@ -5321,8 +5321,14 @@ ixgbevf_dev_start(struct rte_eth_dev *dev)
+@@ -5233,8 +5233,14 @@ ixgbevf_dev_start(struct rte_eth_dev *dev)