[dpdk-stable] patch 'net/i40e: fix SFP X722 with FW4.16' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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/2d22b8f9dd4ed0faff26def39ac42f004d7320a7

Thanks.

Kevin Traynor

---
>From 2d22b8f9dd4ed0faff26def39ac42f004d7320a7 Mon Sep 17 00:00:00 2001
From: Xiao Zhang <xiao.zhang at intel.com>
Date: Fri, 19 Jul 2019 18:59:56 +0800
Subject: [PATCH] net/i40e: fix SFP X722 with FW4.16

[ upstream commit 9efa8d28b4daccda08ec0a2b8e45350fe089065f ]

When NVM API version is 1.7 or above adminq operation to set TPID is
set as supported. This cause using adminq instead of registers.

For SFP X722 FW4.16, reported NVM API version is 1.8, and this cause
adminq operation to set as supported but it is not supported on FW4.16

Additional check added for SFP X722 to not enable adminq operation.

Fixes: 73cd7d6dc8e1 ("net/i40e: use set switch AQ instead of register setting")

Signed-off-by: Xiao Zhang <xiao.zhang at intel.com>
Reviewed-by: Haiyue Wang <haiyue.wang at intel.com>
---
 drivers/net/i40e/i40e_ethdev.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index bef5f25a4..b1b145f32 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -1357,4 +1357,8 @@ eth_i40e_dev_init(struct rte_eth_dev *dev, void *init_params __rte_unused)
 		return -EIO;
 	}
+	/* Firmware of SFP x722 does not support adminq option */
+	if (hw->device_id == I40E_DEV_ID_SFP_X722)
+		hw->flags &= ~I40E_HW_FLAG_802_1AD_CAPABLE;
+
 	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,
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-28 14:32:33.822506476 +0100
+++ 0035-net-i40e-fix-SFP-X722-with-FW4.16.patch	2019-08-28 14:32:31.674956624 +0100
@@ -1 +1 @@
-From 9efa8d28b4daccda08ec0a2b8e45350fe089065f Mon Sep 17 00:00:00 2001
+From 2d22b8f9dd4ed0faff26def39ac42f004d7320a7 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 9efa8d28b4daccda08ec0a2b8e45350fe089065f ]
+
@@ -15 +16,0 @@
-Cc: stable at dpdk.org
@@ -24 +25 @@
-index 8c9151787..4e40b7ab5 100644
+index bef5f25a4..b1b145f32 100644
@@ -27 +28 @@
-@@ -1358,4 +1358,8 @@ eth_i40e_dev_init(struct rte_eth_dev *dev, void *init_params __rte_unused)
+@@ -1357,4 +1357,8 @@ eth_i40e_dev_init(struct rte_eth_dev *dev, void *init_params __rte_unused)