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

net: phy: realtek: Add support for PHY LEDs on RTL8211E 



Like the RTL8211F, the RTL8211E PHY supports up to three LEDs.
Add netdev trigger support for them, too.

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


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

drivers/net/phy/realtek/realtek_main.c

+119 −6
Original line number Diff line number Diff line
@@ -40,6 +40,20 @@ 
#define RTL821x_PAGE_SELECT			0x1f

#define RTL821x_SET_EXT_PAGE			0x07



/* RTL8211E extension page 44/0x2c */

#define RTL8211E_LEDCR_EXT_PAGE			0x2c

#define RTL8211E_LEDCR1				0x1a

#define RTL8211E_LEDCR1_ACT_TXRX		BIT(4)

#define RTL8211E_LEDCR1_MASK			BIT(4)

#define RTL8211E_LEDCR1_SHIFT			1



#define RTL8211E_LEDCR2				0x1c

#define RTL8211E_LEDCR2_LINK_1000		BIT(2)

#define RTL8211E_LEDCR2_LINK_100		BIT(1)

#define RTL8211E_LEDCR2_LINK_10			BIT(0)

#define RTL8211E_LEDCR2_MASK			GENMASK(2, 0)

#define RTL8211E_LEDCR2_SHIFT			4



/* RTL8211E extension page 164/0xa4 */

#define RTL8211E_RGMII_EXT_PAGE			0xa4

#define RTL8211E_RGMII_DELAY			0x1c
@@ -145,7 +159,8 @@ 
#define RTL_8221B_VN_CG				0x001cc84a

#define RTL_8251B				0x001cc862



#define RTL8211F_LED_COUNT			3

/* RTL8211E and RTL8211F support up to three LEDs */

#define RTL8211x_LED_COUNT			3



MODULE_DESCRIPTION("Realtek PHY driver");

MODULE_AUTHOR("Johnson Leung");
@@ -169,6 +184,21 @@ static int rtl821x_write_page(struct phy_device *phydev, int page) 
	return __phy_write(phydev, RTL821x_PAGE_SELECT, page);

}



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

				 u32 regnum)

{

	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_read(phydev, regnum);

	}



	return phy_restore_page(phydev, oldpage, ret);

}



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

				   u32 regnum, u16 mask, u16 set)

{
@@ -608,7 +638,7 @@ static int rtl821x_resume(struct phy_device *phydev) 
	return 0;

}



