patch 'net/ngbe: fix reading PHY ID' has been queued to stable release 21.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.2

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

Thanks.

Kevin

---
>From fe6c80f4a5a7a98b31aeddd75b5986735706f993 Mon Sep 17 00:00:00 2001
From: Jiawen Wu <jiawenwu at trustnetic.com>
Date: Mon, 30 May 2022 17:30:10 +0800
Subject: [PATCH] net/ngbe: fix reading PHY ID

[ upstream commit abe02c6c4c08b293ec523db0d69b36a0cb9f582c ]

Change to check low ID register to determine the valid PHY address,
for yt8521s PHY with high ID register value 0. And fix polling
register when expect value is 0, to complete MDIO read.

Fixes: 44e97550ca68 ("net/ngbe: identify and reset PHY")

Signed-off-by: Jiawen Wu <jiawenwu at trustnetic.com>
---
 drivers/net/ngbe/base/ngbe_phy.c  | 7 ++-----
 drivers/net/ngbe/base/ngbe_regs.h | 9 +++++++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/drivers/net/ngbe/base/ngbe_phy.c b/drivers/net/ngbe/base/ngbe_phy.c
index 7a0ebba98c..e2b6b05ddf 100644
--- a/drivers/net/ngbe/base/ngbe_phy.c
+++ b/drivers/net/ngbe/base/ngbe_phy.c
@@ -122,9 +122,6 @@ bool ngbe_validate_phy_addr(struct ngbe_hw *hw, u32 phy_addr)
 	bool valid = false;
 
-	if (hw->sub_device_id == NGBE_SUB_DEV_ID_EM_YT8521S_SFP)
-		return true;
-
 	hw->phy.addr = phy_addr;
-	hw->phy.read_reg(hw, NGBE_MD_PHY_ID_HIGH,
+	hw->phy.read_reg(hw, NGBE_MD_PHY_ID_LOW,
 			     NGBE_MD_DEV_PMA_PMD, &phy_id);
 
@@ -132,5 +129,5 @@ bool ngbe_validate_phy_addr(struct ngbe_hw *hw, u32 phy_addr)
 		valid = true;
 
-	DEBUGOUT("PHY ID HIGH is 0x%04X", phy_id);
+	DEBUGOUT("PHY ID LOW is 0x%04X", phy_id);
 
 	return valid;
diff --git a/drivers/net/ngbe/base/ngbe_regs.h b/drivers/net/ngbe/base/ngbe_regs.h
index 6432ad8736..640e385990 100644
--- a/drivers/net/ngbe/base/ngbe_regs.h
+++ b/drivers/net/ngbe/base/ngbe_regs.h
@@ -1423,6 +1423,11 @@ po32m(struct ngbe_hw *hw, u32 reg, u32 mask, u32 expect, u32 *actual,
 
 	do {
-		all |= rd32(hw, reg);
-		value |= mask & all;
+		if (expect != 0) {
+			all |= rd32(hw, reg);
+			value |= mask & all;
+		} else {
+			all = rd32(hw, reg);
+			value = mask & all;
+		}
 		if (value == expect)
 			break;
-- 
2.34.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-06-09 12:34:30.649380926 +0100
+++ 0037-net-ngbe-fix-reading-PHY-ID.patch	2022-06-09 12:34:29.742980635 +0100
@@ -1 +1 @@
-From abe02c6c4c08b293ec523db0d69b36a0cb9f582c Mon Sep 17 00:00:00 2001
+From fe6c80f4a5a7a98b31aeddd75b5986735706f993 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit abe02c6c4c08b293ec523db0d69b36a0cb9f582c ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index 8199696428..1025d7d3a1 100644
+index 7a0ebba98c..e2b6b05ddf 100644
@@ -23 +24 @@
-@@ -121,9 +121,6 @@ bool ngbe_validate_phy_addr(struct ngbe_hw *hw, u32 phy_addr)
+@@ -122,9 +122,6 @@ bool ngbe_validate_phy_addr(struct ngbe_hw *hw, u32 phy_addr)
@@ -34 +35 @@
-@@ -131,5 +128,5 @@ bool ngbe_validate_phy_addr(struct ngbe_hw *hw, u32 phy_addr)
+@@ -132,5 +129,5 @@ bool ngbe_validate_phy_addr(struct ngbe_hw *hw, u32 phy_addr)