[dpdk-stable] patch 'net/nfp: fix live MAC changes not supported' has been queued to LTS release 16.11.9

[Luca Boccassi]

Hi,

FYI, your patch has been queued to LTS release 16.11.9

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

Luca Boccassi

---
>From a29020aaa6e5ebcaab9398ea2397f59316190538 Mon Sep 17 00:00:00 2001
From: Alejandro Lucero <alejandro.lucero at netronome.com>
Date: Fri, 24 Aug 2018 15:25:36 +0100
Subject: [PATCH] net/nfp: fix live MAC changes not supported

[ upstream commit 7712a1c660661005225c3f7ccbca09a6296e2751 ]

Some NFP firmwares support live changes to the MAC address, but
this is not always true and the firmware advertises it accordingly.

This patch checks if firmware does not support live changes and
sets RTE_ETH_DEV_NOLIVE_MAC_ADDR in that case.

Signed-off-by: Alejandro Lucero <alejandro.lucero at netronome.com>
---
 drivers/net/nfp/nfp_net.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c
index 0f0589e061..85fd6bda05 100644
--- a/drivers/net/nfp/nfp_net.c
+++ b/drivers/net/nfp/nfp_net.c
@@ -2450,6 +2450,9 @@ nfp_net_init(struct rte_eth_dev *eth_dev)
 	ether_addr_copy((struct ether_addr *)hw->mac_addr,
 			&eth_dev->data->mac_addrs[0]);
 
+	if (!(hw->cap & NFP_NET_CFG_CTRL_LIVE_ADDR))
+		eth_dev->data->dev_flags |= RTE_ETH_DEV_NOLIVE_MAC_ADDR;
+
 	PMD_INIT_LOG(INFO, "port %d VendorID=0x%x DeviceID=0x%x "
 		     "mac=%02x:%02x:%02x:%02x:%02x:%02x",
 		     eth_dev->data->port_id, pci_dev->id.vendor_id,
-- 
2.18.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-09-25 13:26:56.827221937 +0100
+++ 0002-net-nfp-fix-live-MAC-changes-not-supported.patch	2018-09-25 13:26:56.771424700 +0100
@@ -1,26 +1,26 @@
-From 7712a1c660661005225c3f7ccbca09a6296e2751 Mon Sep 17 00:00:00 2001
+From a29020aaa6e5ebcaab9398ea2397f59316190538 Mon Sep 17 00:00:00 2001
 From: Alejandro Lucero <alejandro.lucero at netronome.com>
 Date: Fri, 24 Aug 2018 15:25:36 +0100
 Subject: [PATCH] net/nfp: fix live MAC changes not supported
 
+[ upstream commit 7712a1c660661005225c3f7ccbca09a6296e2751 ]
+
 Some NFP firmwares support live changes to the MAC address, but
 this is not always true and the firmware advertises it accordingly.
 
 This patch checks if firmware does not support live changes and
 sets RTE_ETH_DEV_NOLIVE_MAC_ADDR in that case.
 
-Cc: stable at dpdk.org
-
 Signed-off-by: Alejandro Lucero <alejandro.lucero at netronome.com>
 ---
  drivers/net/nfp/nfp_net.c | 3 +++
  1 file changed, 3 insertions(+)
 
 diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c
-index 6e5e305f1d..ee743e9753 100644
+index 0f0589e061..85fd6bda05 100644
 --- a/drivers/net/nfp/nfp_net.c
 +++ b/drivers/net/nfp/nfp_net.c
-@@ -2886,6 +2886,9 @@ nfp_net_init(struct rte_eth_dev *eth_dev)
+@@ -2450,6 +2450,9 @@ nfp_net_init(struct rte_eth_dev *eth_dev)
  	ether_addr_copy((struct ether_addr *)hw->mac_addr,
  			&eth_dev->data->mac_addrs[0]);