rtl8366_smi: make rtl8366_phy_config_{aneg,init} static
[openwrt/svn-archive/archive.git] / target / linux / ar71xx / files / drivers / net / phy / rtl8366_smi.c
index e5c65ccbc3221a9384df6f82c1858488cc938b61..20510724c5dd7f714e42769bde5054e0f73d3191 100644 (file)
@@ -21,9 +21,7 @@
 #include <linux/phy.h>
 #include <linux/rtl8366_smi.h>
 
-/* #define DEBUG 1 */
-
-#ifdef DEBUG
+#ifdef CONFIG_RTL8366_SMI_DEBUG_FS
 #include <linux/debugfs.h>
 #endif
 
 
 
 #define RTL8366S_PORT_VLAN_CTRL_BASE        0x0058
+#define RTL8366S_PORT_VLAN_CTRL_REG(_p)  \
+               (RTL8366S_PORT_VLAN_CTRL_BASE + (_p) / 4)
+#define RTL8366S_PORT_VLAN_CTRL_MASK       0xf
+#define RTL8366S_PORT_VLAN_CTRL_SHIFT(_p)   (4 * ((_p) % 4))
+
+
 #define RTL8366S_VLAN_TABLE_READ_BASE       0x018B
 #define RTL8366S_VLAN_TABLE_WRITE_BASE      0x0185
 
@@ -167,40 +171,42 @@ struct rtl8366s_vlan4kentry {
        u16     member:6;
 };
 
