Commit 7c6fa3ff authored by Michael Klein's avatar Michael Klein Committed by Paolo Abeni
Browse files

net: phy: realtek: Clean up RTL821x ExtPage access 



Factor out RTL8211E extension page access code to
rtl821x_modify_ext_page() and clean up rtl8211e_config_init()

Signed-off-by: default avatarMichael Klein <michael@fossekall.de>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Link: https://patch.msgid.link/20250504172916.243185-3-michael@fossekall.de


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent f3b26535

drivers/net/phy/realtek/realtek_main.c

+23 −15
Original line number Diff line number Diff line
@@ -26,7 +26,9 @@ 
#define RTL821x_INSR				0x13



#define RTL821x_EXT_PAGE_SELECT			0x1e



#define RTL821x_PAGE_SELECT			0x1f

#define RTL821x_SET_EXT_PAGE			0x07



#define RTL8211F_PHYCR1				0x18

#define RTL8211F_PHYCR2				0x19
@@ -69,9 +71,12 @@ 
#define RTL8211F_ALDPS_ENABLE			BIT(2)

#define RTL8211F_ALDPS_XTAL_OFF			BIT(12)



#define RTL8211E_RGMII_EXT_PAGE			0xa4

#define RTL8211E_RGMII_DELAY			0x1c

#define RTL8211E_CTRL_DELAY			BIT(13)

#define RTL8211E_TX_DELAY			BIT(12)

#define RTL8211E_RX_DELAY			BIT(11)

#define RTL8211E_DELAY_MASK			GENMASK(13, 11)



#define RTL8201F_ISR				0x1e

#define RTL8201F_ISR_ANERR			BIT(15)
@@ -151,6 +156,21 @@ static int rtl821x_write_page(struct phy_device *phydev, int page) 
	return __phy_write(phydev, RTL821x_PAGE_SELECT, page);

}



static int rtl821x_modify_ext_page(struct phy_device *phydev, u16 ext_page,

				   u32 regnum, u16 mask, u16 set)

{

	int oldpage, ret = 0;



	oldpage = phy_select_page(phydev, RTL821x_SET_EXT_PAGE);

	if (oldpage >= 0) {

		ret = __phy_write(phydev, RTL821x_EXT_PAGE_SELECT, ext_page);

		if (ret == 0)

			ret = __phy_modify(phydev, regnum, mask, set);

	}



	return phy_restore_page(phydev, oldpage, ret);

}



static int rtl821x_probe(struct phy_device *phydev)

{

	struct device *dev = &phydev->mdio.dev;
@@ -670,7 +690,6 @@ static int rtl8211f_led_hw_control_set(struct phy_device *phydev, u8 index, 


static int rtl8211e_config_init(struct phy_device *phydev)

{

	int ret = 0, oldpage;

	u16 val;



	/* enable TX/RX delay for rgmii-* modes, and disable them for rgmii. */
@@ -700,20 +719,9 @@ static int rtl8211e_config_init(struct phy_device *phydev) 
	 * 12 = RX Delay, 11 = TX Delay

	 * 10:0 = Test && debug settings reserved by realtek

	 */

	oldpage = phy_select_page(phydev, 0x7);

	if (oldpage < 0)

		goto err_restore_page;



	ret = __phy_write(phydev, RTL821x_EXT_PAGE_SELECT, 0xa4);

	if (ret)

		goto err_restore_page;



	ret = __phy_modify(phydev, 0x1c, RTL8211E_CTRL_DELAY

			   | RTL8211E_TX_DELAY | RTL8211E_RX_DELAY,

			   val);



err_restore_page:

	return phy_restore_page(phydev, oldpage, ret);

	return rtl821x_modify_ext_page(phydev, RTL8211E_RGMII_EXT_PAGE,

				       RTL8211E_RGMII_DELAY,

				       RTL8211E_DELAY_MASK, val);

}



static int rtl8211b_suspend(struct phy_device *phydev)