Messages in this thread |  | | Date | Fri, 9 Jan 2026 08:32:33 +0100 | | Subject | Re: [PATCH net-next 4/5] net: phy: realtek: demystify PHYSR register location | | From | Heiner Kallweit <> |
| |
On 1/9/2026 4:03 AM, Daniel Golle wrote: > Turns out that register address RTL_VND2_PHYSR (0xa434) maps to > Clause-22 register MII_RESV2. Use that to get rid of yet another magic > number, and rename access macros accordingly. >
RTL_VND2_PHYSR is documented in the datasheet, at least for RTL8221B(I)-VB-CG. (this datasheet is publicly available, I don't have access to other datasheets) MII_RESV2 isn't documented there. Is MII_RESV2 documented in any other datasheet?
> Signed-off-by: Daniel Golle <daniel@makrotopia.org> > --- > drivers/net/phy/realtek/realtek_main.c | 24 ++++++++++++------------ > 1 file changed, 12 insertions(+), 12 deletions(-) > > diff --git a/drivers/net/phy/realtek/realtek_main.c b/drivers/net/phy/realtek/realtek_main.c > index d07d60bc1ce34..5712372c71f91 100644 > --- a/drivers/net/phy/realtek/realtek_main.c > +++ b/drivers/net/phy/realtek/realtek_main.c > @@ -178,12 +178,12 @@ > #define RTL9000A_GINMR 0x14 > #define RTL9000A_GINMR_LINK_STATUS BIT(4) > > -#define RTL_VND2_PHYSR 0xa434 > -#define RTL_VND2_PHYSR_DUPLEX BIT(3) > -#define RTL_VND2_PHYSR_SPEEDL GENMASK(5, 4) > -#define RTL_VND2_PHYSR_SPEEDH GENMASK(10, 9) > -#define RTL_VND2_PHYSR_MASTER BIT(11) > -#define RTL_VND2_PHYSR_SPEED_MASK (RTL_VND2_PHYSR_SPEEDL | RTL_VND2_PHYSR_SPEEDH) > +#define RTL_PHYSR MII_RESV2 > +#define RTL_PHYSR_DUPLEX BIT(3) > +#define RTL_PHYSR_SPEEDL GENMASK(5, 4) > +#define RTL_PHYSR_SPEEDH GENMASK(10, 9) > +#define RTL_PHYSR_MASTER BIT(11) > +#define RTL_PHYSR_SPEED_MASK (RTL_PHYSR_SPEEDL | RTL_PHYSR_SPEEDH) > > #define RTL_MDIO_PCS_EEE_ABLE 0xa5c4 > #define RTL_MDIO_AN_EEE_ADV 0xa5d0 > @@ -1102,12 +1102,12 @@ static void rtlgen_decode_physr(struct phy_device *phydev, int val) > * 0: Half Duplex > * 1: Full Duplex > */ > - if (val & RTL_VND2_PHYSR_DUPLEX) > + if (val & RTL_PHYSR_DUPLEX) > phydev->duplex = DUPLEX_FULL; > else > phydev->duplex = DUPLEX_HALF; > > - switch (val & RTL_VND2_PHYSR_SPEED_MASK) { > + switch (val & RTL_PHYSR_SPEED_MASK) { > case 0x0000: > phydev->speed = SPEED_10; > break; > @@ -1135,7 +1135,7 @@ static void rtlgen_decode_physr(struct phy_device *phydev, int val) > * 1: Master Mode > */ > if (phydev->speed >= 1000) { > - if (val & RTL_VND2_PHYSR_MASTER) > + if (val & RTL_PHYSR_MASTER) > phydev->master_slave_state = MASTER_SLAVE_STATE_MASTER; > else > phydev->master_slave_state = MASTER_SLAVE_STATE_SLAVE; > @@ -1155,8 +1155,7 @@ static int rtlgen_read_status(struct phy_device *phydev) > if (!phydev->link) > return 0; > > - val = phy_read_paged(phydev, RTL822X_VND2_TO_PAGE(RTL_VND2_PHYSR), > - RTL822X_VND2_TO_PAGE_REG(RTL_VND2_PHYSR)); > + val = phy_read(phydev, RTL_PHYSR); > if (val < 0) > return val; > > @@ -1622,7 +1621,8 @@ static int rtl822x_c45_read_status(struct phy_device *phydev) > } > > /* Read actual speed from vendor register. */ > - val = phy_read_mmd(phydev, MDIO_MMD_VEND2, RTL_VND2_PHYSR); > + val = phy_read_mmd(phydev, MDIO_MMD_VEND2, > + RTL822X_VND2_C22_REG(RTL_PHYSR)); > if (val < 0) > return val; >
|  |