[dpdk-stable] patch 'net/i40e: fix X722 for 802.1ad frames ability' has been queued to stable release 19.11.7

[Christian Ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.7

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

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/89eedd29d0a1ddfc595ef328d1bf89517266c632

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 89eedd29d0a1ddfc595ef328d1bf89517266c632 Mon Sep 17 00:00:00 2001
From: Weifeng Li <liweifeng96 at 126.com>
Date: Sun, 10 Jan 2021 16:34:17 +0800
Subject: [PATCH] net/i40e: fix X722 for 802.1ad frames ability

[ upstream commit 591bd5e4ae8c0256614417ee5f2645edf6d0f61c ]

I40E_DEV_ID_SFP_I_X722 does not support 802.1ad frames ability,
so I40E_HW_FLAG_802_1AD_CAPABLE should not be set.
The patch also correct the comment for I40E_HW_FLAG_802_1AD_CAPABLE
configure.

Fixes: 9efa8d28b4da ("net/i40e: fix SFP X722 with FW4.16")

Signed-off-by: Weifeng Li <liweifeng96 at 126.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/i40e/i40e_ethdev.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index f58749f84b..c94dd0e1b5 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -1459,8 +1459,9 @@ eth_i40e_dev_init(struct rte_eth_dev *dev, void *init_params __rte_unused)
 		PMD_INIT_LOG(ERR, "Failed to init adminq: %d", ret);
 		return -EIO;
 	}
-	/* Firmware of SFP x722 does not support adminq option */
-	if (hw->device_id == I40E_DEV_ID_SFP_X722)
+	/* Firmware of SFP x722 does not support 802.1ad frames ability */
+	if (hw->device_id == I40E_DEV_ID_SFP_X722 ||
+		hw->device_id == I40E_DEV_ID_SFP_I_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",
-- 
2.30.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-02-04 12:04:30.213133173 +0100
+++ 0051-net-i40e-fix-X722-for-802.1ad-frames-ability.patch	2021-02-04 12:04:27.974789674 +0100
@@ -1 +1 @@
-From 591bd5e4ae8c0256614417ee5f2645edf6d0f61c Mon Sep 17 00:00:00 2001
+From 89eedd29d0a1ddfc595ef328d1bf89517266c632 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 591bd5e4ae8c0256614417ee5f2645edf6d0f61c ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index ba1abc584f..acf7a0f010 100644
+index f58749f84b..c94dd0e1b5 100644
@@ -24 +25 @@
-@@ -1550,8 +1550,9 @@ eth_i40e_dev_init(struct rte_eth_dev *dev, void *init_params __rte_unused)
+@@ -1459,8 +1459,9 @@ eth_i40e_dev_init(struct rte_eth_dev *dev, void *init_params __rte_unused)