Re: [d-kernel] [PATCH] [p10/std-def] phy: realtek: leds configuration for RTL8211f

[Vitaly Chikunov <vt@altlinux.org>]

On Thu, Oct 13, 2022 at 06:33:35PM +0400, Alexey Sheplyakov wrote:
> Configure leds according to 'realtek,led-mode', 'realtek,led[0-2]-control'
> knobs (specified in DTB). Note that *all* of these parameters must be
> set in DTB for this to work.
> See https://my.basealt.space/issues/85133

Applied, thanks.

Обратил внимание на "Если мы хотим этот патч в std-def/un-def -
требуется тщательное тестирование на регрессии на x86_64 системах."

> 
> X-feature-Baikal-M
> DONTUPSTREAM
> ---
>  drivers/net/phy/realtek.c                     | 56 +++++++++++++++++++
>  .../dt-bindings/net/realtek-phy-rtl8211f.h    | 26 +++++++++
>  2 files changed, 82 insertions(+)
>  create mode 100644 include/dt-bindings/net/realtek-phy-rtl8211f.h
> 
> diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c
> index b4879306bb8a..0b73d2dfb03e 100644
> --- a/drivers/net/phy/realtek.c
> +++ b/drivers/net/phy/realtek.c
> @@ -8,6 +8,8 @@
>   * Copyright (c) 2004 Freescale Semiconductor, Inc.
>   */
>  #include <linux/bitops.h>
> +#include <linux/of.h>
> +#include <dt-bindings/net/realtek-phy-rtl8211f.h>
>  #include <linux/phy.h>
>  #include <linux/module.h>
>  #include <linux/delay.h>
> @@ -28,6 +30,7 @@
>  
>  #define RTL8211F_PHYCR1				0x18
>  #define RTL8211F_INSR				0x1d
> +#define RTL8211F_LCR				0x10
>  
>  #define RTL8211F_TX_DELAY			BIT(8)
>  #define RTL8211F_RX_DELAY			BIT(3)
> @@ -178,6 +181,56 @@ static int rtl8211c_config_init(struct phy_device *phydev)
>  			    CTL1000_ENABLE_MASTER | CTL1000_AS_MASTER);
>  }
>  
> +static void rtl8211f_config_led(struct phy_device *phydev)
> +{
> +	struct device *dev = &phydev->mdio.dev;
> +	struct device_node *of_node = dev->of_node;
> +	u16 val;
> +	u32 led_mode, led0_ctrl, led1_ctrl, led2_ctrl;
> +	int ret;
> +
> +	ret = of_property_read_u32(of_node, "realtek,led-mode", &led_mode);
> +	if (ret < 0) {
> +		dev_dbg(dev, "refusing to reconfigure leds: no 'realtek,led-mode' in dtb\n");
> +		return;
> +	}
> +	ret = of_property_read_u32(of_node, "realtek,led0-control", &led0_ctrl);
> +	if (ret < 0) {
> +		dev_dbg(dev, "refusing to reconfigure leds: no 'realtek,led0-control' in dtb\n");
> +		return;
> +	}
> +	ret = of_property_read_u32(of_node, "realtek,led1-control", &led1_ctrl);
> +	if (ret < 0) {
> +		dev_dbg(dev, "refusing to reconfigure leds: no 'realtek,led1-control' in dtb\n");
> +		return;
> +	}
> +	ret = of_property_read_u32(of_node, "realtek,led2-control", &led2_ctrl);
> +	if (ret < 0) {
> +		dev_dbg(dev, "refusing to reconfigure leds: no 'realtek,led2-control' in dtb\n");
> +		return;
> +	}
> +
> +	val = (led_mode << 15) | (led2_ctrl << 10) |
> +	      (led1_ctrl << 5) | led0_ctrl;
> +
> +	ret = phy_write_paged(phydev, 0xd04, RTL8211F_LCR, val);
> +	if (ret < 0)
> +		dev_dbg(dev, "Failed to update the LED control register\n");
> +}
> +
> +static int rtl8211f_config_aneg(struct phy_device *phydev)
> +{
> +	int ret;
> +
> +	rtl8211f_config_led(phydev);
> +
> +	ret = genphy_config_aneg(phydev);
> +	if (ret < 0)
> +		return ret;
> +
> +	return 0;
> +}
> +
>  static int rtl8211f_config_init(struct phy_device *phydev)
>  {
>  	struct device *dev = &phydev->mdio.dev;
> @@ -185,6 +238,8 @@ static int rtl8211f_config_init(struct phy_device *phydev)
>  	u16 val;
>  	int ret;
>  
> +	rtl8211f_config_led(phydev);
> +
>  	val = RTL8211F_ALDPS_ENABLE | RTL8211F_ALDPS_PLL_OFF | RTL8211F_ALDPS_XTAL_OFF;
>  	phy_modify_paged_changed(phydev, 0xa43, RTL8211F_PHYCR1, val, val);
>  
> @@ -633,6 +688,7 @@ static struct phy_driver realtek_drvs[] = {
>  	}, {
>  		PHY_ID_MATCH_EXACT(0x001cc916),
>  		.name		= "RTL8211F Gigabit Ethernet",
> +		.config_aneg	= rtl8211f_config_aneg,
>  		.config_init	= &rtl8211f_config_init,
>  		.ack_interrupt	= &rtl8211f_ack_interrupt,
>  		.config_intr	= &rtl8211f_config_intr,
> diff --git a/include/dt-bindings/net/realtek-phy-rtl8211f.h b/include/dt-bindings/net/realtek-phy-rtl8211f.h
> new file mode 100644
> index 000000000000..46d17644119d
> --- /dev/null
> +++ b/include/dt-bindings/net/realtek-phy-rtl8211f.h
> @@ -0,0 +1,26 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> +#ifndef _DT_BINDINGS_REALTEK_PHY_RTL8211F_H
> +#define _DT_BINDINGS_REALTEK_PHY_RTL8211F_H
> +
> +/* LED modes for RTL8211F PHY */
> +
> +#define RTL8211F_LED_MODE_A	0
> +#define RTL8211F_LED_MODE_B	1
> +
> +#define RTL8211F_LINK_10			1
> +#define RTL8211F_LINK_100			2
> +#define RTL8211F_LINK_10_100			3
> +#define RTL8211F_LINK_1000			8
> +#define RTL8211F_LINK_10_1000			9
> +#define RTL8211F_LINK_100_1000			10
> +#define RTL8211F_LINK_10_100_1000		11
> +#define RTL8211F_ACTIVITY			16
> +#define RTL8211F_LINK_10_ACTIVITY		17
> +#define RTL8211F_LINK_100_ACTIVITY		18
> +#define RTL8211F_LINK_10_100_ACTIVITY		19
> +#define RTL8211F_LINK_1000_ACTIVITY		24
> +#define RTL8211F_LINK_10_1000_ACTIVITY		25
> +#define RTL8211F_LINK_100_1000_ACTIVITY		26
> +#define RTL8211F_LINK_10_100_1000_ACTIVITY	27
> +
> +#endif
> -- 
> 2.33.3
> 
> _______________________________________________
> devel-kernel mailing list
> devel-kernel@lists.altlinux.org
> https://lists.altlinux.org/mailman/listinfo/devel-kernel