patch 'net/igc: remove unnecessary PHY ID checks' has been queued to stable release 20.11.7

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 20.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 11/05/22. 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

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/05e2b4507c90f452a03d20d022ebfb0750acea9a

Thanks.

Luca Boccassi

---
>From 05e2b4507c90f452a03d20d022ebfb0750acea9a Mon Sep 17 00:00:00 2001
From: Mah Yock Gen <yock.gen.mah at intel.com>
Date: Fri, 2 Sep 2022 08:18:28 +0800
Subject: [PATCH] net/igc: remove unnecessary PHY ID checks

[ upstream commit 4841015ffbe59b59e790559a04fc76ae8569e6f4 ]

I225 devices have only one PHY vendor. There is unnecessary to check
_I_PHY_ID during the link establishment and auto-negotiation process,
the checking also caused devices like i225-IT failed. This patch is to
remove the mentioned unnecessary checking.

Signed-off-by: Mah Yock Gen <yock.gen.mah at intel.com>
Signed-off-by: Taripin Samuel <samuel.taripin at intel.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/igc/base/igc_i225.c | 14 ++------------
 drivers/net/igc/base/igc_phy.c  |  6 ++----
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/drivers/net/igc/base/igc_i225.c b/drivers/net/igc/base/igc_i225.c
index 060b2f8f93..180d3cf687 100644
--- a/drivers/net/igc/base/igc_i225.c
+++ b/drivers/net/igc/base/igc_i225.c
@@ -173,18 +173,8 @@ static s32 igc_init_phy_params_i225(struct igc_hw *hw)
 	phy->ops.write_reg = igc_write_phy_reg_gpy;
 
 	ret_val = igc_get_phy_id(hw);
-	/* Verify phy id and set remaining function pointers */
-	switch (phy->id) {
-	case I225_I_PHY_ID:
-		phy->type		= igc_phy_i225;
-		phy->ops.set_d0_lplu_state = igc_set_d0_lplu_state_i225;
-		phy->ops.set_d3_lplu_state = igc_set_d3_lplu_state_i225;
-		/* TODO - complete with GPY PHY information */
-		break;
-	default:
-		ret_val = -IGC_ERR_PHY;
-		goto out;
-	}
+	phy->type = igc_phy_i225;
+
 
 out:
 	return ret_val;
diff --git a/drivers/net/igc/base/igc_phy.c b/drivers/net/igc/base/igc_phy.c
index 43bbe69bca..2906bae21a 100644
--- a/drivers/net/igc/base/igc_phy.c
+++ b/drivers/net/igc/base/igc_phy.c
@@ -1474,8 +1474,7 @@ s32 igc_phy_setup_autoneg(struct igc_hw *hw)
 			return ret_val;
 	}
 
-	if ((phy->autoneg_mask & ADVERTISE_2500_FULL) &&
-	    hw->phy.id == I225_I_PHY_ID) {
+	if (phy->autoneg_mask & ADVERTISE_2500_FULL) {
 	/* Read the MULTI GBT AN Control Register - reg 7.32 */
 		ret_val = phy->ops.read_reg(hw, (STANDARD_AN_REG_MASK <<
 					    MMD_DEVADDR_SHIFT) |
@@ -1615,8 +1614,7 @@ s32 igc_phy_setup_autoneg(struct igc_hw *hw)
 		ret_val = phy->ops.write_reg(hw, PHY_1000T_CTRL,
 					     mii_1000t_ctrl_reg);
 
-	if ((phy->autoneg_mask & ADVERTISE_2500_FULL) &&
-	    hw->phy.id == I225_I_PHY_ID)
+	if (phy->autoneg_mask & ADVERTISE_2500_FULL)
 		ret_val = phy->ops.write_reg(hw,
 					     (STANDARD_AN_REG_MASK <<
 					     MMD_DEVADDR_SHIFT) |
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-03 09:27:27.416657721 +0000
+++ 0033-net-igc-remove-unnecessary-PHY-ID-checks.patch	2022-11-03 09:27:25.381422595 +0000
@@ -1 +1 @@
-From 4841015ffbe59b59e790559a04fc76ae8569e6f4 Mon Sep 17 00:00:00 2001
+From 05e2b4507c90f452a03d20d022ebfb0750acea9a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 4841015ffbe59b59e790559a04fc76ae8569e6f4 ]
+
@@ -11,2 +12,0 @@
-Cc: stable at dpdk.org
-
@@ -17 +17 @@
- drivers/net/igc/base/igc_i225.c | 15 ++-------------
+ drivers/net/igc/base/igc_i225.c | 14 ++------------
@@ -19 +19 @@
- 2 files changed, 4 insertions(+), 17 deletions(-)
+ 2 files changed, 4 insertions(+), 16 deletions(-)
@@ -22 +22 @@
-index 5f3d535490..180d3cf687 100644
+index 060b2f8f93..180d3cf687 100644
@@ -25 +25 @@
-@@ -173,19 +173,8 @@ static s32 igc_init_phy_params_i225(struct igc_hw *hw)
+@@ -173,18 +173,8 @@ static s32 igc_init_phy_params_i225(struct igc_hw *hw)
@@ -32 +31,0 @@
--	case I226_LM_PHY_ID: