Merge tag 'dmaengine-5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul...
[linux-2.6-microblaze.git] / drivers / net / dsa / qca8k.c
index 0396945..d3ed0a7 100644 (file)
@@ -20,6 +20,7 @@
 #include <linux/phylink.h>
 #include <linux/gpio/consumer.h>
 #include <linux/etherdevice.h>
+#include <linux/dsa/tag_qca.h>
 
 #include "qca8k.h"
 
@@ -74,12 +75,6 @@ static const struct qca8k_mib_desc ar8327_mib[] = {
        MIB_DESC(1, 0xac, "TXUnicast"),
 };
 
-/* The 32bit switch registers are accessed indirectly. To achieve this we need
- * to set the page of the register. Track the last page that was set to reduce
- * mdio writes
- */
-static u16 qca8k_current_page = 0xffff;
-
 static void
 qca8k_split_addr(u32 regaddr, u16 *r1, u16 *r2, u16 *page)
 {
@@ -93,6 +88,44 @@ qca8k_split_addr(u32 regaddr, u16 *r1, u16 *r2, u16 *page)
        *page = regaddr & 0x3ff;
 }
 
+static int
+qca8k_set_lo(struct qca8k_priv *priv, int phy_id, u32 regnum, u16 lo)
+{
+       u16 *cached_lo = &priv->mdio_cache.lo;
+       struct mii_bus *bus = priv->bus;
+       int ret;
+
+       if (lo == *cached_lo)
+               return 0;
+
+       ret = bus->write(bus, phy_id, regnum, lo);
+       if (ret < 0)
+               dev_err_ratelimited(&bus->dev,
+                                   "failed to write qca8k 32bit lo register\n");
+
+       *cached_lo = lo;
+       return 0;
+}
+
+static int
+qca8k_set_hi(struct qca8k_priv *priv, int phy_id, u32 regnum, u16 hi)
+{
+       u16 *cached_hi = &priv->mdio_cache.hi;
+       struct mii_bus *bus = priv->bus;
+       int ret;
+
+       if (hi == *cached_hi)
+               return 0;
+
+       ret = bus->write(bus, phy_id, regnum, hi);
+       if (ret < 0)
+               dev_err_ratelimited(&bus->dev,
+                                   "failed to write qca8k 32bit hi register\n");
+
+       *cached_hi = hi;
+       return 0;
+}
+
 static int
 qca8k_mii_read32(struct mii_bus *bus, int phy_id, u32 regnum, u32 *val)
 {
@@ -116,7 +149,7 @@ qca8k_mii_read32(struct mii_bus *bus, int phy_id, u32 regnum, u32 *val)
 }
 
 static void
-qca8k_mii_write32(struct mii_bus *bus, int phy_id, u32 regnum, u32 val)
+qca8k_mii_write32(struct qca8k_priv *priv, int phy_id, u32 regnum, u32 val)
 {
        u16 lo, hi;
        int ret;
@@ -124,20 +157,19 @@ qca8k_mii_write32(struct mii_bus *bus, int phy_id, u32 regnum, u32 val)
        lo = val & 0xffff;
        hi = (u16)(val >> 16);
 
-       ret = bus->write(bus, phy_id, regnum, lo);
+       ret = qca8k_set_lo(priv, phy_id, regnum, lo);
        if (ret >= 0)
-               ret = bus->write(bus, phy_id, regnum + 1, hi);
-       if (ret < 0)
-               dev_err_ratelimited(&bus->dev,
-                                   "failed to write qca8k 32bit register\n");
+               ret = qca8k_set_hi(priv, phy_id, regnum + 1, hi);
 }
 
 static int
-qca8k_set_page(struct mii_bus *bus, u16 page)
+qca8k_set_page(struct qca8k_priv *priv, u16 page)
 {
+       u16 *cached_page = &priv->mdio_cache.page;
+       struct mii_bus *bus = priv->bus;
        int ret;
 
-       if (page == qca8k_current_page)
+       if (page == *cached_page)
                return 0;
 
        ret = bus->write(bus, 0x18, 0, page);
@@ -147,7 +179,7 @@ qca8k_set_page(struct mii_bus *bus, u16 page)
                return ret;
        }
 
-       qca8k_current_page = page;
+       *cached_page = page;
        usleep_range(1000, 2000);
        return 0;
 }
@@ -170,6 +202,252 @@ qca8k_rmw(struct qca8k_priv *priv, u32 reg, u32 mask, u32 write_val)
        return regmap_update_bits(priv->regmap, reg, mask, write_val);
 }
 
