| Message ID | 20230508231749.1681169-1-f.fainelli@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 582dbb2cc1a0a7427840f5b1e3c65608e511b061 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] net: phy: bcm7xx: Correct read from expansion register | expand |
On Mon, May 08, 2023 at 04:17:49PM -0700, Florian Fainelli wrote: > Since the driver works in the "legacy" addressing mode, we need to write > to the expansion register (0x17) with bits 11:8 set to 0xf to properly > select the expansion register passed as argument. > > Fixes: f68d08c437f9 ("net: phy: bcm7xxx: Add EPHY entry for 72165") > Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Reviewed-by: Simon Horman <simon.horman@corigine.com>
Hello: This patch was applied to netdev/net.git (main) by Jakub Kicinski <kuba@kernel.org>: On Mon, 8 May 2023 16:17:49 -0700 you wrote: > Since the driver works in the "legacy" addressing mode, we need to write > to the expansion register (0x17) with bits 11:8 set to 0xf to properly > select the expansion register passed as argument. > > Fixes: f68d08c437f9 ("net: phy: bcm7xxx: Add EPHY entry for 72165") > Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> > > [...] Here is the summary with links: - [net] net: phy: bcm7xx: Correct read from expansion register https://git.kernel.org/netdev/net/c/582dbb2cc1a0 You are awesome, thank you!
diff --git a/drivers/net/phy/bcm-phy-lib.h b/drivers/net/phy/bcm-phy-lib.h index 9902fb182099..729db441797a 100644 --- a/drivers/net/phy/bcm-phy-lib.h +++ b/drivers/net/phy/bcm-phy-lib.h @@ -40,6 +40,11 @@ static inline int bcm_phy_write_exp_sel(struct phy_device *phydev, return bcm_phy_write_exp(phydev, reg | MII_BCM54XX_EXP_SEL_ER, val); } +static inline int bcm_phy_read_exp_sel(struct phy_device *phydev, u16 reg) +{ + return bcm_phy_read_exp(phydev, reg | MII_BCM54XX_EXP_SEL_ER); +} + int bcm54xx_auxctl_write(struct phy_device *phydev, u16 regnum, u16 val); int bcm54xx_auxctl_read(struct phy_device *phydev, u16 regnum); diff --git a/drivers/net/phy/bcm7xxx.c b/drivers/net/phy/bcm7xxx.c index 06be71ecd2f8..f8c17a253f8b 100644 --- a/drivers/net/phy/bcm7xxx.c +++ b/drivers/net/phy/bcm7xxx.c @@ -486,7 +486,7 @@ static int bcm7xxx_16nm_ephy_afe_config(struct phy_device *phydev) bcm_phy_write_misc(phydev, 0x0038, 0x0002, 0xede0); /* Read CORE_EXPA9 */ - tmp = bcm_phy_read_exp(phydev, 0x00a9); + tmp = bcm_phy_read_exp_sel(phydev, 0x00a9); /* CORE_EXPA9[6:1] is rcalcode[5:0] */ rcalcode = (tmp & 0x7e) / 2; /* Correct RCAL code + 1 is -1% rprogr, LP: +16 */
Since the driver works in the "legacy" addressing mode, we need to write to the expansion register (0x17) with bits 11:8 set to 0xf to properly select the expansion register passed as argument. Fixes: f68d08c437f9 ("net: phy: bcm7xxx: Add EPHY entry for 72165") Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> --- drivers/net/phy/bcm-phy-lib.h | 5 +++++ drivers/net/phy/bcm7xxx.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)