[dpdk-stable] patch 'net/bnxt: fix setting default MAC address' has been queued to LTS release 17.11.10

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to LTS release 17.11.10

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/21/19. 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 65c9e9ffb20fdc3af9a4c41c43ffc82ebe653430 Mon Sep 17 00:00:00 2001
From: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
Date: Wed, 2 Oct 2019 16:25:50 -0700
Subject: [PATCH] net/bnxt: fix setting default MAC address

[ upstream commit 988562f0b7a6085fa9fa1b8c68efacd722c60c31 ]

Driver was incorrectly programming the MAC with the already
configured one instead of the newly requested MAC by user.

Also, fix to restore the old mac address back to the default
vnic filter if the mac update operation fails.

Fixes: 68f589f2c728 ("net/bnxt: fix setting primary MAC address")

Signed-off-by: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
Reviewed-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
Reviewed-by: Somnath Kotur <somnath.kotur at broadcom.com>
---
 drivers/net/bnxt/bnxt_ethdev.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index ef49f98833..a41a428982 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -1446,15 +1446,18 @@ bnxt_set_default_mac_addr_op(struct rte_eth_dev *dev, struct ether_addr *addr)
 		rc = bnxt_hwrm_clear_l2_filter(bp, filter);
 		if (rc)
 			break;
-		memcpy(filter->l2_addr, bp->mac_addr, ETHER_ADDR_LEN);
+		memcpy(filter->l2_addr, addr, ETHER_ADDR_LEN);
 		memset(filter->l2_addr_mask, 0xff, ETHER_ADDR_LEN);
 		filter->flags |= HWRM_CFA_L2_FILTER_ALLOC_INPUT_FLAGS_PATH_RX;
 		filter->enables |=
 			HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_ADDR |
 			HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_ADDR_MASK;
 		rc = bnxt_hwrm_set_l2_filter(bp, vnic->fw_vnic_id, filter);
-		if (rc)
+		if (rc) {
+			memcpy(filter->l2_addr, bp->mac_addr,
+			       ETHER_ADDR_LEN);
 			break;
+		}
 		filter->mac_index = 0;
 		RTE_LOG(DEBUG, PMD, "Set MAC addr\n");
 	}
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-19 14:32:28.135271934 +0000
+++ 0045-net-bnxt-fix-setting-default-MAC-address.patch	2019-12-19 14:32:25.981295367 +0000
@@ -1,8 +1,10 @@
-From 988562f0b7a6085fa9fa1b8c68efacd722c60c31 Mon Sep 17 00:00:00 2001
+From 65c9e9ffb20fdc3af9a4c41c43ffc82ebe653430 Mon Sep 17 00:00:00 2001
 From: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
 Date: Wed, 2 Oct 2019 16:25:50 -0700
 Subject: [PATCH] net/bnxt: fix setting default MAC address
 
+[ upstream commit 988562f0b7a6085fa9fa1b8c68efacd722c60c31 ]
+
 Driver was incorrectly programming the MAC with the already
 configured one instead of the newly requested MAC by user.
 
@@ -10,7 +12,6 @@
 vnic filter if the mac update operation fails.
 
 Fixes: 68f589f2c728 ("net/bnxt: fix setting primary MAC address")
-Cc: stable at dpdk.org
 
 Signed-off-by: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
 Reviewed-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
@@ -20,31 +21,30 @@
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
-index 7cd3213558..2c9eaaa2ef 100644
+index ef49f98833..a41a428982 100644
 --- a/drivers/net/bnxt/bnxt_ethdev.c
 +++ b/drivers/net/bnxt/bnxt_ethdev.c
-@@ -1904,7 +1904,7 @@ bnxt_set_default_mac_addr_op(struct rte_eth_dev *dev,
- 		if (filter->mac_index != 0)
- 			continue;
- 
--		memcpy(filter->l2_addr, bp->mac_addr, RTE_ETHER_ADDR_LEN);
-+		memcpy(filter->l2_addr, addr, RTE_ETHER_ADDR_LEN);
- 		memset(filter->l2_addr_mask, 0xff, RTE_ETHER_ADDR_LEN);
- 		filter->flags |= HWRM_CFA_L2_FILTER_ALLOC_INPUT_FLAGS_PATH_RX |
- 			HWRM_CFA_L2_FILTER_ALLOC_INPUT_FLAGS_OUTERMOST;
-@@ -1913,8 +1913,11 @@ bnxt_set_default_mac_addr_op(struct rte_eth_dev *dev,
+@@ -1446,15 +1446,18 @@ bnxt_set_default_mac_addr_op(struct rte_eth_dev *dev, struct ether_addr *addr)
+ 		rc = bnxt_hwrm_clear_l2_filter(bp, filter);
+ 		if (rc)
+ 			break;
+-		memcpy(filter->l2_addr, bp->mac_addr, ETHER_ADDR_LEN);
++		memcpy(filter->l2_addr, addr, ETHER_ADDR_LEN);
+ 		memset(filter->l2_addr_mask, 0xff, ETHER_ADDR_LEN);
+ 		filter->flags |= HWRM_CFA_L2_FILTER_ALLOC_INPUT_FLAGS_PATH_RX;
+ 		filter->enables |=
+ 			HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_ADDR |
  			HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_ADDR_MASK;
- 
  		rc = bnxt_hwrm_set_l2_filter(bp, vnic->fw_vnic_id, filter);
 -		if (rc)
 +		if (rc) {
 +			memcpy(filter->l2_addr, bp->mac_addr,
-+			       RTE_ETHER_ADDR_LEN);
- 			return rc;
++			       ETHER_ADDR_LEN);
+ 			break;
 +		}
- 
- 		memcpy(bp->mac_addr, addr, RTE_ETHER_ADDR_LEN);
- 		PMD_DRV_LOG(DEBUG, "Set MAC addr\n");
+ 		filter->mac_index = 0;
+ 		RTE_LOG(DEBUG, PMD, "Set MAC addr\n");
+ 	}
 -- 
 2.20.1