linux-kernel - Re: [PATCH] net: phy: marvell: add new default led configure for m88e151x

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <56e2bc0f-d480-4f38-60cd-38f4110d988d@huawei.com>
Date:   Mon, 22 Apr 2019 21:48:06 +0800
From:   tanhuazhong <tanhuazhong@...wei.com>
To:     <andrew@...n.ch>, <f.fainelli@...il.com>, <hkallweit1@...il.com>,
        <davem@...emloft.net>
CC:     <netdev@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
        <linuxarm@...wei.com>
Subject: Re: [PATCH] net: phy: marvell: add new default led configure for
 m88e151x

sorry, please ignore this patch, will resend it later.

On 2019/4/22 20:38, Huazhong Tan wrote:
> From: Jian Shen <shenjian15@...wei.com>
> 
> The default m88e151x LED configuration is 0x1177, used LED[0]
> for 1000M link, LED[1] for 100M link, and LED[2] for active.
> But for some boards, which use LED[0] for link, and LED[1] for
> active, prefer to be 0x1040. To be compatible with this case,
> this patch defines a new dev_flag, and set it before connect
> phy in HNS3 driver. When phy initializing, using the new
> LED configuration if the dev_flag set.
> 
> Signed-off-by: Jian Shen <shenjian15@...wei.com>
> ---
>   drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c | 3 +++
>   drivers/net/phy/marvell.c                               | 6 +++++-
>   include/linux/marvell_phy.h                             | 1 +
>   3 files changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c
> index 12be4e2..1e81348 100644
> --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c
> +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c
> @@ -3,6 +3,7 @@
>   
>   #include <linux/etherdevice.h>
>   #include <linux/kernel.h>
> +#include <linux/marvell_phy.h>
>   
>   #include "hclge_cmd.h"
>   #include "hclge_main.h"
> @@ -209,6 +210,8 @@ int hclge_mac_connect_phy(struct hnae3_handle *handle)
>   
>   	linkmode_clear_bit(ETHTOOL_LINK_MODE_FIBRE_BIT, phydev->supported);
>   
> +	phydev->dev_flags |= MARVELL_PHY_LED0_LINK_LED1_ACTIVE;
> +
>   	ret = phy_connect_direct(netdev, phydev,
>   				 hclge_mac_adjust_link,
>   				 PHY_INTERFACE_MODE_SGMII);
> diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
> index 8754cb8..a7e8c81 100644
> --- a/drivers/net/phy/marvell.c
> +++ b/drivers/net/phy/marvell.c
> @@ -137,6 +137,7 @@
>   #define MII_PHY_LED_CTRL	        16
>   #define MII_88E1121_PHY_LED_DEF		0x0030
>   #define MII_88E1510_PHY_LED_DEF		0x1177
> +#define MII_88E1510_PHY_LED0_LINK_LED1_ACTIVE	0x1040
>   
>   #define MII_M1011_PHY_STATUS		0x11
>   #define MII_M1011_PHY_STATUS_1000	0x8000
> @@ -633,7 +634,10 @@ static void marvell_config_led(struct phy_device *phydev)
>   	 * LED[2] .. Blink, Activity
>   	 */
>   	case MARVELL_PHY_FAMILY_ID(MARVELL_PHY_ID_88E1510):
> -		def_config = MII_88E1510_PHY_LED_DEF;
> +		if (phydev->dev_flags & MARVELL_PHY_LED0_LINK_LED1_ACTIVE)
> +			def_config = MII_88E1510_PHY_LED0_LINK_LED1_ACTIVE;
> +		else
> +			def_config = MII_88E1510_PHY_LED_DEF;
>   		break;
>   	default:
>   		return;
> diff --git a/include/linux/marvell_phy.h b/include/linux/marvell_phy.h
> index 73d0474..af6b11d 100644
> --- a/include/linux/marvell_phy.h
> +++ b/include/linux/marvell_phy.h
> @@ -34,5 +34,6 @@
>   /* struct phy_device dev_flags definitions */
>   #define MARVELL_PHY_M1145_FLAGS_RESISTANCE	0x00000001
>   #define MARVELL_PHY_M1118_DNS323_LEDS		0x00000002
> +#define MARVELL_PHY_LED0_LINK_LED1_ACTIVE	0x00000004
>   
>   #endif /* _MARVELL_PHY_H */
>