static int rtl8211f_led_hw_is_supported(struct phy_device *phydev, u8 index,

static int rtl8211x_led_hw_is_supported(struct phy_device *phydev, u8 index,

					unsigned long rules)

{

	const unsigned long mask = BIT(TRIGGER_NETDEV_LINK_10) |
@@ -627,9 +657,11 @@ static int rtl8211f_led_hw_is_supported(struct phy_device *phydev, u8 index, 
	 *      rates and Active indication always at all three 10+100+1000

	 *      link rates.

	 * This code currently uses mode B only.

	 *

	 * RTL8211E PHY LED has one mode, which works like RTL8211F mode B.

	 */



	if (index >= RTL8211F_LED_COUNT)

	if (index >= RTL8211x_LED_COUNT)

		return -EINVAL;



	/* Filter out any other unsupported triggers. */
@@ -648,7 +680,7 @@ static int rtl8211f_led_hw_control_get(struct phy_device *phydev, u8 index, 
{

	int val;



	if (index >= RTL8211F_LED_COUNT)

	if (index >= RTL8211x_LED_COUNT)

		return -EINVAL;



	val = phy_read_paged(phydev, 0xd04, RTL8211F_LEDCR);
@@ -681,7 +713,7 @@ static int rtl8211f_led_hw_control_set(struct phy_device *phydev, u8 index, 
	const u16 mask = RTL8211F_LEDCR_MASK << (RTL8211F_LEDCR_SHIFT * index);

	u16 reg = 0;



	if (index >= RTL8211F_LED_COUNT)

	if (index >= RTL8211x_LED_COUNT)

		return -EINVAL;



	if (test_bit(TRIGGER_NETDEV_LINK_10, &rules))
@@ -704,6 +736,84 @@ static int rtl8211f_led_hw_control_set(struct phy_device *phydev, u8 index, 
	return phy_modify_paged(phydev, 0xd04, RTL8211F_LEDCR, mask, reg);

}



static int rtl8211e_led_hw_control_get(struct phy_device *phydev, u8 index,

				       unsigned long *rules)

{

	int ret;

	u16 cr1, cr2;



	if (index >= RTL8211x_LED_COUNT)

		return -EINVAL;



	ret = rtl821x_read_ext_page(phydev, RTL8211E_LEDCR_EXT_PAGE,

				    RTL8211E_LEDCR1);

	if (ret < 0)

		return ret;



	cr1 = ret >> RTL8211E_LEDCR1_SHIFT * index;

	if (cr1 & RTL8211E_LEDCR1_ACT_TXRX) {

		__set_bit(TRIGGER_NETDEV_RX, rules);

		__set_bit(TRIGGER_NETDEV_TX, rules);

	}



	ret = rtl821x_read_ext_page(phydev, RTL8211E_LEDCR_EXT_PAGE,

				    RTL8211E_LEDCR2);

	if (ret < 0)

		return ret;



	cr2 = ret >> RTL8211E_LEDCR2_SHIFT * index;

	if (cr2 & RTL8211E_LEDCR2_LINK_10)

		__set_bit(TRIGGER_NETDEV_LINK_10, rules);



	if (cr2 & RTL8211E_LEDCR2_LINK_100)

		__set_bit(TRIGGER_NETDEV_LINK_100, rules);



	if (cr2 & RTL8211E_LEDCR2_LINK_1000)

		__set_bit(TRIGGER_NETDEV_LINK_1000, rules);



	return ret;

}



static int rtl8211e_led_hw_control_set(struct phy_device *phydev, u8 index,

				       unsigned long rules)

{

	const u16 cr1mask =

		RTL8211E_LEDCR1_MASK << (RTL8211E_LEDCR1_SHIFT * index);

	const u16 cr2mask =

		RTL8211E_LEDCR2_MASK << (RTL8211E_LEDCR2_SHIFT * index);

	u16 cr1 = 0, cr2 = 0;

	int ret;



	if (index >= RTL8211x_LED_COUNT)

		return -EINVAL;



	if (test_bit(TRIGGER_NETDEV_RX, &rules) ||

	    test_bit(TRIGGER_NETDEV_TX, &rules)) {

		cr1 |= RTL8211E_LEDCR1_ACT_TXRX;

	}



	cr1 <<= RTL8211E_LEDCR1_SHIFT * index;

	ret = rtl821x_modify_ext_page(phydev, RTL8211E_LEDCR_EXT_PAGE,

				      RTL8211E_LEDCR1, cr1mask, cr1);

	if (ret < 0)

		return ret;



	if (test_bit(TRIGGER_NETDEV_LINK_10, &rules))

		cr2 |= RTL8211E_LEDCR2_LINK_10;



	if (test_bit(TRIGGER_NETDEV_LINK_100, &rules))

		cr2 |= RTL8211E_LEDCR2_LINK_100;



	if (test_bit(TRIGGER_NETDEV_LINK_1000, &rules))

		cr2 |= RTL8211E_LEDCR2_LINK_1000;



	cr2 <<= RTL8211E_LEDCR2_SHIFT * index;

	ret = rtl821x_modify_ext_page(phydev, RTL8211E_LEDCR_EXT_PAGE,

				      RTL8211E_LEDCR2, cr2mask, cr2);



	return ret;

}



static int rtl8211e_config_init(struct phy_device *phydev)

{

	u16 val;
@@ -1479,6 +1589,9 @@ static struct phy_driver realtek_drvs[] = { 
		.resume		= genphy_resume,

		.read_page	= rtl821x_read_page,

		.write_page	= rtl821x_write_page,

		.led_hw_is_supported = rtl8211x_led_hw_is_supported,

		.led_hw_control_get = rtl8211e_led_hw_control_get,

		.led_hw_control_set = rtl8211e_led_hw_control_set,

	}, {

		PHY_ID_MATCH_EXACT(0x001cc916),

		.name		= "RTL8211F Gigabit Ethernet",
@@ -1494,7 +1607,7 @@ static struct phy_driver realtek_drvs[] = { 
		.read_page	= rtl821x_read_page,

		.write_page	= rtl821x_write_page,

		.flags		= PHY_ALWAYS_CALL_SUSPEND,

		.led_hw_is_supported = rtl8211f_led_hw_is_supported,

		.led_hw_is_supported = rtl8211x_led_hw_is_supported,

		.led_hw_control_get = rtl8211f_led_hw_control_get,

		.led_hw_control_set = rtl8211f_led_hw_control_set,

	}, {