mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-08-30 16:53:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

net: phy: realtek: improve mmd register access for internal PHY's

Browse Source 
r8169 provides the MDIO bus for the internal PHY's. It has been extended
with c45 access functions for addressing MDIO_MMD_VEND2 registers.
So we can switch from paged access to directly addressing the
MDIO_MMD_VEND2 registers.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Link: https://patch.msgid.link/a5f2333c-dda9-48ad-9801-77049766e632@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Heiner Kallweit
2025-02-13 20:18:17 +01:00
committed by Jakub Kicinski
parent 853e80369c
commit da681ed73f
1 changed files with 33 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
drivers/net/phy/realtek/realtek_main.c
View File

@@ -735,29 +735,31 @@ static int rtlgen_read_status(struct phy_device *phydev)
return 0; return 0;
} }
static int rtlgen_read_vend2(struct phy_device *phydev, int regnum)
{
return __mdiobus_c45_read(phydev->mdio.bus, 0, MDIO_MMD_VEND2, regnum);
}
static int rtlgen_write_vend2(struct phy_device *phydev, int regnum, u16 val)
{
return __mdiobus_c45_write(phydev->mdio.bus, 0, MDIO_MMD_VEND2, regnum,
val);
}
static int rtlgen_read_mmd(struct phy_device *phydev, int devnum, u16 regnum) static int rtlgen_read_mmd(struct phy_device *phydev, int devnum, u16 regnum)
{ {
int ret; int ret;
if (devnum == MDIO_MMD_VEND2) { if (devnum == MDIO_MMD_VEND2)
rtl821x_write_page(phydev, regnum >> 4); ret = rtlgen_read_vend2(phydev, regnum);
ret = __phy_read(phydev, 0x10 + ((regnum & 0xf) >> 1)); else if (devnum == MDIO_MMD_PCS && regnum == MDIO_PCS_EEE_ABLE)
rtl821x_write_page(phydev, 0); ret = rtlgen_read_vend2(phydev, 0xa5c4);
} else if (devnum == MDIO_MMD_PCS && regnum == MDIO_PCS_EEE_ABLE) { else if (devnum == MDIO_MMD_AN && regnum == MDIO_AN_EEE_ADV)
rtl821x_write_page(phydev, 0xa5c); ret = rtlgen_read_vend2(phydev, 0xa5d0);
ret = __phy_read(phydev, 0x12); else if (devnum == MDIO_MMD_AN && regnum == MDIO_AN_EEE_LPABLE)
rtl821x_write_page(phydev, 0); ret = rtlgen_read_vend2(phydev, 0xa5d2);
} else if (devnum == MDIO_MMD_AN && regnum == MDIO_AN_EEE_ADV) { else
rtl821x_write_page(phydev, 0xa5d);
ret = __phy_read(phydev, 0x10);
rtl821x_write_page(phydev, 0);
} else if (devnum == MDIO_MMD_AN && regnum == MDIO_AN_EEE_LPABLE) {
rtl821x_write_page(phydev, 0xa5d);
ret = __phy_read(phydev, 0x11);
rtl821x_write_page(phydev, 0);
} else {
ret = -EOPNOTSUPP; ret = -EOPNOTSUPP;
}
return ret; return ret;
} }
@@ -767,17 +769,12 @@ static int rtlgen_write_mmd(struct phy_device *phydev, int devnum, u16 regnum,
{ {
int ret; int ret;
if (devnum == MDIO_MMD_VEND2) { if (devnum == MDIO_MMD_VEND2)
rtl821x_write_page(phydev, regnum >> 4); ret = rtlgen_write_vend2(phydev, regnum, val);
ret = __phy_write(phydev, 0x10 + ((regnum & 0xf) >> 1), val); else if (devnum == MDIO_MMD_AN && regnum == MDIO_AN_EEE_ADV)
rtl821x_write_page(phydev, 0); ret = rtlgen_write_vend2(phydev, regnum, 0xa5d0);
} else if (devnum == MDIO_MMD_AN && regnum == MDIO_AN_EEE_ADV) { else
rtl821x_write_page(phydev, 0xa5d);
ret = __phy_write(phydev, 0x10, val);
rtl821x_write_page(phydev, 0);
} else {
ret = -EOPNOTSUPP; ret = -EOPNOTSUPP;
}
return ret; return ret;
} }
@@ -789,19 +786,12 @@ static int rtl822x_read_mmd(struct phy_device *phydev, int devnum, u16 regnum)
if (ret != -EOPNOTSUPP) if (ret != -EOPNOTSUPP)
return ret; return ret;
if (devnum == MDIO_MMD_PCS && regnum == MDIO_PCS_EEE_ABLE2) { if (devnum == MDIO_MMD_PCS && regnum == MDIO_PCS_EEE_ABLE2)
rtl821x_write_page(phydev, 0xa6e); ret = rtlgen_read_vend2(phydev, 0xa6ec);
ret = __phy_read(phydev, 0x16); else if (devnum == MDIO_MMD_AN && regnum == MDIO_AN_EEE_ADV2)
rtl821x_write_page(phydev, 0); ret = rtlgen_read_vend2(phydev, 0xa6d4);
} else if (devnum == MDIO_MMD_AN && regnum == MDIO_AN_EEE_ADV2) { else if (devnum == MDIO_MMD_AN && regnum == MDIO_AN_EEE_LPABLE2)
rtl821x_write_page(phydev, 0xa6d); ret = rtlgen_read_vend2(phydev, 0xa6d0);
ret = __phy_read(phydev, 0x12);
rtl821x_write_page(phydev, 0);
} else if (devnum == MDIO_MMD_AN && regnum == MDIO_AN_EEE_LPABLE2) {
rtl821x_write_page(phydev, 0xa6d);
ret = __phy_read(phydev, 0x10);
rtl821x_write_page(phydev, 0);
}
return ret; return ret;
} }
@@ -814,11 +804,8 @@ static int rtl822x_write_mmd(struct phy_device *phydev, int devnum, u16 regnum,
if (ret != -EOPNOTSUPP) if (ret != -EOPNOTSUPP)
return ret; return ret;
if (devnum == MDIO_MMD_AN && regnum == MDIO_AN_EEE_ADV2) { if (devnum == MDIO_MMD_AN && regnum == MDIO_AN_EEE_ADV2)
rtl821x_write_page(phydev, 0xa6d); ret = rtlgen_write_vend2(phydev, 0xa6d4, val);
ret = __phy_write(phydev, 0x12, val);
rtl821x_write_page(phydev, 0);
}
return ret; return ret;
} }