+static void qca8k_rw_reg_ack_handler(struct dsa_switch *ds, struct sk_buff *skb)
+{
+       struct qca8k_mgmt_eth_data *mgmt_eth_data;
+       struct qca8k_priv *priv = ds->priv;
+       struct qca_mgmt_ethhdr *mgmt_ethhdr;
+       u8 len, cmd;
+
+       mgmt_ethhdr = (struct qca_mgmt_ethhdr *)skb_mac_header(skb);
+       mgmt_eth_data = &priv->mgmt_eth_data;
+
+       cmd = FIELD_GET(QCA_HDR_MGMT_CMD, mgmt_ethhdr->command);
+       len = FIELD_GET(QCA_HDR_MGMT_LENGTH, mgmt_ethhdr->command);
+
+       /* Make sure the seq match the requested packet */
+       if (mgmt_ethhdr->seq == mgmt_eth_data->seq)
+               mgmt_eth_data->ack = true;
+
+       if (cmd == MDIO_READ) {
+               mgmt_eth_data->data[0] = mgmt_ethhdr->mdio_data;
+
+               /* Get the rest of the 12 byte of data.
+                * The read/write function will extract the requested data.
+                */
+               if (len > QCA_HDR_MGMT_DATA1_LEN)
+                       memcpy(mgmt_eth_data->data + 1, skb->data,
+                              QCA_HDR_MGMT_DATA2_LEN);
+       }
+
+       complete(&mgmt_eth_data->rw_done);
+}
+
+static struct sk_buff *qca8k_alloc_mdio_header(enum mdio_cmd cmd, u32 reg, u32 *val,
+                                              int priority, unsigned int len)
+{
+       struct qca_mgmt_ethhdr *mgmt_ethhdr;
+       unsigned int real_len;
+       struct sk_buff *skb;
+       u32 *data2;
+       u16 hdr;
+
+       skb = dev_alloc_skb(QCA_HDR_MGMT_PKT_LEN);
+       if (!skb)
+               return NULL;
+
+       /* Max value for len reg is 15 (0xf) but the switch actually return 16 byte
+        * Actually for some reason the steps are:
+        * 0: nothing
+        * 1-4: first 4 byte
+        * 5-6: first 12 byte
+        * 7-15: all 16 byte
+        */
+       if (len == 16)
+               real_len = 15;
+       else
+               real_len = len;
+
+       skb_reset_mac_header(skb);
+       skb_set_network_header(skb, skb->len);
+
+       mgmt_ethhdr = skb_push(skb, QCA_HDR_MGMT_HEADER_LEN + QCA_HDR_LEN);
+
+       hdr = FIELD_PREP(QCA_HDR_XMIT_VERSION, QCA_HDR_VERSION);
+       hdr |= FIELD_PREP(QCA_HDR_XMIT_PRIORITY, priority);
+       hdr |= QCA_HDR_XMIT_FROM_CPU;
+       hdr |= FIELD_PREP(QCA_HDR_XMIT_DP_BIT, BIT(0));
+       hdr |= FIELD_PREP(QCA_HDR_XMIT_CONTROL, QCA_HDR_XMIT_TYPE_RW_REG);
+
+       mgmt_ethhdr->command = FIELD_PREP(QCA_HDR_MGMT_ADDR, reg);
+       mgmt_ethhdr->command |= FIELD_PREP(QCA_HDR_MGMT_LENGTH, real_len);
+       mgmt_ethhdr->command |= FIELD_PREP(QCA_HDR_MGMT_CMD, cmd);
+       mgmt_ethhdr->command |= FIELD_PREP(QCA_HDR_MGMT_CHECK_CODE,
+                                          QCA_HDR_MGMT_CHECK_CODE_VAL);
+
+       if (cmd == MDIO_WRITE)
+               mgmt_ethhdr->mdio_data = *val;
+
+       mgmt_ethhdr->hdr = htons(hdr);
+
+       data2 = skb_put_zero(skb, QCA_HDR_MGMT_DATA2_LEN + QCA_HDR_MGMT_PADDING_LEN);
+       if (cmd == MDIO_WRITE && len > QCA_HDR_MGMT_DATA1_LEN)
+               memcpy(data2, val + 1, len - QCA_HDR_MGMT_DATA1_LEN);
+
+       return skb;
+}
+
+static void qca8k_mdio_header_fill_seq_num(struct sk_buff *skb, u32 seq_num)
+{
+       struct qca_mgmt_ethhdr *mgmt_ethhdr;
+
+       mgmt_ethhdr = (struct qca_mgmt_ethhdr *)skb->data;
+       mgmt_ethhdr->seq = FIELD_PREP(QCA_HDR_MGMT_SEQ_NUM, seq_num);
+}
+
+static int qca8k_read_eth(struct qca8k_priv *priv, u32 reg, u32 *val, int len)
+{
+       struct qca8k_mgmt_eth_data *mgmt_eth_data = &priv->mgmt_eth_data;
+       struct sk_buff *skb;
+       bool ack;
+       int ret;
+
+       skb = qca8k_alloc_mdio_header(MDIO_READ, reg, NULL,
+                                     QCA8K_ETHERNET_MDIO_PRIORITY, len);
+       if (!skb)
+               return -ENOMEM;
+
+       mutex_lock(&mgmt_eth_data->mutex);
+
+       /* Check mgmt_master if is operational */
+       if (!priv->mgmt_master) {
+               kfree_skb(skb);
+               mutex_unlock(&mgmt_eth_data->mutex);
+               return -EINVAL;
+       }
+
+       skb->dev = priv->mgmt_master;
+
+       reinit_completion(&mgmt_eth_data->rw_done);
+
+       /* Increment seq_num and set it in the mdio pkt */
+       mgmt_eth_data->seq++;
+       qca8k_mdio_header_fill_seq_num(skb, mgmt_eth_data->seq);
+       mgmt_eth_data->ack = false;
+
+       dev_queue_xmit(skb);
+
+       ret = wait_for_completion_timeout(&mgmt_eth_data->rw_done,
+                                         msecs_to_jiffies(QCA8K_ETHERNET_TIMEOUT));
+
+       *val = mgmt_eth_data->data[0];
+       if (len > QCA_HDR_MGMT_DATA1_LEN)
+               memcpy(val + 1, mgmt_eth_data->data + 1, len - QCA_HDR_MGMT_DATA1_LEN);
+
+       ack = mgmt_eth_data->ack;
+
+       mutex_unlock(&mgmt_eth_data->mutex);
+
+       if (ret <= 0)
+               return -ETIMEDOUT;
+
+       if (!ack)
+               return -EINVAL;
+
+       return 0;
+}
+
+static int qca8k_write_eth(struct qca8k_priv *priv, u32 reg, u32 *val, int len)
+{
+       struct qca8k_mgmt_eth_data *mgmt_eth_data = &priv->mgmt_eth_data;
+       struct sk_buff *skb;
+       bool ack;
+       int ret;
+
+       skb = qca8k_alloc_mdio_header(MDIO_WRITE, reg, val,
+                                     QCA8K_ETHERNET_MDIO_PRIORITY, len);
+       if (!skb)
+               return -ENOMEM;
+
+       mutex_lock(&mgmt_eth_data->mutex);
+
+       /* Check mgmt_master if is operational */
+       if (!priv->mgmt_master) {
+               kfree_skb(skb);
+               mutex_unlock(&mgmt_eth_data->mutex);
+               return -EINVAL;
+       }
+
+       skb->dev = priv->mgmt_master;
+
+       reinit_completion(&mgmt_eth_data->rw_done);
+
+       /* Increment seq_num and set it in the mdio pkt */
+       mgmt_eth_data->seq++;
+       qca8k_mdio_header_fill_seq_num(skb, mgmt_eth_data->seq);
+       mgmt_eth_data->ack = false;
+
+       dev_queue_xmit(skb);
+
+       ret = wait_for_completion_timeout(&mgmt_eth_data->rw_done,
+                                         msecs_to_jiffies(QCA8K_ETHERNET_TIMEOUT));
+
+       ack = mgmt_eth_data->ack;
+
+       mutex_unlock(&mgmt_eth_data->mutex);
+
+       if (ret <= 0)
+               return -ETIMEDOUT;
+
+       if (!ack)
+               return -EINVAL;
+
+       return 0;
+}
+
+static int
+qca8k_regmap_update_bits_eth(struct qca8k_priv *priv, u32 reg, u32 mask, u32 write_val)
+{
+       u32 val = 0;
+       int ret;
+
+       ret = qca8k_read_eth(priv, reg, &val, sizeof(val));
+       if (ret)
+               return ret;
+
+       val &= ~mask;
+       val |= write_val;
+
+       return qca8k_write_eth(priv, reg, &val, sizeof(val));
+}
+
+static int
+qca8k_bulk_read(struct qca8k_priv *priv, u32 reg, u32 *val, int len)
+{
+       int i, count = len / sizeof(u32), ret;
+
+       if (priv->mgmt_master && !qca8k_read_eth(priv, reg, val, len))
+               return 0;
+
+       for (i = 0; i < count; i++) {
+               ret = regmap_read(priv->regmap, reg + (i * 4), val + i);
+               if (ret < 0)
+                       return ret;
+       }
+
+       return 0;
+}
+
+static int
+qca8k_bulk_write(struct qca8k_priv *priv, u32 reg, u32 *val, int len)
+{
+       int i, count = len / sizeof(u32), ret;
+       u32 tmp;
+
+       if (priv->mgmt_master && !qca8k_write_eth(priv, reg, val, len))
+               return 0;
+
+       for (i = 0; i < count; i++) {
+               tmp = val[i];
+
+               ret = regmap_write(priv->regmap, reg + (i * 4), tmp);
+               if (ret < 0)
+                       return ret;
+       }
+
+       return 0;
+}
+
 static int
 qca8k_regmap_read(void *ctx, uint32_t reg, uint32_t *val)
 {
@@ -178,11 +456,14 @@ qca8k_regmap_read(void *ctx, uint32_t reg, uint32_t *val)
        u16 r1, r2, page;
        int ret;
 
+       if (!qca8k_read_eth(priv, reg, val, sizeof(*val)))
+               return 0;
+
        qca8k_split_addr(reg, &r1, &r2, &page);
 
        mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
 
-       ret = qca8k_set_page(bus, page);
+       ret = qca8k_set_page(priv, page);
        if (ret < 0)
                goto exit;
 
@@ -201,15 +482,18 @@ qca8k_regmap_write(void *ctx, uint32_t reg, uint32_t val)
        u16 r1, r2, page;
        int ret;
 
+       if (!qca8k_write_eth(priv, reg, &val, sizeof(val)))
+               return 0;
+
        qca8k_split_addr(reg, &r1, &r2, &page);
 
        mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
 
-       ret = qca8k_set_page(bus, page);
+       ret = qca8k_set_page(priv, page);
        if (ret < 0)
                goto exit;
 
-       qca8k_mii_write32(bus, 0x10 | r2, r1, val);
+       qca8k_mii_write32(priv, 0x10 | r2, r1, val);
 
 exit:
        mutex_unlock(&bus->mdio_lock);
@@ -225,11 +509,14 @@ qca8k_regmap_update_bits(void *ctx, uint32_t reg, uint32_t mask, uint32_t write_
        u32 val;
        int ret;
 
+       if (!qca8k_regmap_update_bits_eth(priv, reg, mask, write_val))
+               return 0;
+
        qca8k_split_addr(reg, &r1, &r2, &page);
 
        mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
 
-       ret = qca8k_set_page(bus, page);
+       ret = qca8k_set_page(priv, page);
        if (ret < 0)
                goto exit;
 
@@ -239,7 +526,7 @@ qca8k_regmap_update_bits(void *ctx, uint32_t reg, uint32_t mask, uint32_t write_
 
        val &= ~mask;
        val |= write_val;
-       qca8k_mii_write32(bus, 0x10 | r2, r1, val);
+       qca8k_mii_write32(priv, 0x10 | r2, r1, val);
 
 exit:
        mutex_unlock(&bus->mdio_lock);
@@ -296,17 +583,13 @@ qca8k_busy_wait(struct qca8k_priv *priv, u32 reg, u32 mask)
 static int
 qca8k_fdb_read(struct qca8k_priv *priv, struct qca8k_fdb *fdb)
 {
-       u32 reg[4], val;
-       int i, ret;
+       u32 reg[3];
+       int ret;
 
        /* load the ARL table into an array */
-       for (i = 0; i < 4; i++) {
-               ret = qca8k_read(priv, QCA8K_REG_ATU_DATA0 + (i * 4), &val);
-               if (ret < 0)
-                       return ret;
-
-               reg[i] = val;
-       }
+       ret = qca8k_bulk_read(priv, QCA8K_REG_ATU_DATA0, reg, sizeof(reg));
+       if (ret)
+               return ret;
 
        /* vid - 83:72 */
        fdb->vid = FIELD_GET(QCA8K_ATU_VID_MASK, reg[2]);
@@ -330,7 +613,6 @@ qca8k_fdb_write(struct qca8k_priv *priv, u16 vid, u8 port_mask, const u8 *mac,
                u8 aging)
 {
        u32 reg[3] = { 0 };
-       int i;
 
        /* vid - 83:72 */
        reg[2] = FIELD_PREP(QCA8K_ATU_VID_MASK, vid);
@@ -347,8 +629,7 @@ qca8k_fdb_write(struct qca8k_priv *priv, u16 vid, u8 port_mask, const u8 *mac,
        reg[0] |= FIELD_PREP(QCA8K_ATU_ADDR5_MASK, mac[5]);
 
        /* load the array into the ARL table */
-       for (i = 0; i < 3; i++)
-               qca8k_write(priv, QCA8K_REG_ATU_DATA0 + (i * 4), reg[i]);
+       qca8k_bulk_write(priv, QCA8K_REG_ATU_DATA0, reg, sizeof(reg));
 }
 
 static int
@@ -632,7 +913,10 @@ qca8k_mib_init(struct qca8k_priv *priv)
        int ret;
 
        mutex_lock(&priv->reg_mutex);
-       ret = regmap_set_bits(priv->regmap, QCA8K_REG_MIB, QCA8K_MIB_FLUSH | QCA8K_MIB_BUSY);
+       ret = regmap_update_bits(priv->regmap, QCA8K_REG_MIB,
+                                QCA8K_MIB_FUNC | QCA8K_MIB_BUSY,
+                                FIELD_PREP(QCA8K_MIB_FUNC, QCA8K_MIB_FLUSH) |
+                                QCA8K_MIB_BUSY);
        if (ret)
                goto exit;
 
@@ -666,6 +950,199 @@ qca8k_port_set_status(struct qca8k_priv *priv, int port, int enable)
                regmap_clear_bits(priv->regmap, QCA8K_REG_PORT_STATUS(port), mask);
 }
 
+static int
+qca8k_phy_eth_busy_wait(struct qca8k_mgmt_eth_data *mgmt_eth_data,
+                       struct sk_buff *read_skb, u32 *val)
+{
+       struct sk_buff *skb = skb_copy(read_skb, GFP_KERNEL);
+       bool ack;
+       int ret;
+
+       reinit_completion(&mgmt_eth_data->rw_done);
+
+       /* Increment seq_num and set it in the copy pkt */
+       mgmt_eth_data->seq++;
+       qca8k_mdio_header_fill_seq_num(skb, mgmt_eth_data->seq);
+       mgmt_eth_data->ack = false;
+
+       dev_queue_xmit(skb);
+
+       ret = wait_for_completion_timeout(&mgmt_eth_data->rw_done,
+                                         QCA8K_ETHERNET_TIMEOUT);
+
+       ack = mgmt_eth_data->ack;
+
+       if (ret <= 0)
+               return -ETIMEDOUT;
+
+       if (!ack)
+               return -EINVAL;
+
+       *val = mgmt_eth_data->data[0];
+
+       return 0;
+}
+
+static int
+qca8k_phy_eth_command(struct qca8k_priv *priv, bool read, int phy,
+                     int regnum, u16 data)
+{
+       struct sk_buff *write_skb, *clear_skb, *read_skb;
+       struct qca8k_mgmt_eth_data *mgmt_eth_data;
+       u32 write_val, clear_val = 0, val;
+       struct net_device *mgmt_master;
+       int ret, ret1;
+       bool ack;
+
+       if (regnum >= QCA8K_MDIO_MASTER_MAX_REG)
+               return -EINVAL;
+
+       mgmt_eth_data = &priv->mgmt_eth_data;
+
+       write_val = QCA8K_MDIO_MASTER_BUSY | QCA8K_MDIO_MASTER_EN |
+                   QCA8K_MDIO_MASTER_PHY_ADDR(phy) |
+                   QCA8K_MDIO_MASTER_REG_ADDR(regnum);
+
+       if (read) {
+               write_val |= QCA8K_MDIO_MASTER_READ;
+       } else {
+               write_val |= QCA8K_MDIO_MASTER_WRITE;
+               write_val |= QCA8K_MDIO_MASTER_DATA(data);
+       }
+
+       /* Prealloc all the needed skb before the lock */
+       write_skb = qca8k_alloc_mdio_header(MDIO_WRITE, QCA8K_MDIO_MASTER_CTRL, &write_val,
+                                           QCA8K_ETHERNET_PHY_PRIORITY, sizeof(write_val));
+       if (!write_skb)
+               return -ENOMEM;
+
+       clear_skb = qca8k_alloc_mdio_header(MDIO_WRITE, QCA8K_MDIO_MASTER_CTRL, &clear_val,
+                                           QCA8K_ETHERNET_PHY_PRIORITY, sizeof(clear_val));
+       if (!clear_skb) {
+               ret = -ENOMEM;
+               goto err_clear_skb;
+       }
+
+       read_skb = qca8k_alloc_mdio_header(MDIO_READ, QCA8K_MDIO_MASTER_CTRL, &clear_val,
+                                          QCA8K_ETHERNET_PHY_PRIORITY, sizeof(clear_val));
+       if (!read_skb) {
+               ret = -ENOMEM;
+               goto err_read_skb;
+       }
+
+       /* Actually start the request:
+        * 1. Send mdio master packet
+        * 2. Busy Wait for mdio master command
+        * 3. Get the data if we are reading
+        * 4. Reset the mdio master (even with error)
+        */
+       mutex_lock(&mgmt_eth_data->mutex);
+
+       /* Check if mgmt_master is operational */
+       mgmt_master = priv->mgmt_master;
+       if (!mgmt_master) {
+               mutex_unlock(&mgmt_eth_data->mutex);
+               ret = -EINVAL;
+               goto err_mgmt_master;
+       }
+
+       read_skb->dev = mgmt_master;
+       clear_skb->dev = mgmt_master;
+       write_skb->dev = mgmt_master;
+
+       reinit_completion(&mgmt_eth_data->rw_done);
+
+       /* Increment seq_num and set it in the write pkt */
+       mgmt_eth_data->seq++;
+       qca8k_mdio_header_fill_seq_num(write_skb, mgmt_eth_data->seq);
+       mgmt_eth_data->ack = false;
+
+       dev_queue_xmit(write_skb);
+
+       ret = wait_for_completion_timeout(&mgmt_eth_data->rw_done,
+                                         QCA8K_ETHERNET_TIMEOUT);
+
+       ack = mgmt_eth_data->ack;
+
+       if (ret <= 0) {
+               ret = -ETIMEDOUT;
+               kfree_skb(read_skb);
+               goto exit;
+       }
+
+       if (!ack) {
+               ret = -EINVAL;
+               kfree_skb(read_skb);
+               goto exit;
+       }
+
+       ret = read_poll_timeout(qca8k_phy_eth_busy_wait, ret1,
+                               !(val & QCA8K_MDIO_MASTER_BUSY), 0,
+                               QCA8K_BUSY_WAIT_TIMEOUT * USEC_PER_MSEC, false,
+                               mgmt_eth_data, read_skb, &val);
+
+       if (ret < 0 && ret1 < 0) {
+               ret = ret1;
+               goto exit;
+       }
+
+       if (read) {
+               reinit_completion(&mgmt_eth_data->rw_done);
+
+               /* Increment seq_num and set it in the read pkt */
+               mgmt_eth_data->seq++;
+               qca8k_mdio_header_fill_seq_num(read_skb, mgmt_eth_data->seq);
+               mgmt_eth_data->ack = false;
+
+               dev_queue_xmit(read_skb);
+
+               ret = wait_for_completion_timeout(&mgmt_eth_data->rw_done,
+                                                 QCA8K_ETHERNET_TIMEOUT);
+
+               ack = mgmt_eth_data->ack;
+
+               if (ret <= 0) {
+                       ret = -ETIMEDOUT;
+                       goto exit;
+               }
+
+               if (!ack) {
+                       ret = -EINVAL;
+                       goto exit;
+               }
+
+               ret = mgmt_eth_data->data[0] & QCA8K_MDIO_MASTER_DATA_MASK;
+       } else {
+               kfree_skb(read_skb);
+       }
+exit:
+       reinit_completion(&mgmt_eth_data->rw_done);
+
+       /* Increment seq_num and set it in the clear pkt */
+       mgmt_eth_data->seq++;
+       qca8k_mdio_header_fill_seq_num(clear_skb, mgmt_eth_data->seq);
+       mgmt_eth_data->ack = false;
+
+       dev_queue_xmit(clear_skb);
+
+       wait_for_completion_timeout(&mgmt_eth_data->rw_done,
+                                   QCA8K_ETHERNET_TIMEOUT);
+
+       mutex_unlock(&mgmt_eth_data->mutex);
+
+       return ret;
+
+       /* Error handling before lock */
+err_mgmt_master:
+       kfree_skb(read_skb);
+err_read_skb:
+       kfree_skb(clear_skb);
+err_clear_skb:
+       kfree_skb(write_skb);
+
+       return ret;
+}
+
 static u32
 qca8k_port_to_phy(int port)
 {
@@ -704,8 +1181,9 @@ qca8k_mdio_busy_wait(struct mii_bus *bus, u32 reg, u32 mask)
 }
 
 static int
-qca8k_mdio_write(struct mii_bus *bus, int phy, int regnum, u16 data)
+qca8k_mdio_write(struct qca8k_priv *priv, int phy, int regnum, u16 data)
 {
+       struct mii_bus *bus = priv->bus;
        u16 r1, r2, page;
        u32 val;
        int ret;
@@ -722,18 +1200,18 @@ qca8k_mdio_write(struct mii_bus *bus, int phy, int regnum, u16 data)
 
        mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
 
-       ret = qca8k_set_page(bus, page);
+       ret = qca8k_set_page(priv, page);
        if (ret)
                goto exit;
 
-       qca8k_mii_write32(bus, 0x10 | r2, r1, val);
+       qca8k_mii_write32(priv, 0x10 | r2, r1, val);
 
        ret = qca8k_mdio_busy_wait(bus, QCA8K_MDIO_MASTER_CTRL,
                                   QCA8K_MDIO_MASTER_BUSY);
 
 exit:
        /* even if the busy_wait timeouts try to clear the MASTER_EN */
-       qca8k_mii_write32(bus, 0x10 | r2, r1, 0);
+       qca8k_mii_write32(priv, 0x10 | r2, r1, 0);
 
        mutex_unlock(&bus->mdio_lock);
 
@@ -741,8 +1219,9 @@ exit:
 }
 
 static int
-qca8k_mdio_read(struct mii_bus *bus, int phy, int regnum)
+qca8k_mdio_read(struct qca8k_priv *priv, int phy, int regnum)
 {
+       struct mii_bus *bus = priv->bus;
        u16 r1, r2, page;
        u32 val;
        int ret;
@@ -758,11 +1237,11 @@ qca8k_mdio_read(struct mii_bus *bus, int phy, int regnum)
 
        mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
 
-       ret = qca8k_set_page(bus, page);
+       ret = qca8k_set_page(priv, page);
        if (ret)
                goto exit;
 
-       qca8k_mii_write32(bus, 0x10 | r2, r1, val);
+       qca8k_mii_write32(priv, 0x10 | r2, r1, val);
 
        ret = qca8k_mdio_busy_wait(bus, QCA8K_MDIO_MASTER_CTRL,
                                   QCA8K_MDIO_MASTER_BUSY);
@@ -773,7 +1252,7 @@ qca8k_mdio_read(struct mii_bus *bus, int phy, int regnum)
 
 exit:
        /* even if the busy_wait timeouts try to clear the MASTER_EN */
-       qca8k_mii_write32(bus, 0x10 | r2, r1, 0);
+       qca8k_mii_write32(priv, 0x10 | r2, r1, 0);
 
        mutex_unlock(&bus->mdio_lock);
 
@@ -787,24 +1266,35 @@ static int
 qca8k_internal_mdio_write(struct mii_bus *slave_bus, int phy, int regnum, u16 data)
 {
        struct qca8k_priv *priv = slave_bus->priv;
-       struct mii_bus *bus = priv->bus;
+       int ret;
 
-       return qca8k_mdio_write(bus, phy, regnum, data);
+       /* Use mdio Ethernet when available, fallback to legacy one on error */
+       ret = qca8k_phy_eth_command(priv, false, phy, regnum, data);
+       if (!ret)
+               return 0;
+
+       return qca8k_mdio_write(priv, phy, regnum, data);
 }
 
 static int
 qca8k_internal_mdio_read(struct mii_bus *slave_bus, int phy, int regnum)
 {
        struct qca8k_priv *priv = slave_bus->priv;
-       struct mii_bus *bus = priv->bus;
+       int ret;
 
-       return qca8k_mdio_read(bus, phy, regnum);
+       /* Use mdio Ethernet when available, fallback to legacy one on error */
+       ret = qca8k_phy_eth_command(priv, true, phy, regnum, 0);
+       if (ret >= 0)
+               return ret;
+
+       return qca8k_mdio_read(priv, phy, regnum);
 }
 
 static int
 qca8k_phy_write(struct dsa_switch *ds, int port, int regnum, u16 data)
 {
        struct qca8k_priv *priv = ds->priv;
+       int ret;
 
        /* Check if the legacy mapping should be used and the
         * port is not correctly mapped to the right PHY in the
@@ -813,7 +1303,12 @@ qca8k_phy_write(struct dsa_switch *ds, int port, int regnum, u16 data)
        if (priv->legacy_phy_port_mapping)
                port = qca8k_port_to_phy(port) % PHY_MAX_ADDR;
 
-       return qca8k_mdio_write(priv->bus, port, regnum, data);
+       /* Use mdio Ethernet when available, fallback to legacy one on error */
+       ret = qca8k_phy_eth_command(priv, false, port, regnum, 0);
+       if (!ret)
+               return ret;
+
+       return qca8k_mdio_write(priv, port, regnum, data);
 }
 
 static int
@@ -829,7 +1324,12 @@ qca8k_phy_read(struct dsa_switch *ds, int port, int regnum)
        if (priv->legacy_phy_port_mapping)
                port = qca8k_port_to_phy(port) % PHY_MAX_ADDR;
 
-       ret = qca8k_mdio_read(priv->bus, port, regnum);
+       /* Use mdio Ethernet when available, fallback to legacy one on error */
+       ret = qca8k_phy_eth_command(priv, true, port, regnum, 0);
+       if (ret >= 0)
+               return ret;
+
+       ret = qca8k_mdio_read(priv, port, regnum);
 
        if (ret < 0)
                return 0xffff;
@@ -1132,220 +1632,6 @@ qca8k_parse_port_config(struct qca8k_priv *priv)
        return 0;
 }
 
-static int
-qca8k_setup(struct dsa_switch *ds)
-{
-       struct qca8k_priv *priv = (struct qca8k_priv *)ds->priv;
-       int cpu_port, ret, i;
-       u32 mask;
-
-       cpu_port = qca8k_find_cpu_port(ds);
-       if (cpu_port < 0) {
-               dev_err(priv->dev, "No cpu port configured in both cpu port0 and port6");
-               return cpu_port;
-       }
-
-       /* Parse CPU port config to be later used in phy_link mac_config */
-       ret = qca8k_parse_port_config(priv);
-       if (ret)
-               return ret;
-
-       ret = qca8k_setup_mdio_bus(priv);
-       if (ret)
-               return ret;
-
-       ret = qca8k_setup_of_pws_reg(priv);
-       if (ret)
-               return ret;
-
-       ret = qca8k_setup_mac_pwr_sel(priv);
-       if (ret)
-               return ret;
-
-       /* Make sure MAC06 is disabled */
-       ret = regmap_clear_bits(priv->regmap, QCA8K_REG_PORT0_PAD_CTRL,
-                               QCA8K_PORT0_PAD_MAC06_EXCHANGE_EN);
-       if (ret) {
-               dev_err(priv->dev, "failed disabling MAC06 exchange");
-               return ret;
-       }
-
-       /* Enable CPU Port */
-       ret = regmap_set_bits(priv->regmap, QCA8K_REG_GLOBAL_FW_CTRL0,
-                             QCA8K_GLOBAL_FW_CTRL0_CPU_PORT_EN);
-       if (ret) {
-               dev_err(priv->dev, "failed enabling CPU port");
-               return ret;
-       }
-
-       /* Enable MIB counters */
-       ret = qca8k_mib_init(priv);
-       if (ret)
-               dev_warn(priv->dev, "mib init failed");
-
-       /* Initial setup of all ports */
-       for (i = 0; i < QCA8K_NUM_PORTS; i++) {
-               /* Disable forwarding by default on all ports */
-               ret = qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(i),
-                               QCA8K_PORT_LOOKUP_MEMBER, 0);
-               if (ret)
-                       return ret;
-
-               /* Enable QCA header mode on all cpu ports */
-               if (dsa_is_cpu_port(ds, i)) {
-                       ret = qca8k_write(priv, QCA8K_REG_PORT_HDR_CTRL(i),
-                                         FIELD_PREP(QCA8K_PORT_HDR_CTRL_TX_MASK, QCA8K_PORT_HDR_CTRL_ALL) |
-                                         FIELD_PREP(QCA8K_PORT_HDR_CTRL_RX_MASK, QCA8K_PORT_HDR_CTRL_ALL));
-                       if (ret) {
-                               dev_err(priv->dev, "failed enabling QCA header mode");
-                               return ret;
-                       }
-               }
-
-               /* Disable MAC by default on all user ports */
-               if (dsa_is_user_port(ds, i))
-                       qca8k_port_set_status(priv, i, 0);
-       }
-
-       /* Forward all unknown frames to CPU port for Linux processing
-        * Notice that in multi-cpu config only one port should be set
-        * for igmp, unknown, multicast and broadcast packet
-        */
-       ret = qca8k_write(priv, QCA8K_REG_GLOBAL_FW_CTRL1,
-                         FIELD_PREP(QCA8K_GLOBAL_FW_CTRL1_IGMP_DP_MASK, BIT(cpu_port)) |
-                         FIELD_PREP(QCA8K_GLOBAL_FW_CTRL1_BC_DP_MASK, BIT(cpu_port)) |
-                         FIELD_PREP(QCA8K_GLOBAL_FW_CTRL1_MC_DP_MASK, BIT(cpu_port)) |
-                         FIELD_PREP(QCA8K_GLOBAL_FW_CTRL1_UC_DP_MASK, BIT(cpu_port)));
-       if (ret)
-               return ret;
-
-       /* Setup connection between CPU port & user ports
-        * Configure specific switch configuration for ports
-        */
-       for (i = 0; i < QCA8K_NUM_PORTS; i++) {
-               /* CPU port gets connected to all user ports of the switch */
-               if (dsa_is_cpu_port(ds, i)) {
-                       ret = qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(i),
-                                       QCA8K_PORT_LOOKUP_MEMBER, dsa_user_ports(ds));
-                       if (ret)
-                               return ret;
-               }
-
-               /* Individual user ports get connected to CPU port only */
-               if (dsa_is_user_port(ds, i)) {
-                       ret = qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(i),
-                                       QCA8K_PORT_LOOKUP_MEMBER,
-                                       BIT(cpu_port));
-                       if (ret)
-                               return ret;
-
-                       /* Enable ARP Auto-learning by default */
-                       ret = regmap_set_bits(priv->regmap, QCA8K_PORT_LOOKUP_CTRL(i),
-                                             QCA8K_PORT_LOOKUP_LEARN);
-                       if (ret)
-                               return ret;
-
-                       /* For port based vlans to work we need to set the
-                        * default egress vid
-                        */
-                       ret = qca8k_rmw(priv, QCA8K_EGRESS_VLAN(i),
-                                       QCA8K_EGREES_VLAN_PORT_MASK(i),
-                                       QCA8K_EGREES_VLAN_PORT(i, QCA8K_PORT_VID_DEF));
-                       if (ret)
-                               return ret;
-
-                       ret = qca8k_write(priv, QCA8K_REG_PORT_VLAN_CTRL0(i),
-                                         QCA8K_PORT_VLAN_CVID(QCA8K_PORT_VID_DEF) |
-                                         QCA8K_PORT_VLAN_SVID(QCA8K_PORT_VID_DEF));
-                       if (ret)
-                               return ret;
-               }
-
-               /* The port 5 of the qca8337 have some problem in flood condition. The
-                * original legacy driver had some specific buffer and priority settings
-                * for the different port suggested by the QCA switch team. Add this
-                * missing settings to improve switch stability under load condition.
-                * This problem is limited to qca8337 and other qca8k switch are not affected.
-                */
-               if (priv->switch_id == QCA8K_ID_QCA8337) {
-                       switch (i) {
-                       /* The 2 CPU port and port 5 requires some different
-                        * priority than any other ports.
-                        */
-                       case 0:
-                       case 5:
-                       case 6:
-                               mask = QCA8K_PORT_HOL_CTRL0_EG_PRI0(0x3) |
-                                       QCA8K_PORT_HOL_CTRL0_EG_PRI1(0x4) |
-                                       QCA8K_PORT_HOL_CTRL0_EG_PRI2(0x4) |
-                                       QCA8K_PORT_HOL_CTRL0_EG_PRI3(0x4) |
-                                       QCA8K_PORT_HOL_CTRL0_EG_PRI4(0x6) |
-                                       QCA8K_PORT_HOL_CTRL0_EG_PRI5(0x8) |
-                                       QCA8K_PORT_HOL_CTRL0_EG_PORT(0x1e);
-                               break;
-                       default:
-                               mask = QCA8K_PORT_HOL_CTRL0_EG_PRI0(0x3) |
-                                       QCA8K_PORT_HOL_CTRL0_EG_PRI1(0x4) |
-                                       QCA8K_PORT_HOL_CTRL0_EG_PRI2(0x6) |
-                                       QCA8K_PORT_HOL_CTRL0_EG_PRI3(0x8) |
-                                       QCA8K_PORT_HOL_CTRL0_EG_PORT(0x19);
-                       }
-                       qca8k_write(priv, QCA8K_REG_PORT_HOL_CTRL0(i), mask);
-
-                       mask = QCA8K_PORT_HOL_CTRL1_ING(0x6) |
-                       QCA8K_PORT_HOL_CTRL1_EG_PRI_BUF_EN |
-                       QCA8K_PORT_HOL_CTRL1_EG_PORT_BUF_EN |
-                       QCA8K_PORT_HOL_CTRL1_WRED_EN;
-                       qca8k_rmw(priv, QCA8K_REG_PORT_HOL_CTRL1(i),
-                                 QCA8K_PORT_HOL_CTRL1_ING_BUF_MASK |
-                                 QCA8K_PORT_HOL_CTRL1_EG_PRI_BUF_EN |
-                                 QCA8K_PORT_HOL_CTRL1_EG_PORT_BUF_EN |
-                                 QCA8K_PORT_HOL_CTRL1_WRED_EN,
-                                 mask);
-               }
-
-               /* Set initial MTU for every port.
-                * We have only have a general MTU setting. So track
-                * every port and set the max across all port.
-                * Set per port MTU to 1500 as the MTU change function
-                * will add the overhead and if its set to 1518 then it
-                * will apply the overhead again and we will end up with
-                * MTU of 1536 instead of 1518
-                */
-               priv->port_mtu[i] = ETH_DATA_LEN;
-       }
-
-       /* Special GLOBAL_FC_THRESH value are needed for ar8327 switch */
-       if (priv->switch_id == QCA8K_ID_QCA8327) {
-               mask = QCA8K_GLOBAL_FC_GOL_XON_THRES(288) |
-                      QCA8K_GLOBAL_FC_GOL_XOFF_THRES(496);
-               qca8k_rmw(priv, QCA8K_REG_GLOBAL_FC_THRESH,
-                         QCA8K_GLOBAL_FC_GOL_XON_THRES_MASK |
-                         QCA8K_GLOBAL_FC_GOL_XOFF_THRES_MASK,
-                         mask);
-       }
-
-       /* Setup our port MTUs to match power on defaults */
-       ret = qca8k_write(priv, QCA8K_MAX_FRAME_SIZE, ETH_FRAME_LEN + ETH_FCS_LEN);
-       if (ret)
-               dev_warn(priv->dev, "failed setting MTU settings");
-
-       /* Flush the FDB table */
-       qca8k_fdb_flush(priv);
-
-       /* We don't have interrupts for link changes, so we need to poll */
-       ds->pcs_poll = true;
-
-       /* Set min a max ageing value supported */
-       ds->ageing_time_min = 7000;
-       ds->ageing_time_max = 458745000;
-
-       /* Set max number of LAGs supported */
-       ds->num_lag_ids = QCA8K_NUM_LAGS;
-
-       return 0;
-}
-
 static void
 qca8k_mac_config_setup_internal_delay(struct qca8k_priv *priv, int cpu_port_index,
                                      u32 reg)
@@ -1387,13 +1673,41 @@ qca8k_mac_config_setup_internal_delay(struct qca8k_priv *priv, int cpu_port_inde
                        cpu_port_index == QCA8K_CPU_PORT0 ? 0 : 6);
 }
 
