]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
net: dsa: bcm_sf2: Disable learning for ASP port
authorFlorian Fainelli <f.fainelli@gmail.com>
Mon, 30 Mar 2020 21:38:50 +0000 (14:38 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 31 Mar 2020 02:55:42 +0000 (19:55 -0700)
We don't want to enable learning for the ASP port since it only receives
directed traffic, this allows us to bypass ARL-driven forwarding rules
which could conflict with Broadcom tags and/or CFP forwarding.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/dsa/bcm_sf2.c

index 368ead87e07a322c1fe0f42281ebd17f3a93ba1f..affa5c6e135c3ba505c66b121f6c42065356ce7c 100644 (file)
@@ -178,9 +178,17 @@ static int bcm_sf2_port_setup(struct dsa_switch *ds, int port,
        core_writel(priv, reg, CORE_DIS_LEARN);
 
        /* Enable Broadcom tags for that port if requested */
-       if (priv->brcm_tag_mask & BIT(port))
+       if (priv->brcm_tag_mask & BIT(port)) {
                b53_brcm_hdr_setup(ds, port);
 
+               /* Disable learning on ASP port */
+               if (port == 7) {
+                       reg = core_readl(priv, CORE_DIS_LEARN);
+                       reg |= BIT(port);
+                       core_writel(priv, reg, CORE_DIS_LEARN);
+               }
+       }
+
        /* Configure Traffic Class to QoS mapping, allow each priority to map
         * to a different queue number
         */