-static const char *MIBCOUNTERS[] = { "IfInOctets                        ",
-                                    "EtherStatsOctets                  ",
-                                    "EtherStatsUnderSizePkts           ",
-                                    "EtherFregament                    ",
-                                    "EtherStatsPkts64Octets            ",
-                                    "EtherStatsPkts65to127Octets       ",
-                                    "EtherStatsPkts128to255Octets      ",
-                                    "EtherStatsPkts256to511Octets      ",
-                                    "EtherStatsPkts512to1023Octets     ",
-                                    "EtherStatsPkts1024to1518Octets    ",
-                                    "EtherOversizeStats                ",
-                                    "EtherStatsJabbers                 ",
-                                    "IfInUcastPkts                     ",
-                                    "EtherStatsMulticastPkts           ",
-                                    "EtherStatsBroadcastPkts           ",
-                                    "EtherStatsDropEvents              ",
-                                    "Dot3StatsFCSErrors                ",
-                                    "Dot3StatsSymbolErrors             ",
-                                    "Dot3InPauseFrames                 ",
-                                    "Dot3ControlInUnknownOpcodes       ",
-                                    "IfOutOctets                       ",
-                                    "Dot3StatsSingleCollisionFrames    ",
-                                    "Dot3StatMultipleCollisionFrames   ",
-                                    "Dot3sDeferredTransmissions        ",
-                                    "Dot3StatsLateCollisions           ",
-                                    "EtherStatsCollisions              ",
-                                    "Dot3StatsExcessiveCollisions      ",
-                                    "Dot3OutPauseFrames                ",
-                                    "Dot1dBasePortDelayExceededDiscards",
-                                    "Dot1dTpPortInDiscards             ",
-                                    "IfOutUcastPkts                    ",
-                                    "IfOutMulticastPkts                ",
-                                    "IfOutBroadcastPkts                ",
-                                    NULL };
+static const char *MIBCOUNTERS[] = {
+       "IfInOctets                        ",
+       "EtherStatsOctets                  ",
+       "EtherStatsUnderSizePkts           ",
+       "EtherFregament                    ",
+       "EtherStatsPkts64Octets            ",
+       "EtherStatsPkts65to127Octets       ",
+       "EtherStatsPkts128to255Octets      ",
+       "EtherStatsPkts256to511Octets      ",
+       "EtherStatsPkts512to1023Octets     ",
+       "EtherStatsPkts1024to1518Octets    ",
+       "EtherOversizeStats                ",
+       "EtherStatsJabbers                 ",
+       "IfInUcastPkts                     ",
+       "EtherStatsMulticastPkts           ",
+       "EtherStatsBroadcastPkts           ",
+       "EtherStatsDropEvents              ",
+       "Dot3StatsFCSErrors                ",
+       "Dot3StatsSymbolErrors             ",
+       "Dot3InPauseFrames                 ",
+       "Dot3ControlInUnknownOpcodes       ",
+       "IfOutOctets                       ",
+       "Dot3StatsSingleCollisionFrames    ",
+       "Dot3StatMultipleCollisionFrames   ",
+       "Dot3sDeferredTransmissions        ",
+       "Dot3StatsLateCollisions           ",
+       "EtherStatsCollisions              ",
+       "Dot3StatsExcessiveCollisions      ",
+       "Dot3OutPauseFrames                ",
+       "Dot1dBasePortDelayExceededDiscards",
+       "Dot1dTpPortInDiscards             ",
+       "IfOutUcastPkts                    ",
+       "IfOutMulticastPkts                ",
+       "IfOutBroadcastPkts                ",
+       NULL,
+};
 
 struct rtl8366_smi {
        struct platform_device             *pdev;
@@ -209,16 +215,20 @@ struct rtl8366_smi {
        struct mii_bus                     *mii_bus;
        struct switch_dev                  dev;
        int                                mii_irq[PHY_MAX_ADDR];
-#ifdef DEBUG
+       char                               buf[4096];
+#ifdef CONFIG_RTL8366_SMI_DEBUG_FS
        struct dentry                      *debugfs_root;
 #endif
 };
 
-#ifdef DEBUG
+#ifdef CONFIG_RTL8366_SMI_DEBUG_FS
 u16 g_dbg_reg;
 #endif
 
-#define to_rtl8366(_dev) container_of(_dev, struct rtl8366_smi, dev)
+static inline struct rtl8366_smi *sw_to_rtl8366(struct switch_dev *sw)
+{
+       return container_of(sw, struct rtl8366_smi, dev);
+}
 
 static inline void rtl8366_smi_clk_delay(struct rtl8366_smi *smi)
 {
@@ -549,20 +559,18 @@ static int rtl8366_get_mib_counter(struct rtl8366_smi *smi, int counter,
        if (port > RTL8366_NUM_PORTS || counter >= RTL8366S_MIB_COUNT)
                return -EINVAL;
 
-       i = 0;
        regoffset = RTL8366S_MIB_COUNTER_PORT_OFFSET * (port);
 
-       while (i < counter) {
+       for (i = 0; i < counter; i++)
                regoffset += mibLength[i];
-               i++;
-       }
 
        addr = RTL8366S_MIB_COUNTER_BASE + regoffset;
 
-
-       /* writing access counter address first */
-       /* then ASIC will prepare 64bits counter wait for being retrived */
-       data = 0;/* writing data will be discard by ASIC */
+       /*
+        * Writing access counter address first
+        * then ASIC will prepare 64bits counter wait for being retrived
+        */
+       data = 0; /* writing data will be discard by ASIC */
        err = rtl8366_smi_write_reg(smi, addr, data);
        if (err)
                return err;
@@ -667,34 +675,34 @@ static int rtl8366s_set_vlan_4k_entry(struct rtl8366_smi *smi,
 
        data = *tableaddr;
 
-       rtl8366_smi_write_reg(smi, RTL8366S_VLAN_TABLE_WRITE_BASE + 1, data);
-
+       err = rtl8366_smi_write_reg(smi, RTL8366S_VLAN_TABLE_WRITE_BASE + 1,
+                                   data);
+       if (err)
+               return err;
 
        /* write table access control word */
        err = rtl8366_smi_write_reg(smi, RTL8366S_TABLE_ACCESS_CTRL_REG,
                                    RTL8366S_TABLE_VLAN_WRITE_CTRL);
-       if (err)
-               return err;
 
-       return 0;
+       return err;
 }
 
 static int rtl8366s_get_vlan_member_config(struct rtl8366_smi *smi, u32 index,
-                                          struct rtl8366s_vlanconfig
-                                          *vlanmconf)
+                                          struct rtl8366s_vlanconfig *vlanmc)
 {
        int err;
        u32 addr;
        u32 data;
        u16 *tableaddr;
 
+       memset(vlanmc, '\0', sizeof(struct rtl8366s_vlanconfig));
+
        if (index >= RTL8366_NUM_VLANS)
                return -EINVAL;
 
-       tableaddr = (u16 *)vlanmconf;
+       tableaddr = (u16 *)vlanmc;
 
        addr = RTL8366S_VLAN_MEMCONF_BASE + (index << 1);
-
        err = rtl8366_smi_read_reg(smi, addr, &data);
        if (err)
                return err;
@@ -703,7 +711,6 @@ static int rtl8366s_get_vlan_member_config(struct rtl8366_smi *smi, u32 index,
        tableaddr++;
 
        addr = RTL8366S_VLAN_MEMCONF_BASE + 1 + (index << 1);
-
        err = rtl8366_smi_read_reg(smi, addr, &data);
        if (err)
                return err;
@@ -715,7 +722,7 @@ static int rtl8366s_get_vlan_member_config(struct rtl8366_smi *smi, u32 index,
 
 static int rtl8366s_set_vlan_member_config(struct rtl8366_smi *smi, u32 index,
                                           const struct rtl8366s_vlanconfig
-                                          *vlanmconf)
+                                          *vlanmc)
 {
        int err;
        u32 addr;
@@ -723,17 +730,16 @@ static int rtl8366s_set_vlan_member_config(struct rtl8366_smi *smi, u32 index,
        u16 *tableaddr;
 
        if (index >= RTL8366_NUM_VLANS ||
-          vlanmconf->vid >= RTL8366_NUM_VIDS ||
-          vlanmconf->priority > RTL8366S_PRIORITYMAX ||
-          vlanmconf->member > RTL8366_PORT_ALL ||
-          vlanmconf->untag > RTL8366_PORT_ALL ||
-          vlanmconf->fid > RTL8366S_FIDMAX)
+           vlanmc->vid >= RTL8366_NUM_VIDS ||
+           vlanmc->priority > RTL8366S_PRIORITYMAX ||
+           vlanmc->member > RTL8366_PORT_ALL ||
+           vlanmc->untag > RTL8366_PORT_ALL ||
+           vlanmc->fid > RTL8366S_FIDMAX)
                return -EINVAL;
 
        addr = RTL8366S_VLAN_MEMCONF_BASE + (index << 1);
 
-
-       tableaddr = (u16 *)vlanmconf;
+       tableaddr = (u16 *)vlanmc;
        data = *tableaddr;
 
        err = rtl8366_smi_write_reg(smi, addr, data);
@@ -755,28 +761,19 @@ static int rtl8366s_set_vlan_member_config(struct rtl8366_smi *smi, u32 index,
 static int rtl8366_get_port_vlan_index(struct rtl8366_smi *smi, int port,
                                       int *val)
 {
-       int err;
-       u32 addr;
        u32 data;
-
-       /* bits mapping to port vlan control register of port n */
-       const u16 bits[RTL8366_NUM_PORTS] = { 0x000F, 0x00F0, 0x0F00,
-                                            0xF000, 0x000F, 0x00F0 };
-       /* bits offset to port vlan control register of port n */
-       const u16 bitoffset[RTL8366_NUM_PORTS] = { 0, 4, 8, 12, 0, 4 };
-       /* address offset to port vlan control register of port n */
-       const u16 addroffset[RTL8366_NUM_PORTS] = { 0, 0, 0, 0, 1, 1 };
+       int err;
 
        if (port >= RTL8366_NUM_PORTS)
                return -EINVAL;
 
-       addr = RTL8366S_PORT_VLAN_CTRL_BASE + addroffset[port];
-
-       err = rtl8366_smi_read_reg(smi, addr, &data);
+       err = rtl8366_smi_read_reg(smi, RTL8366S_PORT_VLAN_CTRL_REG(port),
+                                  &data);
        if (err)
                return err;
 
-       *val = (data & bits[port]) >> bitoffset[port];
+       *val = (data >> RTL8366S_PORT_VLAN_CTRL_SHIFT(port)) &
+              RTL8366S_PORT_VLAN_CTRL_MASK;
 
        return 0;
 
@@ -785,92 +782,73 @@ static int rtl8366_get_port_vlan_index(struct rtl8366_smi *smi, int port,
 static int rtl8366_get_vlan_port_pvid(struct rtl8366_smi *smi, int port,
                                      int *val)
 {
+       struct rtl8366s_vlanconfig vlanmc;
        int err;
        int index;
-       struct rtl8366s_vlanconfig vlanMC;
-
-       memset(&vlanMC, '\0', sizeof(struct rtl8366s_vlanconfig));
 
        err = rtl8366_get_port_vlan_index(smi, port, &index);
        if (err)
                return err;
 
-       err = rtl8366s_get_vlan_member_config(smi, index, &vlanMC);
+       err = rtl8366s_get_vlan_member_config(smi, index, &vlanmc);
        if (err)
                return err;
 
-       *val = vlanMC.vid;
+       *val = vlanmc.vid;
        return 0;
 }
 
 static int rtl8366_set_port_vlan_index(struct rtl8366_smi *smi, int port,
                                       int index)
 {
-       int err;
-       u32 addr;
        u32 data;
-       u32 vlan_data;
-       u32 bits;
-
-       /* bits mapping to port vlan control register of port n */
-       const u16 bitmasks[6] = { 0x000F, 0x00F0, 0x0F00,
-                                0xF000, 0x000F, 0x00F0 };
-       /* bits offset to port vlan control register of port n */
-       const u16 bitOff[6] = { 0, 4, 8, 12, 0, 4 };
-       /* address offset to port vlan control register of port n */
-       const u16 addrOff[6] = { 0, 0, 0, 0, 1, 1 };
+       int err;
 
        if (port >= RTL8366_NUM_PORTS || index >= RTL8366_NUM_VLANS)
                return -EINVAL;
 
-       addr = RTL8366S_PORT_VLAN_CTRL_BASE + addrOff[port];
-
-       bits = bitmasks[port];
-
-       data = (index << bitOff[port]) & bits;
-
-       err = rtl8366_smi_read_reg(smi, addr, &vlan_data);
+       err = rtl8366_smi_read_reg(smi, RTL8366S_PORT_VLAN_CTRL_REG(port),
+                                  &data);
        if (err)
                return err;
 
-       vlan_data &= ~(vlan_data & bits);
-       vlan_data |= data;
-
-       err = rtl8366_smi_write_reg(smi, addr, vlan_data);
-       if (err)
-               return err;
+       data &= ~(RTL8366S_PORT_VLAN_CTRL_MASK <<
+                 RTL8366S_PORT_VLAN_CTRL_SHIFT(port));
+       data |= (index & RTL8366S_PORT_VLAN_CTRL_MASK) <<
+                RTL8366S_PORT_VLAN_CTRL_SHIFT(port);
 
-       return 0;
+       err = rtl8366_smi_write_reg(smi, RTL8366S_PORT_VLAN_CTRL_REG(port),
+                                   data);
+       return err;
 }
 
 static int rtl8366_set_vlan_port_pvid(struct rtl8366_smi *smi, int port,
                                      int val)
 {
        int i;
-       struct rtl8366s_vlanconfig vlanMC;
-       struct rtl8366s_vlan4kentry vlan4K;
+       struct rtl8366s_vlanconfig vlanmc;
+       struct rtl8366s_vlan4kentry vlan4k;
 
        if (port >= RTL8366_NUM_PORTS || val >= RTL8366_NUM_VIDS)
                return -EINVAL;
 
-
-
        /* Updating the 4K entry; lookup it and change the port member set */
-       rtl8366s_get_vlan_4k_entry(smi, val, &vlan4K);
-       vlan4K.member |= ((1 << port) | RTL8366_PORT_CPU);
-       vlan4K.untag = RTL8366_PORT_ALL_BUT_CPU;
-       rtl8366s_set_vlan_4k_entry(smi, &vlan4K);
+       rtl8366s_get_vlan_4k_entry(smi, val, &vlan4k);
+       vlan4k.member |= ((1 << port) | RTL8366_PORT_CPU);
+       vlan4k.untag = RTL8366_PORT_ALL_BUT_CPU;
+       rtl8366s_set_vlan_4k_entry(smi, &vlan4k);
 
-       /* For the 16 entries more work needs to be done. First see if such
-          VID is already there and change it */
+       /*
+        * For the 16 entries more work needs to be done. First see if such
+        * VID is already there and change it
+        */
        for (i = 0; i < RTL8366_NUM_VLANS; ++i) {
-               memset(&vlanMC, '\0', sizeof(struct rtl8366s_vlanconfig));
-               rtl8366s_get_vlan_member_config(smi, i, &vlanMC);
+               rtl8366s_get_vlan_member_config(smi, i, &vlanmc);
 
                /* Try to find an existing vid and update port member set */
-               if (val == vlanMC.vid) {
-                       vlanMC.member |= ((1 << port) | RTL8366_PORT_CPU);
-                       rtl8366s_set_vlan_member_config(smi, i, &vlanMC);
+               if (val == vlanmc.vid) {
+                       vlanmc.member |= ((1 << port) | RTL8366_PORT_CPU);
+                       rtl8366s_set_vlan_member_config(smi, i, &vlanmc);
 
                        /* Now update PVID register settings */
                        rtl8366_set_port_vlan_index(smi, port, i);
@@ -879,22 +857,25 @@ static int rtl8366_set_vlan_port_pvid(struct rtl8366_smi *smi, int port,
                }
        }
 
-       /* PVID could not be found from vlan table. Replace unused (one that
-          has no member ports) with new one */
+       /*
+         * PVID could not be found from vlan table. Replace unused (one that
+        * has no member ports) with new one
+        */
        for (i = 0; i < RTL8366_NUM_VLANS; ++i) {
-               memset(&vlanMC, '\0', sizeof(struct rtl8366s_vlanconfig));
-               rtl8366s_get_vlan_member_config(smi, i, &vlanMC);
+               rtl8366s_get_vlan_member_config(smi, i, &vlanmc);
 
-               /* See if this vlan member configuration is unused. It is
-                  unused if member set contains no ports or CPU port only */
-               if (!vlanMC.member || vlanMC.member == RTL8366_PORT_CPU) {
-                       vlanMC.vid = val;
-                       vlanMC.priority = 0;
-                       vlanMC.untag = RTL8366_PORT_ALL_BUT_CPU;
-                       vlanMC.member = ((1 << port) | RTL8366_PORT_CPU);
-                       vlanMC.fid = 0;
+               /*
+                * See if this vlan member configuration is unused. It is
+                * unused if member set contains no ports or CPU port only
+                */
+               if (!vlanmc.member || vlanmc.member == RTL8366_PORT_CPU) {
+                       vlanmc.vid = val;
+                       vlanmc.priority = 0;
+                       vlanmc.untag = RTL8366_PORT_ALL_BUT_CPU;
+                       vlanmc.member = ((1 << port) | RTL8366_PORT_CPU);
+                       vlanmc.fid = 0;
 
-                       rtl8366s_set_vlan_member_config(smi, i, &vlanMC);
+                       rtl8366s_set_vlan_member_config(smi, i, &vlanmc);
 
                        /* Now update PVID register settings */
                        rtl8366_set_port_vlan_index(smi, port, i);
@@ -903,8 +884,9 @@ static int rtl8366_set_vlan_port_pvid(struct rtl8366_smi *smi, int port,
                }
        }
 
-       dev_err(&smi->pdev->dev, "All 16 vlan member configurations are in "
-               "use\n");
+       dev_err(&smi->pdev->dev,
+               "All 16 vlan member configurations are in use\n");
+
        return -EINVAL;
 }
 
@@ -912,11 +894,13 @@ static int rtl8366_set_vlan_port_pvid(struct rtl8366_smi *smi, int port,
 static int rtl8366_vlan_set_vlan(struct rtl8366_smi *smi, int enable)
 {
        u32 data = 0;
+
        rtl8366_smi_read_reg(smi, RTL8366_CHIP_GLOBAL_CTRL_REG, &data);
 
-       data &= ~(data & RTL8366_CHIP_CTRL_VLAN);
        if (enable)
                data |= RTL8366_CHIP_CTRL_VLAN;
+       else
+               data &= ~RTL8366_CHIP_CTRL_VLAN;
 
        return rtl8366_smi_write_reg(smi, RTL8366_CHIP_GLOBAL_CTRL_REG, data);
 }
@@ -924,50 +908,56 @@ static int rtl8366_vlan_set_vlan(struct rtl8366_smi *smi, int enable)
 static int rtl8366_vlan_set_4ktable(struct rtl8366_smi *smi, int enable)
 {
        u32 data = 0;
+
        rtl8366_smi_read_reg(smi, RTL8366S_VLAN_TB_CTRL_REG, &data);
 
-       data &= ~(data & 1);
        if (enable)
                data |= 1;
+       else
+               data &= ~1;
 
        return rtl8366_smi_write_reg(smi, RTL8366S_VLAN_TB_CTRL_REG, data);
 }
 
 static int rtl8366s_reset_vlan(struct rtl8366_smi *smi)
 {
+       struct rtl8366s_vlan4kentry vlan4k;
+       struct rtl8366s_vlanconfig vlanmc;
+       int err;
        int i;
-       struct rtl8366s_vlan4kentry vlan4K;
-       struct rtl8366s_vlanconfig vlanMC;
 
        /* clear 16 VLAN member configuration */
+       vlanmc.vid = 0;
+       vlanmc.priority = 0;
+       vlanmc.member = 0;
+       vlanmc.untag = 0;
+       vlanmc.fid = 0;
        for (i = 0; i < RTL8366_NUM_VLANS; i++) {
-               vlanMC.vid = 0;
-               vlanMC.priority = 0;
-               vlanMC.member = 0;
-               vlanMC.untag = 0;
-               vlanMC.fid = 0;
-               if (rtl8366s_set_vlan_member_config(smi, i, &vlanMC) != 0)
-                       return -EIO;
+               err = rtl8366s_set_vlan_member_config(smi, i, &vlanmc);
+               if (err)
+                       return err;
        }
 
        /* Set a default VLAN with vid 1 to 4K table for all ports */
-       vlan4K.vid = 1;
-       vlan4K.member = RTL8366_PORT_ALL;
-       vlan4K.untag = RTL8366_PORT_ALL;
-       vlan4K.fid = 0;
-       if (rtl8366s_set_vlan_4k_entry(smi, &vlan4K) != 0)
-               return -EIO;
+       vlan4k.vid = 1;
+       vlan4k.member = RTL8366_PORT_ALL;
+       vlan4k.untag = RTL8366_PORT_ALL;
+       vlan4k.fid = 0;
+       err = rtl8366s_set_vlan_4k_entry(smi, &vlan4k);
+       if (err)
+               return err;
 
        /* Set all ports PVID to default VLAN */
        for (i = 0; i < RTL8366_NUM_PORTS; i++) {
-               if (rtl8366_set_vlan_port_pvid(smi, i, 0) != 0)
-                       return -EIO;
+               err = rtl8366_set_vlan_port_pvid(smi, i, 0);
+               if (err)
+                       return err;
        }
 
        return 0;
 }
 
-#ifdef DEBUG
+#ifdef CONFIG_RTL8366_SMI_DEBUG_FS
 static int rtl8366_debugfs_open(struct inode *inode, struct file *file)
 {
        file->private_data = inode->i_private;
@@ -978,44 +968,46 @@ static ssize_t rtl8366_read_debugfs_mibs(struct file *file,
                                         char __user *user_buf,
                                         size_t count, loff_t *ppos)
 {
-       char buf[4096];
-       int i, j, len = 0;
        struct rtl8366_smi *smi = (struct rtl8366_smi *)file->private_data;
+       int i, j, len = 0;
+       char *buf = smi->buf;
 
-       len += snprintf(buf + len, sizeof(buf) - len, "MIB Counters:\n");
-       len += snprintf(buf + len, sizeof(buf) - len, "Counter"
+       len += snprintf(buf + len, sizeof(smi->buf) - len, "MIB Counters:\n");
+       len += snprintf(buf + len, sizeof(smi->buf) - len, "Counter"
                        "                            "
                        "Port 0 \t\t Port 1 \t\t Port 2 \t\t Port 3 \t\t "
                        "Port 4\n");
 
        for (i = 0; i < 33; ++i) {
-
-               len += snprintf(buf + len, sizeof(buf) - len, "%d:%s ",
+               len += snprintf(buf + len, sizeof(smi->buf) - len, "%d:%s ",
                                i, MIBCOUNTERS[i]);
                for (j = 0; j < RTL8366_NUM_PORTS; ++j) {
                        unsigned long long counter = 0;
 
                        if (!rtl8366_get_mib_counter(smi, i, j, &counter))
-                               len += snprintf(buf + len, sizeof(buf) - len,
+                               len += snprintf(buf + len,
+                                               sizeof(smi->buf) - len,
                                                "[%llu]", counter);
                        else
-                               len += snprintf(buf + len, sizeof(buf) - len,
+                               len += snprintf(buf + len,
+                                               sizeof(smi->buf) - len,
                                                "[error]");
 
                        if (j != RTL8366_NUM_PORTS - 1) {
                                if (counter < 100000)
                                        len += snprintf(buf + len,
-                                                       sizeof(buf) - len,
+                                                       sizeof(smi->buf) - len,
                                                        "\t");
 
-                               len += snprintf(buf + len, sizeof(buf) - len,
+                               len += snprintf(buf + len,
+                                               sizeof(smi->buf) - len,
                                                "\t");
                        }
                }
-               len += snprintf(buf + len, sizeof(buf) - len, "\n");
+               len += snprintf(buf + len, sizeof(smi->buf) - len, "\n");
        }
 
-       len += snprintf(buf + len, sizeof(buf) - len, "\n");
+       len += snprintf(buf + len, sizeof(smi->buf) - len, "\n");
 
        return simple_read_from_buffer(user_buf, count, ppos, buf, len);
 }
@@ -1024,35 +1016,36 @@ static ssize_t rtl8366_read_debugfs_vlan(struct file *file,
                                         char __user *user_buf,
                                         size_t count, loff_t *ppos)
 {
-       char buf[4096];
-       int i, j, len = 0;
        struct rtl8366_smi *smi = (struct rtl8366_smi *)file->private_data;
+       int i, j, len = 0;
+       char *buf = smi->buf;
 
-       len += snprintf(buf + len, sizeof(buf) - len, "VLAN Member Config:\n");
-       len += snprintf(buf + len, sizeof(buf) - len,
+       len += snprintf(buf + len, sizeof(smi->buf) - len,
+                       "VLAN Member Config:\n");
+       len += snprintf(buf + len, sizeof(smi->buf) - len,
                        "\t id \t vid \t prio \t member \t untag  \t fid "
                        "\tports\n");
 
        for (i = 0; i < RTL8366_NUM_VLANS; ++i) {
-               struct rtl8366s_vlanconfig vlanMC;
-               memset(&vlanMC, '\0', sizeof(struct rtl8366s_vlanconfig));
-               rtl8366s_get_vlan_member_config(smi, i, &vlanMC);
+               struct rtl8366s_vlanconfig vlanmc;
+
+               rtl8366s_get_vlan_member_config(smi, i, &vlanmc);
 
-               len += snprintf(buf + len, sizeof(buf) - len,
+               len += snprintf(buf + len, sizeof(smi->buf) - len,
                                "\t[%d] \t %d \t %d \t 0x%04x \t 0x%04x \t %d "
-                               "\t", i, vlanMC.vid, vlanMC.priority,
-                               vlanMC.member, vlanMC.untag, vlanMC.fid);
+                               "\t", i, vlanmc.vid, vlanmc.priority,
+                               vlanmc.member, vlanmc.untag, vlanmc.fid);
 
                for (j = 0; j < RTL8366_NUM_PORTS; ++j) {
                        int index = 0;
                        if (!rtl8366_get_port_vlan_index(smi, j, &index)) {
                                if (index == i)
                                        len += snprintf(buf + len,
-                                                       sizeof(buf) - len,
+                                                       sizeof(smi->buf) - len,
                                                        "%d", j);
                        }
                }
-               len += snprintf(buf + len, sizeof(buf) - len, "\n");
+               len += snprintf(buf + len, sizeof(smi->buf) - len, "\n");
        }
 
        return simple_read_from_buffer(user_buf, count, ppos, buf, len);
@@ -1062,21 +1055,21 @@ static ssize_t rtl8366_read_debugfs_reg(struct file *file,
                                        char __user *user_buf,
                                        size_t count, loff_t *ppos)
 {
+       struct rtl8366_smi *smi = (struct rtl8366_smi *)file->private_data;
        u32 t, reg = g_dbg_reg;
        int err, len = 0;
-       char buf[512];
-       struct rtl8366_smi *smi = (struct rtl8366_smi *)file->private_data;
+       char *buf = smi->buf;
 
-       memset(buf, '\0', sizeof(buf));
+       memset(buf, '\0', sizeof(smi->buf));
 
        err = rtl8366_smi_read_reg(smi, reg, &t);
        if (err) {
-               len += snprintf(buf, sizeof(buf),
+               len += snprintf(buf, sizeof(smi->buf),
                                "Read failed (reg: 0x%04x)\n", reg);
                return simple_read_from_buffer(user_buf, count, ppos, buf, len);
        }
 
-       len += snprintf(buf, sizeof(buf), "reg = 0x%04x, val = 0x%04x\n",
+       len += snprintf(buf, sizeof(smi->buf), "reg = 0x%04x, val = 0x%04x\n",
                        reg, t);
 
        return simple_read_from_buffer(user_buf, count, ppos, buf, len);
@@ -1086,14 +1079,14 @@ static ssize_t rtl8366_write_debugfs_reg(struct file *file,
                                         const char __user *user_buf,
                                         size_t count, loff_t *ppos)
 {
+       struct rtl8366_smi *smi = (struct rtl8366_smi *)file->private_data;
        unsigned long data;
        u32 reg = g_dbg_reg;
        int err;
-       char buf[50];
        size_t len;
-       struct rtl8366_smi *smi = (struct rtl8366_smi *)file->private_data;
+       char *buf = smi->buf;
 
-       len = min(count, sizeof(buf) - 1);
+       len = min(count, sizeof(smi->buf) - 1);
        if (copy_from_user(buf, user_buf, len)) {
                dev_err(&smi->pdev->dev, "copy from user failed\n");
                return -EFAULT;
@@ -1167,16 +1160,16 @@ static void rtl8366_debugfs_init(struct rtl8366_smi *smi)
        node = debugfs_create_file("vlan", S_IRUSR, root, smi,
                                   &fops_rtl8366_vlan);
        if (!node) {
-               dev_err(&smi->pdev->dev, "Creating debugfs file vlan "
-                       "failed\n");
+               dev_err(&smi->pdev->dev,
+                       "Creating debugfs file vlan failed\n");
                return;
        }
 
        node = debugfs_create_file("mibs", S_IRUSR, root, smi,
                                   &fops_rtl8366_mibs);
        if (!node) {
-               dev_err(&smi->pdev->dev, "Creating debugfs file mibs "
-                       "xfailed\n");
+               dev_err(&smi->pdev->dev,
+                       "Creating debugfs file mibs failed\n");
                return;
        }
 }
@@ -1192,14 +1185,14 @@ static void rtl8366_debugfs_remove(struct rtl8366_smi *smi)
 #else
 static inline void rtl8366_debugfs_init(struct rtl8366_smi *smi) {}
 static inline void rtl8366_debugfs_remove(struct rtl8366_smi *smi) {}
-#endif
+#endif /* CONFIG_RTL8366_SMI_DEBUG_FS */
 
 static int rtl8366_global_reset_mibs(struct switch_dev *dev,
                                     const struct switch_attr *attr,
                                     struct switch_val *val)
 {
+       struct rtl8366_smi *smi = sw_to_rtl8366(dev);
        u32 data = 0;
-       struct rtl8366_smi *smi = to_rtl8366(dev);
 
        if (val->value.i == 1) {
                rtl8366_smi_read_reg(smi, RTL8366S_MIB_CTRL_REG, &data);
@@ -1214,8 +1207,8 @@ static int rtl8366_get_vlan(struct switch_dev *dev,
                            const struct switch_attr *attr,
                            struct switch_val *val)
 {
+       struct rtl8366_smi *smi = sw_to_rtl8366(dev);
        u32 data;
-       struct rtl8366_smi *smi = to_rtl8366(dev);
 
        if (attr->ofs == 1) {
                rtl8366_smi_read_reg(smi, RTL8366_CHIP_GLOBAL_CTRL_REG, &data);
@@ -1240,8 +1233,9 @@ static int rtl8366_global_get_blinkrate(struct switch_dev *dev,
                                        const struct switch_attr *attr,
                                        struct switch_val *val)
 {
+       struct rtl8366_smi *smi = sw_to_rtl8366(dev);
        u32 data;
-       struct rtl8366_smi *smi = to_rtl8366(dev);
+
        rtl8366_smi_read_reg(smi, RTL8366_LED_BLINKRATE_REG, &data);
 
        val->value.i = (data & (RTL8366_LED_BLINKRATE_MASK));
@@ -1254,14 +1248,14 @@ static int rtl8366_global_set_blinkrate(struct switch_dev *dev,
                                        struct switch_val *val)
 {
        u32 data;
-       struct rtl8366_smi *smi = to_rtl8366(dev);
+       struct rtl8366_smi *smi = sw_to_rtl8366(dev);
 
        if (val->value.i >= 6)
                return -EINVAL;
 
        rtl8366_smi_read_reg(smi, RTL8366_LED_BLINKRATE_REG, &data);
 
-       data &= ~(data & RTL8366_LED_BLINKRATE_MASK);
+       data &= ~RTL8366_LED_BLINKRATE_MASK;
        data |= val->value.i;
 
        rtl8366_smi_write_reg(smi, RTL8366_LED_BLINKRATE_REG, data);
@@ -1273,7 +1267,7 @@ static int rtl8366_set_vlan(struct switch_dev *dev,
                            const struct switch_attr *attr,
                            struct switch_val *val)
 {
-       struct rtl8366_smi *smi = to_rtl8366(dev);
+       struct rtl8366_smi *smi = sw_to_rtl8366(dev);
 
        if (attr->ofs == 1)
                return rtl8366_vlan_set_vlan(smi, val->value.i);
@@ -1281,27 +1275,19 @@ static int rtl8366_set_vlan(struct switch_dev *dev,
                return rtl8366_vlan_set_4ktable(smi, val->value.i);
 }
 
-static int rtl8366_init_vlan(struct switch_dev *dev,
-                            const struct switch_attr *attr,
-                            struct switch_val *val)
-{
-       struct rtl8366_smi *smi = to_rtl8366(dev);
-       return rtl8366s_reset_vlan(smi);
-}
-
 static int rtl8366_attr_get_port_link(struct switch_dev *dev,
                                      const struct switch_attr *attr,
                                      struct switch_val *val)
 {
-       char buf[1024];
        u32 len = 0, data = 0;
        int speed, duplex, link, txpause, rxpause, nway;
-       struct rtl8366_smi *smi = to_rtl8366(dev);
+       struct rtl8366_smi *smi = sw_to_rtl8366(dev);
+       char *buf = smi->buf;
 
        if (val->port_vlan >= RTL8366_NUM_PORTS)
                return -EINVAL;
 
-       memset(buf, '\0', sizeof(buf));
+       memset(buf, '\0', sizeof(smi->buf));
        rtl8366_smi_read_reg(smi, RTL8366S_PORT_LINK_STATUS_BASE +
                             (val->port_vlan >> 1),
                             &data);
@@ -1316,34 +1302,42 @@ static int rtl8366_attr_get_port_link(struct switch_dev *dev,
        rxpause = (data & RTL8366S_PORT_STATUS_RXPAUSE_MASK) >> 6;
        nway = (data & RTL8366S_PORT_STATUS_AN_MASK) >> 7;
 
-       len += snprintf(buf + len, sizeof(buf) - len, "Port %d: ",
+       len += snprintf(buf + len, sizeof(smi->buf) - len, "Port %d: ",
                        val->port_vlan);
 
        if (link)
-               len += snprintf(buf + len, sizeof(buf) - len,
+               len += snprintf(buf + len, sizeof(smi->buf) - len,
                                "Link UP, Speed: ");
        else
-               len += snprintf(buf + len, sizeof(buf) - len,
+               len += snprintf(buf + len, sizeof(smi->buf) - len,
                                "Link DOWN, Speed: ");
 
        if (speed == 0)
-               len += snprintf(buf + len, sizeof(buf) - len, "10Base-TX ");
+               len += snprintf(buf + len, sizeof(smi->buf) - len,
+                               "10Base-TX ");
        else if (speed == 1)
-               len += snprintf(buf + len, sizeof(buf) - len, "100Base-TX ");
+               len += snprintf(buf + len, sizeof(smi->buf) - len,
+                               "100Base-TX ");
        else if (speed == 2)
-               len += snprintf(buf + len, sizeof(buf) - len, "1000Base-TX ");
+               len += snprintf(buf + len, sizeof(smi->buf) - len,
+                               "1000Base-TX ");
 
        if (duplex)
-               len += snprintf(buf + len, sizeof(buf) - len, "Full-Duplex, ");
+               len += snprintf(buf + len, sizeof(smi->buf) - len,
+                               "Full-Duplex, ");
        else
-               len += snprintf(buf + len, sizeof(buf) - len, "Half-Duplex, ");
+               len += snprintf(buf + len, sizeof(smi->buf) - len,
+                               "Half-Duplex, ");
 
        if (txpause)
-               len += snprintf(buf + len, sizeof(buf) - len, "TX-Pause ");
+               len += snprintf(buf + len, sizeof(smi->buf) - len,
+                               "TX-Pause ");
        if (rxpause)
-               len += snprintf(buf + len, sizeof(buf) - len, "RX-Pause ");
+               len += snprintf(buf + len, sizeof(smi->buf) - len,
+                               "RX-Pause ");
        if (nway)
-               len += snprintf(buf + len, sizeof(buf) - len, "nway ");
+               len += snprintf(buf + len, sizeof(smi->buf) - len,
+                               "nway ");
 
        val->value.s = buf;
        val->len = len;
@@ -1356,43 +1350,43 @@ static int rtl8366_attr_get_vlan_info(struct switch_dev *dev,
                                      struct switch_val *val)
 {
        int i;
-       char buf[1024];
        u32 len = 0;
-       struct rtl8366s_vlanconfig vlanMC;
-       struct rtl8366s_vlan4kentry vlan4K;
-       struct rtl8366_smi *smi = to_rtl8366(dev);
+       struct rtl8366s_vlanconfig vlanmc;
+       struct rtl8366s_vlan4kentry vlan4k;
+       struct rtl8366_smi *smi = sw_to_rtl8366(dev);
+       char *buf = smi->buf;
 
-       if (val->port_vlan >= RTL8366_NUM_PORTS)
+       if (val->port_vlan >= RTL8366_NUM_VLANS)
                return -EINVAL;
 
-       memset(buf, '\0', sizeof(buf));
-       memset(&vlanMC, '\0', sizeof(struct rtl8366s_vlanconfig));
+       memset(buf, '\0', sizeof(smi->buf));
 
-       rtl8366s_get_vlan_member_config(smi, val->port_vlan, &vlanMC);
-       rtl8366s_get_vlan_4k_entry(smi, vlanMC.vid, &vlan4K);
+       rtl8366s_get_vlan_member_config(smi, val->port_vlan, &vlanmc);
+       rtl8366s_get_vlan_4k_entry(smi, vlanmc.vid, &vlan4k);
 
-       len += snprintf(buf + len, sizeof(buf) - len, "VLAN %d: Ports: ",
+       len += snprintf(buf + len, sizeof(smi->buf) - len, "VLAN %d: Ports: ",
                        val->port_vlan);
 
        for (i = 0; i < RTL8366_NUM_PORTS; ++i) {
                int index = 0;
                if (!rtl8366_get_port_vlan_index(smi, i, &index) &&
                    index == val->port_vlan)
-                       len += snprintf(buf + len, sizeof(buf) - len, "%d", i);
+                       len += snprintf(buf + len, sizeof(smi->buf) - len,
+                                       "%d", i);
        }
-       len += snprintf(buf + len, sizeof(buf) - len, "\n");
+       len += snprintf(buf + len, sizeof(smi->buf) - len, "\n");
 
-       len += snprintf(buf + len, sizeof(buf) - len,
+       len += snprintf(buf + len, sizeof(smi->buf) - len,
                        "\t\t vid \t prio \t member \t untag \t fid\n");
-       len += snprintf(buf + len, sizeof(buf) - len, "\tMC:\t");
-       len += snprintf(buf + len, sizeof(buf) - len,
+       len += snprintf(buf + len, sizeof(smi->buf) - len, "\tMC:\t");
+       len += snprintf(buf + len, sizeof(smi->buf) - len,
                        "%d \t %d \t 0x%04x \t 0x%04x \t %d\n",
-                       vlanMC.vid, vlanMC.priority, vlanMC.member,
-                       vlanMC.untag, vlanMC.fid);
-       len += snprintf(buf + len, sizeof(buf) - len, "\t4K:\t");
-       len += snprintf(buf + len, sizeof(buf) - len,
+                       vlanmc.vid, vlanmc.priority, vlanmc.member,
+                       vlanmc.untag, vlanmc.fid);
+       len += snprintf(buf + len, sizeof(smi->buf) - len, "\t4K:\t");
+       len += snprintf(buf + len, sizeof(smi->buf) - len,
                        "%d \t  \t 0x%04x \t 0x%04x \t %d",
-                       vlan4K.vid, vlan4K.member, vlan4K.untag, vlan4K.fid);
+                       vlan4k.vid, vlan4k.member, vlan4k.untag, vlan4k.fid);
 
        val->value.s = buf;
        val->len = len;
@@ -1404,8 +1398,9 @@ static int rtl8366_set_port_led(struct switch_dev *dev,
                                const struct switch_attr *attr,
                                struct switch_val *val)
 {
+       struct rtl8366_smi *smi = sw_to_rtl8366(dev);
        u32 data = 0;
-       struct rtl8366_smi *smi = to_rtl8366(dev);
+
        if (val->port_vlan >= RTL8366_NUM_PORTS ||
            (1 << val->port_vlan) == RTL8366_PORT_UNKNOWN)
                return -EINVAL;
@@ -1428,8 +1423,9 @@ static int rtl8366_get_port_led(struct switch_dev *dev,
                                const struct switch_attr *attr,
                                struct switch_val *val)
 {
+       struct rtl8366_smi *smi = sw_to_rtl8366(dev);
        u32 data = 0;
-       struct rtl8366_smi *smi = to_rtl8366(dev);
+
        if (val->port_vlan >= RTL8366_NUM_LEDGROUPS)
                return -EINVAL;
 
@@ -1443,8 +1439,9 @@ static int rtl8366_reset_port_mibs(struct switch_dev *dev,
                                   const struct switch_attr *attr,
                                   struct switch_val *val)
 {
+       struct rtl8366_smi *smi = sw_to_rtl8366(dev);
        u32 data = 0;
-       struct rtl8366_smi *smi = to_rtl8366(dev);
+
        if (val->port_vlan >= RTL8366_NUM_PORTS)
                return -EINVAL;
 
@@ -1459,24 +1456,26 @@ static int rtl8366_get_port_mib(struct switch_dev *dev,
                                const struct switch_attr *attr,
                                struct switch_val *val)
 {
-       char buf[2048];
+       struct rtl8366_smi *smi = sw_to_rtl8366(dev);
        int i, len = 0;
        unsigned long long counter = 0;
-       struct rtl8366_smi *smi = to_rtl8366(dev);
+       char *buf = smi->buf;
+
        if (val->port_vlan >= RTL8366_NUM_PORTS)
                return -EINVAL;
 
-       len += snprintf(buf + len, sizeof(buf) - len, "Port %d MIB counters\n",
+       len += snprintf(buf + len, sizeof(smi->buf) - len,
+                       "Port %d MIB counters\n",
                        val->port_vlan);
-       for (i = 0; i < RTL8366S_MIB_COUNT; ++i) {
 
-               len += snprintf(buf + len, sizeof(buf) - len,
+       for (i = 0; i < RTL8366S_MIB_COUNT; ++i) {
+               len += snprintf(buf + len, sizeof(smi->buf) - len,
                                "%d:%s\t", i, MIBCOUNTERS[i]);
                if (!rtl8366_get_mib_counter(smi, i, val->port_vlan, &counter))
-                       len += snprintf(buf + len, sizeof(buf) - len,
+                       len += snprintf(buf + len, sizeof(smi->buf) - len,
                                        "[%llu]\n", counter);
                else
-                       len += snprintf(buf + len, sizeof(buf) - len,
+                       len += snprintf(buf + len, sizeof(smi->buf) - len,
                                        "[error]\n");
        }
 
@@ -1485,111 +1484,103 @@ static int rtl8366_get_port_mib(struct switch_dev *dev,
        return 0;
 }
 
-static int rtl8366_set_member(struct switch_dev *dev,
-                             const struct switch_attr *attr,
-                             struct switch_val *val)
-{
-       struct rtl8366s_vlanconfig vlanMC;
-       struct rtl8366s_vlan4kentry vlan4K;
-       struct rtl8366_smi *smi = to_rtl8366(dev);
-       memset(&vlanMC, '\0', sizeof(struct rtl8366s_vlanconfig));
-
-       if (val->port_vlan >= RTL8366_NUM_VLANS)
-               return -EINVAL;
-
-       rtl8366s_get_vlan_member_config(smi, val->port_vlan, &vlanMC);
-
-       rtl8366s_get_vlan_4k_entry(smi, vlanMC.vid, &vlan4K);
-
-       vlan4K.member = vlanMC.member = val->value.i;
-       rtl8366s_set_vlan_member_config(smi, val->port_vlan, &vlanMC);
-       rtl8366s_set_vlan_4k_entry(smi, &vlan4K);
-
-       return 0;
-}
-
-static int rtl8366_get_member(struct switch_dev *dev,
-                             const struct switch_attr *attr,
-                             struct switch_val *val)
+static int rtl8366_get_ports(struct switch_dev *dev,
+                            struct switch_val *val)
 {
-       struct rtl8366s_vlanconfig vlanMC;
-       struct rtl8366s_vlan4kentry vlan4K;
-       struct rtl8366_smi *smi = to_rtl8366(dev);
-       memset(&vlanMC, '\0', sizeof(struct rtl8366s_vlanconfig));
+       struct rtl8366s_vlanconfig vlanmc;
+       struct rtl8366_smi *smi = sw_to_rtl8366(dev);
+       struct switch_port *port;
+       int i;
 
        if (val->port_vlan >= RTL8366_NUM_VLANS)
                return -EINVAL;
 
-       rtl8366s_get_vlan_member_config(smi, val->port_vlan, &vlanMC);
-
-       rtl8366s_get_vlan_4k_entry(smi, vlanMC.vid, &vlan4K);
-
-       val->value.i = vlanMC.member;
+       rtl8366s_get_vlan_member_config(smi, val->port_vlan, &vlanmc);
 
+       port = &val->value.ports[0];
+       val->len = 0;
+       for (i = 0; i < RTL8366_NUM_PORTS; i++) {
+               if (!(vlanmc.member & BIT(i)))
+                       continue;
+
+               port->id = i;
+               port->flags = (vlanmc.untag & BIT(i)) ?
+                                       0 : BIT(SWITCH_PORT_FLAG_TAGGED);
+               val->len++;
+               port++;
+       }
        return 0;
 }
 
-static int rtl8366_set_untag(struct switch_dev *dev,
-                            const struct switch_attr *attr,
+static int rtl8366_set_ports(struct switch_dev *dev,
                             struct switch_val *val)
 {
-       struct rtl8366s_vlanconfig vlanMC;
-       struct rtl8366s_vlan4kentry vlan4K;
-       struct rtl8366_smi *smi = to_rtl8366(dev);
-       memset(&vlanMC, '\0', sizeof(struct rtl8366s_vlanconfig));
+       struct rtl8366s_vlanconfig vlanmc;
+       struct rtl8366s_vlan4kentry vlan4k;
+       struct rtl8366_smi *smi = sw_to_rtl8366(dev);
+       struct switch_port *port;
+       int i;
 
        if (val->port_vlan >= RTL8366_NUM_VLANS)
                return -EINVAL;
 
-       rtl8366s_get_vlan_member_config(smi, val->port_vlan, &vlanMC);
-       rtl8366s_get_vlan_4k_entry(smi, vlanMC.vid, &vlan4K);
+       rtl8366s_get_vlan_member_config(smi, val->port_vlan, &vlanmc);
+       rtl8366s_get_vlan_4k_entry(smi, vlanmc.vid, &vlan4k);
 
-       vlan4K.untag = vlanMC.untag = val->value.i;
-       rtl8366s_set_vlan_member_config(smi, val->port_vlan, &vlanMC);
-       rtl8366s_set_vlan_4k_entry(smi, &vlan4K);
-
-       return 0;
-}
+       vlanmc.untag = 0;
+       vlanmc.member = 0;
 
-static int rtl8366_get_untag(struct switch_dev *dev,
-                            const struct switch_attr *attr,
-                            struct switch_val *val)
-{
-       struct rtl8366s_vlanconfig vlanMC;
-       struct rtl8366s_vlan4kentry vlan4K;
-       struct rtl8366_smi *smi = to_rtl8366(dev);
-       memset(&vlanMC, '\0', sizeof(struct rtl8366s_vlanconfig));
-
-       if (val->port_vlan >= RTL8366_NUM_VLANS)
-               return -EINVAL;
-
-       rtl8366s_get_vlan_member_config(smi, val->port_vlan, &vlanMC);
-       rtl8366s_get_vlan_4k_entry(smi, vlanMC.vid, &vlan4K);
+       port = &val->value.ports[0];
+       for (i = 0; i < val->len; i++, port++) {
+               vlanmc.member |= BIT(port->id);
 
+               if (!(port->flags & BIT(SWITCH_PORT_FLAG_TAGGED)))
+                       vlanmc.untag |= BIT(port->id);
+       }
 
-       val->value.i = vlanMC.untag;
+       vlan4k.member = vlanmc.member;
+       vlan4k.untag = vlanmc.untag;
 
+       rtl8366s_set_vlan_member_config(smi, val->port_vlan, &vlanmc);
+       rtl8366s_set_vlan_4k_entry(smi, &vlan4k);
        return 0;
 }
 
 static int rtl8366_get_port_pvid(struct switch_dev *dev, int port, int *val)
 {
-       struct rtl8366_smi *smi = to_rtl8366(dev);
+       struct rtl8366_smi *smi = sw_to_rtl8366(dev);
        return rtl8366_get_vlan_port_pvid(smi, port, val);
 }
 
 static int rtl8366_set_port_pvid(struct switch_dev *dev, int port, int val)
 {
-       struct rtl8366_smi *smi = to_rtl8366(dev);
+       struct rtl8366_smi *smi = sw_to_rtl8366(dev);
        return rtl8366_set_vlan_port_pvid(smi, port, val);
 }
 
 static int rtl8366_reset_switch(struct switch_dev *dev)
 {
-       struct rtl8366_smi *smi = to_rtl8366(dev);
+       struct rtl8366_smi *smi = sw_to_rtl8366(dev);
+       int timeout = 10;
+       u32 data;
+
        rtl8366_smi_write_reg(smi, RTL8366_RESET_CTRL_REG,
                              RTL8366_CHIP_CTRL_RESET_HW);
-       return 0;
+       do {
+               msleep(1);
+               if (rtl8366_smi_read_reg(smi, RTL8366_RESET_CTRL_REG, &data))
+                       return -EIO;
+
+               if (!(data & RTL8366_CHIP_CTRL_RESET_HW))
+                       break;
+       } while (--timeout);
+
+       if (!timeout) {
+               printk("Timeout waiting for the switch to reset\n");
+               return -EIO;
+       }
+
+       return rtl8366s_reset_vlan(smi);
 }
 
 static struct switch_attr rtl8366_globals[] = {
@@ -1601,8 +1592,7 @@ static struct switch_attr rtl8366_globals[] = {
                .get = rtl8366_get_vlan,
                .max = 1,
                .ofs = 1
-       },
-       {
+       }, {
                .type = SWITCH_TYPE_INT,
                .name = "enable_vlan4k",
                .description = "Enable VLAN 4K mode",
@@ -1610,25 +1600,14 @@ static struct switch_attr rtl8366_globals[] = {
                .get = rtl8366_get_vlan,
                .max = 1,
                .ofs = 2
-       },
-       {
-               .type = SWITCH_TYPE_INT,
-               .name = "init_vlan",
-               .description = "Initialize VLAN tables to defaults",
-               .set = rtl8366_init_vlan,
-               .get = NULL,
-               .max = 1
-       },
-
-       {
+       }, {
                .type = SWITCH_TYPE_INT,
                .name = "reset_mibs",
                .description = "Reset all MIB counters",
                .set = rtl8366_global_reset_mibs,
                .get = NULL,
                .max = 1
-       },
-       {
+       }, {
                .type = SWITCH_TYPE_INT,
                .name = "blinkrate",
                .description = "Get/Set LED blinking rate (0 = 43ms, 1 = 84ms,"
@@ -1647,24 +1626,21 @@ static struct switch_attr rtl8366_port[] = {
                .max = 1,
                .set = NULL,
                .get = rtl8366_attr_get_port_link
-       },
-       {
+       }, {
                .type = SWITCH_TYPE_INT,
                .name = "reset_mib",
                .description = "Reset single port MIB counters",
                .max = 1,
                .set = rtl8366_reset_port_mibs,
                .get = NULL
-       },
-       {
+       }, {
                .type = SWITCH_TYPE_STRING,
                .name = "mib",
                .description = "Get MIB counters for port",
                .max = 33,
                .set = NULL,
                .get = rtl8366_get_port_mib
-       },
-       {
+       }, {
                .type = SWITCH_TYPE_INT,
                .name = "led",
                .description = "Get/Set port group (0 - 3) led mode (0 - 15)",
@@ -1675,22 +1651,6 @@ static struct switch_attr rtl8366_port[] = {
 };
 
 static struct switch_attr rtl8366_vlan[] = {
-       {
-               .type = SWITCH_TYPE_INT,
-               .name = "untag",
-               .description = "Get/Set VLAN untag port set (bitmask)",
-               .set = rtl8366_set_untag,
-               .get = rtl8366_get_untag,
-               .max = 63,
-       },
-       {
-               .type = SWITCH_TYPE_INT,
-               .name = "member",
-               .description = "Get/Set VLAN member port set (bitmask)",
-               .set = rtl8366_set_member,
-               .get = rtl8366_get_member,
-               .max = 63,
-       },
        {
                .type = SWITCH_TYPE_STRING,
                .name = "info",
@@ -1721,11 +1681,34 @@ static struct switch_dev rtldev = {
                .n_attr = ARRAY_SIZE(rtl8366_vlan),
        },
 
+       .get_vlan_ports = rtl8366_get_ports,
+       .set_vlan_ports = rtl8366_set_ports,
        .get_port_pvid = rtl8366_get_port_pvid,
        .set_port_pvid = rtl8366_set_port_pvid,
        .reset_switch = rtl8366_reset_switch,
 };
 
+static int rtl8366_smi_switch_init(struct rtl8366_smi *smi)
+{
+       struct switch_dev *dev = &smi->dev;
+       int err;
+
+       memcpy(dev, &rtldev, sizeof(struct switch_dev));
+       dev->priv = smi;
+       dev->devname = dev_name(&smi->pdev->dev);
+
+       err = register_switch(dev, NULL);
+       if (err)
+               dev_err(&smi->pdev->dev, "switch registration failed\n");
+
+       return err;
+}
+
+static void rtl8366_smi_switch_cleanup(struct rtl8366_smi *smi)
+{
+       unregister_switch(&smi->dev);
+}
+
 static int rtl8366_smi_mii_read(struct mii_bus *bus, int addr, int reg)
 {
        struct rtl8366_smi *smi = bus->priv;
@@ -1795,6 +1778,12 @@ static void rtl8366_smi_mii_cleanup(struct rtl8366_smi *smi)
        mdiobus_free(smi->mii_bus);
 }
 
+static int rtl8366_smi_mii_bus_match(struct mii_bus *bus)
+{
+       return (bus->read == rtl8366_smi_mii_read &&
+               bus->write == rtl8366_smi_mii_write);
+}
+
 static int rtl8366_smi_setup(struct rtl8366_smi *smi)
 {
        u32 chip_id = 0;
@@ -1886,8 +1875,14 @@ static int __init rtl8366_smi_probe(struct platform_device *pdev)
        if (err)
                goto err_clear_drvdata;
 
+       err = rtl8366_smi_switch_init(smi);
+       if (err)
+               goto err_mii_cleanup;
+
        return 0;
 
+ err_mii_cleanup:
+       rtl8366_smi_mii_cleanup(smi);
  err_clear_drvdata:
        platform_set_drvdata(pdev, NULL);
        gpio_free(pdata->gpio_sck);
@@ -1899,33 +1894,15 @@ static int __init rtl8366_smi_probe(struct platform_device *pdev)
        return err;
 }
 
-int rtl8366_phy_config_init(struct phy_device *phydev)
+static int rtl8366_phy_config_init(struct phy_device *phydev)
 {
-       int err;
-       struct net_device *netdev = phydev->attached_dev;
-       struct rtl8366_smi *smi = phydev->bus->priv;
-       struct switch_dev *dev = &smi->dev;
-
-       /* Only init the switch for the primary PHY */
-       if (phydev->addr != 4) {
-               printk(KERN_INFO "Discarding address: %d\n", phydev->addr);
-               return 0;
-       }
-
-       memcpy(&smi->dev, &rtldev, sizeof(struct switch_dev));
-       dev->priv = smi;
-       dev->netdev = netdev;
-
-       err = register_switch(dev, netdev);
-       if (err < 0) {
-               printk(KERN_INFO "Switch registration failed\n");
-               return err;
-       }
+       if (!rtl8366_smi_mii_bus_match(phydev->bus))
+               return -EINVAL;
 
        return 0;
 }
 
-int rtl8366_phy_config_aneg(struct phy_device *phydev)
+static int rtl8366_phy_config_aneg(struct phy_device *phydev)
 {
        return 0;
 }
@@ -1952,8 +1929,8 @@ static int __devexit rtl8366_smi_remove(struct platform_device *pdev)
 
                pdata = pdev->dev.platform_data;
 
+               rtl8366_smi_switch_cleanup(smi);
                rtl8366_debugfs_remove(smi);
-               phy_driver_unregister(&rtl8366_smi_phy_driver);
                rtl8366_smi_mii_cleanup(smi);
                platform_set_drvdata(pdev, NULL);
                gpio_free(pdata->gpio_sck);