| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990 |
- From e52faf1564a8bcaf866f9a6c7bf0e8a8748afb15 Mon Sep 17 00:00:00 2001
- From: Daniel Golle <[email protected]>
- Date: Sun, 30 Apr 2023 00:15:41 +0100
- Subject: [PATCH] net: phy: realtek: detect early version of RTL8221B
- Early versions (?) of the RTL8221B PHY cannot be identified in a regular
- Clause-45 bus scan as the PHY doesn't report the implemented MMDs
- correctly but returns 0 instead.
- Implement custom identify function using the PKGID instead of iterating
- over the implemented MMDs.
- Signed-off-by: Daniel Golle <[email protected]>
- ---
- drivers/net/phy/realtek.c | 50 ++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 49 insertions(+), 1 deletion(-)
- --- a/drivers/net/phy/realtek.c
- +++ b/drivers/net/phy/realtek.c
- @@ -81,6 +81,7 @@
-
- #define RTL_GENERIC_PHYID 0x001cc800
- #define RTL_8211FVD_PHYID 0x001cc878
- +#define RTL_8221B_VB_CG 0x001cc849
-
- MODULE_DESCRIPTION("Realtek PHY driver");
- MODULE_AUTHOR("Johnson Leung");
- @@ -801,6 +802,54 @@ static int rtl822x_probe(struct phy_devi
- return 0;
- }
-
- +static int rtl8221b_vb_cg_match_phy_device(struct phy_device *phydev)
- +{
- + int val;
- + u32 id;
- +
- + if (phydev->is_c45) {
- + if (phydev->c45_ids.device_ids[1])
- + return phydev->c45_ids.device_ids[1] == RTL_8221B_VB_CG;
- + } else {
- + if (phydev->phy_id)
- + return phydev->phy_id == RTL_8221B_VB_CG;
- + }
- +
- + if (phydev->mdio.bus->read_c45) {
- + val = phy_read_mmd(phydev, MDIO_MMD_PMAPMD, MDIO_PKGID1);
- + if (val < 0)
- + return 0;
- +
- + id = val << 16;
- + val = phy_read_mmd(phydev, MDIO_MMD_PMAPMD, MDIO_PKGID2);
- + if (val < 0)
- + return 0;
- +
- + id |= val;
- + } else {
- + val = phy_read(phydev, MII_PHYSID1);
- + if (val < 0)
- + return 0;
- +
- + id = val << 16;
- + val = phy_read(phydev, MII_PHYSID2);
- + if (val < 0)
- + return 0;
- +
- + id |= val;
- + }
- +
- + if (id != RTL_8221B_VB_CG)
- + return 0;
- +
- + if (phydev->is_c45)
- + phydev->c45_ids.device_ids[1] = id;
- + else
- + phydev->phy_id = id;
- +
- + return 1;
- +}
- +
- static int rtlgen_resume(struct phy_device *phydev)
- {
- int ret = genphy_resume(phydev);
- @@ -1134,7 +1183,7 @@ static struct phy_driver realtek_drvs[]
- .write_page = rtl821x_write_page,
- .soft_reset = genphy_soft_reset,
- }, {
- - PHY_ID_MATCH_EXACT(0x001cc849),
- + .match_phy_device = rtl8221b_vb_cg_match_phy_device,
- .name = "RTL8221B-VB-CG 2.5Gbps PHY",
- .get_features = rtl822x_get_features,
- .config_init = rtl8221b_config_init,
|
