| Message ID | 20250317035005.3064083-1-JJLIU0@nuvoton.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [v1] net: phy: broadcom: Correct BCM5221 PHY model detection failure | expand |
On Mon, Mar 17, 2025 at 11:50:05AM +0800, Jim Liu wrote: > Use "BRCM_PHY_MODEL" can be applied to the entire 5221 family of PHYs. > > Fixes: 3abbd0699b67 (net: phy: broadcom: add support for BCM5221 phy) > Signed-off-by: Jim Liu <JJLIU0@nuvoton.com> > --- > drivers/net/phy/broadcom.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c > index 22edb7e4c1a1..3529289e9d13 100644 > --- a/drivers/net/phy/broadcom.c > +++ b/drivers/net/phy/broadcom.c > @@ -859,7 +859,7 @@ static int brcm_fet_config_init(struct phy_device *phydev) > return reg; > > /* Unmask events we are interested in and mask interrupts globally. */ > - if (phydev->phy_id == PHY_ID_BCM5221) > + if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM5221) > reg = MII_BRCM_FET_IR_ENABLE | > MII_BRCM_FET_IR_MASK; > else > @@ -888,7 +888,7 @@ static int brcm_fet_config_init(struct phy_device *phydev) > return err; > } > > - if (phydev->phy_id != PHY_ID_BCM5221) { > + if (BRCM_PHY_MODEL(phydev) != PHY_ID_BCM5221) { > /* Set the LED mode */ > reg = __phy_read(phydev, MII_BRCM_FET_SHDW_AUXMODE4); > if (reg < 0) { > @@ -1009,7 +1009,7 @@ static int brcm_fet_suspend(struct phy_device *phydev) > return err; > } > > - if (phydev->phy_id == PHY_ID_BCM5221) > + if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM5221) > /* Force Low Power Mode with clock enabled */ > reg = BCM5221_SHDW_AM4_EN_CLK_LPM | BCM5221_SHDW_AM4_FORCE_LPM; > else > -- > 2.34.1 It will be nice to have wider explanation what it is fixing in commit message. Is phydev->phy_id different than phydev->driver->phy_id? Looks like masking isn't crucial as phydev->driver->phy_id is initialized by PHY_ID_BCM5221 which is already masked. Anyway, looks fine, thanks. Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
On Mon, Mar 17, 2025 at 09:47:37AM +0100, Michal Swiatkowski wrote: > It will be nice to have wider explanation what it is fixing in commit > message. Is phydev->phy_id different than phydev->driver->phy_id? Looks > like masking isn't crucial as phydev->driver->phy_id is initialized by > PHY_ID_BCM5221 which is already masked. The two are very different, and this driver just gets it totally wrong. phydev->phy_id is the ID read from the PHY. It includes the revision field. phydev->drv is one of the phy_driver entries at the bottom of the file. These contain whatever the driver author puts there, which in this case would be PHY_ID_BCM5221, and PHY_ID_BCM5221 is defined without the revision number. So doing the masking is entirely redundant if you're comparing the drv->phy_id that was initialised with a definition against the same definition. As pointed out in my review with v2, there's more problems in this driver _because_ this has not been understood. In an attempt to get rid of some of this stuff, I introduced phydev_id_compare() and phy_id_compare() helpers into core phylib code, but didn't get around to updating broadcom.c. See my comments against v2.
diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c index 22edb7e4c1a1..3529289e9d13 100644 --- a/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c @@ -859,7 +859,7 @@ static int brcm_fet_config_init(struct phy_device *phydev) return reg; /* Unmask events we are interested in and mask interrupts globally. */ - if (phydev->phy_id == PHY_ID_BCM5221) + if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM5221) reg = MII_BRCM_FET_IR_ENABLE | MII_BRCM_FET_IR_MASK; else @@ -888,7 +888,7 @@ static int brcm_fet_config_init(struct phy_device *phydev) return err; } - if (phydev->phy_id != PHY_ID_BCM5221) { + if (BRCM_PHY_MODEL(phydev) != PHY_ID_BCM5221) { /* Set the LED mode */ reg = __phy_read(phydev, MII_BRCM_FET_SHDW_AUXMODE4); if (reg < 0) { @@ -1009,7 +1009,7 @@ static int brcm_fet_suspend(struct phy_device *phydev) return err; } - if (phydev->phy_id == PHY_ID_BCM5221) + if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM5221) /* Force Low Power Mode with clock enabled */ reg = BCM5221_SHDW_AM4_EN_CLK_LPM | BCM5221_SHDW_AM4_FORCE_LPM; else
Use "BRCM_PHY_MODEL" can be applied to the entire 5221 family of PHYs. Fixes: 3abbd0699b67 (net: phy: broadcom: add support for BCM5221 phy) Signed-off-by: Jim Liu <JJLIU0@nuvoton.com> --- drivers/net/phy/broadcom.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)