net: mscc: ocelot: use separate flooding PGID for broadcast

In preparation of offloading the bridge port flags which have
independent settings for unknown multicast and for broadcast, we should
also start reserving one destination Port Group ID for the flooding of
broadcast packets, to allow configuring it individually.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/ocelot/felix.c b/drivers/net/dsa/ocelot/felix.c
index ae11d3f030acc07dbd9a23367cdbe7f3f95ff07c..00b053d8294fe23b8868be9a17c15a5732563f01 100644 (file)
--- a/drivers/net/dsa/ocelot/felix.c
+++ b/drivers/net/dsa/ocelot/felix.c
@@ -299,6 +299,7 @@ static int felix_setup_tag_8021q(struct dsa_switch *ds, int cpu)
        cpu_flood = ANA_PGID_PGID_PGID(BIT(ocelot->num_phys_ports));
        ocelot_rmw_rix(ocelot, 0, cpu_flood, ANA_PGID_PGID, PGID_UC);
        ocelot_rmw_rix(ocelot, 0, cpu_flood, ANA_PGID_PGID, PGID_MC);
+       ocelot_rmw_rix(ocelot, 0, cpu_flood, ANA_PGID_PGID, PGID_BC);
 
        felix->dsa_8021q_ctx = kzalloc(sizeof(*felix->dsa_8021q_ctx),
                                       GFP_KERNEL);
@@ -412,6 +413,7 @@ static int felix_setup_tag_npi(struct dsa_switch *ds, int cpu)
        cpu_flood = ANA_PGID_PGID_PGID(BIT(ocelot->num_phys_ports));
        ocelot_rmw_rix(ocelot, cpu_flood, cpu_flood, ANA_PGID_PGID, PGID_UC);
        ocelot_rmw_rix(ocelot, cpu_flood, cpu_flood, ANA_PGID_PGID, PGID_MC);
+       ocelot_rmw_rix(ocelot, cpu_flood, cpu_flood, ANA_PGID_PGID, PGID_BC);
 
        return 0;
 }

diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c
index 1654a6e22a7df91038edcfaf6b2aecf12e7736b6..1a31598e2ae67695975a74661cc8627b859b4794 100644 (file)
--- a/drivers/net/ethernet/mscc/ocelot.c
+++ b/drivers/net/ethernet/mscc/ocelot.c
@@ -1716,7 +1716,7 @@ int ocelot_init(struct ocelot *ocelot)
        /* Setup flooding PGIDs */
        for (i = 0; i < ocelot->num_flooding_pgids; i++)
                ocelot_write_rix(ocelot, ANA_FLOODING_FLD_MULTICAST(PGID_MC) |
-                                ANA_FLOODING_FLD_BROADCAST(PGID_MC) |
+                                ANA_FLOODING_FLD_BROADCAST(PGID_BC) |
                                 ANA_FLOODING_FLD_UNICAST(PGID_UC),
                                 ANA_FLOODING, i);
        ocelot_write(ocelot, ANA_FLOODING_IPMC_FLD_MC6_DATA(PGID_MCIPV6) |
@@ -1737,15 +1737,18 @@ int ocelot_init(struct ocelot *ocelot)
                ocelot_write_rix(ocelot, 0, ANA_PGID_PGID, PGID_SRC + port);
        }
 
-       /* Allow broadcast MAC frames. */
        for_each_nonreserved_multicast_dest_pgid(ocelot, i) {
                u32 val = ANA_PGID_PGID_PGID(GENMASK(ocelot->num_phys_ports - 1, 0));
 
                ocelot_write_rix(ocelot, val, ANA_PGID_PGID, i);
        }
-       ocelot_write_rix(ocelot,
-                        ANA_PGID_PGID_PGID(GENMASK(ocelot->num_phys_ports, 0)),
-                        ANA_PGID_PGID, PGID_MC);
+       /* Allow broadcast and unknown L2 multicast to the CPU. */
+       ocelot_rmw_rix(ocelot, ANA_PGID_PGID_PGID(BIT(ocelot->num_phys_ports)),
+                      ANA_PGID_PGID_PGID(BIT(ocelot->num_phys_ports)),
+                      ANA_PGID_PGID, PGID_MC);
+       ocelot_rmw_rix(ocelot, ANA_PGID_PGID_PGID(BIT(ocelot->num_phys_ports)),
+                      ANA_PGID_PGID_PGID(BIT(ocelot->num_phys_ports)),
+                      ANA_PGID_PGID, PGID_BC);
        ocelot_write_rix(ocelot, 0, ANA_PGID_PGID, PGID_MCIPV4);
        ocelot_write_rix(ocelot, 0, ANA_PGID_PGID, PGID_MCIPV6);
 

diff --git a/include/soc/mscc/ocelot.h b/include/soc/mscc/ocelot.h
index bfce3df61bfd071cdd470330418d2203af48e935..9acbef1416f16c2bc4f4cff08b0923e9ce1db585 100644 (file)
--- a/include/soc/mscc/ocelot.h
+++ b/include/soc/mscc/ocelot.h
@@ -54,16 +54,17 @@
  * PGID_CPU: used for whitelisting certain MAC addresses, such as the addresses
  *           of the switch port net devices, towards the CPU port module.
  * PGID_UC: the flooding destinations for unknown unicast traffic.
- * PGID_MC: the flooding destinations for broadcast and non-IP multicast
- *          traffic.
+ * PGID_MC: the flooding destinations for non-IP multicast traffic.
  * PGID_MCIPV4: the flooding destinations for IPv4 multicast traffic.
  * PGID_MCIPV6: the flooding destinations for IPv6 multicast traffic.
+ * PGID_BC: the flooding destinations for broadcast traffic.
  */
-#define PGID_CPU                       59
-#define PGID_UC                                60
-#define PGID_MC                                61
-#define PGID_MCIPV4                    62
-#define PGID_MCIPV6                    63
+#define PGID_CPU                       58
+#define PGID_UC                                59
+#define PGID_MC                                60
+#define PGID_MCIPV4                    61
+#define PGID_MCIPV6                    62
+#define PGID_BC                                63
 
 #define for_each_unicast_dest_pgid(ocelot, pgid)               \
        for ((pgid) = 0;                                        \