]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
net: dsa: bcm_sf2: Fix Wake-on-LAN with mac_link_down()
authorFlorian Fainelli <f.fainelli@gmail.com>
Thu, 12 May 2022 02:17:31 +0000 (19:17 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 12 May 2022 17:01:36 +0000 (10:01 -0700)
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>
Link: https://lore.kernel.org/r/20220512021731.2494261-1-f.fainelli@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/dsa/bcm_sf2.c

index cf82b1fa972529494eaaa525140eb85e766d983a..87e81c636339f9720260807521f917ff57f74fb9 100644 (file)
@@ -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)