patch 'net/i40e: support 25G AOC/ACC cables' has been queued to stable release 19.11.11

[christian.ehrhardt at canonical.com]

Hi,

FYI, your patch has been queued to stable release 19.11.11

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

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From f81d60e607bb8c13fcb13450e85d74721f1d9c8f Mon Sep 17 00:00:00 2001
From: Yury Kylulin <yury.kylulin at intel.com>
Date: Tue, 13 Apr 2021 18:29:50 +0300
Subject: [PATCH] net/i40e: support 25G AOC/ACC cables

[ 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
Cc: stable at dpdk.org

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>
---
 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 508f90595f..0c896ea915 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -2264,7 +2264,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.34.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-30 16:50:06.280423439 +0100
+++ 0001-net-i40e-support-25G-AOC-ACC-cables.patch	2021-11-30 16:50:05.482871270 +0100
@@ -1 +1 @@
-From b1daa3461429e7674206a714c17adca65e9b44b4 Mon Sep 17 00:00:00 2001
+From f81d60e607bb8c13fcb13450e85d74721f1d9c8f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b1daa3461429e7674206a714c17adca65e9b44b4 ]
+
@@ -8,0 +11,3 @@
+Ubuntu bug: https://bugs.launchpad.net/ubuntu/+source/dpdk/+bug/1940957
+Cc: stable at dpdk.org
+
@@ -10,0 +16 @@
+Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>
@@ -16 +22 @@
-index ea5d384283..e6206a7e51 100644
+index 508f90595f..0c896ea915 100644
@@ -19 +25 @@
-@@ -2307,7 +2307,8 @@ i40e_phy_conf_link(struct i40e_hw *hw,
+@@ -2264,7 +2264,8 @@ i40e_phy_conf_link(struct i40e_hw *hw,