[openwrt/openwrt] realtek: 6.12: enhance mdio max port patch (once again)

LEDE Commits lede-commits at lists.infradead.org
Wed Jun 11 13:27:50 PDT 2025


robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/debb69ccb5cf5a0c677d27187af20ce7bcce2c18

commit debb69ccb5cf5a0c677d27187af20ce7bcce2c18
Author: Markus Stockhausen <markus.stockhausen at gmx.de>
AuthorDate: Tue Jun 3 10:35:29 2025 -0400

    realtek: 6.12: enhance mdio max port patch (once again)
    
    Some bits where missed during the last enhancement of the mdio
    patch. In the forthcoming patches the phy_mask will be populated
    to avoid unwanted ports (>= cpu port) from being scanned. Add
    additional locations where 32 bit values need to be converted
    to 64 bits.
    
    Signed-off-by: Markus Stockhausen <markus.stockhausen at gmx.de>
    Link: https://github.com/openwrt/openwrt/pull/18935
    Signed-off-by: Robert Marko <robimarko at gmail.com>
---
 ...mdio-increase-max-ports-for-rtl839x-rtl931x.patch | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/target/linux/realtek/patches-6.12/700-dsa-mdio-increase-max-ports-for-rtl839x-rtl931x.patch b/target/linux/realtek/patches-6.12/700-dsa-mdio-increase-max-ports-for-rtl839x-rtl931x.patch
index 3db46a2285..1485b79263 100644
--- a/target/linux/realtek/patches-6.12/700-dsa-mdio-increase-max-ports-for-rtl839x-rtl931x.patch
+++ b/target/linux/realtek/patches-6.12/700-dsa-mdio-increase-max-ports-for-rtl839x-rtl931x.patch
@@ -130,3 +130,23 @@ Signed-off-by: Markus Stockhausen <markus.stockhausen at gmx.de>
  		return ds->ops->phy_write(ds, addr, reg, val);
  
  	return 0;
+--- a/drivers/net/phy/mdio_bus.c
++++ b/drivers/net/phy/mdio_bus.c
+@@ -611,7 +611,7 @@ static int mdiobus_scan_bus_c22(struct m
+ 	int i;
+ 
+ 	for (i = 0; i < PHY_MAX_ADDR; i++) {
+-		if ((bus->phy_mask & BIT(i)) == 0) {
++		if ((bus->phy_mask & BIT_ULL(i)) == 0ULL) {
+ 			struct phy_device *phydev;
+ 
+ 			phydev = mdiobus_scan_c22(bus, i);
+@@ -627,7 +627,7 @@ static int mdiobus_scan_bus_c45(struct m
+ 	int i;
+ 
+ 	for (i = 0; i < PHY_MAX_ADDR; i++) {
+-		if ((bus->phy_mask & BIT(i)) == 0) {
++		if ((bus->phy_mask & BIT_ULL(i)) == 0ULL) {
+ 			struct phy_device *phydev;
+ 
+ 			/* Don't scan C45 if we already have a C22 device */




More information about the lede-commits mailing list