2023-02-16 19:42:08

by Doug Berger

Subject: [PATCH net] net: bcmgenet: fix MoCA LED control

When the bcmgenet_mii_config() code was refactored it was missed
that the LED control for the MoCA interface got overwritten by
the port_ctrl value. Its previous programming is restored here.

Fixes: 4f8d81b77e66 ("net: bcmgenet: Refactor register access in bcmgenet_mii_config")
Signed-off-by: Doug Berger <[email protected]>
---
drivers/net/ethernet/broadcom/genet/bcmmii.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/genet/bcmmii.c b/drivers/net/ethernet/broadcom/genet/bcmmii.c
index b615176338b2..be042905ada2 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmmii.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c
@@ -176,15 +176,6 @@ void bcmgenet_phy_power_set(struct net_device *dev, bool enable)

static void bcmgenet_moca_phy_setup(struct bcmgenet_priv *priv)
{
- u32 reg;
-
- if (!GENET_IS_V5(priv)) {
- /* Speed settings are set in bcmgenet_mii_setup() */
- reg = bcmgenet_sys_readl(priv, SYS_PORT_CTRL);
- reg |= LED_ACT_SOURCE_MAC;
- bcmgenet_sys_writel(priv, reg, SYS_PORT_CTRL);
- }
-
if (priv->hw_params->flags & GENET_HAS_MOCA_LINK_DET)
fixed_phy_set_link_update(priv->dev->phydev,
bcmgenet_fixed_phy_link_update);
@@ -217,6 +208,8 @@ int bcmgenet_mii_config(struct net_device *dev, bool init)

if (!phy_name) {
phy_name = "MoCA";
+ if (!GENET_IS_V5(priv))
+ port_ctrl |= LED_ACT_SOURCE_MAC;
bcmgenet_moca_phy_setup(priv);
}
break;
--
2.25.1

2023-02-16 19:46:38

by Florian Fainelli

Subject: Re: [PATCH net] net: bcmgenet: fix MoCA LED control

On 2/16/23 11:41, Doug Berger wrote:
> When the bcmgenet_mii_config() code was refactored it was missed
> that the LED control for the MoCA interface got overwritten by
> the port_ctrl value. Its previous programming is restored here.
>
> Fixes: 4f8d81b77e66 ("net: bcmgenet: Refactor register access in bcmgenet_mii_config")
> Signed-off-by: Doug Berger <[email protected]>

Acked-by: Florian Fainelli <[email protected]>
--
Florian

2023-02-20 10:10:23

by patchwork-bot+netdevbpf

Subject: Re: [PATCH net] net: bcmgenet: fix MoCA LED control

Hello:

This patch was applied to netdev/net.git (master)
by David S. Miller <[email protected]>:

On Thu, 16 Feb 2023 11:41:28 -0800 you wrote:
> When the bcmgenet_mii_config() code was refactored it was missed
> that the LED control for the MoCA interface got overwritten by
> the port_ctrl value. Its previous programming is restored here.
>
> Fixes: 4f8d81b77e66 ("net: bcmgenet: Refactor register access in bcmgenet_mii_config")
> Signed-off-by: Doug Berger <[email protected]>
>
> [...]

Here is the summary with links:
- [net] net: bcmgenet: fix MoCA LED control
https://git.kernel.org/netdev/net/c/a7515af9fb8f

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html