12 files changed, 257 insertions, 51 deletions

diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c
index 0e4bbdcc614f..c76892ac4e69 100644
--- a/drivers/net/dsa/b53/b53_common.c
+++ b/drivers/net/dsa/b53/b53_common.c
@@ -344,7 +344,8 @@ static void b53_set_forwarding(struct b53_device *dev, int enable)
         b53_write8(dev, B53_CTRL_PAGE, B53_SWITCH_CTRL, mgmt);
 }
 
-static void b53_enable_vlan(struct b53_device *dev, bool enable)
+static void b53_enable_vlan(struct b53_device *dev, bool enable,
+                            bool enable_filtering)
 {
         u8 mgmt, vc0, vc1, vc4 = 0, vc5;
 
@@ -369,8 +370,13 @@ static void b53_enable_vlan(struct b53_device *dev, bool enable)
                 vc0 |= VC0_VLAN_EN | VC0_VID_CHK_EN | VC0_VID_HASH_VID;
                 vc1 |= VC1_RX_MCST_UNTAG_EN | VC1_RX_MCST_FWD_EN;
                 vc4 &= ~VC4_ING_VID_CHECK_MASK;
-                vc4 |= VC4_ING_VID_VIO_DROP << VC4_ING_VID_CHECK_S;
-                vc5 |= VC5_DROP_VTABLE_MISS;
+                if (enable_filtering) {
+                        vc4 |= VC4_ING_VID_VIO_DROP << VC4_ING_VID_CHECK_S;
+                        vc5 |= VC5_DROP_VTABLE_MISS;
+                } else {
+                        vc4 |= VC4_ING_VID_VIO_FWD << VC4_ING_VID_CHECK_S;
+                        vc5 &= ~VC5_DROP_VTABLE_MISS;
+                }
 
                 if (is5325(dev))
                         vc0 &= ~VC0_RESERVED_1;
@@ -420,6 +426,9 @@ static void b53_enable_vlan(struct b53_device *dev, bool enable)
         }
 
         b53_write8(dev, B53_CTRL_PAGE, B53_SWITCH_MODE, mgmt);
+
+        dev->vlan_enabled = enable;
+        dev->vlan_filtering_enabled = enable_filtering;
 }
 
 static int b53_set_jumbo(struct b53_device *dev, bool enable, bool allow_10_100)
@@ -632,25 +641,35 @@ static void b53_enable_mib(struct b53_device *dev)
         b53_write8(dev, B53_MGMT_PAGE, B53_GLOBAL_CONFIG, gc);
 }
 
+static u16 b53_default_pvid(struct b53_device *dev)
+{
+        if (is5325(dev) || is5365(dev))
+                return 1;
+        else
+                return 0;
+}
+
 int b53_configure_vlan(struct dsa_switch *ds)
 {
         struct b53_device *dev = ds->priv;
         struct b53_vlan vl = { 0 };
-        int i;
+        int i, def_vid;
+
+        def_vid = b53_default_pvid(dev);
 
         /* clear all vlan entries */
         if (is5325(dev) || is5365(dev)) {
-                for (i = 1; i < dev->num_vlans; i++)
+                for (i = def_vid; i < dev->num_vlans; i++)
                         b53_set_vlan_entry(dev, i, &vl);
         } else {
                 b53_do_vlan_op(dev, VTA_CMD_CLEAR);
         }
 
-        b53_enable_vlan(dev, false);
+        b53_enable_vlan(dev, false, dev->vlan_filtering_enabled);
 
         b53_for_each_port(dev, i)
                 b53_write16(dev, B53_VLAN_PAGE,
-                            B53_VLAN_PORT_DEF_TAG(i), 1);
+                            B53_VLAN_PORT_DEF_TAG(i), def_vid);
 
         if (!is5325(dev) && !is5365(dev))
                 b53_set_jumbo(dev, dev->enable_jumbo, false);
