Commit da681ed7 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Jakub Kicinski
Browse files

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



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: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Link: https://patch.msgid.link/a5f2333c-dda9-48ad-9801-77049766e632@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 853e8036

drivers/net/phy/realtek/realtek_main.c

+33 −46
Original line number Diff line number Diff line
@@ -735,29 +735,31 @@ static int rtlgen_read_status(struct phy_device *phydev) 
	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)

{

	int ret;



	if (devnum == MDIO_MMD_VEND2) {

		rtl821x_write_page(phydev, regnum >> 4);

		ret = __phy_read(phydev, 0x10 + ((regnum & 0xf) >> 1));

		rtl821x_write_page(phydev, 0);

	} else if (devnum == MDIO_MMD_PCS && regnum == MDIO_PCS_EEE_ABLE) {

		rtl821x_write_page(phydev, 0xa5c);

		ret = __phy_read(phydev, 0x12);

		rtl821x_write_page(phydev, 0);

	} else if (devnum == MDIO_MMD_AN && regnum == MDIO_AN_EEE_ADV) {

		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 {

	if (devnum == MDIO_MMD_VEND2)

		ret = rtlgen_read_vend2(phydev, regnum);

	else if (devnum == MDIO_MMD_PCS && regnum == MDIO_PCS_EEE_ABLE)

		ret = rtlgen_read_vend2(phydev, 0xa5c4);

	else if (devnum == MDIO_MMD_AN && regnum == MDIO_AN_EEE_ADV)

		ret = rtlgen_read_vend2(phydev, 0xa5d0);

	else if (devnum == MDIO_MMD_AN && regnum == MDIO_AN_EEE_LPABLE)

		ret = rtlgen_read_vend2(phydev, 0xa5d2);

	else

		ret = -EOPNOTSUPP;

	}



	return ret;

}
@@ -767,17 +769,12 @@ static int rtlgen_write_mmd(struct phy_device *phydev, int devnum, u16 regnum, 
{

	int ret;



	if (devnum == MDIO_MMD_VEND2) {

		rtl821x_write_page(phydev, regnum >> 4);

		ret = __phy_write(phydev, 0x10 + ((regnum & 0xf) >> 1), val);

		rtl821x_write_page(phydev, 0);

	} else if (devnum == MDIO_MMD_AN && regnum == MDIO_AN_EEE_ADV) {

		rtl821x_write_page(phydev, 0xa5d);

		ret = __phy_write(phydev, 0x10, val);

		rtl821x_write_page(phydev, 0);

	} else {

	if (devnum == MDIO_MMD_VEND2)

		ret = rtlgen_write_vend2(phydev, regnum, val);

	else if (devnum == MDIO_MMD_AN && regnum == MDIO_AN_EEE_ADV)

		ret = rtlgen_write_vend2(phydev, regnum, 0xa5d0);

	else

		ret = -EOPNOTSUPP;

	}



	return ret;

}
@@ -789,19 +786,12 @@ static int rtl822x_read_mmd(struct phy_device *phydev, int devnum, u16 regnum) 
	if (ret != -EOPNOTSUPP)

		return ret;



	if (devnum == MDIO_MMD_PCS && regnum == MDIO_PCS_EEE_ABLE2) {

		rtl821x_write_page(phydev, 0xa6e);

		ret = __phy_read(phydev, 0x16);

		rtl821x_write_page(phydev, 0);

	} else if (devnum == MDIO_MMD_AN && regnum == MDIO_AN_EEE_ADV2) {

		rtl821x_write_page(phydev, 0xa6d);

		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);

	}

	if (devnum == MDIO_MMD_PCS && regnum == MDIO_PCS_EEE_ABLE2)

		ret = rtlgen_read_vend2(phydev, 0xa6ec);

	else if (devnum == MDIO_MMD_AN && regnum == MDIO_AN_EEE_ADV2)

		ret = rtlgen_read_vend2(phydev, 0xa6d4);

	else if (devnum == MDIO_MMD_AN && regnum == MDIO_AN_EEE_LPABLE2)

		ret = rtlgen_read_vend2(phydev, 0xa6d0);



	return ret;

}
@@ -814,11 +804,8 @@ static int rtl822x_write_mmd(struct phy_device *phydev, int devnum, u16 regnum, 
	if (ret != -EOPNOTSUPP)

		return ret;



	if (devnum == MDIO_MMD_AN && regnum == MDIO_AN_EEE_ADV2) {

		rtl821x_write_page(phydev, 0xa6d);

		ret = __phy_write(phydev, 0x12, val);

		rtl821x_write_page(phydev, 0);

	}

	if (devnum == MDIO_MMD_AN && regnum == MDIO_AN_EEE_ADV2)

		ret = rtlgen_write_vend2(phydev, 0xa6d4, val);



	return ret;

}