6 files changed, 372 insertions, 217 deletions

diff --git a/drivers/net/dsa/Kconfig b/drivers/net/dsa/Kconfig
index 7ad0a4d8e475..4c483d937481 100644
--- a/drivers/net/dsa/Kconfig
+++ b/drivers/net/dsa/Kconfig
@@ -46,13 +46,13 @@ config NET_DSA_MV88E6171
           ethernet switches chips.
 
 config NET_DSA_MV88E6352
-        tristate "Marvell 88E6172/88E6176/88E6352 ethernet switch chip support"
+        tristate "Marvell 88E6172/6176/6320/6321/6352 ethernet switch chip support"
         depends on NET_DSA
         select NET_DSA_MV88E6XXX
         select NET_DSA_TAG_EDSA
         ---help---
-          This enables support for the Marvell 88E6172, 88E6176 and 88E6352
-          ethernet switch chips.
+          This enables support for the Marvell 88E6172, 88E6176, 88E6320,
+          88E6321 and 88E6352 ethernet switch chips.
 
 config NET_DSA_BCM_SF2
         tristate "Broadcom Starfighter 2 Ethernet switch support"
diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c
index 079897b3a955..289e20443d83 100644
--- a/drivers/net/dsa/bcm_sf2.c
+++ b/drivers/net/dsa/bcm_sf2.c
@@ -901,15 +901,11 @@ static void bcm_sf2_sw_fixed_link_update(struct dsa_switch *ds, int port,
                                          struct fixed_phy_status *status)
 {
         struct bcm_sf2_priv *priv = ds_to_priv(ds);
-        u32 duplex, pause, speed;
+        u32 duplex, pause;
         u32 reg;
 
         duplex = core_readl(priv, CORE_DUPSTS);
         pause = core_readl(priv, CORE_PAUSESTS);
-        speed = core_readl(priv, CORE_SPDSTS);
-
-        speed >>= (port * SPDSTS_SHIFT);
-        speed &= SPDSTS_MASK;
 
         status->link = 0;
 
@@ -944,18 +940,6 @@ static void bcm_sf2_sw_fixed_link_update(struct dsa_switch *ds, int port,
                 reg &= ~LINK_STS;
         core_writel(priv, reg, CORE_STS_OVERRIDE_GMIIP_PORT(port));
 
-        switch (speed) {
-        case SPDSTS_10:
-                status->speed = SPEED_10;
-                break;
-        case SPDSTS_100:
-                status->speed = SPEED_100;
-                break;
-        case SPDSTS_1000:
-                status->speed = SPEED_1000;
-                break;
-        }
-
         if ((pause & (1 << port)) &&
             (pause & (1 << (port + PAUSESTS_TX_PAUSE_SHIFT)))) {
                 status->asym_pause = 1;
diff --git a/drivers/net/dsa/mv88e6171.c b/drivers/net/dsa/mv88e6171.c
index 1c7808495a9d..735f04cd83ee 100644
--- a/drivers/net/dsa/mv88e6171.c
+++ b/drivers/net/dsa/mv88e6171.c
@@ -116,9 +116,9 @@ struct dsa_switch_driver mv88e6171_switch_driver = {
         .port_join_bridge       = mv88e6xxx_join_bridge,
         .port_leave_bridge      = mv88e6xxx_leave_bridge,
         .port_stp_update        = mv88e6xxx_port_stp_update,
-        .fdb_add                = mv88e6xxx_port_fdb_add,
-        .fdb_del                = mv88e6xxx_port_fdb_del,
-        .fdb_getnext            = mv88e6xxx_port_fdb_getnext,
+        .port_fdb_add           = mv88e6xxx_port_fdb_add,
+        .port_fdb_del           = mv88e6xxx_port_fdb_del,
+        .port_fdb_getnext       = mv88e6xxx_port_fdb_getnext,
 };
 
 MODULE_ALIAS("platform:mv88e6171");
diff --git a/drivers/net/dsa/mv88e6352.c b/drivers/net/dsa/mv88e6352.c
index 632815c10a40..a18f7c83d4cb 100644
--- a/drivers/net/dsa/mv88e6352.c
+++ b/drivers/net/dsa/mv88e6352.c
@@ -36,6 +36,18 @@ static char *mv88e6352_probe(struct device *host_dev, int sw_addr)
                         return "Marvell 88E6172";
                 if ((ret & 0xfff0) == PORT_SWITCH_ID_6176)
                         return "Marvell 88E6176";
+                if (ret == PORT_SWITCH_ID_6320_A1)
+                        return "Marvell 88E6320 (A1)";
+                if (ret == PORT_SWITCH_ID_6320_A2)
+                        return "Marvell 88e6320 (A2)";
+                if ((ret & 0xfff0) == PORT_SWITCH_ID_6320)
+                        return "Marvell 88E6320";
+                if (ret == PORT_SWITCH_ID_6321_A1)
+                        return "Marvell 88E6321 (A1)";
+                if (ret == PORT_SWITCH_ID_6321_A2)
+                        return "Marvell 88e6321 (A2)";
+                if ((ret & 0xfff0) == PORT_SWITCH_ID_6321)
+                        return "Marvell 88E6321";
                 if (ret == PORT_SWITCH_ID_6352_A0)
                         return "Marvell 88E6352 (A0)";
                 if (ret == PORT_SWITCH_ID_6352_A1)
@@ -80,66 +92,6 @@ static int mv88e6352_setup_global(struct dsa_switch *ds)
         return 0;
 }
 
-#ifdef CONFIG_NET_DSA_HWMON
-
-static int mv88e6352_get_temp(struct dsa_switch *ds, int *temp)
-{
-        int ret;
-
-        *temp = 0;
-
-        ret = mv88e6xxx_phy_page_read(ds, 0, 6, 27);
-        if (ret < 0)
-                return ret;
-
-        *temp = (ret & 0xff) - 25;
-
-        return 0;
-}
-
-static int mv88e6352_get_temp_limit(struct dsa_switch *ds, int *temp)
-{
-        int ret;
-
-        *temp = 0;
-
-        ret = mv88e6xxx_phy_page_read(ds, 0, 6, 26);
-        if (ret < 0)
-                return ret;
-
-        *temp = (((ret >> 8) & 0x1f) * 5) - 25;
-
-        return 0;
-}
-
-static int mv88e6352_set_temp_limit(struct dsa_switch *ds, int temp)
-{
-        int ret;
-
-        ret = mv88e6xxx_phy_page_read(ds, 0, 6, 26);
-        if (ret < 0)
-                return ret;
-        temp = clamp_val(DIV_ROUND_CLOSEST(temp, 5) + 5, 0, 0x1f);
-        return mv88e6xxx_phy_page_write(ds, 0, 6, 26,
-                                        (ret & 0xe0ff) | (temp << 8));
-}
-
-static int mv88e6352_get_temp_alarm(struct dsa_switch *ds, bool *alarm)
-{
-        int ret;
-
-        *alarm = false;
-
-        ret = mv88e6xxx_phy_page_read(ds, 0, 6, 26);
-        if (ret < 0)
-                return ret;
-
-        *alarm = !!(ret & 0x40);
-
-        return 0;
-}
-#endif /* CONFIG_NET_DSA_HWMON */
-
 static int mv88e6352_setup(struct dsa_switch *ds)
 {
         struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);
@@ -171,8 +123,9 @@ static int mv88e6352_read_eeprom_word(struct dsa_switch *ds, int addr)
 
         mutex_lock(&ps->eeprom_mutex);
 
-        ret = mv88e6xxx_reg_write(ds, REG_GLOBAL2, 0x14,
-                                  0xc000 | (addr & 0xff));
+        ret = mv88e6xxx_reg_write(ds, REG_GLOBAL2, GLOBAL2_EEPROM_OP,
+                                  GLOBAL2_EEPROM_OP_READ |
+                                  (addr & GLOBAL2_EEPROM_OP_ADDR_MASK));
         if (ret < 0)
                 goto error;
 
@@ -180,7 +133,7 @@ static int mv88e6352_read_eeprom_word(struct dsa_switch *ds, int addr)
         if (ret < 0)
                 goto error;
 
-        ret = mv88e6xxx_reg_read(ds, REG_GLOBAL2, 0x15);
+        ret = mv88e6xxx_reg_read(ds, REG_GLOBAL2, GLOBAL2_EEPROM_DATA);
 error:
         mutex_unlock(&ps->eeprom_mutex);
         return ret;
@@ -253,11 +206,11 @@ static int mv88e6352_eeprom_is_readonly(struct dsa_switch *ds)
 {
         int ret;
 
-        ret = mv88e6xxx_reg_read(ds, REG_GLOBAL2, 0x14);
+        ret = mv88e6xxx_reg_read(ds, REG_GLOBAL2, GLOBAL2_EEPROM_OP);
         if (ret < 0)
                 return ret;
 
-        if (!(ret & 0x0400))
+        if (!(ret & GLOBAL2_EEPROM_OP_WRITE_EN))
                 return -EROFS;
 
         return 0;
@@ -271,12 +224,13 @@ static int mv88e6352_write_eeprom_word(struct dsa_switch *ds, int addr,
 
         mutex_lock(&ps->eeprom_mutex);
 
-        ret = mv88e6xxx_reg_write(ds, REG_GLOBAL2, 0x15, data);
+        ret = mv88e6xxx_reg_write(ds, REG_GLOBAL2, GLOBAL2_EEPROM_DATA, data);
         if (ret < 0)
                 goto error;
 
-        ret = mv88e6xxx_reg_write(ds, REG_GLOBAL2, 0x14,
-                                  0xb000 | (addr & 0xff));
+        ret = mv88e6xxx_reg_write(ds, REG_GLOBAL2, GLOBAL2_EEPROM_OP,
+                                  GLOBAL2_EEPROM_OP_WRITE |
+                                  (addr & GLOBAL2_EEPROM_OP_ADDR_MASK));
         if (ret < 0)
                 goto error;
 
@@ -377,10 +331,10 @@ struct dsa_switch_driver mv88e6352_switch_driver = {
         .set_eee                = mv88e6xxx_set_eee,
         .get_eee                = mv88e6xxx_get_eee,
 #ifdef CONFIG_NET_DSA_HWMON
-        .get_temp               = mv88e6352_get_temp,
-        .get_temp_limit         = mv88e6352_get_temp_limit,
-        .set_temp_limit         = mv88e6352_set_temp_limit,
-        .get_temp_alarm         = mv88e6352_get_temp_alarm,
+        .get_temp               = mv88e6xxx_get_temp,
+        .get_temp_limit         = mv88e6xxx_get_temp_limit,
+        .set_temp_limit         = mv88e6xxx_set_temp_limit,
+        .get_temp_alarm         = mv88e6xxx_get_temp_alarm,
 #endif
         .get_eeprom             = mv88e6352_get_eeprom,
         .set_eeprom             = mv88e6352_set_eeprom,
@@ -389,10 +343,13 @@ struct dsa_switch_driver mv88e6352_switch_driver = {
         .port_join_bridge       = mv88e6xxx_join_bridge,
         .port_leave_bridge      = mv88e6xxx_leave_bridge,
         .port_stp_update        = mv88e6xxx_port_stp_update,
-        .fdb_add                = mv88e6xxx_port_fdb_add,
-        .fdb_del                = mv88e6xxx_port_fdb_del,
-        .fdb_getnext            = mv88e6xxx_port_fdb_getnext,
+        .port_fdb_add           = mv88e6xxx_port_fdb_add,
+        .port_fdb_del           = mv88e6xxx_port_fdb_del,
+        .port_fdb_getnext       = mv88e6xxx_port_fdb_getnext,
 };
 
-MODULE_ALIAS("platform:mv88e6352");
 MODULE_ALIAS("platform:mv88e6172");
+MODULE_ALIAS("platform:mv88e6176");
+MODULE_ALIAS("platform:mv88e6320");
+MODULE_ALIAS("platform:mv88e6321");
+MODULE_ALIAS("platform:mv88e6352");
diff --git a/drivers/net/dsa/mv88e6xxx.c b/drivers/net/dsa/mv88e6xxx.c
index 561342466076..9978245474a7 100644
--- a/drivers/net/dsa/mv88e6xxx.c
+++ b/drivers/net/dsa/mv88e6xxx.c
@@ -517,6 +517,18 @@ static bool mv88e6xxx_6185_family(struct dsa_switch *ds)
         return false;
 }
 
+static bool mv88e6xxx_6320_family(struct dsa_switch *ds)
+{
+        struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);
+
+        switch (ps->id) {
+        case PORT_SWITCH_ID_6320:
+        case PORT_SWITCH_ID_6321:
+                return true;
+        }
+        return false;
+}
+
 static bool mv88e6xxx_6351_family(struct dsa_switch *ds)
 {
         struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);
@@ -565,7 +577,7 @@ static int _mv88e6xxx_stats_snapshot(struct dsa_switch *ds, int port)
 {
         int ret;
 
-        if (mv88e6xxx_6352_family(ds))
+        if (mv88e6xxx_6320_family(ds) || mv88e6xxx_6352_family(ds))
                 port = (port + 1) << 5;
 
         /* Snapshot the hardware statistics counters for this port. */
@@ -796,54 +808,6 @@ void mv88e6xxx_get_regs(struct dsa_switch *ds, int port,
         }
 }
 
-#ifdef CONFIG_NET_DSA_HWMON
-
-int  mv88e6xxx_get_temp(struct dsa_switch *ds, int *temp)
-{
-        struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);
-        int ret;
-        int val;
-
-        *temp = 0;
-
-        mutex_lock(&ps->smi_mutex);
-
-        ret = _mv88e6xxx_phy_write(ds, 0x0, 0x16, 0x6);
-        if (ret < 0)
-                goto error;
-
-        /* Enable temperature sensor */
-        ret = _mv88e6xxx_phy_read(ds, 0x0, 0x1a);
-        if (ret < 0)
-                goto error;
-
-        ret = _mv88e6xxx_phy_write(ds, 0x0, 0x1a, ret | (1 << 5));
-        if (ret < 0)
-                goto error;
-
-        /* Wait for temperature to stabilize */
-        usleep_range(10000, 12000);
-
-        val = _mv88e6xxx_phy_read(ds, 0x0, 0x1a);
-        if (val < 0) {
-                ret = val;
-                goto error;
-        }
-
-        /* Disable temperature sensor */
-        ret = _mv88e6xxx_phy_write(ds, 0x0, 0x1a, ret & ~(1 << 5));
-        if (ret < 0)
-                goto error;
-
-        *temp = ((val & 0x1f) - 5) * 5;
-
-error:
-        _mv88e6xxx_phy_write(ds, 0x0, 0x16, 0x0);
-        mutex_unlock(&ps->smi_mutex);
-        return ret;
-}
-#endif /* CONFIG_NET_DSA_HWMON */
-
 /* Must be called with SMI lock held */
 static int _mv88e6xxx_wait(struct dsa_switch *ds, int reg, int offset,
                            u16 mask)
@@ -1000,7 +964,7 @@ static int _mv88e6xxx_atu_cmd(struct dsa_switch *ds, int fid, u16 cmd)
 {
         int ret;
 
-        ret = _mv88e6xxx_reg_write(ds, REG_GLOBAL, 0x01, fid);
+        ret = _mv88e6xxx_reg_write(ds, REG_GLOBAL, GLOBAL_ATU_FID, fid);
         if (ret < 0)
                 return ret;
 
@@ -1127,7 +1091,7 @@ int mv88e6xxx_join_bridge(struct dsa_switch *ds, int port, u32 br_port_mask)
         ps->bridge_mask[fid] = br_port_mask;
 
         if (fid != ps->fid[port]) {
-                ps->fid_mask |= 1 << ps->fid[port];
+                clear_bit(ps->fid[port], ps->fid_bitmap);
                 ps->fid[port] = fid;
                 ret = _mv88e6xxx_update_bridge_config(ds, fid);
         }
@@ -1161,9 +1125,16 @@ int mv88e6xxx_leave_bridge(struct dsa_switch *ds, int port, u32 br_port_mask)
 
         mutex_lock(&ps->smi_mutex);
 
-        newfid = __ffs(ps->fid_mask);
+        newfid = find_next_zero_bit(ps->fid_bitmap, VLAN_N_VID, 1);
+        if (unlikely(newfid > ps->num_ports)) {
+                netdev_err(ds->ports[port], "all first %d FIDs are used\n",
+                           ps->num_ports);
+                ret = -ENOSPC;
+                goto unlock;
+        }
+
         ps->fid[port] = newfid;
-        ps->fid_mask &= ~(1 << newfid);
+        set_bit(newfid, ps->fid_bitmap);
         ps->bridge_mask[fid] &= ~(1 << port);
         ps->bridge_mask[newfid] = 1 << port;
 
@@ -1171,6 +1142,7 @@ int mv88e6xxx_leave_bridge(struct dsa_switch *ds, int port, u32 br_port_mask)
         if (!ret)
                 ret = _mv88e6xxx_update_bridge_config(ds, newfid);
 
+unlock:
         mutex_unlock(&ps->smi_mutex);
 
         return ret;
@@ -1210,8 +1182,8 @@ int mv88e6xxx_port_stp_update(struct dsa_switch *ds, int port, u8 state)
         return 0;
 }
 
-static int __mv88e6xxx_write_addr(struct dsa_switch *ds,
-                                  const unsigned char *addr)
+static int _mv88e6xxx_atu_mac_write(struct dsa_switch *ds,
+                                    const unsigned char *addr)
 {
         int i, ret;
 
@@ -1226,7 +1198,7 @@ static int __mv88e6xxx_write_addr(struct dsa_switch *ds,
         return 0;
 }
 
-static int __mv88e6xxx_read_addr(struct dsa_switch *ds, unsigned char *addr)
+static int _mv88e6xxx_atu_mac_read(struct dsa_switch *ds, unsigned char *addr)
 {
         int i, ret;
 
@@ -1242,29 +1214,74 @@ static int __mv88e6xxx_read_addr(struct dsa_switch *ds, unsigned char *addr)
         return 0;
 }
 
-static int __mv88e6xxx_port_fdb_cmd(struct dsa_switch *ds, int port,
-                                    const unsigned char *addr, int state)
+static int _mv88e6xxx_atu_load(struct dsa_switch *ds,
+                               struct mv88e6xxx_atu_entry *entry)
 {
-        struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);
-        u8 fid = ps->fid[port];
+        u16 reg = 0;
         int ret;
 
         ret = _mv88e6xxx_atu_wait(ds);
         if (ret < 0)
                 return ret;
 
-        ret = __mv88e6xxx_write_addr(ds, addr);
+        ret = _mv88e6xxx_atu_mac_write(ds, entry->mac);
         if (ret < 0)
                 return ret;
 
-        ret = _mv88e6xxx_reg_write(ds, REG_GLOBAL, GLOBAL_ATU_DATA,
-                                   (0x10 << port) | state);
-        if (ret)
+        if (entry->state != GLOBAL_ATU_DATA_STATE_UNUSED) {
+                unsigned int mask, shift;
+
+                if (entry->trunk) {
+                        reg |= GLOBAL_ATU_DATA_TRUNK;
+                        mask = GLOBAL_ATU_DATA_TRUNK_ID_MASK;
+                        shift = GLOBAL_ATU_DATA_TRUNK_ID_SHIFT;
+                } else {
+                        mask = GLOBAL_ATU_DATA_PORT_VECTOR_MASK;
+                        shift = GLOBAL_ATU_DATA_PORT_VECTOR_SHIFT;
+                }
+
+                reg |= (entry->portv_trunkid << shift) & mask;
+        }
+
+        reg |= entry->state & GLOBAL_ATU_DATA_STATE_MASK;
+
+        ret = _mv88e6xxx_reg_write(ds, REG_GLOBAL, GLOBAL_ATU_DATA, reg);
+        if (ret < 0)
                 return ret;
 
-        ret = _mv88e6xxx_atu_cmd(ds, fid, GLOBAL_ATU_OP_LOAD_DB);
+        return _mv88e6xxx_atu_cmd(ds, entry->fid, GLOBAL_ATU_OP_LOAD_DB);
+}
+
+static int _mv88e6xxx_port_vid_to_fid(struct dsa_switch *ds, int port, u16 vid)
+{
+        struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);
 
-        return ret;
+        if (vid == 0)
+                return ps->fid[port];
+
+        return -ENOENT;
+}
+
+static int _mv88e6xxx_port_fdb_load(struct dsa_switch *ds, int port,
+                                    const unsigned char *addr, u16 vid,
+                                    u8 state)
+{
+        struct mv88e6xxx_atu_entry entry = { 0 };
+        int ret;
+
+        ret = _mv88e6xxx_port_vid_to_fid(ds, port, vid);
+        if (ret < 0)
+                return ret;
+
+        entry.fid = ret;
+        entry.state = state;
+        ether_addr_copy(entry.mac, addr);
+        if (state != GLOBAL_ATU_DATA_STATE_UNUSED) {
+                entry.trunk = false;
+                entry.portv_trunkid = BIT(port);
+        }
+
+        return _mv88e6xxx_atu_load(ds, &entry);
 }
 
 int mv88e6xxx_port_fdb_add(struct dsa_switch *ds, int port,
@@ -1277,7 +1294,7 @@ int mv88e6xxx_port_fdb_add(struct dsa_switch *ds, int port,
         int ret;
 
         mutex_lock(&ps->smi_mutex);
-        ret = __mv88e6xxx_port_fdb_cmd(ds, port, addr, state);
+        ret = _mv88e6xxx_port_fdb_load(ds, port, addr, vid, state);
         mutex_unlock(&ps->smi_mutex);
 
         return ret;
@@ -1290,61 +1307,99 @@ int mv88e6xxx_port_fdb_del(struct dsa_switch *ds, int port,
         int ret;
 
         mutex_lock(&ps->smi_mutex);
-        ret = __mv88e6xxx_port_fdb_cmd(ds, port, addr,
+        ret = _mv88e6xxx_port_fdb_load(ds, port, addr, vid,
                                        GLOBAL_ATU_DATA_STATE_UNUSED);
         mutex_unlock(&ps->smi_mutex);
 
         return ret;
 }
 
-static int __mv88e6xxx_port_getnext(struct dsa_switch *ds, int port,
-                                    unsigned char *addr, bool *is_static)
+static int _mv88e6xxx_atu_getnext(struct dsa_switch *ds, u16 fid,
+                                  const unsigned char *addr,
+                                  struct mv88e6xxx_atu_entry *entry)
 {
-        struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);
-        u8 fid = ps->fid[port];
-        int ret, state;
+        struct mv88e6xxx_atu_entry next = { 0 };
+        int ret;
+
+        next.fid = fid;
 
         ret = _mv88e6xxx_atu_wait(ds);
         if (ret < 0)
                 return ret;
 
-        ret = __mv88e6xxx_write_addr(ds, addr);
+        ret = _mv88e6xxx_atu_mac_write(ds, addr);
         if (ret < 0)
                 return ret;
 
-        do {
-                ret = _mv88e6xxx_atu_cmd(ds, fid,  GLOBAL_ATU_OP_GET_NEXT_DB);
-                if (ret < 0)
-                        return ret;
+        ret = _mv88e6xxx_atu_cmd(ds, fid, GLOBAL_ATU_OP_GET_NEXT_DB);
+        if (ret < 0)
+                return ret;
 
-                ret = _mv88e6xxx_reg_read(ds, REG_GLOBAL, GLOBAL_ATU_DATA);
-                if (ret < 0)
-                        return ret;
-                state = ret & GLOBAL_ATU_DATA_STATE_MASK;
-                if (state == GLOBAL_ATU_DATA_STATE_UNUSED)
-                        return -ENOENT;
-        } while (!(((ret >> 4) & 0xff) & (1 << port)));
+        ret = _mv88e6xxx_atu_mac_read(ds, next.mac);
+        if (ret < 0)
+                return ret;
 
-        ret = __mv88e6xxx_read_addr(ds, addr);
+        ret = _mv88e6xxx_reg_read(ds, REG_GLOBAL, GLOBAL_ATU_DATA);
         if (ret < 0)
                 return ret;
 
-        *is_static = state == (is_multicast_ether_addr(addr) ?
-                               GLOBAL_ATU_DATA_STATE_MC_STATIC :
-                               GLOBAL_ATU_DATA_STATE_UC_STATIC);
+        next.state = ret & GLOBAL_ATU_DATA_STATE_MASK;
+        if (next.state != GLOBAL_ATU_DATA_STATE_UNUSED) {
+                unsigned int mask, shift;
+
+                if (ret & GLOBAL_ATU_DATA_TRUNK) {
+                        next.trunk = true;
+                        mask = GLOBAL_ATU_DATA_TRUNK_ID_MASK;
+                        shift = GLOBAL_ATU_DATA_TRUNK_ID_SHIFT;
+                } else {
+                        next.trunk = false;
+                        mask = GLOBAL_ATU_DATA_PORT_VECTOR_MASK;
+                        shift = GLOBAL_ATU_DATA_PORT_VECTOR_SHIFT;
+                }
 
+                next.portv_trunkid = (ret & mask) >> shift;
+        }
+
+        *entry = next;
         return 0;
 }
 
 /* get next entry for port */
 int mv88e6xxx_port_fdb_getnext(struct dsa_switch *ds, int port,
-                               unsigned char *addr, bool *is_static)
+                               unsigned char *addr, u16 *vid, bool *is_static)
 {
         struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);
+        struct mv88e6xxx_atu_entry next;
+        u16 fid;
         int ret;
 
         mutex_lock(&ps->smi_mutex);
-        ret = __mv88e6xxx_port_getnext(ds, port, addr, is_static);
+
+        ret = _mv88e6xxx_port_vid_to_fid(ds, port, *vid);
+        if (ret < 0)
+                goto unlock;
+        fid = ret;
+
+        do {
+                if (is_broadcast_ether_addr(addr)) {
+                        ret = -ENOENT;
+                        goto unlock;
+                }
+
+                ret = _mv88e6xxx_atu_getnext(ds, fid, addr, &next);
+                if (ret < 0)
+                        goto unlock;
+
+                ether_addr_copy(addr, next.mac);
+
+                if (next.state == GLOBAL_ATU_DATA_STATE_UNUSED)
+                        continue;
+        } while (next.trunk || (next.portv_trunkid & BIT(port)) == 0);
+
+        *is_static = next.state == (is_multicast_ether_addr(addr) ?
+                                    GLOBAL_ATU_DATA_STATE_MC_STATIC :
+                                    GLOBAL_ATU_DATA_STATE_UC_STATIC);
+unlock:
         mutex_unlock(&ps->smi_mutex);
 
         return ret;
@@ -1377,7 +1432,7 @@ static int mv88e6xxx_setup_port(struct dsa_switch *ds, int port)
         if (mv88e6xxx_6352_family(ds) || mv88e6xxx_6351_family(ds) ||
             mv88e6xxx_6165_family(ds) || mv88e6xxx_6097_family(ds) ||
             mv88e6xxx_6185_family(ds) || mv88e6xxx_6095_family(ds) ||
-            mv88e6xxx_6065_family(ds)) {
+            mv88e6xxx_6065_family(ds) || mv88e6xxx_6320_family(ds)) {
                 /* MAC Forcing register: don't force link, speed,
                  * duplex or flow control state to any particular
                  * values on physical ports, but force the CPU port
@@ -1423,7 +1478,7 @@ static int mv88e6xxx_setup_port(struct dsa_switch *ds, int port)
         if (mv88e6xxx_6352_family(ds) || mv88e6xxx_6351_family(ds) ||
             mv88e6xxx_6165_family(ds) || mv88e6xxx_6097_family(ds) ||
             mv88e6xxx_6095_family(ds) || mv88e6xxx_6065_family(ds) ||
-            mv88e6xxx_6185_family(ds))
+            mv88e6xxx_6185_family(ds) || mv88e6xxx_6320_family(ds))
                 reg = PORT_CONTROL_IGMP_MLD_SNOOP |
                 PORT_CONTROL_USE_TAG | PORT_CONTROL_USE_IP |
                 PORT_CONTROL_STATE_FORWARDING;
@@ -1431,7 +1486,8 @@ static int mv88e6xxx_setup_port(struct dsa_switch *ds, int port)
                 if (mv88e6xxx_6095_family(ds) || mv88e6xxx_6185_family(ds))
                         reg |= PORT_CONTROL_DSA_TAG;
                 if (mv88e6xxx_6352_family(ds) || mv88e6xxx_6351_family(ds) ||
-                    mv88e6xxx_6165_family(ds) || mv88e6xxx_6097_family(ds)) {
+                    mv88e6xxx_6165_family(ds) || mv88e6xxx_6097_family(ds) ||
+                    mv88e6xxx_6320_family(ds)) {
                         if (ds->dst->tag_protocol == DSA_TAG_PROTO_EDSA)
                                 reg |= PORT_CONTROL_FRAME_ETHER_TYPE_DSA;
                         else
@@ -1441,14 +1497,15 @@ static int mv88e6xxx_setup_port(struct dsa_switch *ds, int port)
                 if (mv88e6xxx_6352_family(ds) || mv88e6xxx_6351_family(ds) ||
                     mv88e6xxx_6165_family(ds) || mv88e6xxx_6097_family(ds) ||
                     mv88e6xxx_6095_family(ds) || mv88e6xxx_6065_family(ds) ||
-                    mv88e6xxx_6185_family(ds)) {
+                    mv88e6xxx_6185_family(ds) || mv88e6xxx_6320_family(ds)) {
                         if (ds->dst->tag_protocol == DSA_TAG_PROTO_EDSA)
                                 reg |= PORT_CONTROL_EGRESS_ADD_TAG;
                 }
         }
         if (mv88e6xxx_6352_family(ds) || mv88e6xxx_6351_family(ds) ||
             mv88e6xxx_6165_family(ds) || mv88e6xxx_6097_family(ds) ||
-            mv88e6xxx_6095_family(ds) || mv88e6xxx_6065_family(ds)) {
+            mv88e6xxx_6095_family(ds) || mv88e6xxx_6065_family(ds) ||
+            mv88e6xxx_6320_family(ds)) {
                 if (ds->dsa_port_mask & (1 << port))
                         reg |= PORT_CONTROL_FRAME_MODE_DSA;
                 if (port == dsa_upstream_port(ds))
@@ -1473,11 +1530,11 @@ static int mv88e6xxx_setup_port(struct dsa_switch *ds, int port)
         reg = 0;
         if (mv88e6xxx_6352_family(ds) || mv88e6xxx_6351_family(ds) ||
             mv88e6xxx_6165_family(ds) || mv88e6xxx_6097_family(ds) ||
-            mv88e6xxx_6095_family(ds))
+            mv88e6xxx_6095_family(ds) || mv88e6xxx_6320_family(ds))
                 reg = PORT_CONTROL_2_MAP_DA;
 
         if (mv88e6xxx_6352_family(ds) || mv88e6xxx_6351_family(ds) ||
-            mv88e6xxx_6165_family(ds))
+            mv88e6xxx_6165_family(ds) || mv88e6xxx_6320_family(ds))
                 reg |= PORT_CONTROL_2_JUMBO_10240;
 
         if (mv88e6xxx_6095_family(ds) || mv88e6xxx_6185_family(ds)) {
@@ -1514,7 +1571,8 @@ static int mv88e6xxx_setup_port(struct dsa_switch *ds, int port)
                 goto abort;
 
         if (mv88e6xxx_6352_family(ds) || mv88e6xxx_6351_family(ds) ||
-            mv88e6xxx_6165_family(ds) || mv88e6xxx_6097_family(ds)) {
+            mv88e6xxx_6165_family(ds) || mv88e6xxx_6097_family(ds) ||
+            mv88e6xxx_6320_family(ds)) {
                 /* Do not limit the period of time that this port can
                  * be paused for by the remote end or the period of
                  * time that this port can pause the remote end.
@@ -1564,7 +1622,8 @@ static int mv88e6xxx_setup_port(struct dsa_switch *ds, int port)
 
         if (mv88e6xxx_6352_family(ds) || mv88e6xxx_6351_family(ds) ||
             mv88e6xxx_6165_family(ds) || mv88e6xxx_6097_family(ds) ||
-            mv88e6xxx_6185_family(ds) || mv88e6xxx_6095_family(ds)) {
+            mv88e6xxx_6185_family(ds) || mv88e6xxx_6095_family(ds) ||
+            mv88e6xxx_6320_family(ds)) {
                 /* Rate Control: disable ingress rate limiting. */
                 ret = _mv88e6xxx_reg_write(ds, REG_PORT(port),
                                            PORT_RATE_CONTROL, 0x0001);
@@ -1584,9 +1643,9 @@ static int mv88e6xxx_setup_port(struct dsa_switch *ds, int port)
          * ports, and allow each of the 'real' ports to only talk to
          * the upstream port.
          */
-        fid = __ffs(ps->fid_mask);
+        fid = port + 1;
         ps->fid[port] = fid;
-        ps->fid_mask &= ~(1 << fid);
+        set_bit(fid, ps->fid_bitmap);
 
         if (!dsa_is_cpu_port(ds, port))
                 ps->bridge_mask[fid] = 1 << port;
@@ -1683,7 +1742,7 @@ static int mv88e6xxx_atu_show_db(struct seq_file *s, struct dsa_switch *ds,
         unsigned char addr[6];
         int ret, data, state;
 
-        ret = __mv88e6xxx_write_addr(ds, bcast);
+        ret = _mv88e6xxx_atu_mac_write(ds, bcast);
         if (ret < 0)
                 return ret;
 
@@ -1698,7 +1757,7 @@ static int mv88e6xxx_atu_show_db(struct seq_file *s, struct dsa_switch *ds,
                 state = data & GLOBAL_ATU_DATA_STATE_MASK;
                 if (state == GLOBAL_ATU_DATA_STATE_UNUSED)
                         break;
-                ret = __mv88e6xxx_read_addr(ds, addr);
+                ret = _mv88e6xxx_atu_mac_read(ds, addr);
                 if (ret < 0)
                         return ret;
                 mv88e6xxx_atu_show_entry(s, dbnum, addr, data);
@@ -1885,8 +1944,6 @@ int mv88e6xxx_setup_common(struct dsa_switch *ds)
 
         ps->id = REG_READ(REG_PORT(0), PORT_SWITCH_ID) & 0xfff0;
 
-        ps->fid_mask = (1 << DSA_MAX_PORTS) - 1;
-
         INIT_WORK(&ps->bridge_work, mv88e6xxx_bridge_work);
 
         name = kasprintf(GFP_KERNEL, "dsa%d", ds->index);
@@ -1913,6 +1970,7 @@ int mv88e6xxx_setup_common(struct dsa_switch *ds)
 int mv88e6xxx_setup_global(struct dsa_switch *ds)
 {
         struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);
+        int ret;
         int i;
 
         /* Set the default address aging time to 5 minutes, and
@@ -1976,7 +2034,8 @@ int mv88e6xxx_setup_global(struct dsa_switch *ds)
                           (i << GLOBAL2_TRUNK_MAPPING_ID_SHIFT));
 
         if (mv88e6xxx_6352_family(ds) || mv88e6xxx_6351_family(ds) ||
-            mv88e6xxx_6165_family(ds) || mv88e6xxx_6097_family(ds)) {
+            mv88e6xxx_6165_family(ds) || mv88e6xxx_6097_family(ds) ||
+            mv88e6xxx_6320_family(ds)) {
                 /* Send all frames with destination addresses matching
                  * 01:80:c2:00:00:2x to the CPU port.
                  */
@@ -1995,7 +2054,8 @@ int mv88e6xxx_setup_global(struct dsa_switch *ds)
 
         if (mv88e6xxx_6352_family(ds) || mv88e6xxx_6351_family(ds) ||
             mv88e6xxx_6165_family(ds) || mv88e6xxx_6097_family(ds) ||
-            mv88e6xxx_6185_family(ds) || mv88e6xxx_6095_family(ds)) {
+            mv88e6xxx_6185_family(ds) || mv88e6xxx_6095_family(ds) ||
+            mv88e6xxx_6320_family(ds)) {
                 /* Disable ingress rate limiting by resetting all
                  * ingress rate limit registers to their initial
                  * state.
@@ -2009,9 +2069,11 @@ int mv88e6xxx_setup_global(struct dsa_switch *ds)
         REG_WRITE(REG_GLOBAL, GLOBAL_STATS_OP, GLOBAL_STATS_OP_FLUSH_ALL);
 
         /* Wait for the flush to complete. */
-        _mv88e6xxx_stats_wait(ds);
+        mutex_lock(&ps->smi_mutex);
+        ret = _mv88e6xxx_stats_wait(ds);
+        mutex_unlock(&ps->smi_mutex);
 
-        return 0;
+        return ret;
 }
 
 int mv88e6xxx_switch_reset(struct dsa_switch *ds, bool ppu_active)
@@ -2162,6 +2224,132 @@ mv88e6xxx_phy_write_indirect(struct dsa_switch *ds, int port, int regnum,
         return ret;
 }
 
+#ifdef CONFIG_NET_DSA_HWMON
+
+static int mv88e61xx_get_temp(struct dsa_switch *ds, int *temp)
+{
+        struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);
+        int ret;
+        int val;
+
+        *temp = 0;
+
+        mutex_lock(&ps->smi_mutex);
+
+        ret = _mv88e6xxx_phy_write(ds, 0x0, 0x16, 0x6);
+        if (ret < 0)
+                goto error;
+
+        /* Enable temperature sensor */
+        ret = _mv88e6xxx_phy_read(ds, 0x0, 0x1a);
+        if (ret < 0)
+                goto error;
+
+        ret = _mv88e6xxx_phy_write(ds, 0x0, 0x1a, ret | (1 << 5));
+        if (ret < 0)
+                goto error;
+
+        /* Wait for temperature to stabilize */
+        usleep_range(10000, 12000);
+
+        val = _mv88e6xxx_phy_read(ds, 0x0, 0x1a);
+        if (val < 0) {
+                ret = val;
+                goto error;
+        }
+
+        /* Disable temperature sensor */
+        ret = _mv88e6xxx_phy_write(ds, 0x0, 0x1a, ret & ~(1 << 5));
+        if (ret < 0)
+                goto error;
+
+        *temp = ((val & 0x1f) - 5) * 5;
+
+error:
+        _mv88e6xxx_phy_write(ds, 0x0, 0x16, 0x0);
+        mutex_unlock(&ps->smi_mutex);
+        return ret;
+}
+
+static int mv88e63xx_get_temp(struct dsa_switch *ds, int *temp)
+{
+        int phy = mv88e6xxx_6320_family(ds) ? 3 : 0;
+        int ret;
+
+        *temp = 0;
+
+        ret = mv88e6xxx_phy_page_read(ds, phy, 6, 27);
+        if (ret < 0)
+                return ret;
+
+        *temp = (ret & 0xff) - 25;
+
+        return 0;
+}
+
+int mv88e6xxx_get_temp(struct dsa_switch *ds, int *temp)
+{
+        if (mv88e6xxx_6320_family(ds) || mv88e6xxx_6352_family(ds))
+                return mv88e63xx_get_temp(ds, temp);
+
+        return mv88e61xx_get_temp(ds, temp);
+}
+
+int mv88e6xxx_get_temp_limit(struct dsa_switch *ds, int *temp)
+{
+        int phy = mv88e6xxx_6320_family(ds) ? 3 : 0;
+        int ret;
+
+        if (!mv88e6xxx_6320_family(ds) && !mv88e6xxx_6352_family(ds))
+                return -EOPNOTSUPP;
+
+        *temp = 0;
+
+        ret = mv88e6xxx_phy_page_read(ds, phy, 6, 26);
+        if (ret < 0)
+                return ret;
+
+        *temp = (((ret >> 8) & 0x1f) * 5) - 25;
+
+        return 0;
+}
+
+int mv88e6xxx_set_temp_limit(struct dsa_switch *ds, int temp)
+{
+        int phy = mv88e6xxx_6320_family(ds) ? 3 : 0;
+        int ret;
+
+        if (!mv88e6xxx_6320_family(ds) && !mv88e6xxx_6352_family(ds))
+                return -EOPNOTSUPP;
+
+        ret = mv88e6xxx_phy_page_read(ds, phy, 6, 26);
+        if (ret < 0)
+                return ret;
+        temp = clamp_val(DIV_ROUND_CLOSEST(temp, 5) + 5, 0, 0x1f);
+        return mv88e6xxx_phy_page_write(ds, phy, 6, 26,
+                                        (ret & 0xe0ff) | (temp << 8));
+}
+
+int mv88e6xxx_get_temp_alarm(struct dsa_switch *ds, bool *alarm)
+{
+        int phy = mv88e6xxx_6320_family(ds) ? 3 : 0;
+        int ret;
+
+        if (!mv88e6xxx_6320_family(ds) && !mv88e6xxx_6352_family(ds))
+                return -EOPNOTSUPP;
+
+        *alarm = false;
+
+        ret = mv88e6xxx_phy_page_read(ds, phy, 6, 26);
+        if (ret < 0)
+                return ret;
+
+        *alarm = !!(ret & 0x40);
+
+        return 0;
+}
+#endif /* CONFIG_NET_DSA_HWMON */
+
 static int __init mv88e6xxx_init(void)
 {
 #if IS_ENABLED(CONFIG_NET_DSA_MV88E6131)
diff --git a/drivers/net/dsa/mv88e6xxx.h b/drivers/net/dsa/mv88e6xxx.h
index a650b2656de9..10fae325671e 100644
--- a/drivers/net/dsa/mv88e6xxx.h
+++ b/drivers/net/dsa/mv88e6xxx.h
@@ -11,6 +11,8 @@
 #ifndef __MV88E6XXX_H
 #define __MV88E6XXX_H
 
+#include <linux/if_vlan.h>
+
 #ifndef UINT64_MAX
 #define UINT64_MAX              (u64)(~((u64)0))
 #endif
@@ -89,7 +91,12 @@
 #define PORT_SWITCH_ID_6182     0x1a60
 #define PORT_SWITCH_ID_6185     0x1a70
 #define PORT_SWITCH_ID_6240     0x2400
-#define PORT_SWITCH_ID_6320     0x1250
+#define PORT_SWITCH_ID_6320     0x1150
+#define PORT_SWITCH_ID_6320_A1  0x1151
+#define PORT_SWITCH_ID_6320_A2  0x1152
+#define PORT_SWITCH_ID_6321     0x3100
+#define PORT_SWITCH_ID_6321_A1  0x3101
+#define PORT_SWITCH_ID_6321_A2  0x3102
 #define PORT_SWITCH_ID_6350     0x3710
 #define PORT_SWITCH_ID_6351     0x3750
 #define PORT_SWITCH_ID_6352     0x3520
@@ -164,6 +171,7 @@
 #define GLOBAL_MAC_01           0x01
 #define GLOBAL_MAC_23           0x02
 #define GLOBAL_MAC_45           0x03
+#define GLOBAL_ATU_FID          0x01    /* 6097 6165 6351 6352 */
 #define GLOBAL_CONTROL          0x04
 #define GLOBAL_CONTROL_SW_RESET         BIT(15)
 #define GLOBAL_CONTROL_PPU_ENABLE       BIT(14)
@@ -198,6 +206,8 @@
 #define GLOBAL_ATU_OP_GET_CLR_VIOLATION   ((7 << 12) | GLOBAL_ATU_OP_BUSY)
 #define GLOBAL_ATU_DATA         0x0c
 #define GLOBAL_ATU_DATA_TRUNK                   BIT(15)
+#define GLOBAL_ATU_DATA_TRUNK_ID_MASK           0x00f0
+#define GLOBAL_ATU_DATA_TRUNK_ID_SHIFT          4
 #define GLOBAL_ATU_DATA_PORT_VECTOR_MASK        0x3ff0
 #define GLOBAL_ATU_DATA_PORT_VECTOR_SHIFT       4
 #define GLOBAL_ATU_DATA_STATE_MASK              0x0f
@@ -280,8 +290,12 @@
 #define GLOBAL2_PRIO_OVERRIDE_FORCE_ARP         BIT(3)
 #define GLOBAL2_PRIO_OVERRIDE_ARP_SHIFT         0
 #define GLOBAL2_EEPROM_OP       0x14
-#define GLOBAL2_EEPROM_OP_BUSY  BIT(15)
-#define GLOBAL2_EEPROM_OP_LOAD  BIT(11)
+#define GLOBAL2_EEPROM_OP_BUSY          BIT(15)
+#define GLOBAL2_EEPROM_OP_WRITE         ((3 << 12) | GLOBAL2_EEPROM_OP_BUSY)
+#define GLOBAL2_EEPROM_OP_READ          ((4 << 12) | GLOBAL2_EEPROM_OP_BUSY)
+#define GLOBAL2_EEPROM_OP_LOAD          BIT(11)
+#define GLOBAL2_EEPROM_OP_WRITE_EN      BIT(10)
+#define GLOBAL2_EEPROM_OP_ADDR_MASK     0xff
 #define GLOBAL2_EEPROM_DATA     0x15
 #define GLOBAL2_PTP_AVB_OP      0x16
 #define GLOBAL2_PTP_AVB_DATA    0x17
@@ -304,6 +318,14 @@
 #define GLOBAL2_QOS_WEIGHT      0x1c
 #define GLOBAL2_MISC            0x1d
 
+struct mv88e6xxx_atu_entry {
+        u16     fid;
+        u8      state;
+        bool    trunk;
+        u16     portv_trunkid;
+        u8      mac[ETH_ALEN];
+};
+
 struct mv88e6xxx_priv_state {
         /* When using multi-chip addressing, this mutex protects
          * access to the indirect access registers.  (In single-chip
@@ -342,9 +364,9 @@ struct mv88e6xxx_priv_state {
 
         /* hw bridging */
 
-        u32 fid_mask;
-        u8 fid[DSA_MAX_PORTS];
-        u16 bridge_mask[DSA_MAX_PORTS];
+        DECLARE_BITMAP(fid_bitmap, VLAN_N_VID); /* FIDs 1 to 4095 available */
+        u16 fid[DSA_MAX_PORTS];                 /* per (non-bridged) port FID */
+        u16 bridge_mask[DSA_MAX_PORTS];         /* br groups (indexed by FID) */
 
         unsigned long port_state_update_mask;
         u8 port_state[DSA_MAX_PORTS];
@@ -389,7 +411,10 @@ int mv88e6xxx_get_sset_count_basic(struct dsa_switch *ds);
 int mv88e6xxx_get_regs_len(struct dsa_switch *ds, int port);
 void mv88e6xxx_get_regs(struct dsa_switch *ds, int port,
                         struct ethtool_regs *regs, void *_p);
-int  mv88e6xxx_get_temp(struct dsa_switch *ds, int *temp);
+int mv88e6xxx_get_temp(struct dsa_switch *ds, int *temp);
+int mv88e6xxx_get_temp_limit(struct dsa_switch *ds, int *temp);
+int mv88e6xxx_set_temp_limit(struct dsa_switch *ds, int temp);
+int mv88e6xxx_get_temp_alarm(struct dsa_switch *ds, bool *alarm);
 int mv88e6xxx_eeprom_load_wait(struct dsa_switch *ds);
 int mv88e6xxx_eeprom_busy_wait(struct dsa_switch *ds);
 int mv88e6xxx_phy_read_indirect(struct dsa_switch *ds, int addr, int regnum);
@@ -406,10 +431,11 @@ int mv88e6xxx_port_fdb_add(struct dsa_switch *ds, int port,
 int mv88e6xxx_port_fdb_del(struct dsa_switch *ds, int port,
                            const unsigned char *addr, u16 vid);
 int mv88e6xxx_port_fdb_getnext(struct dsa_switch *ds, int port,
-                               unsigned char *addr, bool *is_static);
+                               unsigned char *addr, u16 *vid, bool *is_static);
 int mv88e6xxx_phy_page_read(struct dsa_switch *ds, int port, int page, int reg);
 int mv88e6xxx_phy_page_write(struct dsa_switch *ds, int port, int page,
                              int reg, int val);
+
 extern struct dsa_switch_driver mv88e6131_switch_driver;
 extern struct dsa_switch_driver mv88e6123_61_65_switch_driver;
 extern struct dsa_switch_driver mv88e6352_switch_driver;