@@ -1255,6 +1274,46 @@ EXPORT_SYMBOL(b53_phylink_mac_link_up);
 
 int b53_vlan_filtering(struct dsa_switch *ds, int port, bool vlan_filtering)
 {
+        struct b53_device *dev = ds->priv;
+        struct net_device *bridge_dev;
+        unsigned int i;
+        u16 pvid, new_pvid;
+
+        /* Handle the case were multiple bridges span the same switch device
+         * and one of them has a different setting than what is being requested
+         * which would be breaking filtering semantics for any of the other
+         * bridge devices.
+         */
+        b53_for_each_port(dev, i) {
+                bridge_dev = dsa_to_port(ds, i)->bridge_dev;
+                if (bridge_dev &&
+                    bridge_dev != dsa_to_port(ds, port)->bridge_dev &&
+                    br_vlan_enabled(bridge_dev) != vlan_filtering) {
+                        netdev_err(bridge_dev,
+                                   "VLAN filtering is global to the switch!\n");
+                        return -EINVAL;
+                }
+        }
+
+        b53_read16(dev, B53_VLAN_PAGE, B53_VLAN_PORT_DEF_TAG(port), &pvid);
+        new_pvid = pvid;
+        if (dev->vlan_filtering_enabled && !vlan_filtering) {
+                /* Filtering is currently enabled, use the default PVID since
+                 * the bridge does not expect tagging anymore
+                 */
+                dev->ports[port].pvid = pvid;
+                new_pvid = b53_default_pvid(dev);
+        } else if (!dev->vlan_filtering_enabled && vlan_filtering) {
+                /* Filtering is currently disabled, restore the previous PVID */
+                new_pvid = dev->ports[port].pvid;
+        }
+
+        if (pvid != new_pvid)
+                b53_write16(dev, B53_VLAN_PAGE, B53_VLAN_PORT_DEF_TAG(port),
+                            new_pvid);
+
+        b53_enable_vlan(dev, dev->vlan_enabled, vlan_filtering);
+
         return 0;
 }
 EXPORT_SYMBOL(b53_vlan_filtering);
@@ -1270,7 +1329,7 @@ int b53_vlan_prepare(struct dsa_switch *ds, int port,
         if (vlan->vid_end > dev->num_vlans)
                 return -ERANGE;
 
-        b53_enable_vlan(dev, true);
+        b53_enable_vlan(dev, true, dev->vlan_filtering_enabled);
 
         return 0;
 }
@@ -1300,7 +1359,7 @@ void b53_vlan_add(struct dsa_switch *ds, int port,
                 b53_fast_age_vlan(dev, vid);
         }
 
