| Message ID | 20240227075151.793496-4-ericwouds@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | rtl8221b/8251b add C45 instances and SerDes switching | expand |
On Tue, Feb 27, 2024 at 08:51:48AM +0100, Eric Woudstra wrote: > The value of the register to determine the speed, is retrieved > differently when using Clause 45 only. > > To use the rtlgen_get_speed() function in this case, pass the value of the > register as argument to rtlgen_get_speed(). Nit: I'd suggest something like rtlgen_decode_speed() as it's decoding the register value to a speed. > The function would then always return 0, so change it to void. > > Signed-off-by: Eric Woudstra <ericwouds@gmail.com> Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> Thanks!
diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c index 75c4f3e14371..e7c42ec18971 100644 --- a/drivers/net/phy/realtek.c +++ b/drivers/net/phy/realtek.c @@ -541,16 +541,10 @@ static int rtl8366rb_config_init(struct phy_device *phydev) } /* get actual speed to cover the downshift case */ -static int rtlgen_get_speed(struct phy_device *phydev) +static void rtlgen_get_speed(struct phy_device *phydev, int val) { - int val; - if (!phydev->link) - return 0; - - val = phy_read_paged(phydev, 0xa43, 0x12); - if (val < 0) - return val; + return; switch (val & RTLGEN_SPEED_MASK) { case 0x0000: @@ -574,19 +568,23 @@ static int rtlgen_get_speed(struct phy_device *phydev) default: break; } - - return 0; } static int rtlgen_read_status(struct phy_device *phydev) { - int ret; + int ret, val; ret = genphy_read_status(phydev); if (ret < 0) return ret; - return rtlgen_get_speed(phydev); + val = phy_read_paged(phydev, 0xa43, 0x12); + if (val < 0) + return val; + + rtlgen_get_speed(phydev, val); + + return 0; } static int rtlgen_read_mmd(struct phy_device *phydev, int devnum, u16 regnum)
The value of the register to determine the speed, is retrieved differently when using Clause 45 only. To use the rtlgen_get_speed() function in this case, pass the value of the register as argument to rtlgen_get_speed(). The function would then always return 0, so change it to void. Signed-off-by: Eric Woudstra <ericwouds@gmail.com> --- drivers/net/phy/realtek.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-)