+static struct phylink_pcs *
+qca8k_phylink_mac_select_pcs(struct dsa_switch *ds, int port,
+                            phy_interface_t interface)
+{
+       struct qca8k_priv *priv = ds->priv;
+       struct phylink_pcs *pcs = NULL;
+
+       switch (interface) {
+       case PHY_INTERFACE_MODE_SGMII:
+       case PHY_INTERFACE_MODE_1000BASEX:
+               switch (port) {
+               case 0:
+                       pcs = &priv->pcs_port_0.pcs;
+                       break;
+
+               case 6:
+                       pcs = &priv->pcs_port_6.pcs;
+                       break;
+               }
+               break;
+
+       default:
+               break;
+       }
+
+       return pcs;
+}
+
 static void
 qca8k_phylink_mac_config(struct dsa_switch *ds, int port, unsigned int mode,
                         const struct phylink_link_state *state)
 {
        struct qca8k_priv *priv = ds->priv;
-       int cpu_port_index, ret;
-       u32 reg, val;
+       int cpu_port_index;
+       u32 reg;
 
        switch (port) {
        case 0: /* 1st CPU port */
@@ -1459,70 +1773,6 @@ qca8k_phylink_mac_config(struct dsa_switch *ds, int port, unsigned int mode,
        case PHY_INTERFACE_MODE_1000BASEX:
                /* Enable SGMII on the port */
                qca8k_write(priv, reg, QCA8K_PORT_PAD_SGMII_EN);
-
-               /* Enable/disable SerDes auto-negotiation as necessary */
-               ret = qca8k_read(priv, QCA8K_REG_PWS, &val);
-               if (ret)
-                       return;
-               if (phylink_autoneg_inband(mode))
-                       val &= ~QCA8K_PWS_SERDES_AEN_DIS;
-               else
-                       val |= QCA8K_PWS_SERDES_AEN_DIS;
-               qca8k_write(priv, QCA8K_REG_PWS, val);
-
-               /* Configure the SGMII parameters */
-               ret = qca8k_read(priv, QCA8K_REG_SGMII_CTRL, &val);
-               if (ret)
-                       return;
-
-               val |= QCA8K_SGMII_EN_SD;
-
-               if (priv->ports_config.sgmii_enable_pll)
-                       val |= QCA8K_SGMII_EN_PLL | QCA8K_SGMII_EN_RX |
-                              QCA8K_SGMII_EN_TX;
-
-               if (dsa_is_cpu_port(ds, port)) {
-                       /* CPU port, we're talking to the CPU MAC, be a PHY */
-                       val &= ~QCA8K_SGMII_MODE_CTRL_MASK;
-                       val |= QCA8K_SGMII_MODE_CTRL_PHY;
-               } else if (state->interface == PHY_INTERFACE_MODE_SGMII) {
-                       val &= ~QCA8K_SGMII_MODE_CTRL_MASK;
-                       val |= QCA8K_SGMII_MODE_CTRL_MAC;
-               } else if (state->interface == PHY_INTERFACE_MODE_1000BASEX) {
-                       val &= ~QCA8K_SGMII_MODE_CTRL_MASK;
-                       val |= QCA8K_SGMII_MODE_CTRL_BASEX;
-               }
-
-               qca8k_write(priv, QCA8K_REG_SGMII_CTRL, val);
-
-               /* From original code is reported port instability as SGMII also
-                * require delay set. Apply advised values here or take them from DT.
-                */
-               if (state->interface == PHY_INTERFACE_MODE_SGMII)
-                       qca8k_mac_config_setup_internal_delay(priv, cpu_port_index, reg);
-
-               /* For qca8327/qca8328/qca8334/qca8338 sgmii is unique and
-                * falling edge is set writing in the PORT0 PAD reg
-                */
-               if (priv->switch_id == QCA8K_ID_QCA8327 ||
-                   priv->switch_id == QCA8K_ID_QCA8337)
-                       reg = QCA8K_REG_PORT0_PAD_CTRL;
-
-               val = 0;
-
-               /* SGMII Clock phase configuration */
-               if (priv->ports_config.sgmii_rx_clk_falling_edge)
-                       val |= QCA8K_PORT0_PAD_SGMII_RXCLK_FALLING_EDGE;
-
-               if (priv->ports_config.sgmii_tx_clk_falling_edge)
-                       val |= QCA8K_PORT0_PAD_SGMII_TXCLK_FALLING_EDGE;
-
-               if (val)
-                       ret = qca8k_rmw(priv, reg,
-                                       QCA8K_PORT0_PAD_SGMII_RXCLK_FALLING_EDGE |
-                                       QCA8K_PORT0_PAD_SGMII_TXCLK_FALLING_EDGE,
-                                       val);
-
                break;
        default:
                dev_err(ds->dev, "xMII mode %s not supported for port %d\n",
@@ -1531,80 +1781,111 @@ qca8k_phylink_mac_config(struct dsa_switch *ds, int port, unsigned int mode,
        }
 }
 
-static void
-qca8k_phylink_validate(struct dsa_switch *ds, int port,
-                      unsigned long *supported,
-                      struct phylink_link_state *state)
+static void qca8k_phylink_get_caps(struct dsa_switch *ds, int port,
+                                  struct phylink_config *config)
 {
-       __ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, };
-
        switch (port) {
        case 0: /* 1st CPU port */
-               if (state->interface != PHY_INTERFACE_MODE_NA &&
-                   state->interface != PHY_INTERFACE_MODE_RGMII &&
-                   state->interface != PHY_INTERFACE_MODE_RGMII_ID &&
-                   state->interface != PHY_INTERFACE_MODE_RGMII_TXID &&
-                   state->interface != PHY_INTERFACE_MODE_RGMII_RXID &&
-                   state->interface != PHY_INTERFACE_MODE_SGMII)
-                       goto unsupported;
+               phy_interface_set_rgmii(config->supported_interfaces);
+               __set_bit(PHY_INTERFACE_MODE_SGMII,
+                         config->supported_interfaces);
                break;
+
        case 1:
        case 2:
        case 3:
        case 4:
        case 5:
                /* Internal PHY */
-               if (state->interface != PHY_INTERFACE_MODE_NA &&
-                   state->interface != PHY_INTERFACE_MODE_GMII &&
-                   state->interface != PHY_INTERFACE_MODE_INTERNAL)
-                       goto unsupported;
+               __set_bit(PHY_INTERFACE_MODE_GMII,
+                         config->supported_interfaces);
+               __set_bit(PHY_INTERFACE_MODE_INTERNAL,
+                         config->supported_interfaces);
                break;
+
        case 6: /* 2nd CPU port / external PHY */
-               if (state->interface != PHY_INTERFACE_MODE_NA &&
-                   state->interface != PHY_INTERFACE_MODE_RGMII &&
-                   state->interface != PHY_INTERFACE_MODE_RGMII_ID &&
-                   state->interface != PHY_INTERFACE_MODE_RGMII_TXID &&
-                   state->interface != PHY_INTERFACE_MODE_RGMII_RXID &&
-                   state->interface != PHY_INTERFACE_MODE_SGMII &&
-                   state->interface != PHY_INTERFACE_MODE_1000BASEX)
-                       goto unsupported;
+               phy_interface_set_rgmii(config->supported_interfaces);
+               __set_bit(PHY_INTERFACE_MODE_SGMII,
+                         config->supported_interfaces);
+               __set_bit(PHY_INTERFACE_MODE_1000BASEX,
+                         config->supported_interfaces);
                break;
-       default:
-unsupported:
-               linkmode_zero(supported);
-               return;
        }
 
-       phylink_set_port_modes(mask);
-       phylink_set(mask, Autoneg);
-
-       phylink_set(mask, 1000baseT_Full);
-       phylink_set(mask, 10baseT_Half);
-       phylink_set(mask, 10baseT_Full);
-       phylink_set(mask, 100baseT_Half);
-       phylink_set(mask, 100baseT_Full);
+       config->mac_capabilities = MAC_ASYM_PAUSE | MAC_SYM_PAUSE |
+               MAC_10 | MAC_100 | MAC_1000FD;
 
-       if (state->interface == PHY_INTERFACE_MODE_1000BASEX)
-               phylink_set(mask, 1000baseX_Full);
+       config->legacy_pre_march2020 = false;
+}
 
-       phylink_set(mask, Pause);
-       phylink_set(mask, Asym_Pause);
+static void
+qca8k_phylink_mac_link_down(struct dsa_switch *ds, int port, unsigned int mode,
+                           phy_interface_t interface)
+{
+       struct qca8k_priv *priv = ds->priv;
 
-       linkmode_and(supported, supported, mask);
-       linkmode_and(state->advertising, state->advertising, mask);
+       qca8k_port_set_status(priv, port, 0);
 }
 
-static int
-qca8k_phylink_mac_link_state(struct dsa_switch *ds, int port,
-                            struct phylink_link_state *state)
+static void
+qca8k_phylink_mac_link_up(struct dsa_switch *ds, int port, unsigned int mode,
+                         phy_interface_t interface, struct phy_device *phydev,
+                         int speed, int duplex, bool tx_pause, bool rx_pause)
 {
        struct qca8k_priv *priv = ds->priv;
        u32 reg;
+
+       if (phylink_autoneg_inband(mode)) {
+               reg = QCA8K_PORT_STATUS_LINK_AUTO;
+       } else {
+               switch (speed) {
+               case SPEED_10:
+                       reg = QCA8K_PORT_STATUS_SPEED_10;
+                       break;
+               case SPEED_100:
+                       reg = QCA8K_PORT_STATUS_SPEED_100;
+                       break;
+               case SPEED_1000:
+                       reg = QCA8K_PORT_STATUS_SPEED_1000;
+                       break;
+               default:
+                       reg = QCA8K_PORT_STATUS_LINK_AUTO;
+                       break;
+               }
+
+               if (duplex == DUPLEX_FULL)
+                       reg |= QCA8K_PORT_STATUS_DUPLEX;
+
+               if (rx_pause || dsa_is_cpu_port(ds, port))
+                       reg |= QCA8K_PORT_STATUS_RXFLOW;
+
+               if (tx_pause || dsa_is_cpu_port(ds, port))
+                       reg |= QCA8K_PORT_STATUS_TXFLOW;
+       }
+
+       reg |= QCA8K_PORT_STATUS_TXMAC | QCA8K_PORT_STATUS_RXMAC;
+
+       qca8k_write(priv, QCA8K_REG_PORT_STATUS(port), reg);
+}
+
+static struct qca8k_pcs *pcs_to_qca8k_pcs(struct phylink_pcs *pcs)
+{
+       return container_of(pcs, struct qca8k_pcs, pcs);
+}
+
+static void qca8k_pcs_get_state(struct phylink_pcs *pcs,
+                               struct phylink_link_state *state)
+{
+       struct qca8k_priv *priv = pcs_to_qca8k_pcs(pcs)->priv;
+       int port = pcs_to_qca8k_pcs(pcs)->port;
+       u32 reg;
        int ret;
 
        ret = qca8k_read(priv, QCA8K_REG_PORT_STATUS(port), &reg);
-       if (ret < 0)
-               return ret;
+       if (ret < 0) {
+               state->link = false;
+               return;
+       }
 
        state->link = !!(reg & QCA8K_PORT_STATUS_LINK_UP);
        state->an_complete = state->link;
@@ -1627,80 +1908,230 @@ qca8k_phylink_mac_link_state(struct dsa_switch *ds, int port,
                break;
        }
 
-       state->pause = MLO_PAUSE_NONE;
        if (reg & QCA8K_PORT_STATUS_RXFLOW)
                state->pause |= MLO_PAUSE_RX;
        if (reg & QCA8K_PORT_STATUS_TXFLOW)
                state->pause |= MLO_PAUSE_TX;
+}
+
+static int qca8k_pcs_config(struct phylink_pcs *pcs, unsigned int mode,
+                           phy_interface_t interface,
+                           const unsigned long *advertising,
+                           bool permit_pause_to_mac)
+{
+       struct qca8k_priv *priv = pcs_to_qca8k_pcs(pcs)->priv;
+       int cpu_port_index, ret, port;
+       u32 reg, val;
+
+       port = pcs_to_qca8k_pcs(pcs)->port;
+       switch (port) {
+       case 0:
+               reg = QCA8K_REG_PORT0_PAD_CTRL;
+               cpu_port_index = QCA8K_CPU_PORT0;
+               break;
+
+       case 6:
+               reg = QCA8K_REG_PORT6_PAD_CTRL;
+               cpu_port_index = QCA8K_CPU_PORT6;
+               break;
+
+       default:
+               WARN_ON(1);
+               return -EINVAL;
+       }
+
+       /* Enable/disable SerDes auto-negotiation as necessary */
+       ret = qca8k_read(priv, QCA8K_REG_PWS, &val);
+       if (ret)
+               return ret;
+       if (phylink_autoneg_inband(mode))
+               val &= ~QCA8K_PWS_SERDES_AEN_DIS;
+       else
+               val |= QCA8K_PWS_SERDES_AEN_DIS;
+       qca8k_write(priv, QCA8K_REG_PWS, val);
+
+       /* Configure the SGMII parameters */
+       ret = qca8k_read(priv, QCA8K_REG_SGMII_CTRL, &val);
+       if (ret)
+               return ret;
+
+       val |= QCA8K_SGMII_EN_SD;
+
+       if (priv->ports_config.sgmii_enable_pll)
+               val |= QCA8K_SGMII_EN_PLL | QCA8K_SGMII_EN_RX |
+                      QCA8K_SGMII_EN_TX;
+
+       if (dsa_is_cpu_port(priv->ds, port)) {
+               /* CPU port, we're talking to the CPU MAC, be a PHY */
+               val &= ~QCA8K_SGMII_MODE_CTRL_MASK;
+               val |= QCA8K_SGMII_MODE_CTRL_PHY;
+       } else if (interface == PHY_INTERFACE_MODE_SGMII) {
+               val &= ~QCA8K_SGMII_MODE_CTRL_MASK;
+               val |= QCA8K_SGMII_MODE_CTRL_MAC;
+       } else if (interface == PHY_INTERFACE_MODE_1000BASEX) {
+               val &= ~QCA8K_SGMII_MODE_CTRL_MASK;
+               val |= QCA8K_SGMII_MODE_CTRL_BASEX;
+       }
+
+       qca8k_write(priv, QCA8K_REG_SGMII_CTRL, val);
+
+       /* From original code is reported port instability as SGMII also
+        * require delay set. Apply advised values here or take them from DT.
+        */
+       if (interface == PHY_INTERFACE_MODE_SGMII)
+               qca8k_mac_config_setup_internal_delay(priv, cpu_port_index, reg);
+       /* For qca8327/qca8328/qca8334/qca8338 sgmii is unique and
+        * falling edge is set writing in the PORT0 PAD reg
+        */
+       if (priv->switch_id == QCA8K_ID_QCA8327 ||
+           priv->switch_id == QCA8K_ID_QCA8337)
+               reg = QCA8K_REG_PORT0_PAD_CTRL;
+
+       val = 0;
+
+       /* SGMII Clock phase configuration */
+       if (priv->ports_config.sgmii_rx_clk_falling_edge)
+               val |= QCA8K_PORT0_PAD_SGMII_RXCLK_FALLING_EDGE;
+
+       if (priv->ports_config.sgmii_tx_clk_falling_edge)
+               val |= QCA8K_PORT0_PAD_SGMII_TXCLK_FALLING_EDGE;
+
+       if (val)
+               ret = qca8k_rmw(priv, reg,
+                               QCA8K_PORT0_PAD_SGMII_RXCLK_FALLING_EDGE |
+                               QCA8K_PORT0_PAD_SGMII_TXCLK_FALLING_EDGE,
+                               val);
+
+       return 0;
+}
+
+static void qca8k_pcs_an_restart(struct phylink_pcs *pcs)
+{
+}
 
-       return 1;
+static const struct phylink_pcs_ops qca8k_pcs_ops = {
+       .pcs_get_state = qca8k_pcs_get_state,
+       .pcs_config = qca8k_pcs_config,
+       .pcs_an_restart = qca8k_pcs_an_restart,
+};
+
+static void qca8k_setup_pcs(struct qca8k_priv *priv, struct qca8k_pcs *qpcs,
+                           int port)
+{
+       qpcs->pcs.ops = &qca8k_pcs_ops;
+
+       /* We don't have interrupts for link changes, so we need to poll */
+       qpcs->pcs.poll = true;
+       qpcs->priv = priv;
+       qpcs->port = port;
 }
 
 static void
-qca8k_phylink_mac_link_down(struct dsa_switch *ds, int port, unsigned int mode,
-                           phy_interface_t interface)
+qca8k_get_strings(struct dsa_switch *ds, int port, u32 stringset, uint8_t *data)
 {
+       const struct qca8k_match_data *match_data;
        struct qca8k_priv *priv = ds->priv;
+       int i;
 
-       qca8k_port_set_status(priv, port, 0);
+       if (stringset != ETH_SS_STATS)
+               return;
+
+       match_data = of_device_get_match_data(priv->dev);
+
+       for (i = 0; i < match_data->mib_count; i++)
+               strncpy(data + i * ETH_GSTRING_LEN, ar8327_mib[i].name,
+                       ETH_GSTRING_LEN);
 }
 
-static void
-qca8k_phylink_mac_link_up(struct dsa_switch *ds, int port, unsigned int mode,
-                         phy_interface_t interface, struct phy_device *phydev,
-                         int speed, int duplex, bool tx_pause, bool rx_pause)
+static void qca8k_mib_autocast_handler(struct dsa_switch *ds, struct sk_buff *skb)
 {
+       const struct qca8k_match_data *match_data;
+       struct qca8k_mib_eth_data *mib_eth_data;
        struct qca8k_priv *priv = ds->priv;
-       u32 reg;
+       const struct qca8k_mib_desc *mib;
+       struct mib_ethhdr *mib_ethhdr;
+       int i, mib_len, offset = 0;
+       u64 *data;
+       u8 port;
 
-       if (phylink_autoneg_inband(mode)) {
-               reg = QCA8K_PORT_STATUS_LINK_AUTO;
-       } else {
-               switch (speed) {
-               case SPEED_10:
-                       reg = QCA8K_PORT_STATUS_SPEED_10;
-                       break;
-               case SPEED_100:
-                       reg = QCA8K_PORT_STATUS_SPEED_100;
-                       break;
-               case SPEED_1000:
-                       reg = QCA8K_PORT_STATUS_SPEED_1000;
-                       break;
-               default:
-                       reg = QCA8K_PORT_STATUS_LINK_AUTO;
-                       break;
+       mib_ethhdr = (struct mib_ethhdr *)skb_mac_header(skb);
+       mib_eth_data = &priv->mib_eth_data;
+
+       /* The switch autocast every port. Ignore other packet and
+        * parse only the requested one.
+        */
+       port = FIELD_GET(QCA_HDR_RECV_SOURCE_PORT, ntohs(mib_ethhdr->hdr));
+       if (port != mib_eth_data->req_port)
+               goto exit;
+
+       match_data = device_get_match_data(priv->dev);
+       data = mib_eth_data->data;
+
+       for (i = 0; i < match_data->mib_count; i++) {
+               mib = &ar8327_mib[i];
+
+               /* First 3 mib are present in the skb head */
+               if (i < 3) {
+                       data[i] = mib_ethhdr->data[i];
+                       continue;
                }
 
-               if (duplex == DUPLEX_FULL)
-                       reg |= QCA8K_PORT_STATUS_DUPLEX;
+               mib_len = sizeof(uint32_t);
 
-               if (rx_pause || dsa_is_cpu_port(ds, port))
-                       reg |= QCA8K_PORT_STATUS_RXFLOW;
+               /* Some mib are 64 bit wide */
+               if (mib->size == 2)
+                       mib_len = sizeof(uint64_t);
 
-               if (tx_pause || dsa_is_cpu_port(ds, port))
-                       reg |= QCA8K_PORT_STATUS_TXFLOW;
-       }
+               /* Copy the mib value from packet to the */
+               memcpy(data + i, skb->data + offset, mib_len);
 
-       reg |= QCA8K_PORT_STATUS_TXMAC | QCA8K_PORT_STATUS_RXMAC;
+               /* Set the offset for the next mib */
+               offset += mib_len;
+       }
 
-       qca8k_write(priv, QCA8K_REG_PORT_STATUS(port), reg);
+exit:
+       /* Complete on receiving all the mib packet */
+       if (refcount_dec_and_test(&mib_eth_data->port_parsed))
+               complete(&mib_eth_data->rw_done);
 }
 
-static void
-qca8k_get_strings(struct dsa_switch *ds, int port, u32 stringset, uint8_t *data)
-{
-       const struct qca8k_match_data *match_data;
-       struct qca8k_priv *priv = ds->priv;
-       int i;
+static int
+qca8k_get_ethtool_stats_eth(struct dsa_switch *ds, int port, u64 *data)
+{
+       struct dsa_port *dp = dsa_to_port(ds, port);
+       struct qca8k_mib_eth_data *mib_eth_data;
+       struct qca8k_priv *priv = ds->priv;
+       int ret;
+
+       mib_eth_data = &priv->mib_eth_data;
+
+       mutex_lock(&mib_eth_data->mutex);
+
+       reinit_completion(&mib_eth_data->rw_done);
+
+       mib_eth_data->req_port = dp->index;
+       mib_eth_data->data = data;
+       refcount_set(&mib_eth_data->port_parsed, QCA8K_NUM_PORTS);
+
+       mutex_lock(&priv->reg_mutex);
+
+       /* Send mib autocast request */
+       ret = regmap_update_bits(priv->regmap, QCA8K_REG_MIB,
+                                QCA8K_MIB_FUNC | QCA8K_MIB_BUSY,
+                                FIELD_PREP(QCA8K_MIB_FUNC, QCA8K_MIB_CAST) |
+                                QCA8K_MIB_BUSY);
+
+       mutex_unlock(&priv->reg_mutex);
+
+       if (ret)
+               goto exit;
 
-       if (stringset != ETH_SS_STATS)
-               return;
+       ret = wait_for_completion_timeout(&mib_eth_data->rw_done, QCA8K_ETHERNET_TIMEOUT);
 
-       match_data = of_device_get_match_data(priv->dev);
+exit:
+       mutex_unlock(&mib_eth_data->mutex);
 
-       for (i = 0; i < match_data->mib_count; i++)
-               strncpy(data + i * ETH_GSTRING_LEN, ar8327_mib[i].name,
-                       ETH_GSTRING_LEN);
+       return ret;
 }
 
 static void
@@ -1714,6 +2145,10 @@ qca8k_get_ethtool_stats(struct dsa_switch *ds, int port,
        u32 hi = 0;
        int ret;
 
+       if (priv->mgmt_master &&
+           qca8k_get_ethtool_stats_eth(ds, port, data) > 0)
+               return;
+
        match_data = of_device_get_match_data(priv->dev);
 
        for (i = 0; i < match_data->mib_count; i++) {
@@ -1812,7 +2247,8 @@ qca8k_port_stp_state_set(struct dsa_switch *ds, int port, u8 state)
 
 static int qca8k_port_bridge_join(struct dsa_switch *ds, int port,
                                  struct dsa_bridge bridge,
-                                 bool *tx_fwd_offload)
+                                 bool *tx_fwd_offload,
+                                 struct netlink_ext_ack *extack)
 {
        struct qca8k_priv *priv = (struct qca8k_priv *)ds->priv;
        int port_mask, cpu_port;
@@ -1963,7 +2399,8 @@ qca8k_port_fdb_insert(struct qca8k_priv *priv, const u8 *addr,
 
 static int
 qca8k_port_fdb_add(struct dsa_switch *ds, int port,
-                  const unsigned char *addr, u16 vid)
+                  const unsigned char *addr, u16 vid,
+                  struct dsa_db db)
 {
        struct qca8k_priv *priv = (struct qca8k_priv *)ds->priv;
        u16 port_mask = BIT(port);
@@ -1973,7 +2410,8 @@ qca8k_port_fdb_add(struct dsa_switch *ds, int port,
 
 static int
 qca8k_port_fdb_del(struct dsa_switch *ds, int port,
-                  const unsigned char *addr, u16 vid)
+                  const unsigned char *addr, u16 vid,
+                  struct dsa_db db)
 {
        struct qca8k_priv *priv = (struct qca8k_priv *)ds->priv;
        u16 port_mask = BIT(port);
@@ -2010,7 +2448,8 @@ qca8k_port_fdb_dump(struct dsa_switch *ds, int port,
 
 static int
 qca8k_port_mdb_add(struct dsa_switch *ds, int port,
-                  const struct switchdev_obj_port_mdb *mdb)
+                  const struct switchdev_obj_port_mdb *mdb,
+                  struct dsa_db db)
 {
        struct qca8k_priv *priv = ds->priv;
        const u8 *addr = mdb->addr;
@@ -2021,7 +2460,8 @@ qca8k_port_mdb_add(struct dsa_switch *ds, int port,
 
 static int
 qca8k_port_mdb_del(struct dsa_switch *ds, int port,
-                  const struct switchdev_obj_port_mdb *mdb)
+                  const struct switchdev_obj_port_mdb *mdb,
+                  struct dsa_db db)
 {
        struct qca8k_priv *priv = ds->priv;
        const u8 *addr = mdb->addr;
@@ -2033,7 +2473,7 @@ qca8k_port_mdb_del(struct dsa_switch *ds, int port,
 static int
 qca8k_port_mirror_add(struct dsa_switch *ds, int port,
                      struct dsa_mall_mirror_tc_entry *mirror,
-                     bool ingress)
+                     bool ingress, struct netlink_ext_ack *extack)
 {
        struct qca8k_priv *priv = ds->priv;
        int monitor_port, ret;
@@ -2212,18 +2652,16 @@ qca8k_get_tag_protocol(struct dsa_switch *ds, int port,
 }
 
 static bool
-qca8k_lag_can_offload(struct dsa_switch *ds,
-                     struct net_device *lag,
+qca8k_lag_can_offload(struct dsa_switch *ds, struct dsa_lag lag,
                      struct netdev_lag_upper_info *info)
 {
        struct dsa_port *dp;
-       int id, members = 0;
+       int members = 0;
 
-       id = dsa_lag_id(ds->dst, lag);
-       if (id < 0 || id >= ds->num_lag_ids)
+       if (!lag.id)
                return false;
 
-       dsa_lag_foreach_port(dp, ds->dst, lag)
+       dsa_lag_foreach_port(dp, ds->dst, &lag)
                /* Includes the port joining the LAG */
                members++;
 
@@ -2241,16 +2679,14 @@ qca8k_lag_can_offload(struct dsa_switch *ds,
 }
 
 static int
-qca8k_lag_setup_hash(struct dsa_switch *ds,
-                    struct net_device *lag,
+qca8k_lag_setup_hash(struct dsa_switch *ds, struct dsa_lag lag,
                     struct netdev_lag_upper_info *info)
 {
+       struct net_device *lag_dev = lag.dev;
        struct qca8k_priv *priv = ds->priv;
        bool unique_lag = true;
+       unsigned int i;
        u32 hash = 0;
-       int i, id;
-
-       id = dsa_lag_id(ds->dst, lag);
 
        switch (info->hash_type) {
        case NETDEV_LAG_HASH_L23:
@@ -2267,7 +2703,7 @@ qca8k_lag_setup_hash(struct dsa_switch *ds,
 
        /* Check if we are the unique configured LAG */
        dsa_lags_foreach_id(i, ds->dst)
-               if (i != id && dsa_lag_dev(ds->dst, i)) {
+               if (i != lag.id && dsa_lag_by_id(ds->dst, i)) {
                        unique_lag = false;
                        break;
                }
@@ -2282,7 +2718,7 @@ qca8k_lag_setup_hash(struct dsa_switch *ds,
        if (unique_lag) {
                priv->lag_hash_mode = hash;
        } else if (priv->lag_hash_mode != hash) {
-               netdev_err(lag, "Error: Mismatched Hash Mode across different lag is not supported\n");
+               netdev_err(lag_dev, "Error: Mismatched Hash Mode across different lag is not supported\n");
                return -EOPNOTSUPP;
        }
 
@@ -2292,13 +2728,14 @@ qca8k_lag_setup_hash(struct dsa_switch *ds,
 
 static int
 qca8k_lag_refresh_portmap(struct dsa_switch *ds, int port,
-                         struct net_device *lag, bool delete)
+                         struct dsa_lag lag, bool delete)
 {
        struct qca8k_priv *priv = ds->priv;
        int ret, id, i;
        u32 val;
 
-       id = dsa_lag_id(ds->dst, lag);
+       /* DSA LAG IDs are one-based, hardware is zero-based */
+       id = lag.id - 1;
 
        /* Read current port member */
        ret = regmap_read(priv->regmap, QCA8K_REG_GOL_TRUNK_CTRL0, &val);
@@ -2360,8 +2797,7 @@ qca8k_lag_refresh_portmap(struct dsa_switch *ds, int port,
 }
 
 static int
-qca8k_port_lag_join(struct dsa_switch *ds, int port,
-                   struct net_device *lag,
+qca8k_port_lag_join(struct dsa_switch *ds, int port, struct dsa_lag lag,
                    struct netdev_lag_upper_info *info)
 {
        int ret;
@@ -2378,11 +2814,265 @@ qca8k_port_lag_join(struct dsa_switch *ds, int port,
 
 static int
 qca8k_port_lag_leave(struct dsa_switch *ds, int port,
-                    struct net_device *lag)
+                    struct dsa_lag lag)
 {
        return qca8k_lag_refresh_portmap(ds, port, lag, true);
 }
 
+static void
+qca8k_master_change(struct dsa_switch *ds, const struct net_device *master,
+                   bool operational)
+{
+       struct dsa_port *dp = master->dsa_ptr;
+       struct qca8k_priv *priv = ds->priv;
+
+       /* Ethernet MIB/MDIO is only supported for CPU port 0 */
+       if (dp->index != 0)
+               return;
+
+       mutex_lock(&priv->mgmt_eth_data.mutex);
+       mutex_lock(&priv->mib_eth_data.mutex);
+
+       priv->mgmt_master = operational ? (struct net_device *)master : NULL;
+
+       mutex_unlock(&priv->mib_eth_data.mutex);
+       mutex_unlock(&priv->mgmt_eth_data.mutex);
+}
+
+static int qca8k_connect_tag_protocol(struct dsa_switch *ds,
+                                     enum dsa_tag_protocol proto)
+{
+       struct qca_tagger_data *tagger_data;
+
+       switch (proto) {
+       case DSA_TAG_PROTO_QCA:
+               tagger_data = ds->tagger_data;
+
+               tagger_data->rw_reg_ack_handler = qca8k_rw_reg_ack_handler;
+               tagger_data->mib_autocast_handler = qca8k_mib_autocast_handler;
+
+               break;
+       default:
+               return -EOPNOTSUPP;
+       }
+
+       return 0;
+}
+
+static int
+qca8k_setup(struct dsa_switch *ds)
+{
+       struct qca8k_priv *priv = (struct qca8k_priv *)ds->priv;
+       int cpu_port, ret, i;
+       u32 mask;
+
+       cpu_port = qca8k_find_cpu_port(ds);
+       if (cpu_port < 0) {
+               dev_err(priv->dev, "No cpu port configured in both cpu port0 and port6");
+               return cpu_port;
+       }
+
+       /* Parse CPU port config to be later used in phy_link mac_config */
+       ret = qca8k_parse_port_config(priv);
+       if (ret)
+               return ret;
+
+       ret = qca8k_setup_mdio_bus(priv);
+       if (ret)
+               return ret;
+
+       ret = qca8k_setup_of_pws_reg(priv);
+       if (ret)
+               return ret;
+
+       ret = qca8k_setup_mac_pwr_sel(priv);
+       if (ret)
+               return ret;
+
+       qca8k_setup_pcs(priv, &priv->pcs_port_0, 0);
+       qca8k_setup_pcs(priv, &priv->pcs_port_6, 6);
+
+       /* Make sure MAC06 is disabled */
+       ret = regmap_clear_bits(priv->regmap, QCA8K_REG_PORT0_PAD_CTRL,
+                               QCA8K_PORT0_PAD_MAC06_EXCHANGE_EN);
+       if (ret) {
+               dev_err(priv->dev, "failed disabling MAC06 exchange");
+               return ret;
+       }
+
+       /* Enable CPU Port */
+       ret = regmap_set_bits(priv->regmap, QCA8K_REG_GLOBAL_FW_CTRL0,
+                             QCA8K_GLOBAL_FW_CTRL0_CPU_PORT_EN);
+       if (ret) {
+               dev_err(priv->dev, "failed enabling CPU port");
+               return ret;
+       }
+
+       /* Enable MIB counters */
+       ret = qca8k_mib_init(priv);
+       if (ret)
+               dev_warn(priv->dev, "mib init failed");
+
+       /* Initial setup of all ports */
+       for (i = 0; i < QCA8K_NUM_PORTS; i++) {
+               /* Disable forwarding by default on all ports */
+               ret = qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(i),
+                               QCA8K_PORT_LOOKUP_MEMBER, 0);
+               if (ret)
+                       return ret;
+
+               /* Enable QCA header mode on all cpu ports */
+               if (dsa_is_cpu_port(ds, i)) {
+                       ret = qca8k_write(priv, QCA8K_REG_PORT_HDR_CTRL(i),
+                                         FIELD_PREP(QCA8K_PORT_HDR_CTRL_TX_MASK, QCA8K_PORT_HDR_CTRL_ALL) |
+                                         FIELD_PREP(QCA8K_PORT_HDR_CTRL_RX_MASK, QCA8K_PORT_HDR_CTRL_ALL));
+                       if (ret) {
+                               dev_err(priv->dev, "failed enabling QCA header mode");
+                               return ret;
+                       }
+               }
+
+               /* Disable MAC by default on all user ports */
+               if (dsa_is_user_port(ds, i))
+                       qca8k_port_set_status(priv, i, 0);
+       }
+
+       /* Forward all unknown frames to CPU port for Linux processing
+        * Notice that in multi-cpu config only one port should be set
+        * for igmp, unknown, multicast and broadcast packet
+        */
+       ret = qca8k_write(priv, QCA8K_REG_GLOBAL_FW_CTRL1,
+                         FIELD_PREP(QCA8K_GLOBAL_FW_CTRL1_IGMP_DP_MASK, BIT(cpu_port)) |
+                         FIELD_PREP(QCA8K_GLOBAL_FW_CTRL1_BC_DP_MASK, BIT(cpu_port)) |
+                         FIELD_PREP(QCA8K_GLOBAL_FW_CTRL1_MC_DP_MASK, BIT(cpu_port)) |
+                         FIELD_PREP(QCA8K_GLOBAL_FW_CTRL1_UC_DP_MASK, BIT(cpu_port)));
+       if (ret)
+               return ret;
+
+       /* Setup connection between CPU port & user ports
+        * Configure specific switch configuration for ports
+        */
+       for (i = 0; i < QCA8K_NUM_PORTS; i++) {
+               /* CPU port gets connected to all user ports of the switch */
+               if (dsa_is_cpu_port(ds, i)) {
+                       ret = qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(i),
+                                       QCA8K_PORT_LOOKUP_MEMBER, dsa_user_ports(ds));
+                       if (ret)
+                               return ret;
+               }
+
+               /* Individual user ports get connected to CPU port only */
+               if (dsa_is_user_port(ds, i)) {
+                       ret = qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(i),
+                                       QCA8K_PORT_LOOKUP_MEMBER,
+                                       BIT(cpu_port));
+                       if (ret)
+                               return ret;
+
+                       /* Enable ARP Auto-learning by default */
+                       ret = regmap_set_bits(priv->regmap, QCA8K_PORT_LOOKUP_CTRL(i),
+                                             QCA8K_PORT_LOOKUP_LEARN);
+                       if (ret)
+                               return ret;
+
+                       /* For port based vlans to work we need to set the
+                        * default egress vid
+                        */
+                       ret = qca8k_rmw(priv, QCA8K_EGRESS_VLAN(i),
+                                       QCA8K_EGREES_VLAN_PORT_MASK(i),
+                                       QCA8K_EGREES_VLAN_PORT(i, QCA8K_PORT_VID_DEF));
+                       if (ret)
+                               return ret;
+
+                       ret = qca8k_write(priv, QCA8K_REG_PORT_VLAN_CTRL0(i),
+                                         QCA8K_PORT_VLAN_CVID(QCA8K_PORT_VID_DEF) |
+                                         QCA8K_PORT_VLAN_SVID(QCA8K_PORT_VID_DEF));
+                       if (ret)
+                               return ret;
+               }
+
+               /* The port 5 of the qca8337 have some problem in flood condition. The
+                * original legacy driver had some specific buffer and priority settings
+                * for the different port suggested by the QCA switch team. Add this
+                * missing settings to improve switch stability under load condition.
+                * This problem is limited to qca8337 and other qca8k switch are not affected.
+                */
+               if (priv->switch_id == QCA8K_ID_QCA8337) {
+                       switch (i) {
+                       /* The 2 CPU port and port 5 requires some different
+                        * priority than any other ports.
+                        */
+                       case 0:
+                       case 5:
+                       case 6:
+                               mask = QCA8K_PORT_HOL_CTRL0_EG_PRI0(0x3) |
+                                       QCA8K_PORT_HOL_CTRL0_EG_PRI1(0x4) |
+                                       QCA8K_PORT_HOL_CTRL0_EG_PRI2(0x4) |
+                                       QCA8K_PORT_HOL_CTRL0_EG_PRI3(0x4) |
+                                       QCA8K_PORT_HOL_CTRL0_EG_PRI4(0x6) |
+                                       QCA8K_PORT_HOL_CTRL0_EG_PRI5(0x8) |
+                                       QCA8K_PORT_HOL_CTRL0_EG_PORT(0x1e);
+                               break;
+                       default:
+                               mask = QCA8K_PORT_HOL_CTRL0_EG_PRI0(0x3) |
+                                       QCA8K_PORT_HOL_CTRL0_EG_PRI1(0x4) |
+                                       QCA8K_PORT_HOL_CTRL0_EG_PRI2(0x6) |
+                                       QCA8K_PORT_HOL_CTRL0_EG_PRI3(0x8) |
+                                       QCA8K_PORT_HOL_CTRL0_EG_PORT(0x19);
+                       }
+                       qca8k_write(priv, QCA8K_REG_PORT_HOL_CTRL0(i), mask);
+
+                       mask = QCA8K_PORT_HOL_CTRL1_ING(0x6) |
+                       QCA8K_PORT_HOL_CTRL1_EG_PRI_BUF_EN |
+                       QCA8K_PORT_HOL_CTRL1_EG_PORT_BUF_EN |
+                       QCA8K_PORT_HOL_CTRL1_WRED_EN;
+                       qca8k_rmw(priv, QCA8K_REG_PORT_HOL_CTRL1(i),
+                                 QCA8K_PORT_HOL_CTRL1_ING_BUF_MASK |
+                                 QCA8K_PORT_HOL_CTRL1_EG_PRI_BUF_EN |
+                                 QCA8K_PORT_HOL_CTRL1_EG_PORT_BUF_EN |
+                                 QCA8K_PORT_HOL_CTRL1_WRED_EN,
+                                 mask);
+               }
+
+               /* Set initial MTU for every port.
+                * We have only have a general MTU setting. So track
+                * every port and set the max across all port.
+                * Set per port MTU to 1500 as the MTU change function
+                * will add the overhead and if its set to 1518 then it
+                * will apply the overhead again and we will end up with
+                * MTU of 1536 instead of 1518
+                */
+               priv->port_mtu[i] = ETH_DATA_LEN;
+       }
+
+       /* Special GLOBAL_FC_THRESH value are needed for ar8327 switch */
+       if (priv->switch_id == QCA8K_ID_QCA8327) {
+               mask = QCA8K_GLOBAL_FC_GOL_XON_THRES(288) |
+                      QCA8K_GLOBAL_FC_GOL_XOFF_THRES(496);
+               qca8k_rmw(priv, QCA8K_REG_GLOBAL_FC_THRESH,
+                         QCA8K_GLOBAL_FC_GOL_XON_THRES_MASK |
+                         QCA8K_GLOBAL_FC_GOL_XOFF_THRES_MASK,
+                         mask);
+       }
+
+       /* Setup our port MTUs to match power on defaults */
+       ret = qca8k_write(priv, QCA8K_MAX_FRAME_SIZE, ETH_FRAME_LEN + ETH_FCS_LEN);
+       if (ret)
+               dev_warn(priv->dev, "failed setting MTU settings");
+
+       /* Flush the FDB table */
+       qca8k_fdb_flush(priv);
+
+       /* Set min a max ageing value supported */
+       ds->ageing_time_min = 7000;
+       ds->ageing_time_max = 458745000;
+
+       /* Set max number of LAGs supported */
+       ds->num_lag_ids = QCA8K_NUM_LAGS;
+
+       return 0;
+}
+
 static const struct dsa_switch_ops qca8k_switch_ops = {
        .get_tag_protocol       = qca8k_get_tag_protocol,
        .setup                  = qca8k_setup,
@@ -2410,14 +3100,16 @@ static const struct dsa_switch_ops qca8k_switch_ops = {
        .port_vlan_filtering    = qca8k_port_vlan_filtering,
        .port_vlan_add          = qca8k_port_vlan_add,
        .port_vlan_del          = qca8k_port_vlan_del,
-       .phylink_validate       = qca8k_phylink_validate,
-       .phylink_mac_link_state = qca8k_phylink_mac_link_state,
+       .phylink_get_caps       = qca8k_phylink_get_caps,
+       .phylink_mac_select_pcs = qca8k_phylink_mac_select_pcs,
        .phylink_mac_config     = qca8k_phylink_mac_config,
        .phylink_mac_link_down  = qca8k_phylink_mac_link_down,
        .phylink_mac_link_up    = qca8k_phylink_mac_link_up,
        .get_phy_flags          = qca8k_get_phy_flags,
        .port_lag_join          = qca8k_port_lag_join,
        .port_lag_leave         = qca8k_port_lag_leave,
+       .master_state_change    = qca8k_master_change,
+       .connect_tag_protocol   = qca8k_connect_tag_protocol,
 };
 
 static int qca8k_read_switch_id(struct qca8k_priv *priv)
@@ -2488,6 +3180,10 @@ qca8k_sw_probe(struct mdio_device *mdiodev)
                return PTR_ERR(priv->regmap);
        }
 
+       priv->mdio_cache.page = 0xffff;
+       priv->mdio_cache.lo = 0xffff;
+       priv->mdio_cache.hi = 0xffff;
+
        /* Check the detected switch id */
        ret = qca8k_read_switch_id(priv);
        if (ret)
@@ -2497,6 +3193,12 @@ qca8k_sw_probe(struct mdio_device *mdiodev)
        if (!priv->ds)
                return -ENOMEM;
 
+       mutex_init(&priv->mgmt_eth_data.mutex);
+       init_completion(&priv->mgmt_eth_data.rw_done);
+
+       mutex_init(&priv->mib_eth_data.mutex);
+       init_completion(&priv->mib_eth_data.rw_done);
+
        priv->ds->dev = &mdiodev->dev;
        priv->ds->num_ports = QCA8K_NUM_PORTS;
        priv->ds->priv = priv;