Re: [PATCH net-next v2 3/4] net: phy: bcm54140: apply the workaround on b0 chips

[David Miller]

From: Michael Walle 
Date: Wed, 29 Apr 2020 01:06:58 +0200

> The lower three bits of the phy_id specifies the chip stepping. The
> workaround is specifically for the B0 stepping. Apply it only on these
> chips.
> 
> Signed-off-by: Michael Walle 
> Reviewed-by: Andrew Lunn 
> Reviewed-by: Florian Fainelli 

Applied.

[PATCH net-next v2 3/4] net: phy: bcm54140: apply the workaround on b0 chips

[Michael Walle]

The lower three bits of the phy_id specifies the chip stepping. The
workaround is specifically for the B0 stepping. Apply it only on these
chips.

Signed-off-by: Michael Walle 
Reviewed-by: Andrew Lunn 
Reviewed-by: Florian Fainelli 
---
changes since v1:
 - added reviewed-by tags

 drivers/net/phy/bcm54140.c | 11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/drivers/net/phy/bcm54140.c b/drivers/net/phy/bcm54140.c
index edafc9dc2f63..d73cbddbc69b 100644
--- a/drivers/net/phy/bcm54140.c
+++ b/drivers/net/phy/bcm54140.c
@@ -115,6 +115,9 @@
 #define BCM54140_HWMON_IN_ALARM_BIT(ch) ((ch) ? BCM54140_RDB_MON_ISR_3V3 \
  : BCM54140_RDB_MON_ISR_1V0)
 
+#define BCM54140_PHY_ID_REV(phy_id)((phy_id) & 0x7)
+#define BCM54140_REV_B01
+
 #define BCM54140_DEFAULT_DOWNSHIFT 5
 #define BCM54140_MAX_DOWNSHIFT 9
 
@@ -632,9 +635,11 @@ static int bcm54140_config_init(struct phy_device *phydev)
int ret;
 
/* Apply hardware errata */
-   ret = bcm54140_b0_workaround(phydev);
-   if (ret)
-   return ret;
+   if (BCM54140_PHY_ID_REV(phydev->phy_id) == BCM54140_REV_B0) {
+   ret = bcm54140_b0_workaround(phydev);
+   if (ret)
+   return ret;
+   }
 
/* Unmask events we are interested in. */
reg &= ~(BCM54140_RDB_INT_DUPLEX |
-- 
2.20.1