generic: backport pending Realtek PHY patches

These patches have been accepted, so we can move them from pending to
backported.

Signed-off-by: Álvaro Fernández Rojas <[email protected]>

target/linux/generic/backport-6.6/781-20-v6.13-net-phy-realtek-clear-1000Base-T-lpa-if-link-is-down.patch

@@ -0,0 +1,52 @@
+From 34d5a86ff7bbe225fba3ad91f9b4dc85fb408e18 Mon Sep 17 00:00:00 2001
+From: Daniel Golle <[email protected]>
+Date: Wed, 15 Jan 2025 14:43:35 +0000
+Subject: [PATCH] net: phy: realtek: clear 1000Base-T lpa if link is down
+
+Only read 1000Base-T link partner advertisement if autonegotiation has
+completed and otherwise 1000Base-T link partner advertisement bits.
+
+This fixes bogus 1000Base-T link partner advertisement after link goes
+down (eg. by disconnecting the wire).
+Fixes: 5cb409b3960e ("net: phy: realtek: clear 1000Base-T link partner advertisement")
+Signed-off-by: Daniel Golle <[email protected]>
+Reviewed-by: Michal Swiatkowski <[email protected]>
+Signed-off-by: David S. Miller <[email protected]>
+---
+ drivers/net/phy/realtek.c | 19 ++++++++-----------
+ 1 file changed, 8 insertions(+), 11 deletions(-)
+
+--- a/drivers/net/phy/realtek.c
++++ b/drivers/net/phy/realtek.c
+@@ -1023,23 +1023,20 @@ static int rtl822x_c45_read_status(struc
+ {
+ 	int ret, val;
+ 
+-	ret = genphy_c45_read_status(phydev);
+-	if (ret < 0)
+-		return ret;
+-
+-	if (phydev->autoneg == AUTONEG_DISABLE ||
+-	    !genphy_c45_aneg_done(phydev))
+-		mii_stat1000_mod_linkmode_lpa_t(phydev->lp_advertising, 0);
+-
+ 	/* Vendor register as C45 has no standardized support for 1000BaseT */
+-	if (phydev->autoneg == AUTONEG_ENABLE) {
++	if (phydev->autoneg == AUTONEG_ENABLE && genphy_c45_aneg_done(phydev)) {
+ 		val = phy_read_mmd(phydev, MDIO_MMD_VEND2,
+ 				   RTL822X_VND2_GANLPAR);
+ 		if (val < 0)
+ 			return val;
+-
+-		mii_stat1000_mod_linkmode_lpa_t(phydev->lp_advertising, val);
++	} else {
++		val = 0;
+ 	}
++	mii_stat1000_mod_linkmode_lpa_t(phydev->lp_advertising, val);
++
++	ret = genphy_c45_read_status(phydev);
++	if (ret < 0)
++		return ret;
+ 
+ 	if (!phydev->link)
+ 		return 0;

target/linux/generic/backport-6.6/781-21-v6.13-net-phy-realtek-clear-master_slave_state-if-link-is-.patch

@@ -0,0 +1,35 @@
+From ea8318cb33e593bbfc59d637eae45a69732c5387 Mon Sep 17 00:00:00 2001
+From: Daniel Golle <[email protected]>
+Date: Wed, 15 Jan 2025 14:43:43 +0000
+Subject: [PATCH] net: phy: realtek: clear master_slave_state if link is down
+
+rtlgen_decode_physr() which sets master_slave_state isn't called in case
+the link is down and other than rtlgen_read_status(),
+rtl822x_c45_read_status() doesn't implicitely clear master_slave_state.
+
+Avoid stale master_slave_state by always setting it to
+MASTER_SLAVE_STATE_UNKNOWN in rtl822x_c45_read_status() in case the link
+is down.
+
+Fixes: 081c9c0265c9 ("net: phy: realtek: read duplex and gbit master from PHYSR register")
+Signed-off-by: Daniel Golle <[email protected]>
+Reviewed-by: Michal Swiatkowski <[email protected]>
+Signed-off-by: David S. Miller <[email protected]>
+---
+ drivers/net/phy/realtek.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/drivers/net/phy/realtek.c
++++ b/drivers/net/phy/realtek.c
+@@ -1038,8 +1038,10 @@ static int rtl822x_c45_read_status(struc
+ 	if (ret < 0)
+ 		return ret;
+ 
+-	if (!phydev->link)
++	if (!phydev->link) {
++		phydev->master_slave_state = MASTER_SLAVE_STATE_UNKNOWN;
+ 		return 0;
++	}
+ 
+ 	/* Read actual speed from vendor register. */
+ 	val = phy_read_mmd(phydev, MDIO_MMD_VEND2, RTL_VND2_PHYSR);

target/linux/generic/backport-6.6/781-22-v6.13-net-phy-realtek-always-clear-NBase-T-lpa.patch

@@ -0,0 +1,42 @@
+From d3eb58549842c60ed46f37da7f4da969e3d6ecd3 Mon Sep 17 00:00:00 2001
+From: Daniel Golle <[email protected]>
+Date: Wed, 15 Jan 2025 14:45:00 +0000
+Subject: [PATCH] net: phy: realtek: always clear NBase-T lpa
+
+Clear NBase-T link partner advertisement before calling
+rtlgen_read_status() to avoid phy_resolve_aneg_linkmode() wrongly
+setting speed and duplex.
+
+This fixes bogus 2.5G/5G/10G link partner advertisement and thus
+speed and duplex being set by phy_resolve_aneg_linkmode() due to stale
+NBase-T lpa.
+
+Fixes: 68d5cd09e891 ("net: phy: realtek: change order of calls in C22 read_status()")
+Signed-off-by: Daniel Golle <[email protected]>
+Reviewed-by: Michal Swiatkowski <[email protected]>
+Signed-off-by: David S. Miller <[email protected]>
+---
+ drivers/net/phy/realtek.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/drivers/net/phy/realtek.c
++++ b/drivers/net/phy/realtek.c
+@@ -952,15 +952,15 @@ static int rtl822x_read_status(struct ph
+ {
+ 	int lpadv, ret;
+ 
++	mii_10gbt_stat_mod_linkmode_lpa_t(phydev->lp_advertising, 0);
++
+ 	ret = rtlgen_read_status(phydev);
+ 	if (ret < 0)
+ 		return ret;
+ 
+ 	if (phydev->autoneg == AUTONEG_DISABLE ||
+-	    !phydev->autoneg_complete) {
+-		mii_10gbt_stat_mod_linkmode_lpa_t(phydev->lp_advertising, 0);
++	    !phydev->autoneg_complete)
+ 		return 0;
+-	}
+ 
+ 	lpadv = phy_read_paged(phydev, 0xa5d, 0x13);
+ 	if (lpadv < 0)

target/linux/generic/backport-6.6/781-21-v6.14-net-phy-move-realtek-PHY-driver-to-its-own-subdirect.patch → target/linux/generic/backport-6.6/781-24-v6.14-net-phy-move-realtek-PHY-driver-to-its-own-subdirect.patch

@@ -63,7 +63,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
 +obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
 --- a/drivers/net/phy/realtek.c
 +++ /dev/null
-@@ -1,1590 +0,0 @@
+@@ -1,1589 +0,0 @@
 -// SPDX-License-Identifier: GPL-2.0+
 -/* drivers/net/phy/realtek.c
 - *
@@ -1026,15 +1026,15 @@ Signed-off-by: Jakub Kicinski <[email protected]>
 -{
 -	int lpadv, ret;
 -
+-	mii_10gbt_stat_mod_linkmode_lpa_t(phydev->lp_advertising, 0);
+-
 -	ret = rtlgen_read_status(phydev);
 -	if (ret < 0)
 -		return ret;
 -
 -	if (phydev->autoneg == AUTONEG_DISABLE ||
--	    !phydev->autoneg_complete) {
--		mii_10gbt_stat_mod_linkmode_lpa_t(phydev->lp_advertising, 0);
+-	    !phydev->autoneg_complete)
 -		return 0;
--	}
 -
 -	lpadv = phy_read_paged(phydev, 0xa5d, 0x13);
 -	if (lpadv < 0)
@@ -1097,26 +1097,25 @@ Signed-off-by: Jakub Kicinski <[email protected]>
 -{
 -	int ret, val;
 -
--	ret = genphy_c45_read_status(phydev);
--	if (ret < 0)
--		return ret;
--
--	if (phydev->autoneg == AUTONEG_DISABLE ||
--	    !genphy_c45_aneg_done(phydev))
--		mii_stat1000_mod_linkmode_lpa_t(phydev->lp_advertising, 0);
--
 -	/* Vendor register as C45 has no standardized support for 1000BaseT */
--	if (phydev->autoneg == AUTONEG_ENABLE) {
+-	if (phydev->autoneg == AUTONEG_ENABLE && genphy_c45_aneg_done(phydev)) {
 -		val = phy_read_mmd(phydev, MDIO_MMD_VEND2,
 -				   RTL822X_VND2_GANLPAR);
 -		if (val < 0)
 -			return val;
--
--		mii_stat1000_mod_linkmode_lpa_t(phydev->lp_advertising, val);
+-	} else {
+-		val = 0;
 -	}
+-	mii_stat1000_mod_linkmode_lpa_t(phydev->lp_advertising, val);
 -
--	if (!phydev->link)
+-	ret = genphy_c45_read_status(phydev);
+-	if (ret < 0)
+-		return ret;
+-
+-	if (!phydev->link) {
+-		phydev->master_slave_state = MASTER_SLAVE_STATE_UNKNOWN;
 -		return 0;
+-	}
 -
 -	/* Read actual speed from vendor register. */
 -	val = phy_read_mmd(phydev, MDIO_MMD_VEND2, RTL_VND2_PHYSR);
@@ -1656,7 +1655,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
 -MODULE_DEVICE_TABLE(mdio, realtek_tbl);
 --- /dev/null
 +++ b/drivers/net/phy/realtek/realtek_main.c
-@@ -0,0 +1,1590 @@
+@@ -0,0 +1,1589 @@
 +// SPDX-License-Identifier: GPL-2.0+
 +/* drivers/net/phy/realtek.c
 + *
@@ -2619,15 +2618,15 @@ Signed-off-by: Jakub Kicinski <[email protected]>
 +{
 +	int lpadv, ret;
 +
++	mii_10gbt_stat_mod_linkmode_lpa_t(phydev->lp_advertising, 0);
++
 +	ret = rtlgen_read_status(phydev);
 +	if (ret < 0)
 +		return ret;
 +
 +	if (phydev->autoneg == AUTONEG_DISABLE ||
-+	    !phydev->autoneg_complete) {
-+		mii_10gbt_stat_mod_linkmode_lpa_t(phydev->lp_advertising, 0);
++	    !phydev->autoneg_complete)
 +		return 0;
-+	}
 +
 +	lpadv = phy_read_paged(phydev, 0xa5d, 0x13);
 +	if (lpadv < 0)
@@ -2690,26 +2689,25 @@ Signed-off-by: Jakub Kicinski <[email protected]>
 +{
 +	int ret, val;
 +
-+	ret = genphy_c45_read_status(phydev);
-+	if (ret < 0)
-+		return ret;
-+
-+	if (phydev->autoneg == AUTONEG_DISABLE ||
-+	    !genphy_c45_aneg_done(phydev))
-+		mii_stat1000_mod_linkmode_lpa_t(phydev->lp_advertising, 0);
-+
 +	/* Vendor register as C45 has no standardized support for 1000BaseT */
-+	if (phydev->autoneg == AUTONEG_ENABLE) {
++	if (phydev->autoneg == AUTONEG_ENABLE && genphy_c45_aneg_done(phydev)) {
 +		val = phy_read_mmd(phydev, MDIO_MMD_VEND2,
 +				   RTL822X_VND2_GANLPAR);
 +		if (val < 0)
 +			return val;
-+
-+		mii_stat1000_mod_linkmode_lpa_t(phydev->lp_advertising, val);
++	} else {
++		val = 0;
 +	}
++	mii_stat1000_mod_linkmode_lpa_t(phydev->lp_advertising, val);
 +
-+	if (!phydev->link)
++	ret = genphy_c45_read_status(phydev);
++	if (ret < 0)
++		return ret;
++
++	if (!phydev->link) {
++		phydev->master_slave_state = MASTER_SLAVE_STATE_UNKNOWN;
 +		return 0;
++	}
 +
 +	/* Read actual speed from vendor register. */
 +	val = phy_read_mmd(phydev, MDIO_MMD_VEND2, RTL_VND2_PHYSR);

target/linux/generic/backport-6.6/781-22-v6.14-net-phy-realtek-add-hwmon-support-for-temp-sensor-on.patch → target/linux/generic/backport-6.6/781-25-v6.14-net-phy-realtek-add-hwmon-support-for-temp-sensor-on.patch

@@ -170,7 +170,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
  static int rtl822xb_config_init(struct phy_device *phydev)
  {
  	bool has_2500, has_sgmii;
-@@ -1519,6 +1530,7 @@ static struct phy_driver realtek_drvs[]
+@@ -1518,6 +1529,7 @@ static struct phy_driver realtek_drvs[]
  		.match_phy_device = rtl_internal_nbaset_match_phy_device,
  		.name           = "Realtek Internal NBASE-T PHY",
  		.flags		= PHY_IS_INTERNAL,

target/linux/generic/pending-6.6/720-01-net-phy-realtek-use-genphy_soft_reset-for-2.5G-PHYs.patch

@@ -15,7 +15,7 @@ Signed-off-by: Daniel Golle <[email protected]>
 
 --- a/drivers/net/phy/realtek/realtek_main.c
 +++ b/drivers/net/phy/realtek/realtek_main.c
-@@ -1431,6 +1431,7 @@ static struct phy_driver realtek_drvs[]
+@@ -1430,6 +1430,7 @@ static struct phy_driver realtek_drvs[]
  	}, {
  		.name		= "RTL8226 2.5Gbps PHY",
  		.match_phy_device = rtl8226_match_phy_device,
@@ -23,7 +23,7 @@ Signed-off-by: Daniel Golle <[email protected]>
  		.get_features	= rtl822x_get_features,
  		.config_aneg	= rtl822x_config_aneg,
  		.read_status	= rtl822x_read_status,
-@@ -1441,6 +1442,7 @@ static struct phy_driver realtek_drvs[]
+@@ -1440,6 +1441,7 @@ static struct phy_driver realtek_drvs[]
  	}, {
  		.match_phy_device = rtl8221b_match_phy_device,
  		.name		= "RTL8226B_RTL8221B 2.5Gbps PHY",
@@ -31,7 +31,7 @@ Signed-off-by: Daniel Golle <[email protected]>
  		.get_features	= rtl822x_get_features,
  		.config_aneg	= rtl822x_config_aneg,
  		.config_init    = rtl822xb_config_init,
-@@ -1453,6 +1455,7 @@ static struct phy_driver realtek_drvs[]
+@@ -1452,6 +1454,7 @@ static struct phy_driver realtek_drvs[]
  	}, {
  		PHY_ID_MATCH_EXACT(0x001cc838),
  		.name           = "RTL8226-CG 2.5Gbps PHY",
@@ -39,7 +39,7 @@ Signed-off-by: Daniel Golle <[email protected]>
  		.get_features   = rtl822x_get_features,
  		.config_aneg    = rtl822x_config_aneg,
  		.read_status    = rtl822x_read_status,
-@@ -1463,6 +1466,7 @@ static struct phy_driver realtek_drvs[]
+@@ -1462,6 +1465,7 @@ static struct phy_driver realtek_drvs[]
  	}, {
  		PHY_ID_MATCH_EXACT(0x001cc848),
  		.name           = "RTL8226B-CG_RTL8221B-CG 2.5Gbps PHY",
@@ -47,7 +47,7 @@ Signed-off-by: Daniel Golle <[email protected]>
  		.get_features   = rtl822x_get_features,
  		.config_aneg    = rtl822x_config_aneg,
  		.config_init    = rtl822xb_config_init,
-@@ -1475,6 +1479,7 @@ static struct phy_driver realtek_drvs[]
+@@ -1474,6 +1478,7 @@ static struct phy_driver realtek_drvs[]
  	}, {
  		.match_phy_device = rtl8221b_vb_cg_c22_match_phy_device,
  		.name           = "RTL8221B-VB-CG 2.5Gbps PHY (C22)",
@@ -55,7 +55,7 @@ Signed-off-by: Daniel Golle <[email protected]>
  		.get_features   = rtl822x_get_features,
  		.config_aneg    = rtl822x_config_aneg,
  		.config_init    = rtl822xb_config_init,
-@@ -1487,6 +1492,7 @@ static struct phy_driver realtek_drvs[]
+@@ -1486,6 +1491,7 @@ static struct phy_driver realtek_drvs[]
  	}, {
  		.match_phy_device = rtl8221b_vb_cg_c45_match_phy_device,
  		.name           = "RTL8221B-VB-CG 2.5Gbps PHY (C45)",
@@ -63,7 +63,7 @@ Signed-off-by: Daniel Golle <[email protected]>
  		.config_init    = rtl822xb_config_init,
  		.get_rate_matching = rtl822xb_get_rate_matching,
  		.get_features   = rtl822x_c45_get_features,
-@@ -1497,6 +1503,7 @@ static struct phy_driver realtek_drvs[]
+@@ -1496,6 +1502,7 @@ static struct phy_driver realtek_drvs[]
  	}, {
  		.match_phy_device = rtl8221b_vn_cg_c22_match_phy_device,
  		.name           = "RTL8221B-VM-CG 2.5Gbps PHY (C22)",
@@ -71,7 +71,7 @@ Signed-off-by: Daniel Golle <[email protected]>
  		.get_features   = rtl822x_get_features,
  		.config_aneg    = rtl822x_config_aneg,
  		.config_init    = rtl822xb_config_init,
-@@ -1509,6 +1516,7 @@ static struct phy_driver realtek_drvs[]
+@@ -1508,6 +1515,7 @@ static struct phy_driver realtek_drvs[]
  	}, {
  		.match_phy_device = rtl8221b_vn_cg_c45_match_phy_device,
  		.name           = "RTL8221B-VN-CG 2.5Gbps PHY (C45)",

target/linux/generic/pending-6.6/720-03-net-phy-realtek-make-sure-paged-read-is-protected-by.patch

@@ -18,7 +18,7 @@ Signed-off-by: Daniel Golle <[email protected]>
 
 --- a/drivers/net/phy/realtek/realtek_main.c
 +++ b/drivers/net/phy/realtek/realtek_main.c
-@@ -1112,9 +1112,11 @@ static bool rtlgen_supports_2_5gbps(stru
+@@ -1111,9 +1111,11 @@ static bool rtlgen_supports_2_5gbps(stru
  {
  	int val;
  

target/linux/generic/pending-6.6/720-04-net-phy-realtek-introduce-rtl822x_probe.patch

@@ -24,7 +24,7 @@ Signed-off-by: Daniel Golle <[email protected]>
  #define RTL8366RB_POWER_SAVE			0x15
  #define RTL8366RB_POWER_SAVE_ON			BIT(12)
  
-@@ -1208,6 +1212,25 @@ static int rtl8251b_c45_match_phy_device
+@@ -1207,6 +1211,25 @@ static int rtl8251b_c45_match_phy_device
  	return rtlgen_is_c45_match(phydev, RTL_8251B, true);
  }
  
@@ -50,7 +50,7 @@ Signed-off-by: Daniel Golle <[email protected]>
  static int rtlgen_resume(struct phy_device *phydev)
  {
  	int ret = genphy_resume(phydev);
-@@ -1479,6 +1502,7 @@ static struct phy_driver realtek_drvs[]
+@@ -1478,6 +1501,7 @@ static struct phy_driver realtek_drvs[]
  	}, {
  		PHY_ID_MATCH_EXACT(0x001cc838),
  		.name           = "RTL8226-CG 2.5Gbps PHY",
@@ -58,7 +58,7 @@ Signed-off-by: Daniel Golle <[email protected]>
  		.soft_reset     = genphy_soft_reset,
  		.get_features   = rtl822x_get_features,
  		.config_aneg    = rtl822x_config_aneg,
-@@ -1490,6 +1514,7 @@ static struct phy_driver realtek_drvs[]
+@@ -1489,6 +1513,7 @@ static struct phy_driver realtek_drvs[]
  	}, {
  		PHY_ID_MATCH_EXACT(0x001cc848),
  		.name           = "RTL8226B-CG_RTL8221B-CG 2.5Gbps PHY",
@@ -66,7 +66,7 @@ Signed-off-by: Daniel Golle <[email protected]>
  		.soft_reset     = genphy_soft_reset,
  		.get_features   = rtl822x_get_features,
  		.config_aneg    = rtl822x_config_aneg,
-@@ -1503,6 +1528,7 @@ static struct phy_driver realtek_drvs[]
+@@ -1502,6 +1527,7 @@ static struct phy_driver realtek_drvs[]
  	}, {
  		.match_phy_device = rtl8221b_vb_cg_c22_match_phy_device,
  		.name           = "RTL8221B-VB-CG 2.5Gbps PHY (C22)",
@@ -74,7 +74,7 @@ Signed-off-by: Daniel Golle <[email protected]>
  		.soft_reset     = genphy_soft_reset,
  		.get_features   = rtl822x_get_features,
  		.config_aneg    = rtl822x_config_aneg,
-@@ -1516,6 +1542,7 @@ static struct phy_driver realtek_drvs[]
+@@ -1515,6 +1541,7 @@ static struct phy_driver realtek_drvs[]
  	}, {
  		.match_phy_device = rtl8221b_vb_cg_c45_match_phy_device,
  		.name           = "RTL8221B-VB-CG 2.5Gbps PHY (C45)",
@@ -82,7 +82,7 @@ Signed-off-by: Daniel Golle <[email protected]>
  		.soft_reset     = genphy_soft_reset,
  		.config_init    = rtl822xb_config_init,
  		.get_rate_matching = rtl822xb_get_rate_matching,
-@@ -1527,6 +1554,7 @@ static struct phy_driver realtek_drvs[]
+@@ -1526,6 +1553,7 @@ static struct phy_driver realtek_drvs[]
  	}, {
  		.match_phy_device = rtl8221b_vn_cg_c22_match_phy_device,
  		.name           = "RTL8221B-VM-CG 2.5Gbps PHY (C22)",
@@ -90,7 +90,7 @@ Signed-off-by: Daniel Golle <[email protected]>
  		.soft_reset     = genphy_soft_reset,
  		.get_features   = rtl822x_get_features,
  		.config_aneg    = rtl822x_config_aneg,
-@@ -1540,6 +1568,7 @@ static struct phy_driver realtek_drvs[]
+@@ -1539,6 +1567,7 @@ static struct phy_driver realtek_drvs[]
  	}, {
  		.match_phy_device = rtl8221b_vn_cg_c45_match_phy_device,
  		.name           = "RTL8221B-VN-CG 2.5Gbps PHY (C45)",

target/linux/generic/pending-6.6/720-05-net-phy-realtek-detect-early-version-of-RTL8221B.patch

@@ -14,7 +14,7 @@ Signed-off-by: Daniel Golle <[email protected]>
 Signed-off-by: Mieczyslaw Nalewaj <[email protected]>
 --- a/drivers/net/phy/realtek/realtek_main.c
 +++ b/drivers/net/phy/realtek/realtek_main.c
-@@ -1158,10 +1158,32 @@ static int rtl8226_match_phy_device(stru
+@@ -1157,10 +1157,32 @@ static int rtl8226_match_phy_device(stru
  static int rtlgen_is_c45_match(struct phy_device *phydev, unsigned int id,
  			       bool is_c45)
  {

target/linux/generic/pending-6.6/720-06-net-phy-realtek-support-interrupt-of-RTL8221B.patch

@@ -12,7 +12,7 @@ Signed-off-by: Jianhui Zhao <[email protected]>
 
 --- a/drivers/net/phy/realtek/realtek_main.c
 +++ b/drivers/net/phy/realtek/realtek_main.c
-@@ -1388,6 +1388,51 @@ static irqreturn_t rtl9000a_handle_inter
+@@ -1387,6 +1387,51 @@ static irqreturn_t rtl9000a_handle_inter
  	return IRQ_HANDLED;
  }
  
@@ -64,7 +64,7 @@ Signed-off-by: Jianhui Zhao <[email protected]>
  static struct phy_driver realtek_drvs[] = {
  	{
  		PHY_ID_MATCH_EXACT(0x00008201),
-@@ -1550,6 +1595,8 @@ static struct phy_driver realtek_drvs[]
+@@ -1549,6 +1594,8 @@ static struct phy_driver realtek_drvs[]
  	}, {
  		.match_phy_device = rtl8221b_vb_cg_c22_match_phy_device,
  		.name           = "RTL8221B-VB-CG 2.5Gbps PHY (C22)",
@@ -73,7 +73,7 @@ Signed-off-by: Jianhui Zhao <[email protected]>
  		.probe          = rtl822x_aldps_probe,
  		.soft_reset     = genphy_soft_reset,
  		.get_features   = rtl822x_get_features,
-@@ -1564,6 +1611,8 @@ static struct phy_driver realtek_drvs[]
+@@ -1563,6 +1610,8 @@ static struct phy_driver realtek_drvs[]
  	}, {
  		.match_phy_device = rtl8221b_vb_cg_c45_match_phy_device,
  		.name           = "RTL8221B-VB-CG 2.5Gbps PHY (C45)",
@@ -82,7 +82,7 @@ Signed-off-by: Jianhui Zhao <[email protected]>
  		.probe          = rtl822x_aldps_probe,
  		.soft_reset     = genphy_soft_reset,
  		.config_init    = rtl822xb_config_init,
-@@ -1576,6 +1625,8 @@ static struct phy_driver realtek_drvs[]
+@@ -1575,6 +1624,8 @@ static struct phy_driver realtek_drvs[]
  	}, {
  		.match_phy_device = rtl8221b_vn_cg_c22_match_phy_device,
  		.name           = "RTL8221B-VM-CG 2.5Gbps PHY (C22)",
@@ -91,7 +91,7 @@ Signed-off-by: Jianhui Zhao <[email protected]>
  		.probe          = rtl822x_aldps_probe,
  		.soft_reset     = genphy_soft_reset,
  		.get_features   = rtl822x_get_features,
-@@ -1590,6 +1641,8 @@ static struct phy_driver realtek_drvs[]
+@@ -1589,6 +1640,8 @@ static struct phy_driver realtek_drvs[]
  	}, {
  		.match_phy_device = rtl8221b_vn_cg_c45_match_phy_device,
  		.name           = "RTL8221B-VN-CG 2.5Gbps PHY (C45)",

target/linux/generic/pending-6.6/721-net-phy-realtek-clear-1000Base-T-lpa-bits-if-link-is.patch

@@ -1,78 +0,0 @@
-From patchwork Wed Jan 15 14:43:35 2025
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-X-Patchwork-Submitter: Daniel Golle <[email protected]>
-X-Patchwork-Id: 13940510
-X-Patchwork-Delegate: [email protected]
-Date: Wed, 15 Jan 2025 14:43:35 +0000
-From: Daniel Golle <[email protected]>
-To: Andrew Lunn <[email protected]>, Heiner Kallweit <[email protected]>,
-	Russell King <[email protected]>,
-	"David S. Miller" <[email protected]>,
-	Eric Dumazet <[email protected]>,
-	Jakub Kicinski <[email protected]>, Paolo Abeni <[email protected]>,
-	Daniel Golle <[email protected]>,
-	"Russell King (Oracle)" <[email protected]>,
-	[email protected], [email protected]
-Subject: [PATCH net 1/3] net: phy: realtek: clear 1000Base-T lpa if link is
- down
-Message-ID: 
- <67e38eee4c46b921938fb33f5bc86c8979b9aa33.1736951652.git.daniel@makrotopia.org>
-References: <[email protected]>
-Precedence: bulk
-X-Mailing-List: [email protected]
-List-Id: <netdev.vger.kernel.org>
-List-Subscribe: <mailto:[email protected]>
-List-Unsubscribe: <mailto:[email protected]>
-MIME-Version: 1.0
-Content-Disposition: inline
-In-Reply-To: <[email protected]>
-X-Patchwork-Delegate: [email protected]
-
-Only read 1000Base-T link partner advertisement if autonegotiation has
-completed and otherwise 1000Base-T link partner advertisement bits.
-
-This fixes bogus 1000Base-T link partner advertisement after link goes
-down (eg. by disconnecting the wire).
-Fixes: 5cb409b3960e ("net: phy: realtek: clear 1000Base-T link partner advertisement")
-Signed-off-by: Daniel Golle <[email protected]>
-Reviewed-by: Michal Swiatkowski <[email protected]>
----
- drivers/net/phy/realtek/realtek_main.c | 19 ++++++++-----------
- 1 file changed, 8 insertions(+), 11 deletions(-)
-
---- a/drivers/net/phy/realtek/realtek_main.c
-+++ b/drivers/net/phy/realtek/realtek_main.c
-@@ -1068,23 +1068,20 @@ static int rtl822x_c45_read_status(struc
- {
- 	int ret, val;
- 
--	ret = genphy_c45_read_status(phydev);
--	if (ret < 0)
--		return ret;
--
--	if (phydev->autoneg == AUTONEG_DISABLE ||
--	    !genphy_c45_aneg_done(phydev))
--		mii_stat1000_mod_linkmode_lpa_t(phydev->lp_advertising, 0);
--
- 	/* Vendor register as C45 has no standardized support for 1000BaseT */
--	if (phydev->autoneg == AUTONEG_ENABLE) {
-+	if (phydev->autoneg == AUTONEG_ENABLE && genphy_c45_aneg_done(phydev)) {
- 		val = phy_read_mmd(phydev, MDIO_MMD_VEND2,
- 				   RTL822X_VND2_GANLPAR);
- 		if (val < 0)
- 			return val;
--
--		mii_stat1000_mod_linkmode_lpa_t(phydev->lp_advertising, val);
-+	} else {
-+		val = 0;
- 	}
-+	mii_stat1000_mod_linkmode_lpa_t(phydev->lp_advertising, val);
-+
-+	ret = genphy_c45_read_status(phydev);
-+	if (ret < 0)
-+		return ret;
- 
- 	if (!phydev->link)
- 		return 0;

target/linux/generic/pending-6.6/722-net-phy-realtek-clear-master_slave_state-if-link-is-.patch

@@ -1,61 +0,0 @@
-From patchwork Wed Jan 15 14:43:43 2025
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-X-Patchwork-Submitter: Daniel Golle <[email protected]>
-X-Patchwork-Id: 13940511
-X-Patchwork-Delegate: [email protected]
-Date: Wed, 15 Jan 2025 14:43:43 +0000
-From: Daniel Golle <[email protected]>
-To: Andrew Lunn <[email protected]>, Heiner Kallweit <[email protected]>,
-	Russell King <[email protected]>,
-	"David S. Miller" <[email protected]>,
-	Eric Dumazet <[email protected]>,
-	Jakub Kicinski <[email protected]>, Paolo Abeni <[email protected]>,
-	Daniel Golle <[email protected]>,
-	"Russell King (Oracle)" <[email protected]>,
-	[email protected], [email protected]
-Subject: [PATCH net 2/3] net: phy: realtek: clear master_slave_state if link
- is down
-Message-ID: 
- <2155887c3a665e4132a034df1e9cfdeec0ae48c9.1736951652.git.daniel@makrotopia.org>
-References: <[email protected]>
-Precedence: bulk
-X-Mailing-List: [email protected]
-List-Id: <netdev.vger.kernel.org>
-List-Subscribe: <mailto:[email protected]>
-List-Unsubscribe: <mailto:[email protected]>
-MIME-Version: 1.0
-Content-Disposition: inline
-In-Reply-To: <[email protected]>
-X-Patchwork-Delegate: [email protected]
-
-rtlgen_decode_physr() which sets master_slave_state isn't called in case
-the link is down and other than rtlgen_read_status(),
-rtl822x_c45_read_status() doesn't implicitely clear master_slave_state.
-
-Avoid stale master_slave_state by always setting it to
-MASTER_SLAVE_STATE_UNKNOWN in rtl822x_c45_read_status() in case the link
-is down.
-
-Fixes: 081c9c0265c9 ("net: phy: realtek: read duplex and gbit master from PHYSR register")
-Signed-off-by: Daniel Golle <[email protected]>
-Reviewed-by: Michal Swiatkowski <[email protected]>
----
- drivers/net/phy/realtek/realtek_main.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
---- a/drivers/net/phy/realtek/realtek_main.c
-+++ b/drivers/net/phy/realtek/realtek_main.c
-@@ -1083,8 +1083,10 @@ static int rtl822x_c45_read_status(struc
- 	if (ret < 0)
- 		return ret;
- 
--	if (!phydev->link)
-+	if (!phydev->link) {
-+		phydev->master_slave_state = MASTER_SLAVE_STATE_UNKNOWN;
- 		return 0;
-+	}
- 
- 	/* Read actual speed from vendor register. */
- 	val = phy_read_mmd(phydev, MDIO_MMD_VEND2, RTL_VND2_PHYSR);

target/linux/generic/pending-6.6/723-net-phy-realtek-always-clear-10gbase-t-link-partner-.patch

@@ -1,67 +0,0 @@
-From patchwork Wed Jan 15 14:45:00 2025
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-X-Patchwork-Submitter: Daniel Golle <[email protected]>
-X-Patchwork-Id: 13940519
-X-Patchwork-Delegate: [email protected]
-Date: Wed, 15 Jan 2025 14:45:00 +0000
-From: Daniel Golle <[email protected]>
-To: Andrew Lunn <[email protected]>, Heiner Kallweit <[email protected]>,
-	Russell King <[email protected]>,
-	"David S. Miller" <[email protected]>,
-	Eric Dumazet <[email protected]>,
-	Jakub Kicinski <[email protected]>, Paolo Abeni <[email protected]>,
-	Daniel Golle <[email protected]>,
-	"Russell King (Oracle)" <[email protected]>,
-	[email protected], [email protected]
-Subject: [PATCH net 3/3] net: phy: realtek: always clear NBase-T lpa
-Message-ID: 
- <566d4771d68a1e18d2d48860e25891e468e26551.1736951652.git.daniel@makrotopia.org>
-References: <[email protected]>
-Precedence: bulk
-X-Mailing-List: [email protected]
-List-Id: <netdev.vger.kernel.org>
-List-Subscribe: <mailto:[email protected]>
-List-Unsubscribe: <mailto:[email protected]>
-MIME-Version: 1.0
-Content-Disposition: inline
-In-Reply-To: <[email protected]>
-X-Patchwork-Delegate: [email protected]
-
-Clear NBase-T link partner advertisement before calling
-rtlgen_read_status() to avoid phy_resolve_aneg_linkmode() wrongly
-setting speed and duplex.
-
-This fixes bogus 2.5G/5G/10G link partner advertisement and thus
-speed and duplex being set by phy_resolve_aneg_linkmode() due to stale
-NBase-T lpa.
-
-Fixes: 68d5cd09e891 ("net: phy: realtek: change order of calls in C22 read_status()")
-Signed-off-by: Daniel Golle <[email protected]>
-Reviewed-by: Michal Swiatkowski <[email protected]>
----
- drivers/net/phy/realtek/realtek_main.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/drivers/net/phy/realtek/realtek_main.c
-+++ b/drivers/net/phy/realtek/realtek_main.c
-@@ -997,15 +997,15 @@ static int rtl822x_read_status(struct ph
- {
- 	int lpadv, ret;
- 
-+	mii_10gbt_stat_mod_linkmode_lpa_t(phydev->lp_advertising, 0);
-+
- 	ret = rtlgen_read_status(phydev);
- 	if (ret < 0)
- 		return ret;
- 
- 	if (phydev->autoneg == AUTONEG_DISABLE ||
--	    !phydev->autoneg_complete) {
--		mii_10gbt_stat_mod_linkmode_lpa_t(phydev->lp_advertising, 0);
-+	    !phydev->autoneg_complete)
- 		return 0;
--	}
- 
- 	lpadv = phy_read_paged(phydev, 0xa5d, 0x13);
- 	if (lpadv < 0)