* [PATCH net] net: bcmgenet: fix MoCA LED control
@ 2023-02-16 19:41 Doug Berger
2023-02-16 19:46 ` Florian Fainelli
2023-02-20 10:10 ` patchwork-bot+netdevbpf
0 siblings, 2 replies; 3+ messages in thread
From: Doug Berger @ 2023-02-16 19:41 UTC (permalink / raw)
To: David S. Miller
Cc: Florian Fainelli, Broadcom internal kernel review list,
Eric Dumazet, Jakub Kicinski, Paolo Abeni, Stefan Wahren, netdev,
linux-kernel, Doug Berger
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(-)
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net] net: bcmgenet: fix MoCA LED control
2023-02-16 19:41 [PATCH net] net: bcmgenet: fix MoCA LED control Doug Berger
@ 2023-02-16 19:46 ` Florian Fainelli
2023-02-20 10:10 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: Florian Fainelli @ 2023-02-16 19:46 UTC (permalink / raw)
To: Doug Berger, David S. Miller
Cc: Florian Fainelli, Broadcom internal kernel review list,
Eric Dumazet, Jakub Kicinski, Paolo Abeni, Stefan Wahren, netdev,
linux-kernel
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>
--
Florian
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net] net: bcmgenet: fix MoCA LED control
2023-02-16 19:41 [PATCH net] net: bcmgenet: fix MoCA LED control Doug Berger
2023-02-16 19:46 ` Florian Fainelli
@ 2023-02-20 10:10 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: patchwork-bot+netdevbpf @ 2023-02-20 10:10 UTC (permalink / raw)
To: Doug Berger
Cc: davem, f.fainelli, bcm-kernel-feedback-list, edumazet, kuba,
pabeni, wahrenst, netdev, linux-kernel
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!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-02-20 10:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-16 19:41 [PATCH net] net: bcmgenet: fix MoCA LED control Doug Berger
2023-02-16 19:46 ` Florian Fainelli
2023-02-20 10:10 ` patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).