net: dsa: mv88e6xxx: use ports list to map bridge

Instead of digging into the other dsa_switch structures of the fabric
and relying too much on the dsa_to_port helper, use the new list
of switch fabric ports to remap the Port VLAN Map of local bridge
group members or remap the Port VLAN Table entry of external bridge
group members.

Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>

diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index af89431420532735bdf36f44e6f344abcf769211..c53d4dc88e9039ef87c200e3d281db2d0ba3f34c 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -2043,29 +2043,26 @@ static int mv88e6xxx_port_fdb_dump(struct dsa_switch *ds, int port,
 static int mv88e6xxx_bridge_map(struct mv88e6xxx_chip *chip,
                                struct net_device *br)
 {
-       struct dsa_switch *ds;
-       int port;
-       int dev;
+       struct dsa_switch *ds = chip->ds;
+       struct dsa_switch_tree *dst = ds->dst;
+       struct dsa_port *dp;
        int err;
 
-       /* Remap the Port VLAN of each local bridge group member */
-       for (port = 0; port < mv88e6xxx_num_ports(chip); ++port) {
-               if (dsa_to_port(chip->ds, port)->bridge_dev == br) {
-                       err = mv88e6xxx_port_vlan_map(chip, port);
-                       if (err)
-                               return err;
-               }
-       }
-
-       /* Remap the Port VLAN of each cross-chip bridge group member */
-       for (dev = 0; dev < DSA_MAX_SWITCHES; ++dev) {
-               ds = chip->ds->dst->ds[dev];
-               if (!ds)
-                       break;
-
-               for (port = 0; port < ds->num_ports; ++port) {
-                       if (dsa_to_port(ds, port)->bridge_dev == br) {
-                               err = mv88e6xxx_pvt_map(chip, dev, port);
+       list_for_each_entry(dp, &dst->ports, list) {
+               if (dp->bridge_dev == br) {
+                       if (dp->ds == ds) {
+                               /* This is a local bridge group member,
+                                * remap its Port VLAN Map.
+                                */
+                               err = mv88e6xxx_port_vlan_map(chip, dp->index);
+                               if (err)
+                                       return err;
+                       } else {
+                               /* This is an external bridge group member,
+                                * remap its cross-chip Port VLAN Table entry.
+                                */
+                               err = mv88e6xxx_pvt_map(chip, dp->ds->index,
+                                                       dp->index);
                                if (err)
                                        return err;
                        }