| Message ID | 20230216194128.3593734-1-opendmb@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | a7515af9fb8f0890fe540b108def4a86b9e8330a |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] net: bcmgenet: fix MoCA LED control | expand |
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 <opendmb@gmail.com> Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Hello: This patch was applied to netdev/net.git (master) by David S. Miller <davem@davemloft.net>: 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 <opendmb@gmail.com> > > [...] 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!
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;
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 <opendmb@gmail.com> --- drivers/net/ethernet/broadcom/genet/bcmmii.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)