-        if (pvid) {
+        if (pvid && !dsa_is_cpu_port(ds, port)) {
                 b53_write16(dev, B53_VLAN_PAGE, B53_VLAN_PORT_DEF_TAG(port),
                             vlan->vid_end);
                 b53_fast_age_vlan(dev, vid);
@@ -1326,12 +1385,8 @@ int b53_vlan_del(struct dsa_switch *ds, int port,
 
                 vl->members &= ~BIT(port);
 
-                if (pvid == vid) {
-                        if (is5325(dev) || is5365(dev))
-                                pvid = 1;
-                        else
-                                pvid = 0;
-                }
+                if (pvid == vid)
+                        pvid = b53_default_pvid(dev);
 
                 if (untagged && !dsa_is_cpu_port(ds, port))
                         vl->untag &= ~(BIT(port));
@@ -1644,10 +1699,7 @@ void b53_br_leave(struct dsa_switch *ds, int port, struct net_device *br)
         b53_write16(dev, B53_PVLAN_PAGE, B53_PVLAN_PORT_MASK(port), pvlan);
         dev->ports[port].vlan_ctl_mask = pvlan;
 
-        if (is5325(dev) || is5365(dev))
-                pvid = 1;
-        else
-                pvid = 0;
+        pvid = b53_default_pvid(dev);
 
         /* Make this port join all VLANs without VLAN entries */
         if (is58xx(dev)) {
diff --git a/drivers/net/dsa/b53/b53_priv.h b/drivers/net/dsa/b53/b53_priv.h
index ec796482792d..4dc7ee38b258 100644
--- a/drivers/net/dsa/b53/b53_priv.h
+++ b/drivers/net/dsa/b53/b53_priv.h
@@ -91,6 +91,7 @@ enum {
 struct b53_port {
         u16             vlan_ctl_mask;
         struct ethtool_eee eee;
+        u16             pvid;
 };
 
 struct b53_vlan {
@@ -137,6 +138,8 @@ struct b53_device {
 
         unsigned int num_vlans;
         struct b53_vlan *vlans;
+        bool vlan_enabled;
+        bool vlan_filtering_enabled;
         unsigned int num_ports;
         struct b53_port *ports;
 };
diff --git a/drivers/net/dsa/b53/b53_srab.c b/drivers/net/dsa/b53/b53_srab.c
index 90f514252987..d9c56a779c08 100644
--- a/drivers/net/dsa/b53/b53_srab.c
+++ b/drivers/net/dsa/b53/b53_srab.c
@@ -511,9 +511,6 @@ static void b53_srab_prepare_irq(struct platform_device *pdev)
         /* Clear all pending interrupts */
         writel(0xffffffff, priv->regs + B53_SRAB_INTR);
 
-        if (dev->pdata && dev->pdata->chip_id != BCM58XX_DEVICE_ID)
-                return;
-
         for (i = 0; i < B53_N_PORTS; i++) {
                 port = &priv->port_intrs[i];
 
diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c
index 361fbde76654..14138d423cf1 100644
--- a/drivers/net/dsa/bcm_sf2.c
+++ b/drivers/net/dsa/bcm_sf2.c
@@ -690,7 +690,7 @@ static int bcm_sf2_sw_suspend(struct dsa_switch *ds)
          * port, the other ones have already been disabled during
          * bcm_sf2_sw_setup
          */
-        for (port = 0; port < DSA_MAX_PORTS; port++) {
+        for (port = 0; port < ds->num_ports; port++) {
                 if (dsa_is_user_port(ds, port) || dsa_is_cpu_port(ds, port))
                         bcm_sf2_port_disable(ds, port, NULL);
         }
@@ -726,10 +726,11 @@ static void bcm_sf2_sw_get_wol(struct dsa_switch *ds, int port,
 {
         struct net_device *p = ds->ports[port].cpu_dp->master;
         struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);
-        struct ethtool_wolinfo pwol;
+        struct ethtool_wolinfo pwol = { };
 
         /* Get the parent device WoL settings */
-        p->ethtool_ops->get_wol(p, &pwol);
+        if (p->ethtool_ops->get_wol)
+                p->ethtool_ops->get_wol(p, &pwol);
 
         /* Advertise the parent device supported settings */
         wol->supported = pwol.supported;
@@ -750,9 +751,10 @@ static int bcm_sf2_sw_set_wol(struct dsa_switch *ds, int port,
         struct net_device *p = ds->ports[port].cpu_dp->master;
         struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);
         s8 cpu_port = ds->ports[port].cpu_dp->index;
-        struct ethtool_wolinfo pwol;
+        struct ethtool_wolinfo pwol =  { };
 
-        p->ethtool_ops->get_wol(p, &pwol);
+        if (p->ethtool_ops->get_wol)
+                p->ethtool_ops->get_wol(p, &pwol);
         if (wol->wolopts & ~pwol.supported)
                 return -EINVAL;
 
diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c
index 3b12e2dcff31..8a5111f9414c 100644
--- a/drivers/net/dsa/microchip/ksz_common.c
+++ b/drivers/net/dsa/microchip/ksz_common.c
@@ -7,7 +7,6 @@
 
 #include <linux/delay.h>
 #include <linux/export.h>
-#include <linux/gpio.h>
 #include <linux/gpio/consumer.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
@@ -15,7 +14,6 @@
 #include <linux/phy.h>
 #include <linux/etherdevice.h>
 #include <linux/if_bridge.h>
-#include <linux/of_gpio.h>
 #include <linux/of_net.h>
 #include <net/dsa.h>
 #include <net/switchdev.h>
diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c
index 74547f43b938..a8a2c728afba 100644
--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
@@ -18,7 +18,6 @@
 #include <linux/mfd/syscon.h>
 #include <linux/module.h>
 #include <linux/netdevice.h>
-#include <linux/of_gpio.h>
 #include <linux/of_mdio.h>
 #include <linux/of_net.h>
 #include <linux/of_platform.h>
diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index 8a517d8fb9d1..12fd7ce3f1ff 100644
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -261,6 +261,7 @@ static irqreturn_t mv88e6xxx_g1_irq_thread_work(struct mv88e6xxx_chip *chip)
         unsigned int sub_irq;
         unsigned int n;
         u16 reg;
+        u16 ctl1;
         int err;
 
         mutex_lock(&chip->reg_lock);
@@ -270,13 +271,28 @@ static irqreturn_t mv88e6xxx_g1_irq_thread_work(struct mv88e6xxx_chip *chip)
         if (err)
                 goto out;
 
-        for (n = 0; n < chip->g1_irq.nirqs; ++n) {
-                if (reg & (1 << n)) {
-                        sub_irq = irq_find_mapping(chip->g1_irq.domain, n);
-                        handle_nested_irq(sub_irq);
-                        ++nhandled;
+        do {
+                for (n = 0; n < chip->g1_irq.nirqs; ++n) {
+                        if (reg & (1 << n)) {
+                                sub_irq = irq_find_mapping(chip->g1_irq.domain,
+                                                           n);
+                                handle_nested_irq(sub_irq);
+                                ++nhandled;
+                        }
                 }
-        }
+
+                mutex_lock(&chip->reg_lock);
+                err = mv88e6xxx_g1_read(chip, MV88E6XXX_G1_CTL1, &ctl1);
+                if (err)
+                        goto unlock;
+                err = mv88e6xxx_g1_read(chip, MV88E6XXX_G1_STS, &reg);
+unlock:
+                mutex_unlock(&chip->reg_lock);
+                if (err)
+                        goto out;
+                ctl1 &= GENMASK(chip->g1_irq.nirqs, 0);
+        } while (reg & ctl1);
+
 out:
         return (nhandled > 0 ? IRQ_HANDLED : IRQ_NONE);
 }
@@ -2403,6 +2419,107 @@ static int mv88e6xxx_stats_setup(struct mv88e6xxx_chip *chip)
         return mv88e6xxx_g1_stats_clear(chip);
 }
 
+/* The mv88e6390 has some hidden registers used for debug and
+ * development. The errata also makes use of them.
+ */
+static int mv88e6390_hidden_write(struct mv88e6xxx_chip *chip, int port,
+                                  int reg, u16 val)
+{
+        u16 ctrl;
+        int err;
+
+        err = mv88e6xxx_port_write(chip, PORT_RESERVED_1A_DATA_PORT,
+                                   PORT_RESERVED_1A, val);
+        if (err)
+                return err;
+
+        ctrl = PORT_RESERVED_1A_BUSY | PORT_RESERVED_1A_WRITE |
+               PORT_RESERVED_1A_BLOCK | port << PORT_RESERVED_1A_PORT_SHIFT |
+               reg;
+
+        return mv88e6xxx_port_write(chip, PORT_RESERVED_1A_CTRL_PORT,
+                                    PORT_RESERVED_1A, ctrl);
+}
+
+static int mv88e6390_hidden_wait(struct mv88e6xxx_chip *chip)
+{
+        return mv88e6xxx_wait(chip, PORT_RESERVED_1A_CTRL_PORT,
+                              PORT_RESERVED_1A, PORT_RESERVED_1A_BUSY);
+}
+
+
+static int mv88e6390_hidden_read(struct mv88e6xxx_chip *chip, int port,
+                                  int reg, u16 *val)
+{
+        u16 ctrl;
+        int err;
+
+        ctrl = PORT_RESERVED_1A_BUSY | PORT_RESERVED_1A_READ |
+               PORT_RESERVED_1A_BLOCK | port << PORT_RESERVED_1A_PORT_SHIFT |
+               reg;
+
+        err = mv88e6xxx_port_write(chip, PORT_RESERVED_1A_CTRL_PORT,
+                                   PORT_RESERVED_1A, ctrl);
+        if (err)
+                return err;
+
+        err = mv88e6390_hidden_wait(chip);
+        if (err)
+                return err;
+
+        return  mv88e6xxx_port_read(chip, PORT_RESERVED_1A_DATA_PORT,
+                                    PORT_RESERVED_1A, val);
+}
+
+/* Check if the errata has already been applied. */
+static bool mv88e6390_setup_errata_applied(struct mv88e6xxx_chip *chip)
+{
+        int port;
+        int err;
+        u16 val;
+
+        for (port = 0; port < mv88e6xxx_num_ports(chip); port++) {
+                err = mv88e6390_hidden_read(chip, port, 0, &val);
+                if (err) {
+                        dev_err(chip->dev,
+                                "Error reading hidden register: %d\n", err);
+                        return false;
+                }
+                if (val != 0x01c0)
+                        return false;
+        }
+
+        return true;
+}
+
+/* The 6390 copper ports have an errata which require poking magic
+ * values into undocumented hidden registers and then performing a
+ * software reset.
+ */
+static int mv88e6390_setup_errata(struct mv88e6xxx_chip *chip)
+{
+        int port;
+        int err;
+
+        if (mv88e6390_setup_errata_applied(chip))
+                return 0;
+
+        /* Set the ports into blocking mode */
+        for (port = 0; port < mv88e6xxx_num_ports(chip); port++) {
+                err = mv88e6xxx_port_set_state(chip, port, BR_STATE_DISABLED);
+                if (err)
+                        return err;
+        }
+
+        for (port = 0; port < mv88e6xxx_num_ports(chip); port++) {
+                err = mv88e6390_hidden_write(chip, port, 0, 0x01c0);
+                if (err)
+                        return err;
+        }
+
+        return mv88e6xxx_software_reset(chip);
+}
+
 static int mv88e6xxx_setup(struct dsa_switch *ds)
 {
         struct mv88e6xxx_chip *chip = ds->priv;
@@ -2415,6 +2532,12 @@ static int mv88e6xxx_setup(struct dsa_switch *ds)
 
         mutex_lock(&chip->reg_lock);
 
+        if (chip->info->ops->setup_errata) {
+                err = chip->info->ops->setup_errata(chip);
+                if (err)
+                        goto unlock;
+        }
+
         /* Cache the cmode of each port. */
         for (i = 0; i < mv88e6xxx_num_ports(chip); i++) {
                 if (chip->info->ops->port_get_cmode) {
@@ -3226,6 +3349,7 @@ static const struct mv88e6xxx_ops mv88e6185_ops = {
 
 static const struct mv88e6xxx_ops mv88e6190_ops = {
         /* MV88E6XXX_FAMILY_6390 */
+        .setup_errata = mv88e6390_setup_errata,
         .irl_init_all = mv88e6390_g2_irl_init_all,
         .get_eeprom = mv88e6xxx_g2_get_eeprom8,
         .set_eeprom = mv88e6xxx_g2_set_eeprom8,
@@ -3269,6 +3393,7 @@ static const struct mv88e6xxx_ops mv88e6190_ops = {
 
 static const struct mv88e6xxx_ops mv88e6190x_ops = {
         /* MV88E6XXX_FAMILY_6390 */
+        .setup_errata = mv88e6390_setup_errata,
         .irl_init_all = mv88e6390_g2_irl_init_all,
         .get_eeprom = mv88e6xxx_g2_get_eeprom8,
         .set_eeprom = mv88e6xxx_g2_set_eeprom8,
@@ -3312,6 +3437,7 @@ static const struct mv88e6xxx_ops mv88e6190x_ops = {
 
 static const struct mv88e6xxx_ops mv88e6191_ops = {
         /* MV88E6XXX_FAMILY_6390 */
+        .setup_errata = mv88e6390_setup_errata,
         .irl_init_all = mv88e6390_g2_irl_init_all,
         .get_eeprom = mv88e6xxx_g2_get_eeprom8,
         .set_eeprom = mv88e6xxx_g2_set_eeprom8,
@@ -3404,6 +3530,7 @@ static const struct mv88e6xxx_ops mv88e6240_ops = {
 
 static const struct mv88e6xxx_ops mv88e6290_ops = {
         /* MV88E6XXX_FAMILY_6390 */
+        .setup_errata = mv88e6390_setup_errata,
         .irl_init_all = mv88e6390_g2_irl_init_all,
         .get_eeprom = mv88e6xxx_g2_get_eeprom8,
         .set_eeprom = mv88e6xxx_g2_set_eeprom8,
@@ -3709,6 +3836,7 @@ static const struct mv88e6xxx_ops mv88e6352_ops = {
 
 static const struct mv88e6xxx_ops mv88e6390_ops = {
         /* MV88E6XXX_FAMILY_6390 */
+        .setup_errata = mv88e6390_setup_errata,
         .irl_init_all = mv88e6390_g2_irl_init_all,
         .get_eeprom = mv88e6xxx_g2_get_eeprom8,
         .set_eeprom = mv88e6xxx_g2_set_eeprom8,
@@ -3756,6 +3884,7 @@ static const struct mv88e6xxx_ops mv88e6390_ops = {
 
 static const struct mv88e6xxx_ops mv88e6390x_ops = {
         /* MV88E6XXX_FAMILY_6390 */
+        .setup_errata = mv88e6390_setup_errata,
         .irl_init_all = mv88e6390_g2_irl_init_all,
         .get_eeprom = mv88e6xxx_g2_get_eeprom8,
         .set_eeprom = mv88e6xxx_g2_set_eeprom8,
diff --git a/drivers/net/dsa/mv88e6xxx/chip.h b/drivers/net/dsa/mv88e6xxx/chip.h
index f9ecb7872d32..546651d8c3e1 100644
--- a/drivers/net/dsa/mv88e6xxx/chip.h
+++ b/drivers/net/dsa/mv88e6xxx/chip.h
@@ -300,6 +300,11 @@ struct mv88e6xxx_mdio_bus {
 };
 
 struct mv88e6xxx_ops {
+        /* Switch Setup Errata, called early in the switch setup to
+         * allow any errata actions to be performed
+         */
+        int (*setup_errata)(struct mv88e6xxx_chip *chip);
+
         int (*ieee_pri_map)(struct mv88e6xxx_chip *chip);
         int (*ip_pri_map)(struct mv88e6xxx_chip *chip);
 
diff --git a/drivers/net/dsa/mv88e6xxx/global1_atu.c b/drivers/net/dsa/mv88e6xxx/global1_atu.c
index 5200e4bdce93..ea243840ee0f 100644
--- a/drivers/net/dsa/mv88e6xxx/global1_atu.c
+++ b/drivers/net/dsa/mv88e6xxx/global1_atu.c
@@ -314,6 +314,7 @@ static irqreturn_t mv88e6xxx_g1_atu_prob_irq_thread_fn(int irq, void *dev_id)
 {
         struct mv88e6xxx_chip *chip = dev_id;
         struct mv88e6xxx_atu_entry entry;
+        int spid;
         int err;
         u16 val;
 
@@ -336,6 +337,8 @@ static irqreturn_t mv88e6xxx_g1_atu_prob_irq_thread_fn(int irq, void *dev_id)
         if (err)
                 goto out;
 
+        spid = entry.state;
+
         if (val & MV88E6XXX_G1_ATU_OP_AGE_OUT_VIOLATION) {
                 dev_err_ratelimited(chip->dev,
                                     "ATU age out violation for %pM\n",
@@ -344,23 +347,23 @@ static irqreturn_t mv88e6xxx_g1_atu_prob_irq_thread_fn(int irq, void *dev_id)
 
         if (val & MV88E6XXX_G1_ATU_OP_MEMBER_VIOLATION) {
                 dev_err_ratelimited(chip->dev,
-                                    "ATU member violation for %pM portvec %x\n",
-                                    entry.mac, entry.portvec);
-                chip->ports[entry.portvec].atu_member_violation++;
+                                    "ATU member violation for %pM portvec %x spid %d\n",
+                                    entry.mac, entry.portvec, spid);
+                chip->ports[spid].atu_member_violation++;
         }
 
         if (val & MV88E6XXX_G1_ATU_OP_MISS_VIOLATION) {
                 dev_err_ratelimited(chip->dev,
-                                    "ATU miss violation for %pM portvec %x\n",
-                                    entry.mac, entry.portvec);
-                chip->ports[entry.portvec].atu_miss_violation++;
+                                    "ATU miss violation for %pM portvec %x spid %d\n",
+                                    entry.mac, entry.portvec, spid);
+                chip->ports[spid].atu_miss_violation++;
         }
 
         if (val & MV88E6XXX_G1_ATU_OP_FULL_VIOLATION) {
                 dev_err_ratelimited(chip->dev,
-                                    "ATU full violation for %pM portvec %x\n",
-                                    entry.mac, entry.portvec);
-                chip->ports[entry.portvec].atu_full_violation++;
+                                    "ATU full violation for %pM portvec %x spid %d\n",
+                                    entry.mac, entry.portvec, spid);
+                chip->ports[spid].atu_full_violation++;
         }
         mutex_unlock(&chip->reg_lock);
 
diff --git a/drivers/net/dsa/mv88e6xxx/port.h b/drivers/net/dsa/mv88e6xxx/port.h
index 0d81866d0e4a..e583641de758 100644
--- a/drivers/net/dsa/mv88e6xxx/port.h
+++ b/drivers/net/dsa/mv88e6xxx/port.h
@@ -251,6 +251,16 @@
 /* Offset 0x19: Port IEEE Priority Remapping Registers (4-7) */
 #define MV88E6095_PORT_IEEE_PRIO_REMAP_4567     0x19
 
+/* Offset 0x1a: Magic undocumented errata register */
+#define PORT_RESERVED_1A                        0x1a
+#define PORT_RESERVED_1A_BUSY                   BIT(15)
+#define PORT_RESERVED_1A_WRITE                  BIT(14)
+#define PORT_RESERVED_1A_READ                   0
+#define PORT_RESERVED_1A_PORT_SHIFT             5
+#define PORT_RESERVED_1A_BLOCK                  (0xf << 10)
+#define PORT_RESERVED_1A_CTRL_PORT              4
+#define PORT_RESERVED_1A_DATA_PORT              5
+
 int mv88e6xxx_port_read(struct mv88e6xxx_chip *chip, int port, int reg,
                         u16 *val);
 int mv88e6xxx_port_write(struct mv88e6xxx_chip *chip, int port, int reg,
diff --git a/drivers/net/dsa/mv88e6xxx/serdes.c b/drivers/net/dsa/mv88e6xxx/serdes.c
index 2caa8c8b4b55..1bfc5ff8d81d 100644
--- a/drivers/net/dsa/mv88e6xxx/serdes.c
+++ b/drivers/net/dsa/mv88e6xxx/serdes.c
@@ -664,7 +664,7 @@ int mv88e6390_serdes_irq_setup(struct mv88e6xxx_chip *chip, int port)
         if (port < 9)
                 return 0;
 
-        return mv88e6390_serdes_irq_setup(chip, port);
+        return mv88e6390x_serdes_irq_setup(chip, port);
 }
 
 void mv88e6390x_serdes_irq_free(struct mv88e6xxx_chip *chip, int port)
diff --git a/drivers/net/dsa/realtek-smi.c b/drivers/net/dsa/realtek-smi.c
index b4b839a1d095..ad41ec63cc9f 100644
--- a/drivers/net/dsa/realtek-smi.c
+++ b/drivers/net/dsa/realtek-smi.c
@@ -347,16 +347,17 @@ int realtek_smi_setup_mdio(struct realtek_smi *smi)
         struct device_node *mdio_np;
         int ret;
 
-        mdio_np = of_find_compatible_node(smi->dev->of_node, NULL,
-                                          "realtek,smi-mdio");
+        mdio_np = of_get_compatible_child(smi->dev->of_node, "realtek,smi-mdio");
         if (!mdio_np) {
                 dev_err(smi->dev, "no MDIO bus node\n");
                 return -ENODEV;
         }
 
         smi->slave_mii_bus = devm_mdiobus_alloc(smi->dev);
-        if (!smi->slave_mii_bus)
-                return -ENOMEM;
+        if (!smi->slave_mii_bus) {
+                ret = -ENOMEM;
+                goto err_put_node;
+        }
         smi->slave_mii_bus->priv = smi;
         smi->slave_mii_bus->name = "SMI slave MII";
         smi->slave_mii_bus->read = realtek_smi_mdio_read;
@@ -371,10 +372,15 @@ int realtek_smi_setup_mdio(struct realtek_smi *smi)
         if (ret) {
                 dev_err(smi->dev, "unable to register MDIO bus %s\n",
                         smi->slave_mii_bus->id);
-                of_node_put(mdio_np);
+                goto err_put_node;
         }
 
         return 0;
+
+err_put_node:
+        of_node_put(mdio_np);
+
+        return ret;
 }
 
 static int realtek_smi_probe(struct platform_device *pdev)
@@ -457,6 +463,8 @@ static int realtek_smi_remove(struct platform_device *pdev)
         struct realtek_smi *smi = dev_get_drvdata(&pdev->dev);
 
         dsa_unregister_switch(smi->ds);
+        if (smi->slave_mii_bus)
+                of_node_put(smi->slave_mii_bus->dev.of_node);
         gpiod_set_value(smi->reset, 1);
 
         return 0;