netdev - Re: [PATCH net-next 2/2] net: phy: broadcom: Do not modify LED configuration for SFP module PHYs

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 for Android: free password hash cracker in your pocket

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

Message-ID: <f730a14f-0426-f009-87cf-7a4fbe4a3f6e@gmail.com>
Date:   Fri, 12 Feb 2021 17:17:53 -0800
From:   Florian Fainelli <f.fainelli@...il.com>
To:     Robert Hancock <robert.hancock@...ian.com>, andrew@...n.ch,
        hkallweit1@...il.com, davem@...emloft.net, kuba@...nel.org
Cc:     f.fainelli@...il.com, linux@...linux.org.uk,
        bcm-kernel-feedback-list@...adcom.com, netdev@...r.kernel.org
Subject: Re: [PATCH net-next 2/2] net: phy: broadcom: Do not modify LED
 configuration for SFP module PHYs



On 2/12/2021 4:28 PM, 'Robert Hancock' via BCM-KERNEL-FEEDBACK-LIST,PDL
wrote:
> bcm54xx_config_init was modifying the PHY LED configuration to enable link
> and activity indications. However, some SFP modules (such as Bel-Fuse
> SFP-1GBT-06) have no LEDs but use the LED outputs to control the SFP LOS
> signal, and modifying the LED settings will cause the LOS output to
> malfunction. Skip this configuration for PHYs which are bound to an SFP
> bus.
> 
> Signed-off-by: Robert Hancock <robert.hancock@...ian.com>
> ---
>  drivers/net/phy/broadcom.c | 26 +++++++++++++++++---------
>  1 file changed, 17 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c
> index 78542580f2b2..81a5721f732a 100644
> --- a/drivers/net/phy/broadcom.c
> +++ b/drivers/net/phy/broadcom.c
> @@ -12,6 +12,7 @@
>  
>  #include "bcm-phy-lib.h"
>  #include <linux/module.h>
> +#include <linux/netdevice.h>
>  #include <linux/phy.h>
>  #include <linux/brcmphy.h>
>  #include <linux/of.h>
> @@ -365,18 +366,25 @@ static int bcm54xx_config_init(struct phy_device *phydev)
>  
>  	bcm54xx_phydsp_config(phydev);
>  
> -	/* Encode link speed into LED1 and LED3 pair (green/amber).
> +	/* For non-SFP setups, encode link speed into LED1 and LED3 pair
> +	 * (green/amber).
>  	 * Also flash these two LEDs on activity. This means configuring
>  	 * them for MULTICOLOR and encoding link/activity into them.
> +	 * Don't do this for devices that may be on an SFP module, since
> +	 * some of these use the LED outputs to control the SFP LOS signal,
> +	 * and changing these settings will cause LOS to malfunction.
>  	 */
> -	val = BCM5482_SHD_LEDS1_LED1(BCM_LED_SRC_MULTICOLOR1) |
> -		BCM5482_SHD_LEDS1_LED3(BCM_LED_SRC_MULTICOLOR1);
> -	bcm_phy_write_shadow(phydev, BCM5482_SHD_LEDS1, val);
> -
> -	val = BCM_LED_MULTICOLOR_IN_PHASE |
> -		BCM5482_SHD_LEDS1_LED1(BCM_LED_MULTICOLOR_LINK_ACT) |
> -		BCM5482_SHD_LEDS1_LED3(BCM_LED_MULTICOLOR_LINK_ACT);
> -	bcm_phy_write_exp(phydev, BCM_EXP_MULTICOLOR, val);
> +	if (!phydev->sfp_bus &&
> +	    (!phydev->attached_dev || !phydev->attached_dev->sfp_bus)) {
> +		val = BCM5482_SHD_LEDS1_LED1(BCM_LED_SRC_MULTICOLOR1) |
> +			BCM5482_SHD_LEDS1_LED3(BCM_LED_SRC_MULTICOLOR1);
> +		bcm_phy_write_shadow(phydev, BCM5482_SHD_LEDS1, val);
> +
> +		val = BCM_LED_MULTICOLOR_IN_PHASE |
> +			BCM5482_SHD_LEDS1_LED1(BCM_LED_MULTICOLOR_LINK_ACT) |
> +			BCM5482_SHD_LEDS1_LED3(BCM_LED_MULTICOLOR_LINK_ACT);
> +		bcm_phy_write_exp(phydev, BCM_EXP_MULTICOLOR, val);

Not sure I can come up with a better solution but this should probably
be made conditional upon the specific SFP module, or a set of specific
SFP modules, whether we can convey those details via a Device Tree
property or by doing a SFP ID lookup.

Acked-by: Florian Fainelli <f.fainelli@...il.com>
-- 
Florian