net: mscc: ocelot: introduce macros for iterating over PGIDs

The current iterators are impossible to understand at first glance
without switching back and forth between the definitions and their
actual use in the for loops.

So introduce some convenience names to help readability.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c
index 468eaf5916e5e16b565f8eb4c158d73d139c0221..b6254c20f2f06243760006ee711248a1b8b229cd 100644 (file)
--- a/drivers/net/ethernet/mscc/ocelot.c
+++ b/drivers/net/ethernet/mscc/ocelot.c
@@ -1064,10 +1064,10 @@ static void ocelot_set_aggr_pgids(struct ocelot *ocelot)
        int i, port, lag;
 
        /* Reset destination and aggregation PGIDS */
-       for (port = 0; port < ocelot->num_phys_ports; port++)
+       for_each_unicast_dest_pgid(ocelot, port)
                ocelot_write_rix(ocelot, BIT(port), ANA_PGID_PGID, port);
 
-       for (i = PGID_AGGR; i < PGID_SRC; i++)
+       for_each_aggr_pgid(ocelot, i)
                ocelot_write_rix(ocelot, GENMASK(ocelot->num_phys_ports - 1, 0),
                                 ANA_PGID_PGID, i);
 
@@ -1089,7 +1089,7 @@ static void ocelot_set_aggr_pgids(struct ocelot *ocelot)
                        aggr_count++;
                }
 
-               for (i = PGID_AGGR; i < PGID_SRC; i++) {
+               for_each_aggr_pgid(ocelot, i) {
                        u32 ac;
 
                        ac = ocelot_read_rix(ocelot, ANA_PGID_PGID, i);
@@ -1451,7 +1451,7 @@ int ocelot_init(struct ocelot *ocelot)
        }
 
        /* Allow broadcast MAC frames. */
-       for (i = ocelot->num_phys_ports + 1; i < PGID_CPU; i++) {
+       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);

diff --git a/drivers/net/ethernet/mscc/ocelot_net.c b/drivers/net/ethernet/mscc/ocelot_net.c
index 1bad146a01054be3eaf192dc1918b88f0ddc797f..702b42543fb733f93f5cda46f31ca40cabb695de 100644 (file)
--- a/drivers/net/ethernet/mscc/ocelot_net.c
+++ b/drivers/net/ethernet/mscc/ocelot_net.c
@@ -422,7 +422,7 @@ static void ocelot_set_rx_mode(struct net_device *dev)
         * forwarded to the CPU port.
         */
        val = GENMASK(ocelot->num_phys_ports - 1, 0);
-       for (i = ocelot->num_phys_ports + 1; i < PGID_CPU; i++)
+       for_each_nonreserved_multicast_dest_pgid(ocelot, i)
                ocelot_write_rix(ocelot, val, ANA_PGID_PGID, i);
 
        __dev_mc_sync(dev, ocelot_mc_sync, ocelot_mc_unsync);

diff --git a/include/soc/mscc/ocelot.h b/include/soc/mscc/ocelot.h
index 80415b63ccfac61f74d0a05aaa58c2cb51032989..e050f8121ba2762128fe5bedbf9c29b8f9a4767b 100644 (file)
--- a/include/soc/mscc/ocelot.h
+++ b/include/soc/mscc/ocelot.h
@@ -65,6 +65,21 @@
 #define PGID_MCIPV4                    62
 #define PGID_MCIPV6                    63
 
+#define for_each_unicast_dest_pgid(ocelot, pgid)               \
+       for ((pgid) = 0;                                        \
+            (pgid) < (ocelot)->num_phys_ports;                 \
+            (pgid)++)
+
+#define for_each_nonreserved_multicast_dest_pgid(ocelot, pgid) \
+       for ((pgid) = (ocelot)->num_phys_ports + 1;             \
+            (pgid) < PGID_CPU;                                 \
+            (pgid)++)
+
+#define for_each_aggr_pgid(ocelot, pgid)                       \
+       for ((pgid) = PGID_AGGR;                                \
+            (pgid) < PGID_SRC;                                 \
+            (pgid)++)
+
 /* Aggregation PGIDs, one per Link Aggregation Code */
 #define PGID_AGGR                      64