[PATCH net] net: dsa: bcm_sf2: Fix Wake-on-LAN with mac_link_down()

[PATCH net] net: dsa: bcm_sf2: Fix Wake-on-LAN with mac_link_down()

[Florian Fainelli]

After commit 2d1f90f9ba83 ("net: dsa/bcm_sf2: fix incorrect usage of
state->link") the interface suspend path would call our mac_link_down()
call back which would forcibly set the link down, thus preventing
Wake-on-LAN packets from reaching our management port.

Fix this by looking at whether the port is enabled for Wake-on-LAN and
not clearing the link status in that case to let packets go through.

Fixes: 2d1f90f9ba83 ("net: dsa/bcm_sf2: fix incorrect usage of state->link")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
 drivers/net/dsa/bcm_sf2.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c
index cf82b1fa9725..87e81c636339 100644
--- a/drivers/net/dsa/bcm_sf2.c
+++ b/drivers/net/dsa/bcm_sf2.c
@@ -809,6 +809,9 @@ static void bcm_sf2_sw_mac_link_down(struct dsa_switch *ds, int port,
 	struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);
 	u32 reg, offset;
 
+	if (priv->wol_ports_mask & BIT(port))
+		return;
+
 	if (port != core_readl(priv, CORE_IMP0_PRT_ID)) {
 		if (priv->type == BCM4908_DEVICE_ID ||
 		    priv->type == BCM7445_DEVICE_ID)
-- 
2.25.1

Re: [PATCH net] net: dsa: bcm_sf2: Fix Wake-on-LAN with mac_link_down()

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net.git (master)
by Jakub Kicinski <kuba@kernel.org>:

On Wed, 11 May 2022 19:17:31 -0700 you wrote:
> After commit 2d1f90f9ba83 ("net: dsa/bcm_sf2: fix incorrect usage of
> state->link") the interface suspend path would call our mac_link_down()
> call back which would forcibly set the link down, thus preventing
> Wake-on-LAN packets from reaching our management port.
> 
> Fix this by looking at whether the port is enabled for Wake-on-LAN and
> not clearing the link status in that case to let packets go through.
> 
> [...]

Here is the summary with links:
  - [net] net: dsa: bcm_sf2: Fix Wake-on-LAN with mac_link_down()
    https://git.kernel.org/netdev/net/c/b7be130c5d52

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