[dpdk-stable] patch 'net/i40e: support 25G AOC/ACC cables' has been queued to stable release 20.11.4

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 20.11.4

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/12/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/steevenlee/dpdk

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/cd9f079d8799f40cf1739045bc7ff5429981cc09

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From cd9f079d8799f40cf1739045bc7ff5429981cc09 Mon Sep 17 00:00:00 2001
From: Yury Kylulin <yury.kylulin at intel.com>
Date: Mon, 6 Sep 2021 10:17:44 +0200
Subject: [PATCH] net/i40e: support 25G AOC/ACC cables
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit b1daa3461429e7674206a714c17adca65e9b44b4 ]

Enable additional PHY types (25G-AOC and 25G-ACC) for set PHY config
command.

Ubuntu bug: https://bugs.launchpad.net/ubuntu/+source/dpdk/+bug/1940957

Signed-off-by: Yury Kylulin <yury.kylulin at intel.com>
Tested-by: Ashish Paul <apaul at juniper.net>
Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>
Acked-by: Luca Boccassi <luca.boccassi at microsoft.com>
---
 drivers/net/i40e/i40e_ethdev.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 0dc20de9a0..5e3b80a6b8 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -2372,7 +2372,8 @@ i40e_phy_conf_link(struct i40e_hw *hw,
 	phy_conf.phy_type = is_up ? cpu_to_le32(phy_type_mask) : 0;
 	phy_conf.phy_type_ext = is_up ? (I40E_AQ_PHY_TYPE_EXT_25G_KR |
 		I40E_AQ_PHY_TYPE_EXT_25G_CR | I40E_AQ_PHY_TYPE_EXT_25G_SR |
-		I40E_AQ_PHY_TYPE_EXT_25G_LR) : 0;
+		I40E_AQ_PHY_TYPE_EXT_25G_LR | I40E_AQ_PHY_TYPE_EXT_25G_AOC |
+		I40E_AQ_PHY_TYPE_EXT_25G_ACC) : 0;
 	phy_conf.fec_config = phy_ab.fec_cfg_curr_mod_ext_info;
 	phy_conf.eee_capability = phy_ab.eee_capability;
 	phy_conf.eeer = phy_ab.eeer_val;
-- 
2.33.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-10 14:17:02.172063822 +0800
+++ 0001-net-i40e-support-25G-AOC-ACC-cables.patch	2021-11-10 14:17:01.730747236 +0800
@@ -1 +1 @@
-From b1daa3461429e7674206a714c17adca65e9b44b4 Mon Sep 17 00:00:00 2001
+From cd9f079d8799f40cf1739045bc7ff5429981cc09 Mon Sep 17 00:00:00 2001
@@ -3 +3 @@
-Date: Tue, 13 Apr 2021 18:29:50 +0300
+Date: Mon, 6 Sep 2021 10:17:44 +0200
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit b1daa3461429e7674206a714c17adca65e9b44b4 ]
@@ -8,0 +12,2 @@
+Ubuntu bug: https://bugs.launchpad.net/ubuntu/+source/dpdk/+bug/1940957
+
@@ -10,0 +16,2 @@
+Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>
+Acked-by: Luca Boccassi <luca.boccassi at microsoft.com>
@@ -16 +23 @@
-index ea5d384283..e6206a7e51 100644
+index 0dc20de9a0..5e3b80a6b8 100644
@@ -19 +26 @@
-@@ -2307,7 +2307,8 @@ i40e_phy_conf_link(struct i40e_hw *hw,
+@@ -2372,7 +2372,8 @@ i40e_phy_conf_link(struct i40e_hw *hw,