mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 06:33:41 +00:00
69906789e0
Follow the advise of Russell King allows to greatly improve the driver for RealTek's 1G and 2.5G Ethernet PHYs. The results are full/half duplex as well as Gbit master/slave property being read from PHY Specific Status Register (PHYSR), and fixes regarding link-partner advertisement. Fixes: #14504 Signed-off-by: Daniel Golle <daniel@makrotopia.org>
52 lines
1.5 KiB
Diff
52 lines
1.5 KiB
Diff
From eaca24de0c0e64145c130759207da32594d2e5d1 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Golle <daniel@makrotopia.org>
|
|
Date: Tue, 8 Oct 2024 21:05:47 +0100
|
|
Subject: [PATCH 2/3] net: phy: realtek: change order of calls in C22
|
|
read_status()
|
|
|
|
Always call rtlgen_read_status() first, so genphy_read_status() which
|
|
is called by it clears bits in case auto-negotiation has not completed.
|
|
Also clear 10GBT link-partner advertisement bits in case auto-negotiation
|
|
is disabled or has not completed.
|
|
|
|
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|
---
|
|
drivers/net/phy/realtek.c | 22 +++++++++++++++-------
|
|
1 file changed, 15 insertions(+), 7 deletions(-)
|
|
|
|
--- a/drivers/net/phy/realtek.c
|
|
+++ b/drivers/net/phy/realtek.c
|
|
@@ -979,17 +979,25 @@ static void rtl822xb_update_interface(st
|
|
|
|
static int rtl822x_read_status(struct phy_device *phydev)
|
|
{
|
|
- if (phydev->autoneg == AUTONEG_ENABLE) {
|
|
- int lpadv = phy_read_paged(phydev, 0xa5d, 0x13);
|
|
+ int lpadv, ret;
|
|
|
|
- if (lpadv < 0)
|
|
- return lpadv;
|
|
+ ret = rtlgen_read_status(phydev);
|
|
+ if (ret < 0)
|
|
+ return ret;
|
|
|
|
- mii_10gbt_stat_mod_linkmode_lpa_t(phydev->lp_advertising,
|
|
- lpadv);
|
|
+ if (phydev->autoneg == AUTONEG_DISABLE ||
|
|
+ !phydev->autoneg_complete) {
|
|
+ mii_10gbt_stat_mod_linkmode_lpa_t(phydev->lp_advertising, 0);
|
|
+ return 0;
|
|
}
|
|
|
|
- return rtlgen_read_status(phydev);
|
|
+ lpadv = phy_read_paged(phydev, 0xa5d, 0x13);
|
|
+ if (lpadv < 0)
|
|
+ return lpadv;
|
|
+
|
|
+ mii_10gbt_stat_mod_linkmode_lpa_t(phydev->lp_advertising, lpadv);
|
|
+
|
|
+ return 0;
|
|
}
|
|
|
|
static int rtl822xb_read_status(struct phy_device *phydev)
|