[PATCH v3] (respin) 802.1Q VLAN support for ADM6996M/ADM6996FC

[openwrt.git] / target / linux / generic / files / drivers / net / phy / rtl8366rb.c

diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366rb.c b/target/linux/generic/files/drivers/net/phy/rtl8366rb.c
index 2105b2b..640ed51 100644 (file)
--- a/target/linux/generic/files/drivers/net/phy/rtl8366rb.c
+++ b/target/linux/generic/files/drivers/net/phy/rtl8366rb.c
@@ -1,8 +1,9 @@
 /*
 /*

- * Platform driver for the Realtek RTL8366S ethernet switch
+ * Platform driver for the Realtek RTL8366RB ethernet switch

  *
  * Copyright (C) 2009-2010 Gabor Juhos <juhosg@openwrt.org>
  * Copyright (C) 2010 Antti Seppälä <a.seppala@gmail.com>
  *
  * Copyright (C) 2009-2010 Gabor Juhos <juhosg@openwrt.org>
  * Copyright (C) 2010 Antti Seppälä <a.seppala@gmail.com>

+ * Copyright (C) 2010 Roman Yeryomin <roman@advem.lv>

  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published


@@ -15,229 +16,215 @@
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/skbuff.h>
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/skbuff.h>

-#include <linux/switch.h>

 #include <linux/rtl8366rb.h>
 
 #include "rtl8366_smi.h"
 
 #include <linux/rtl8366rb.h>
 
 #include "rtl8366_smi.h"
 

-#ifdef CONFIG_RTL8366S_PHY_DEBUG_FS
-#include <linux/debugfs.h>
-#endif
+#define RTL8366RB_DRIVER_DESC  "Realtek RTL8366RB ethernet switch driver"
+#define RTL8366RB_DRIVER_VER   "0.2.3"

 
 

-#define RTL8366S_DRIVER_DESC   "Realtek RTL8366RB ethernet switch driver"
-#define RTL8366S_DRIVER_VER    "0.2.2"
-
-#define RTL8366S_PHY_NO_MAX                 4
-#define RTL8366S_PHY_PAGE_MAX               7
-#define RTL8366S_PHY_ADDR_MAX               31
-
-#define RTL8366_CHIP_GLOBAL_CTRL_REG        0x0000
-#define RTL8366_CHIP_CTRL_VLAN              (1 << 13)
-#define RTL8366_CHIP_CTRL_VLAN_4KTB         (1 << 14)
+#define RTL8366RB_PHY_NO_MAX   4
+#define RTL8366RB_PHY_PAGE_MAX 7
+#define RTL8366RB_PHY_ADDR_MAX 31

 
 /* Switch Global Configuration register */
 
 /* Switch Global Configuration register */

-#define RTL8366_SGCR                   0x0000
-#define RTL8366_SGCR_EN_BC_STORM_CTRL  BIT(0)
-#define RTL8366_SGCR_MAX_LENGTH(_x)    (_x << 4)
-#define RTL8366_SGCR_MAX_LENGTH_MASK   RTL8366_SGCR_MAX_LENGTH(0x3)
-#define RTL8366_SGCR_MAX_LENGTH_1522   RTL8366_SGCR_MAX_LENGTH(0x0)
-#define RTL8366_SGCR_MAX_LENGTH_1536   RTL8366_SGCR_MAX_LENGTH(0x1)
-#define RTL8366_SGCR_MAX_LENGTH_1552   RTL8366_SGCR_MAX_LENGTH(0x2)
-#define RTL8366_SGCR_MAX_LENGTH_9216   RTL8366_SGCR_MAX_LENGTH(0x3)
+#define RTL8366RB_SGCR                         0x0000
+#define RTL8366RB_SGCR_EN_BC_STORM_CTRL                BIT(0)
+#define RTL8366RB_SGCR_MAX_LENGTH(_x)          (_x << 4)
+#define RTL8366RB_SGCR_MAX_LENGTH_MASK         RTL8366RB_SGCR_MAX_LENGTH(0x3)
+#define RTL8366RB_SGCR_MAX_LENGTH_1522         RTL8366RB_SGCR_MAX_LENGTH(0x0)
+#define RTL8366RB_SGCR_MAX_LENGTH_1536         RTL8366RB_SGCR_MAX_LENGTH(0x1)
+#define RTL8366RB_SGCR_MAX_LENGTH_1552         RTL8366RB_SGCR_MAX_LENGTH(0x2)
+#define RTL8366RB_SGCR_MAX_LENGTH_9216         RTL8366RB_SGCR_MAX_LENGTH(0x3)
+#define RTL8366RB_SGCR_EN_VLAN                 BIT(13)
+#define RTL8366RB_SGCR_EN_VLAN_4KTB            BIT(14)

 
 /* Port Enable Control register */
 
 /* Port Enable Control register */

-#define RTL8366_PECR                   0x0001
+#define RTL8366RB_PECR                         0x0001

 
 /* Switch Security Control registers */
 
 /* Switch Security Control registers */

-#define RTL8366_SSCR0                  0x0002
-#define RTL8366_SSCR1                  0x0003
-#define RTL8366_SSCR2                  0x0004
-#define RTL8366_SSCR2_DROP_UNKNOWN_DA  BIT(0)
+#define RTL8366RB_SSCR0                                0x0002
+#define RTL8366RB_SSCR1                                0x0003
+#define RTL8366RB_SSCR2                                0x0004
+#define RTL8366RB_SSCR2_DROP_UNKNOWN_DA                BIT(0)

 
 

-#define RTL8366_RESET_CTRL_REG              0x0100
-#define RTL8366_CHIP_CTRL_RESET_HW          1
-#define RTL8366_CHIP_CTRL_RESET_SW          (1 << 1)
+#define RTL8366RB_RESET_CTRL_REG               0x0100
+#define RTL8366RB_CHIP_CTRL_RESET_HW           1
+#define RTL8366RB_CHIP_CTRL_RESET_SW           (1 << 1)

 
 

-#define RTL8366S_CHIP_VERSION_CTRL_REG      0x050A
-#define RTL8366S_CHIP_VERSION_MASK          0xf
-#define RTL8366S_CHIP_ID_REG                0x0509
-#define RTL8366S_CHIP_ID_8366               0x5937
+#define RTL8366RB_CHIP_VERSION_CTRL_REG                0x050A
+#define RTL8366RB_CHIP_VERSION_MASK            0xf
+#define RTL8366RB_CHIP_ID_REG                  0x0509
+#define RTL8366RB_CHIP_ID_8366                 0x5937

 
 /* PHY registers control */
 
 /* PHY registers control */

-#define RTL8366S_PHY_ACCESS_CTRL_REG        0x8000
-#define RTL8366S_PHY_ACCESS_DATA_REG        0x8002
-
-#define RTL8366S_PHY_CTRL_READ              1
-#define RTL8366S_PHY_CTRL_WRITE             0
-
-#define RTL8366S_PHY_REG_MASK               0x1f
-#define RTL8366S_PHY_PAGE_OFFSET            5
-#define RTL8366S_PHY_PAGE_MASK              (0xf << 5)
-#define RTL8366S_PHY_NO_OFFSET              9
-#define RTL8366S_PHY_NO_MASK                (0x1f << 9)
-
-/* LED control registers */
-#define RTL8366_LED_BLINKRATE_REG           0x0430
-#define RTL8366_LED_BLINKRATE_BIT           0
-#define RTL8366_LED_BLINKRATE_MASK          0x0007
-
-#define RTL8366_LED_CTRL_REG                0x0431
-#define RTL8366_LED_0_1_CTRL_REG            0x0432
-#define RTL8366_LED_2_3_CTRL_REG            0x0433
-
-#define RTL8366S_MIB_COUNT                  33
-#define RTL8366S_GLOBAL_MIB_COUNT           1
-#define RTL8366S_MIB_COUNTER_PORT_OFFSET    0x0050
-#define RTL8366S_MIB_COUNTER_BASE           0x1000
-#define RTL8366S_MIB_CTRL_REG               0x13F0
-#define RTL8366S_MIB_CTRL_USER_MASK         0x0FFC
-#define RTL8366S_MIB_CTRL_BUSY_MASK         0x0001
-#define RTL8366S_MIB_CTRL_RESET_MASK        0x0001
-
-#define RTL8366S_MIB_CTRL_GLOBAL_RESET_MASK 0x0004
-#define RTL8366S_MIB_CTRL_PORT_RESET_BIT    0x0003
-#define RTL8366S_MIB_CTRL_PORT_RESET_MASK   0x01FC
-
-
-#define RTL8366S_PORT_VLAN_CTRL_BASE        0x0063
-#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       0x018C
-#define RTL8366S_VLAN_TABLE_WRITE_BASE      0x0185
-
-
-#define RTL8366S_TABLE_ACCESS_CTRL_REG      0x0180
-#define RTL8366S_TABLE_VLAN_READ_CTRL       0x0E01
-#define RTL8366S_TABLE_VLAN_WRITE_CTRL      0x0F01
-
-#define RTL8366S_VLAN_MEMCONF_BASE          0x0020
-
-
-#define RTL8366S_PORT_LINK_STATUS_BASE      0x0014
-#define RTL8366S_PORT_STATUS_SPEED_MASK     0x0003
-#define RTL8366S_PORT_STATUS_DUPLEX_MASK    0x0004
-#define RTL8366S_PORT_STATUS_LINK_MASK      0x0010
-#define RTL8366S_PORT_STATUS_TXPAUSE_MASK   0x0020
-#define RTL8366S_PORT_STATUS_RXPAUSE_MASK   0x0040
-#define RTL8366S_PORT_STATUS_AN_MASK        0x0080
-
-
-#define RTL8366_PORT_NUM_CPU                5
-#define RTL8366_NUM_PORTS                   6
-#define RTL8366_NUM_VLANS                   16
-#define RTL8366_NUM_LEDGROUPS               4
-#define RTL8366_NUM_VIDS                    4096
-#define RTL8366S_PRIORITYMAX                7
-#define RTL8366S_FIDMAX                            7
-
-
-#define RTL8366_PORT_1                      (1 << 0) /* In userspace port 0 */
-#define RTL8366_PORT_2                      (1 << 1) /* In userspace port 1 */
-#define RTL8366_PORT_3                      (1 << 2) /* In userspace port 2 */
-#define RTL8366_PORT_4                      (1 << 3) /* In userspace port 3 */
-#define RTL8366_PORT_5                      (1 << 4) /* In userspace port 4 */
-
-#define RTL8366_PORT_CPU                    (1 << 5) /* CPU port */
-
-#define RTL8366_PORT_ALL                    (RTL8366_PORT_1 |       \
-                                            RTL8366_PORT_2 |       \
-                                            RTL8366_PORT_3 |       \
-                                            RTL8366_PORT_4 |       \
-                                            RTL8366_PORT_5 |       \
-                                            RTL8366_PORT_CPU)
-
-#define RTL8366_PORT_ALL_BUT_CPU            (RTL8366_PORT_1 |       \
-                                            RTL8366_PORT_2 |       \
-                                            RTL8366_PORT_3 |       \
-                                            RTL8366_PORT_4 |       \
-                                            RTL8366_PORT_5)
-
-#define RTL8366_PORT_ALL_EXTERNAL           (RTL8366_PORT_1 |       \
-                                            RTL8366_PORT_2 |       \
-                                            RTL8366_PORT_3 |       \
-                                            RTL8366_PORT_4)
-
-#define RTL8366_PORT_ALL_INTERNAL           RTL8366_PORT_CPU
-
-struct rtl8366rb {
-       struct device           *parent;
-       struct rtl8366_smi      smi;
-       struct switch_dev       dev;
-       char                    buf[4096];
-#ifdef CONFIG_RTL8366S_PHY_DEBUG_FS
-       struct dentry           *debugfs_root;
-#endif
-};
+#define RTL8366RB_PHY_ACCESS_CTRL_REG          0x8000
+#define RTL8366RB_PHY_ACCESS_DATA_REG          0x8002

 
 

-struct rtl8366rb_vlan_mc {
-       u16     reserved2:1;
-       u16     priority:3;
-       u16     vid:12;
-       u16     untag:8;
-       u16     member:8;
-       u16     stag_mbr:8;
-       u16     stag_idx:3;
-       u16     reserved1:2;
-       u16     fid:3;
-};
-
-struct rtl8366rb_vlan_4k {
-       u16     reserved1:4;
-       u16     vid:12;
-       u16     untag:8;
-       u16     member:8;
-       u16     reserved2:13;
-       u16     fid:3;
-};
+#define RTL8366RB_PHY_CTRL_READ                        1
+#define RTL8366RB_PHY_CTRL_WRITE               0

 
 

-#ifdef CONFIG_RTL8366S_PHY_DEBUG_FS
-u16 gl_dbg_reg;
-#endif
+#define RTL8366RB_PHY_REG_MASK                 0x1f
+#define RTL8366RB_PHY_PAGE_OFFSET              5
+#define RTL8366RB_PHY_PAGE_MASK                        (0xf << 5)
+#define RTL8366RB_PHY_NO_OFFSET                        9
+#define RTL8366RB_PHY_NO_MASK                  (0x1f << 9)

 
 

-struct mib_counter {
-       unsigned        offset;
-       unsigned        length;
-       const char      *name;
-};
+#define RTL8366RB_VLAN_INGRESS_CTRL2_REG       0x037f

 
 

-static struct mib_counter rtl8366rb_mib_counters[RTL8366S_MIB_COUNT] = {
-       {  0, 4, "IfInOctets"                           },
-       {  4, 4, "EtherStatsOctets"                     },
-       {  8, 2, "EtherStatsUnderSizePkts"              },
-       { 10, 2, "EtherFragments"                       },
-       { 12, 2, "EtherStatsPkts64Octets"               },
-       { 14, 2, "EtherStatsPkts65to127Octets"          },
-       { 16, 2, "EtherStatsPkts128to255Octets"         },
-       { 18, 2, "EtherStatsPkts256to511Octets"         },
-       { 20, 2, "EtherStatsPkts512to1023Octets"        },
-       { 22, 2, "EtherStatsPkts1024to1518Octets"       },
-       { 24, 2, "EtherOversizeStats"                   },
-       { 26, 2, "EtherStatsJabbers"                    },
-       { 28, 2, "IfInUcastPkts"                        },
-       { 30, 2, "EtherStatsMulticastPkts"              },
-       { 32, 2, "EtherStatsBroadcastPkts"              },
-       { 34, 2, "EtherStatsDropEvents"                 },
-       { 36, 2, "Dot3StatsFCSErrors"                   },
-       { 38, 2, "Dot3StatsSymbolErrors"                },
-       { 40, 2, "Dot3InPauseFrames"                    },
-       { 42, 2, "Dot3ControlInUnknownOpcodes"          },
-       { 44, 4, "IfOutOctets"                          },
-       { 48, 2, "Dot3StatsSingleCollisionFrames"       },
-       { 50, 2, "Dot3StatMultipleCollisionFrames"      },
-       { 52, 2, "Dot3sDeferredTransmissions"           },
-       { 54, 2, "Dot3StatsLateCollisions"              },
-       { 56, 2, "EtherStatsCollisions"                 },
-       { 58, 2, "Dot3StatsExcessiveCollisions"         },
-       { 60, 2, "Dot3OutPauseFrames"                   },
-       { 62, 2, "Dot1dBasePortDelayExceededDiscards"   },
-       { 64, 2, "Dot1dTpPortInDiscards"                },
-       { 66, 2, "IfOutUcastPkts"                       },
-       { 68, 2, "IfOutMulticastPkts"                   },
-       { 70, 2, "IfOutBroadcastPkts"                   },
+/* LED control registers */
+#define RTL8366RB_LED_BLINKRATE_REG            0x0430
+#define RTL8366RB_LED_BLINKRATE_BIT            0
+#define RTL8366RB_LED_BLINKRATE_MASK           0x0007
+
+#define RTL8366RB_LED_CTRL_REG                 0x0431
+#define RTL8366RB_LED_0_1_CTRL_REG             0x0432
+#define RTL8366RB_LED_2_3_CTRL_REG             0x0433
+
+#define RTL8366RB_MIB_COUNT                    33
+#define RTL8366RB_GLOBAL_MIB_COUNT             1
+#define RTL8366RB_MIB_COUNTER_PORT_OFFSET      0x0050
+#define RTL8366RB_MIB_COUNTER_BASE             0x1000
+#define RTL8366RB_MIB_CTRL_REG                 0x13F0
+#define RTL8366RB_MIB_CTRL_USER_MASK           0x0FFC
+#define RTL8366RB_MIB_CTRL_BUSY_MASK           BIT(0)
+#define RTL8366RB_MIB_CTRL_RESET_MASK          BIT(1)
+#define RTL8366RB_MIB_CTRL_PORT_RESET(_p)      BIT(2 + (_p))
+#define RTL8366RB_MIB_CTRL_GLOBAL_RESET                BIT(11)
+
+#define RTL8366RB_PORT_VLAN_CTRL_BASE          0x0063
+#define RTL8366RB_PORT_VLAN_CTRL_REG(_p)  \
+               (RTL8366RB_PORT_VLAN_CTRL_BASE + (_p) / 4)
+#define RTL8366RB_PORT_VLAN_CTRL_MASK          0xf
+#define RTL8366RB_PORT_VLAN_CTRL_SHIFT(_p)     (4 * ((_p) % 4))
+
+
+#define RTL8366RB_VLAN_TABLE_READ_BASE         0x018C
+#define RTL8366RB_VLAN_TABLE_WRITE_BASE                0x0185
+
+
+#define RTL8366RB_TABLE_ACCESS_CTRL_REG                0x0180
+#define RTL8366RB_TABLE_VLAN_READ_CTRL         0x0E01
+#define RTL8366RB_TABLE_VLAN_WRITE_CTRL                0x0F01
+
+#define RTL8366RB_VLAN_MC_BASE(_x)             (0x0020 + (_x) * 3)
+
+
+#define RTL8366RB_PORT_LINK_STATUS_BASE                0x0014
+#define RTL8366RB_PORT_STATUS_SPEED_MASK       0x0003
+#define RTL8366RB_PORT_STATUS_DUPLEX_MASK      0x0004
+#define RTL8366RB_PORT_STATUS_LINK_MASK                0x0010
+#define RTL8366RB_PORT_STATUS_TXPAUSE_MASK     0x0020
+#define RTL8366RB_PORT_STATUS_RXPAUSE_MASK     0x0040
+#define RTL8366RB_PORT_STATUS_AN_MASK          0x0080
+
+
+#define RTL8366RB_PORT_NUM_CPU         5
+#define RTL8366RB_NUM_PORTS            6
+#define RTL8366RB_NUM_VLANS            16
+#define RTL8366RB_NUM_LEDGROUPS                4
+#define RTL8366RB_NUM_VIDS             4096
+#define RTL8366RB_PRIORITYMAX          7
+#define RTL8366RB_FIDMAX               7
+
+
+#define RTL8366RB_PORT_1               (1 << 0) /* In userspace port 0 */
+#define RTL8366RB_PORT_2               (1 << 1) /* In userspace port 1 */
+#define RTL8366RB_PORT_3               (1 << 2) /* In userspace port 2 */
+#define RTL8366RB_PORT_4               (1 << 3) /* In userspace port 3 */
+#define RTL8366RB_PORT_5               (1 << 4) /* In userspace port 4 */
+
+#define RTL8366RB_PORT_CPU             (1 << 5) /* CPU port */
+
+#define RTL8366RB_PORT_ALL             (RTL8366RB_PORT_1 |     \
+                                        RTL8366RB_PORT_2 |     \
+                                        RTL8366RB_PORT_3 |     \
+                                        RTL8366RB_PORT_4 |     \
+                                        RTL8366RB_PORT_5 |     \
+                                        RTL8366RB_PORT_CPU)
+
+#define RTL8366RB_PORT_ALL_BUT_CPU     (RTL8366RB_PORT_1 |     \
+                                        RTL8366RB_PORT_2 |     \
+                                        RTL8366RB_PORT_3 |     \
+                                        RTL8366RB_PORT_4 |     \
+                                        RTL8366RB_PORT_5)
+
+#define RTL8366RB_PORT_ALL_EXTERNAL    (RTL8366RB_PORT_1 |     \
+                                        RTL8366RB_PORT_2 |     \
+                                        RTL8366RB_PORT_3 |     \
+                                        RTL8366RB_PORT_4)
+
+#define RTL8366RB_PORT_ALL_INTERNAL     RTL8366RB_PORT_CPU
+
+#define RTL8366RB_VLAN_VID_MASK                0xfff
+#define RTL8366RB_VLAN_PRIORITY_SHIFT  12
+#define RTL8366RB_VLAN_PRIORITY_MASK   0x7
+#define RTL8366RB_VLAN_UNTAG_SHIFT     8
+#define RTL8366RB_VLAN_UNTAG_MASK      0xff
+#define RTL8366RB_VLAN_MEMBER_MASK     0xff
+#define RTL8366RB_VLAN_FID_MASK                0x7
+
+
+/* Port ingress bandwidth control */
+#define RTL8366RB_IB_BASE              0x0200
+#define RTL8366RB_IB_REG(pnum)         (RTL8366RB_IB_BASE + pnum)
+#define RTL8366RB_IB_BDTH_MASK         0x3fff
+#define RTL8366RB_IB_PREIFG_OFFSET     14
+#define RTL8366RB_IB_PREIFG_MASK       (1 << RTL8366RB_IB_PREIFG_OFFSET)
+
+/* Port egress bandwidth control */
+#define RTL8366RB_EB_BASE              0x02d1
+#define RTL8366RB_EB_REG(pnum)         (RTL8366RB_EB_BASE + pnum)
+#define RTL8366RB_EB_BDTH_MASK         0x3fff
+#define RTL8366RB_EB_PREIFG_REG        0x02f8
+#define RTL8366RB_EB_PREIFG_OFFSET     9
+#define RTL8366RB_EB_PREIFG_MASK       (1 << RTL8366RB_EB_PREIFG_OFFSET)
+
+#define RTL8366RB_BDTH_SW_MAX          1048512
+#define RTL8366RB_BDTH_UNIT            64
+#define RTL8366RB_BDTH_REG_DEFAULT     16383
+
+/* QOS */
+#define RTL8366RB_QOS_BIT              15
+#define RTL8366RB_QOS_MASK             (1 << RTL8366RB_QOS_BIT)
+/* Include/Exclude Preamble and IFG (20 bytes). 0:Exclude, 1:Include. */
+#define RTL8366RB_QOS_DEFAULT_PREIFG   1
+
+
+static struct rtl8366_mib_counter rtl8366rb_mib_counters[] = {
+       { 0,  0, 4, "IfInOctets"                                },
+       { 0,  4, 4, "EtherStatsOctets"                          },
+       { 0,  8, 2, "EtherStatsUnderSizePkts"                   },
+       { 0, 10, 2, "EtherFragments"                            },
+       { 0, 12, 2, "EtherStatsPkts64Octets"                    },
+       { 0, 14, 2, "EtherStatsPkts65to127Octets"               },
+       { 0, 16, 2, "EtherStatsPkts128to255Octets"              },
+       { 0, 18, 2, "EtherStatsPkts256to511Octets"              },
+       { 0, 20, 2, "EtherStatsPkts512to1023Octets"             },
+       { 0, 22, 2, "EtherStatsPkts1024to1518Octets"            },
+       { 0, 24, 2, "EtherOversizeStats"                        },
+       { 0, 26, 2, "EtherStatsJabbers"                         },
+       { 0, 28, 2, "IfInUcastPkts"                             },
+       { 0, 30, 2, "EtherStatsMulticastPkts"                   },
+       { 0, 32, 2, "EtherStatsBroadcastPkts"                   },
+       { 0, 34, 2, "EtherStatsDropEvents"                      },
+       { 0, 36, 2, "Dot3StatsFCSErrors"                        },
+       { 0, 38, 2, "Dot3StatsSymbolErrors"                     },
+       { 0, 40, 2, "Dot3InPauseFrames"                         },
+       { 0, 42, 2, "Dot3ControlInUnknownOpcodes"               },
+       { 0, 44, 4, "IfOutOctets"                               },
+       { 0, 48, 2, "Dot3StatsSingleCollisionFrames"            },
+       { 0, 50, 2, "Dot3StatMultipleCollisionFrames"           },
+       { 0, 52, 2, "Dot3sDeferredTransmissions"                },
+       { 0, 54, 2, "Dot3StatsLateCollisions"                   },
+       { 0, 56, 2, "EtherStatsCollisions"                      },
+       { 0, 58, 2, "Dot3StatsExcessiveCollisions"              },
+       { 0, 60, 2, "Dot3OutPauseFrames"                        },
+       { 0, 62, 2, "Dot1dBasePortDelayExceededDiscards"        },
+       { 0, 64, 2, "Dot1dTpPortInDiscards"                     },
+       { 0, 66, 2, "IfOutUcastPkts"                            },
+       { 0, 68, 2, "IfOutMulticastPkts"                        },
+       { 0, 70, 2, "IfOutBroadcastPkts"                        },

 };
 
 #define REG_WR(_smi, _reg, _val)                                       \
 };
 
 #define REG_WR(_smi, _reg, _val)                                       \


@@ -254,35 +241,19 @@ static struct mib_counter rtl8366rb_mib_counters[RTL8366S_MIB_COUNT] = {
                        return err;                                     \
        } while (0)
 
                        return err;                                     \
        } while (0)
 

-static inline struct rtl8366rb *smi_to_rtl8366rb(struct rtl8366_smi *smi)
-{
-       return container_of(smi, struct rtl8366rb, smi);
-}
-
-static inline struct rtl8366rb *sw_to_rtl8366rb(struct switch_dev *sw)
-{
-       return container_of(sw, struct rtl8366rb, dev);
-}
-
-static inline struct rtl8366_smi *sw_to_rtl8366_smi(struct switch_dev *sw)
-{
-       struct rtl8366rb *rtl = sw_to_rtl8366rb(sw);
-       return &rtl->smi;
-}
-

 static int rtl8366rb_reset_chip(struct rtl8366_smi *smi)
 {
        int timeout = 10;
        u32 data;
 
 static int rtl8366rb_reset_chip(struct rtl8366_smi *smi)
 {
        int timeout = 10;
        u32 data;
 

-       rtl8366_smi_write_reg(smi, RTL8366_RESET_CTRL_REG,
-                             RTL8366_CHIP_CTRL_RESET_HW);
+       rtl8366_smi_write_reg(smi, RTL8366RB_RESET_CTRL_REG,
+                             RTL8366RB_CHIP_CTRL_RESET_HW);

        do {
                msleep(1);
        do {
                msleep(1);

-               if (rtl8366_smi_read_reg(smi, RTL8366_RESET_CTRL_REG, &data))
+               if (rtl8366_smi_read_reg(smi, RTL8366RB_RESET_CTRL_REG, &data))

                        return -EIO;
 
                        return -EIO;
 

-               if (!(data & RTL8366_CHIP_CTRL_RESET_HW))
+               if (!(data & RTL8366RB_CHIP_CTRL_RESET_HW))

                        break;
        } while (--timeout);
 
                        break;
        } while (--timeout);
 


@@ -299,20 +270,23 @@ static int rtl8366rb_hw_init(struct rtl8366_smi *smi)
        int err;
 
        /* set maximum packet length to 1536 bytes */
        int err;
 
        /* set maximum packet length to 1536 bytes */

-       REG_RMW(smi, RTL8366_SGCR, RTL8366_SGCR_MAX_LENGTH_MASK,
-               RTL8366_SGCR_MAX_LENGTH_1536);
+       REG_RMW(smi, RTL8366RB_SGCR, RTL8366RB_SGCR_MAX_LENGTH_MASK,
+               RTL8366RB_SGCR_MAX_LENGTH_1536);

 
 

-       /* enable all ports */
-       REG_WR(smi, RTL8366_PECR, 0);
+       /* enable learning for all ports */
+       REG_WR(smi, RTL8366RB_SSCR0, 0);

 
 

-       /* disable learning for all ports */
-       REG_WR(smi, RTL8366_SSCR0, RTL8366_PORT_ALL);
+       /* enable auto ageing for all ports */
+       REG_WR(smi, RTL8366RB_SSCR1, 0);

 
 

-       /* disable auto ageing for all ports */
-       REG_WR(smi, RTL8366_SSCR1, RTL8366_PORT_ALL);
+       /*
+        * discard VLAN tagged packets if the port is not a member of
+        * the VLAN with which the packets is associated.
+        */
+       REG_WR(smi, RTL8366RB_VLAN_INGRESS_CTRL2_REG, RTL8366RB_PORT_ALL);

 
        /* don't drop packets whose DA has not been learned */
 
        /* don't drop packets whose DA has not been learned */

-       REG_RMW(smi, RTL8366_SSCR2, RTL8366_SSCR2_DROP_UNKNOWN_DA, 0);
+       REG_RMW(smi, RTL8366RB_SSCR2, RTL8366RB_SSCR2_DROP_UNKNOWN_DA, 0);

 
        return 0;
 }
 
        return 0;
 }


@@ -323,29 +297,29 @@ static int rtl8366rb_read_phy_reg(struct rtl8366_smi *smi,
        u32 reg;
        int ret;
 
        u32 reg;
        int ret;
 

-       if (phy_no > RTL8366S_PHY_NO_MAX)
+       if (phy_no > RTL8366RB_PHY_NO_MAX)

                return -EINVAL;
 
                return -EINVAL;
 

-       if (page > RTL8366S_PHY_PAGE_MAX)
+       if (page > RTL8366RB_PHY_PAGE_MAX)

                return -EINVAL;
 
                return -EINVAL;
 

-       if (addr > RTL8366S_PHY_ADDR_MAX)
+       if (addr > RTL8366RB_PHY_ADDR_MAX)

                return -EINVAL;
 
                return -EINVAL;
 

-       ret = rtl8366_smi_write_reg(smi, RTL8366S_PHY_ACCESS_CTRL_REG,
-                                   RTL8366S_PHY_CTRL_READ);
+       ret = rtl8366_smi_write_reg(smi, RTL8366RB_PHY_ACCESS_CTRL_REG,
+                                   RTL8366RB_PHY_CTRL_READ);

        if (ret)
                return ret;
 
        if (ret)
                return ret;
 

-       reg = 0x8000 | (1 << (phy_no + RTL8366S_PHY_NO_OFFSET)) |
-             ((page << RTL8366S_PHY_PAGE_OFFSET) & RTL8366S_PHY_PAGE_MASK) |
-             (addr & RTL8366S_PHY_REG_MASK);
+       reg = 0x8000 | (1 << (phy_no + RTL8366RB_PHY_NO_OFFSET)) |
+             ((page << RTL8366RB_PHY_PAGE_OFFSET) & RTL8366RB_PHY_PAGE_MASK) |
+             (addr & RTL8366RB_PHY_REG_MASK);

 
        ret = rtl8366_smi_write_reg(smi, reg, 0);
        if (ret)
                return ret;
 
 
        ret = rtl8366_smi_write_reg(smi, reg, 0);
        if (ret)
                return ret;
 

-       ret = rtl8366_smi_read_reg(smi, RTL8366S_PHY_ACCESS_DATA_REG, data);
+       ret = rtl8366_smi_read_reg(smi, RTL8366RB_PHY_ACCESS_DATA_REG, data);

        if (ret)
                return ret;
 
        if (ret)
                return ret;
 


@@ -358,23 +332,23 @@ static int rtl8366rb_write_phy_reg(struct rtl8366_smi *smi,
        u32 reg;
        int ret;
 
        u32 reg;
        int ret;
 

-       if (phy_no > RTL8366S_PHY_NO_MAX)
+       if (phy_no > RTL8366RB_PHY_NO_MAX)

                return -EINVAL;
 
                return -EINVAL;
 

-       if (page > RTL8366S_PHY_PAGE_MAX)
+       if (page > RTL8366RB_PHY_PAGE_MAX)

                return -EINVAL;
 
                return -EINVAL;
 

-       if (addr > RTL8366S_PHY_ADDR_MAX)
+       if (addr > RTL8366RB_PHY_ADDR_MAX)

                return -EINVAL;
 
                return -EINVAL;
 

-       ret = rtl8366_smi_write_reg(smi, RTL8366S_PHY_ACCESS_CTRL_REG,
-                                   RTL8366S_PHY_CTRL_WRITE);
+       ret = rtl8366_smi_write_reg(smi, RTL8366RB_PHY_ACCESS_CTRL_REG,
+                                   RTL8366RB_PHY_CTRL_WRITE);

        if (ret)
                return ret;
 
        if (ret)
                return ret;
 

-       reg = 0x8000 | (1 << (phy_no + RTL8366S_PHY_NO_OFFSET)) |
-             ((page << RTL8366S_PHY_PAGE_OFFSET) & RTL8366S_PHY_PAGE_MASK) |
-             (addr & RTL8366S_PHY_REG_MASK);
+       reg = 0x8000 | (1 << (phy_no + RTL8366RB_PHY_NO_OFFSET)) |
+             ((page << RTL8366RB_PHY_PAGE_OFFSET) & RTL8366RB_PHY_PAGE_MASK) |
+             (addr & RTL8366RB_PHY_REG_MASK);

 
        ret = rtl8366_smi_write_reg(smi, reg, data);
        if (ret)
 
        ret = rtl8366_smi_write_reg(smi, reg, data);
        if (ret)


@@ -383,19 +357,19 @@ static int rtl8366rb_write_phy_reg(struct rtl8366_smi *smi,
        return 0;
 }
 
        return 0;
 }
 

-static int rtl8366_get_mib_counter(struct rtl8366_smi *smi, int counter,
-                                  int port, unsigned long long *val)
+static int rtl8366rb_get_mib_counter(struct rtl8366_smi *smi, int counter,
+                                    int port, unsigned long long *val)

 {
        int i;
        int err;
        u32 addr, data;
        u64 mibvalue;
 
 {
        int i;
        int err;
        u32 addr, data;
        u64 mibvalue;
 

-       if (port > RTL8366_NUM_PORTS || counter >= RTL8366S_MIB_COUNT)
+       if (port > RTL8366RB_NUM_PORTS || counter >= RTL8366RB_MIB_COUNT)

                return -EINVAL;
 
                return -EINVAL;
 

-       addr = RTL8366S_MIB_COUNTER_BASE +
-              RTL8366S_MIB_COUNTER_PORT_OFFSET * (port) +
+       addr = RTL8366RB_MIB_COUNTER_BASE +
+              RTL8366RB_MIB_COUNTER_PORT_OFFSET * (port) +

               rtl8366rb_mib_counters[counter].offset;
 
        /*
               rtl8366rb_mib_counters[counter].offset;
 
        /*


@@ -408,14 +382,14 @@ static int rtl8366_get_mib_counter(struct rtl8366_smi *smi, int counter,
                return err;
 
        /* read MIB control register */
                return err;
 
        /* read MIB control register */

-       err =  rtl8366_smi_read_reg(smi, RTL8366S_MIB_CTRL_REG, &data);
+       err =  rtl8366_smi_read_reg(smi, RTL8366RB_MIB_CTRL_REG, &data);

        if (err)
                return err;
 
        if (err)
                return err;
 

-       if (data & RTL8366S_MIB_CTRL_BUSY_MASK)
+       if (data & RTL8366RB_MIB_CTRL_BUSY_MASK)

                return -EBUSY;
 
                return -EBUSY;
 

-       if (data & RTL8366S_MIB_CTRL_RESET_MASK)
+       if (data & RTL8366RB_MIB_CTRL_RESET_MASK)

                return -EIO;
 
        mibvalue = 0;
                return -EIO;
 
        mibvalue = 0;


@@ -434,56 +408,40 @@ static int rtl8366_get_mib_counter(struct rtl8366_smi *smi, int counter,
 static int rtl8366rb_get_vlan_4k(struct rtl8366_smi *smi, u32 vid,
                                 struct rtl8366_vlan_4k *vlan4k)
 {
 static int rtl8366rb_get_vlan_4k(struct rtl8366_smi *smi, u32 vid,
                                 struct rtl8366_vlan_4k *vlan4k)
 {

-       struct rtl8366rb_vlan_4k vlan4k_priv;
+       u32 data[3];

        int err;
        int err;

-       u32 data;
-       u16 *tableaddr;
+       int i;

 
        memset(vlan4k, '\0', sizeof(struct rtl8366_vlan_4k));
 
        memset(vlan4k, '\0', sizeof(struct rtl8366_vlan_4k));

-       vlan4k_priv.vid = vid;

 
 

-       if (vid >= RTL8366_NUM_VIDS)
+       if (vid >= RTL8366RB_NUM_VIDS)

                return -EINVAL;
 
                return -EINVAL;
 

-       tableaddr = (u16 *)&vlan4k_priv;
-

        /* write VID */
        /* write VID */

-       data = *tableaddr;
-       err = rtl8366_smi_write_reg(smi, RTL8366S_VLAN_TABLE_WRITE_BASE, data);
+       err = rtl8366_smi_write_reg(smi, RTL8366RB_VLAN_TABLE_WRITE_BASE,
+                                   vid & RTL8366RB_VLAN_VID_MASK);

        if (err)
                return err;
 
        /* write table access control word */
        if (err)
                return err;
 
        /* write table access control word */

-       err = rtl8366_smi_write_reg(smi, RTL8366S_TABLE_ACCESS_CTRL_REG,
-                                   RTL8366S_TABLE_VLAN_READ_CTRL);
-       if (err)
-               return err;
-
-       err = rtl8366_smi_read_reg(smi, RTL8366S_VLAN_TABLE_READ_BASE, &data);
-       if (err)
-               return err;
-
-       *tableaddr = data;
-       tableaddr++;
-
-       err = rtl8366_smi_read_reg(smi, RTL8366S_VLAN_TABLE_READ_BASE + 1,
-                                  &data);
+       err = rtl8366_smi_write_reg(smi, RTL8366RB_TABLE_ACCESS_CTRL_REG,
+                                   RTL8366RB_TABLE_VLAN_READ_CTRL);

        if (err)
                return err;
 
        if (err)
                return err;
 

-       *tableaddr = data;
-       tableaddr++;
-
-       err = rtl8366_smi_read_reg(smi, RTL8366S_VLAN_TABLE_READ_BASE + 2,
-                                  &data);
-       if (err)
-               return err;
-       *tableaddr = data;
+       for (i = 0; i < 3; i++) {
+               err = rtl8366_smi_read_reg(smi,
+                                          RTL8366RB_VLAN_TABLE_READ_BASE + i,
+                                          &data[i]);
+               if (err)
+                       return err;
+       }

 
        vlan4k->vid = vid;
 
        vlan4k->vid = vid;

-       vlan4k->untag = vlan4k_priv.untag;
-       vlan4k->member = vlan4k_priv.member;
-       vlan4k->fid = vlan4k_priv.fid;
+       vlan4k->untag = (data[1] >> RTL8366RB_VLAN_UNTAG_SHIFT) &
+                       RTL8366RB_VLAN_UNTAG_MASK;
+       vlan4k->member = data[1] & RTL8366RB_VLAN_MEMBER_MASK;
+       vlan4k->fid = data[2] & RTL8366RB_VLAN_FID_MASK;

 
        return 0;
 }
 
        return 0;
 }


@@ -491,51 +449,33 @@ static int rtl8366rb_get_vlan_4k(struct rtl8366_smi *smi, u32 vid,
 static int rtl8366rb_set_vlan_4k(struct rtl8366_smi *smi,
                                 const struct rtl8366_vlan_4k *vlan4k)
 {
 static int rtl8366rb_set_vlan_4k(struct rtl8366_smi *smi,
                                 const struct rtl8366_vlan_4k *vlan4k)
 {

-       struct rtl8366rb_vlan_4k vlan4k_priv;
+       u32 data[3];

        int err;
        int err;

-       u32 data;
-       u16 *tableaddr;
+       int i;

 
 

-       if (vlan4k->vid >= RTL8366_NUM_VIDS ||
-           vlan4k->member > RTL8366_PORT_ALL ||
-           vlan4k->untag > RTL8366_PORT_ALL ||
-           vlan4k->fid > RTL8366S_FIDMAX)
+       if (vlan4k->vid >= RTL8366RB_NUM_VIDS ||
+           vlan4k->member > RTL8366RB_VLAN_MEMBER_MASK ||
+           vlan4k->untag > RTL8366RB_VLAN_UNTAG_MASK ||
+           vlan4k->fid > RTL8366RB_FIDMAX)

                return -EINVAL;
 
                return -EINVAL;
 

-       vlan4k_priv.vid = vlan4k->vid;
-       vlan4k_priv.untag = vlan4k->untag;
-       vlan4k_priv.member = vlan4k->member;
-       vlan4k_priv.fid = vlan4k->fid;
-
-       tableaddr = (u16 *)&vlan4k_priv;
-
-       data = *tableaddr;
-
-       err = rtl8366_smi_write_reg(smi, RTL8366S_VLAN_TABLE_WRITE_BASE, data);
-       if (err)
-               return err;
-
-       tableaddr++;
-
-       data = *tableaddr;
-
-       err = rtl8366_smi_write_reg(smi, RTL8366S_VLAN_TABLE_WRITE_BASE + 1,
-                                   data);
-       if (err)
-               return err;
-
-       tableaddr++;
+       data[0] = vlan4k->vid & RTL8366RB_VLAN_VID_MASK;
+       data[1] = (vlan4k->member & RTL8366RB_VLAN_MEMBER_MASK) |
+                 ((vlan4k->untag & RTL8366RB_VLAN_UNTAG_MASK) <<
+                       RTL8366RB_VLAN_UNTAG_SHIFT);
+       data[2] = vlan4k->fid & RTL8366RB_VLAN_FID_MASK;

 
 

-       data = *tableaddr;
-
-       err = rtl8366_smi_write_reg(smi, RTL8366S_VLAN_TABLE_WRITE_BASE + 2,
-                                   data);
-       if (err)
-               return err;
+       for (i = 0; i < 3; i++) {
+               err = rtl8366_smi_write_reg(smi,
+                                           RTL8366RB_VLAN_TABLE_WRITE_BASE + i,
+                                           data[i]);
+               if (err)
+                       return err;
+       }

 
        /* write table access control word */
 
        /* write table access control word */

-       err = rtl8366_smi_write_reg(smi, RTL8366S_TABLE_ACCESS_CTRL_REG,
-                                   RTL8366S_TABLE_VLAN_WRITE_CTRL);
+       err = rtl8366_smi_write_reg(smi, RTL8366RB_TABLE_ACCESS_CTRL_REG,
+                                   RTL8366RB_TABLE_VLAN_WRITE_CTRL);

 
        return err;
 }
 
        return err;
 }


@@ -543,47 +483,30 @@ static int rtl8366rb_set_vlan_4k(struct rtl8366_smi *smi,
 static int rtl8366rb_get_vlan_mc(struct rtl8366_smi *smi, u32 index,
                                 struct rtl8366_vlan_mc *vlanmc)
 {
 static int rtl8366rb_get_vlan_mc(struct rtl8366_smi *smi, u32 index,
                                 struct rtl8366_vlan_mc *vlanmc)
 {

-       struct rtl8366rb_vlan_mc vlanmc_priv;
+       u32 data[3];

        int err;
        int err;

-       u32 addr;
-       u32 data;
-       u16 *tableaddr;
+       int i;

 
        memset(vlanmc, '\0', sizeof(struct rtl8366_vlan_mc));
 
 
        memset(vlanmc, '\0', sizeof(struct rtl8366_vlan_mc));
 

-       if (index >= RTL8366_NUM_VLANS)
+       if (index >= RTL8366RB_NUM_VLANS)

                return -EINVAL;
 
                return -EINVAL;
 

-       tableaddr = (u16 *)&vlanmc_priv;
-
-       addr = RTL8366S_VLAN_MEMCONF_BASE + (index * 3);
-       err = rtl8366_smi_read_reg(smi, addr, &data);
-       if (err)
-               return err;
-
-       *tableaddr = data;
-       tableaddr++;
-
-       addr = RTL8366S_VLAN_MEMCONF_BASE + 1 + (index * 3);
-       err = rtl8366_smi_read_reg(smi, addr, &data);
-       if (err)
-               return err;
-
-       *tableaddr = data;
-       tableaddr++;
-
-       addr = RTL8366S_VLAN_MEMCONF_BASE + 2 + (index * 3);
-       err = rtl8366_smi_read_reg(smi, addr, &data);
-       if (err)
-               return err;
-
-       *tableaddr = data;
+       for (i = 0; i < 3; i++) {
+               err = rtl8366_smi_read_reg(smi,
+                                          RTL8366RB_VLAN_MC_BASE(index) + i,
+                                          &data[i]);
+               if (err)
+                       return err;
+       }

 
 

-       vlanmc->vid = vlanmc_priv.vid;
-       vlanmc->priority = vlanmc_priv.priority;
-       vlanmc->untag = vlanmc_priv.untag;
-       vlanmc->member = vlanmc_priv.member;
-       vlanmc->fid = vlanmc_priv.fid;
+       vlanmc->vid = data[0] & RTL8366RB_VLAN_VID_MASK;
+       vlanmc->priority = (data[0] >> RTL8366RB_VLAN_PRIORITY_SHIFT) &
+                          RTL8366RB_VLAN_PRIORITY_MASK;
+       vlanmc->untag = (data[1] >> RTL8366RB_VLAN_UNTAG_SHIFT) &
+                       RTL8366RB_VLAN_UNTAG_MASK;
+       vlanmc->member = data[1] & RTL8366RB_VLAN_MEMBER_MASK;
+       vlanmc->fid = data[2] & RTL8366RB_VLAN_FID_MASK;

 
        return 0;
 }
 
        return 0;
 }


@@ -591,54 +514,34 @@ static int rtl8366rb_get_vlan_mc(struct rtl8366_smi *smi, u32 index,
 static int rtl8366rb_set_vlan_mc(struct rtl8366_smi *smi, u32 index,
                                 const struct rtl8366_vlan_mc *vlanmc)
 {
 static int rtl8366rb_set_vlan_mc(struct rtl8366_smi *smi, u32 index,
                                 const struct rtl8366_vlan_mc *vlanmc)
 {

-       struct rtl8366rb_vlan_mc vlanmc_priv;
+       u32 data[3];

        int err;
        int err;

-       u32 addr;
-       u32 data;
-       u16 *tableaddr;
-
-       if (index >= RTL8366_NUM_VLANS ||
-           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;
-
-       vlanmc_priv.vid = vlanmc->vid;
-       vlanmc_priv.priority = vlanmc->priority;
-       vlanmc_priv.untag = vlanmc->untag;
-       vlanmc_priv.member = vlanmc->member;
-       vlanmc_priv.stag_mbr = 0;
-       vlanmc_priv.stag_idx = 0;
-       vlanmc_priv.fid = vlanmc->fid;
-
-       addr = RTL8366S_VLAN_MEMCONF_BASE + (index * 3);
-
-       tableaddr = (u16 *)&vlanmc_priv;
-       data = *tableaddr;
-
-       err = rtl8366_smi_write_reg(smi, addr, data);
-       if (err)
-               return err;
-
-       addr = RTL8366S_VLAN_MEMCONF_BASE + 1 + (index * 3);
-
-       tableaddr++;
-       data = *tableaddr;
-
-       err = rtl8366_smi_write_reg(smi, addr, data);
-       if (err)
-               return err;
+       int i;

 
 

-       addr = RTL8366S_VLAN_MEMCONF_BASE + 2 + (index * 3);
+       if (index >= RTL8366RB_NUM_VLANS ||
+           vlanmc->vid >= RTL8366RB_NUM_VIDS ||
+           vlanmc->priority > RTL8366RB_PRIORITYMAX ||
+           vlanmc->member > RTL8366RB_VLAN_MEMBER_MASK ||
+           vlanmc->untag > RTL8366RB_VLAN_UNTAG_MASK ||
+           vlanmc->fid > RTL8366RB_FIDMAX)
+               return -EINVAL;

 
 

-       tableaddr++;
-       data = *tableaddr;
+       data[0] = (vlanmc->vid & RTL8366RB_VLAN_VID_MASK) |
+                 ((vlanmc->priority & RTL8366RB_VLAN_PRIORITY_MASK) <<
+                       RTL8366RB_VLAN_PRIORITY_SHIFT);
+       data[1] = (vlanmc->member & RTL8366RB_VLAN_MEMBER_MASK) |
+                 ((vlanmc->untag & RTL8366RB_VLAN_UNTAG_MASK) <<
+                       RTL8366RB_VLAN_UNTAG_SHIFT);
+       data[2] = vlanmc->fid & RTL8366RB_VLAN_FID_MASK;
+
+       for (i = 0; i < 3; i++) {
+               err = rtl8366_smi_write_reg(smi,
+                                           RTL8366RB_VLAN_MC_BASE(index) + i,
+                                           data[i]);
+               if (err)
+                       return err;
+       }

 
 

-       err = rtl8366_smi_write_reg(smi, addr, data);
-       if (err)
-               return err;

        return 0;
 }
 
        return 0;
 }
 


@@ -647,16 +550,16 @@ static int rtl8366rb_get_mc_index(struct rtl8366_smi *smi, int port, int *val)
        u32 data;
        int err;
 
        u32 data;
        int err;
 

-       if (port >= RTL8366_NUM_PORTS)
+       if (port >= RTL8366RB_NUM_PORTS)

                return -EINVAL;
 
                return -EINVAL;
 

-       err = rtl8366_smi_read_reg(smi, RTL8366S_PORT_VLAN_CTRL_REG(port),
+       err = rtl8366_smi_read_reg(smi, RTL8366RB_PORT_VLAN_CTRL_REG(port),

                                   &data);
        if (err)
                return err;
 
                                   &data);
        if (err)
                return err;
 

-       *val = (data >> RTL8366S_PORT_VLAN_CTRL_SHIFT(port)) &
-              RTL8366S_PORT_VLAN_CTRL_MASK;
+       *val = (data >> RTL8366RB_PORT_VLAN_CTRL_SHIFT(port)) &
+              RTL8366RB_PORT_VLAN_CTRL_MASK;

 
        return 0;
 
 
        return 0;
 


@@ -664,478 +567,56 @@ static int rtl8366rb_get_mc_index(struct rtl8366_smi *smi, int port, int *val)
 
 static int rtl8366rb_set_mc_index(struct rtl8366_smi *smi, int port, int index)
 {
 
 static int rtl8366rb_set_mc_index(struct rtl8366_smi *smi, int port, int index)
 {

-       if (port >= RTL8366_NUM_PORTS || index >= RTL8366_NUM_VLANS)
+       if (port >= RTL8366RB_NUM_PORTS || index >= RTL8366RB_NUM_VLANS)

                return -EINVAL;
 
                return -EINVAL;
 

-       return rtl8366_smi_rmwr(smi, RTL8366S_PORT_VLAN_CTRL_REG(port),
-                               RTL8366S_PORT_VLAN_CTRL_MASK <<
-                                       RTL8366S_PORT_VLAN_CTRL_SHIFT(port),
-                               (index & RTL8366S_PORT_VLAN_CTRL_MASK) <<
-                                       RTL8366S_PORT_VLAN_CTRL_SHIFT(port));
-}
-
-static int rtl8366rb_set_vlan(struct rtl8366_smi *smi, int vid, u32 member,
-                             u32 untag, u32 fid)
-{
-       struct rtl8366_vlan_4k vlan4k;
-       int err;
-       int i;
-
-       /* Update the 4K table */
-       err = rtl8366rb_get_vlan_4k(smi, vid, &vlan4k);
-       if (err)
-               return err;
-
-       vlan4k.member = member;
-       vlan4k.untag = untag;
-       vlan4k.fid = fid;
-       err = rtl8366rb_set_vlan_4k(smi, &vlan4k);
-       if (err)
-               return err;
-
-       /* Try to find an existing MC entry for this VID */
-       for (i = 0; i < RTL8366_NUM_VLANS; i++) {
-               struct rtl8366_vlan_mc vlanmc;
-
-               err = rtl8366rb_get_vlan_mc(smi, i, &vlanmc);
-               if (err)
-                       return err;
-
-               if (vid == vlanmc.vid) {
-                       /* update the MC entry */
-                       vlanmc.member = member;
-                       vlanmc.untag = untag;
-                       vlanmc.fid = fid;
-
-                       err = rtl8366rb_set_vlan_mc(smi, i, &vlanmc);
-                       break;
-               }
-       }
-
-       return err;
-}
-
-static int rtl8366rb_get_pvid(struct rtl8366_smi *smi, int port, int *val)
-{
-       struct rtl8366_vlan_mc vlanmc;
-       int err;
-       int index;
-
-       err = rtl8366rb_get_mc_index(smi, port, &index);
-       if (err)
-               return err;
-
-       err = rtl8366rb_get_vlan_mc(smi, index, &vlanmc);
-       if (err)
-               return err;
-
-       *val = vlanmc.vid;
-       return 0;
-}
-
-static int rtl8366rb_mc_is_used(struct rtl8366_smi *smi, int mc_index,
-                               int *used)
-{
-       int err;
-       int i;
-
-       *used = 0;
-       for (i = 0; i < RTL8366_NUM_PORTS; i++) {
-               int index = 0;
-
-               err = rtl8366rb_get_mc_index(smi, i, &index);
-               if (err)
-                       return err;
-
-               if (mc_index == index) {
-                       *used = 1;
-                       break;
-               }
-       }
-
-       return 0;
-}
-
-static int rtl8366rb_set_pvid(struct rtl8366_smi *smi, unsigned port,
-                             unsigned vid)
-{
-       struct rtl8366_vlan_mc vlanmc;
-       struct rtl8366_vlan_4k vlan4k;
-       int err;
-       int i;
-
-       /* Try to find an existing MC entry for this VID */
-       for (i = 0; i < RTL8366_NUM_VLANS; i++) {
-               err = rtl8366rb_get_vlan_mc(smi, i, &vlanmc);
-               if (err)
-                       return err;
-
-               if (vid == vlanmc.vid) {
-                       err = rtl8366rb_set_vlan_mc(smi, i, &vlanmc);
-                       if (err)
-                               return err;
-
-                       err = rtl8366rb_set_mc_index(smi, port, i);
-                       return err;
-               }
-       }
-
-       /* We have no MC entry for this VID, try to find an empty one */
-       for (i = 0; i < RTL8366_NUM_VLANS; i++) {
-               err = rtl8366rb_get_vlan_mc(smi, i, &vlanmc);
-               if (err)
-                       return err;
-
-               if (vlanmc.vid == 0 && vlanmc.member == 0) {
-                       /* Update the entry from the 4K table */
-                       err = rtl8366rb_get_vlan_4k(smi, vid, &vlan4k);
-                       if (err)
-                               return err;
-
-                       vlanmc.vid = vid;
-                       vlanmc.member = vlan4k.member;
-                       vlanmc.untag = vlan4k.untag;
-                       vlanmc.fid = vlan4k.fid;
-                       err = rtl8366rb_set_vlan_mc(smi, i, &vlanmc);
-                       if (err)
-                               return err;
-
-                       err = rtl8366rb_set_mc_index(smi, port, i);
-                       return err;
-               }
-       }
-
-       /* MC table is full, try to find an unused entry and replace it */
-       for (i = 0; i < RTL8366_NUM_VLANS; i++) {
-               int used;
-
-               err = rtl8366rb_mc_is_used(smi, i, &used);
-               if (err)
-                       return err;
-
-               if (!used) {
-                       /* Update the entry from the 4K table */
-                       err = rtl8366rb_get_vlan_4k(smi, vid, &vlan4k);
-                       if (err)
-                               return err;
-
-                       vlanmc.vid = vid;
-                       vlanmc.member = vlan4k.member;
-                       vlanmc.untag = vlan4k.untag;
-                       vlanmc.fid = vlan4k.fid;
-                       err = rtl8366rb_set_vlan_mc(smi, i, &vlanmc);
-                       if (err)
-                               return err;
-
-                       err = rtl8366rb_set_mc_index(smi, port, i);
-                       return err;
-               }
-       }
-
-       dev_err(smi->parent,
-               "all VLAN member configurations are in use\n");
-
-       return -ENOSPC;
+       return rtl8366_smi_rmwr(smi, RTL8366RB_PORT_VLAN_CTRL_REG(port),
+                               RTL8366RB_PORT_VLAN_CTRL_MASK <<
+                                       RTL8366RB_PORT_VLAN_CTRL_SHIFT(port),
+                               (index & RTL8366RB_PORT_VLAN_CTRL_MASK) <<
+                                       RTL8366RB_PORT_VLAN_CTRL_SHIFT(port));

 }
 
 }
 

-static int rtl8366rb_vlan_set_vlan(struct rtl8366_smi *smi, int enable)
+static int rtl8366rb_is_vlan_valid(struct rtl8366_smi *smi, unsigned vlan)

 {
 {

-       return rtl8366_smi_rmwr(smi, RTL8366_CHIP_GLOBAL_CTRL_REG,
-                               RTL8366_CHIP_CTRL_VLAN,
-                               (enable) ? RTL8366_CHIP_CTRL_VLAN : 0);
-}
-
-static int rtl8366rb_vlan_set_4ktable(struct rtl8366_smi *smi, int enable)
-{
-       return rtl8366_smi_rmwr(smi, RTL8366_CHIP_GLOBAL_CTRL_REG,
-                               RTL8366_CHIP_CTRL_VLAN_4KTB,
-                               (enable) ? RTL8366_CHIP_CTRL_VLAN_4KTB : 0);
-}
-
-static int rtl8366rb_reset_vlan(struct rtl8366_smi *smi)
-{
-       struct rtl8366_vlan_mc vlanmc;
-       int err;
-       int i;
-
-       /* clear VLAN member configurations */
-       vlanmc.vid = 0;
-       vlanmc.priority = 0;
-       vlanmc.member = 0;
-       vlanmc.untag = 0;
-       vlanmc.fid = 0;
-       for (i = 0; i < RTL8366_NUM_VLANS; i++) {
-               err = rtl8366rb_set_vlan_mc(smi, i, &vlanmc);
-               if (err)
-                       return err;
-       }
-
-       for (i = 0; i < RTL8366_NUM_PORTS; i++) {
-               if (i == RTL8366_PORT_CPU)
-                       continue;
-
-               err = rtl8366rb_set_vlan(smi, (i + 1),
-                                        (1 << i) | RTL8366_PORT_CPU,
-                                        (1 << i) | RTL8366_PORT_CPU,
-                                        0);
-               if (err)
-                       return err;
+       unsigned max = RTL8366RB_NUM_VLANS;

 
 

-               err = rtl8366rb_set_pvid(smi, i, (i + 1));
-               if (err)
-                       return err;
-       }
+       if (smi->vlan4k_enabled)
+               max = RTL8366RB_NUM_VIDS - 1;

 
 

-       return 0;
-}
+       if (vlan == 0 || vlan >= max)
+               return 0;

 
 

-#ifdef CONFIG_RTL8366S_PHY_DEBUG_FS
-static int rtl8366rb_debugfs_open(struct inode *inode, struct file *file)
-{
-       file->private_data = inode->i_private;
-       return 0;
+       return 1;

 }
 
 }
 

-static ssize_t rtl8366rb_read_debugfs_mibs(struct file *file,
-                                         char __user *user_buf,
-                                         size_t count, loff_t *ppos)
+static int rtl8366rb_enable_vlan(struct rtl8366_smi *smi, int enable)

 {
 {

-       struct rtl8366rb *rtl = (struct rtl8366rb *)file->private_data;
-       struct rtl8366_smi *smi = &rtl->smi;
-       int i, j, len = 0;
-       char *buf = rtl->buf;
-
-       len += snprintf(buf + len, sizeof(rtl->buf) - len,
-                       "%-36s %12s %12s %12s %12s %12s %12s\n",
-                       "Counter",
-                       "Port 0", "Port 1", "Port 2",
-                       "Port 3", "Port 4", "Port 5");
-
-       for (i = 0; i < ARRAY_SIZE(rtl8366rb_mib_counters); ++i) {
-               len += snprintf(buf + len, sizeof(rtl->buf) - len, "%-36s ",
-                               rtl8366rb_mib_counters[i].name);
-               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(rtl->buf) - len,
-                                               "%12llu ", counter);
-                       else
-                               len += snprintf(buf + len,
-                                               sizeof(rtl->buf) - len,
-                                               "%12s ", "error");
-               }
-               len += snprintf(buf + len, sizeof(rtl->buf) - len, "\n");
-       }
-
-       return simple_read_from_buffer(user_buf, count, ppos, buf, len);
+       return rtl8366_smi_rmwr(smi, RTL8366RB_SGCR, RTL8366RB_SGCR_EN_VLAN,
+                               (enable) ? RTL8366RB_SGCR_EN_VLAN : 0);

 }
 
 }
 

-static ssize_t rtl8366rb_read_debugfs_vlan_mc(struct file *file,
-                                             char __user *user_buf,
-                                             size_t count, loff_t *ppos)
+static int rtl8366rb_enable_vlan4k(struct rtl8366_smi *smi, int enable)

 {
 {

-       struct rtl8366rb *rtl = (struct rtl8366rb *)file->private_data;
-       struct rtl8366_smi *smi = &rtl->smi;
-       int i, len = 0;
-       char *buf = rtl->buf;
-
-       len += snprintf(buf + len, sizeof(rtl->buf) - len,
-                       "%2s %6s %4s %6s %6s %3s\n",
-                       "id", "vid","prio", "member", "untag", "fid");
-
-       for (i = 0; i < RTL8366_NUM_VLANS; ++i) {
-               struct rtl8366_vlan_mc vlanmc;
-
-               rtl8366rb_get_vlan_mc(smi, i, &vlanmc);
-
-               len += snprintf(buf + len, sizeof(rtl->buf) - len,
-                               "%2d %6d %4d 0x%04x 0x%04x %3d\n",
-                               i, vlanmc.vid, vlanmc.priority,
-                               vlanmc.member, vlanmc.untag, vlanmc.fid);
-       }
-
-       return simple_read_from_buffer(user_buf, count, ppos, buf, len);
+       return rtl8366_smi_rmwr(smi, RTL8366RB_SGCR,
+                               RTL8366RB_SGCR_EN_VLAN_4KTB,
+                               (enable) ? RTL8366RB_SGCR_EN_VLAN_4KTB : 0);

 }
 
 }
 

-static ssize_t rtl8366rb_read_debugfs_reg(struct file *file,
-                                        char __user *user_buf,
-                                        size_t count, loff_t *ppos)
+static int rtl8366rb_enable_port(struct rtl8366_smi *smi, int port, int enable)

 {
 {

-       struct rtl8366rb *rtl = (struct rtl8366rb *)file->private_data;
-       struct rtl8366_smi *smi = &rtl->smi;
-       u32 t, reg = gl_dbg_reg;
-       int err, len = 0;
-       char *buf = rtl->buf;
-
-       memset(buf, '\0', sizeof(rtl->buf));
-
-       err = rtl8366_smi_read_reg(smi, reg, &t);
-       if (err) {
-               len += snprintf(buf, sizeof(rtl->buf),
-                               "Read failed (reg: 0x%04x)\n", reg);
-               return simple_read_from_buffer(user_buf, count, ppos, buf, len);
-       }
-
-       len += snprintf(buf, sizeof(rtl->buf), "reg = 0x%04x, val = 0x%04x\n",
-                       reg, t);
-
-       return simple_read_from_buffer(user_buf, count, ppos, buf, len);
+       return rtl8366_smi_rmwr(smi, RTL8366RB_PECR, (1 << port),
+                               (enable) ? 0 : (1 << port));

 }
 
 }
 

-static ssize_t rtl8366rb_write_debugfs_reg(struct file *file,
-                                         const char __user *user_buf,
-                                         size_t count, loff_t *ppos)
-{
-       struct rtl8366rb *rtl = (struct rtl8366rb *)file->private_data;
-       struct rtl8366_smi *smi = &rtl->smi;
-       unsigned long data;
-       u32 reg = gl_dbg_reg;
-       int err;
-       size_t len;
-       char *buf = rtl->buf;
-
-       len = min(count, sizeof(rtl->buf) - 1);
-       if (copy_from_user(buf, user_buf, len)) {
-               dev_err(rtl->parent, "copy from user failed\n");
-               return -EFAULT;
-       }
-
-       buf[len] = '\0';
-       if (len > 0 && buf[len - 1] == '\n')
-               buf[len - 1] = '\0';
-
-
-       if (strict_strtoul(buf, 16, &data)) {
-               dev_err(rtl->parent, "Invalid reg value %s\n", buf);
-       } else {
-               err = rtl8366_smi_write_reg(smi, reg, data);
-               if (err) {
-                       dev_err(rtl->parent,
-                               "writing reg 0x%04x val 0x%04lx failed\n",
-                               reg, data);
-               }
-       }
-
-       return count;
-}
-
-static const struct file_operations fops_rtl8366rb_regs = {
-       .read = rtl8366rb_read_debugfs_reg,
-       .write = rtl8366rb_write_debugfs_reg,
-       .open = rtl8366rb_debugfs_open,
-       .owner = THIS_MODULE
-};
-
-static const struct file_operations fops_rtl8366rb_vlan_mc = {
-       .read = rtl8366rb_read_debugfs_vlan_mc,
-       .open = rtl8366rb_debugfs_open,
-       .owner = THIS_MODULE
-};
-
-static const struct file_operations fops_rtl8366rb_mibs = {
-       .read = rtl8366rb_read_debugfs_mibs,
-       .open = rtl8366rb_debugfs_open,
-       .owner = THIS_MODULE
-};
-
-static void rtl8366rb_debugfs_init(struct rtl8366rb *rtl)
-{
-       struct dentry *node;
-       struct dentry *root;
-
-       if (!rtl->debugfs_root)
-               rtl->debugfs_root = debugfs_create_dir("rtl8366rb", NULL);
-
-       if (!rtl->debugfs_root) {
-               dev_err(rtl->parent, "Unable to create debugfs dir\n");
-               return;
-       }
-       root = rtl->debugfs_root;
-
-       node = debugfs_create_x16("reg", S_IRUGO | S_IWUSR, root, &gl_dbg_reg);
-       if (!node) {
-               dev_err(rtl->parent, "Creating debugfs file '%s' failed\n",
-                       "reg");
-               return;
-       }
-
-       node = debugfs_create_file("val", S_IRUGO | S_IWUSR, root, rtl,
-                                  &fops_rtl8366rb_regs);
-       if (!node) {
-               dev_err(rtl->parent, "Creating debugfs file '%s' failed\n",
-                       "val");
-               return;
-       }
-
-       node = debugfs_create_file("vlan_mc", S_IRUSR, root, rtl,
-                                  &fops_rtl8366rb_vlan_mc);
-       if (!node) {
-               dev_err(rtl->parent, "Creating debugfs file '%s' failed\n",
-                       "vlan_mc");
-               return;
-       }
-
-       node = debugfs_create_file("mibs", S_IRUSR, root, rtl,
-                                  &fops_rtl8366rb_mibs);
-       if (!node) {
-               dev_err(rtl->parent, "Creating debugfs file '%s' failed\n",
-                       "mibs");
-               return;
-       }
-}
-
-static void rtl8366rb_debugfs_remove(struct rtl8366rb *rtl)
-{
-       if (rtl->debugfs_root) {
-               debugfs_remove_recursive(rtl->debugfs_root);
-               rtl->debugfs_root = NULL;
-       }
-}
-
-#else
-static inline void rtl8366rb_debugfs_init(struct rtl8366rb *rtl) {}
-static inline void rtl8366rb_debugfs_remove(struct rtl8366rb *rtl) {}
-#endif /* CONFIG_RTL8366S_PHY_DEBUG_FS */
-

 static int rtl8366rb_sw_reset_mibs(struct switch_dev *dev,
                                  const struct switch_attr *attr,
                                  struct switch_val *val)
 {
        struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
 static int rtl8366rb_sw_reset_mibs(struct switch_dev *dev,
                                  const struct switch_attr *attr,
                                  struct switch_val *val)
 {
        struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);

-       int err = 0;
-
-       if (val->value.i == 1)
-               err = rtl8366_smi_rmwr(smi, RTL8366S_MIB_CTRL_REG, 0, (1 << 2));

 
 

-       return err;
-}
-
-static int rtl8366rb_sw_get_vlan_enable(struct switch_dev *dev,
-                                      const struct switch_attr *attr,
-                                      struct switch_val *val)
-{
-       struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-       u32 data;
-
-       if (attr->ofs == 1) {
-               rtl8366_smi_read_reg(smi, RTL8366_CHIP_GLOBAL_CTRL_REG, &data);
-
-               if (data & RTL8366_CHIP_CTRL_VLAN)
-                       val->value.i = 1;
-               else
-                       val->value.i = 0;
-       } else if (attr->ofs == 2) {
-               rtl8366_smi_read_reg(smi, RTL8366_CHIP_GLOBAL_CTRL_REG, &data);
-
-               if (data & RTL8366_CHIP_CTRL_VLAN_4KTB)
-                       val->value.i = 1;
-               else
-                       val->value.i = 0;
-       }
-
-       return 0;
+       return rtl8366_smi_rmwr(smi, RTL8366RB_MIB_CTRL_REG, 0,
+                               RTL8366RB_MIB_CTRL_GLOBAL_RESET);

 }
 
 static int rtl8366rb_sw_get_blinkrate(struct switch_dev *dev,
 }
 
 static int rtl8366rb_sw_get_blinkrate(struct switch_dev *dev,


@@ -1145,9 +626,9 @@ static int rtl8366rb_sw_get_blinkrate(struct switch_dev *dev,
        struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
        u32 data;
 
        struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
        u32 data;
 

-       rtl8366_smi_read_reg(smi, RTL8366_LED_BLINKRATE_REG, &data);
+       rtl8366_smi_read_reg(smi, RTL8366RB_LED_BLINKRATE_REG, &data);

 
 

-       val->value.i = (data & (RTL8366_LED_BLINKRATE_MASK));
+       val->value.i = (data & (RTL8366RB_LED_BLINKRATE_MASK));

 
        return 0;
 }
 
        return 0;
 }


@@ -1161,23 +642,46 @@ static int rtl8366rb_sw_set_blinkrate(struct switch_dev *dev,
        if (val->value.i >= 6)
                return -EINVAL;
 
        if (val->value.i >= 6)
                return -EINVAL;
 

-       return rtl8366_smi_rmwr(smi, RTL8366_LED_BLINKRATE_REG,
-                               RTL8366_LED_BLINKRATE_MASK,
+       return rtl8366_smi_rmwr(smi, RTL8366RB_LED_BLINKRATE_REG,
+                               RTL8366RB_LED_BLINKRATE_MASK,

                                val->value.i);
 }
 
                                val->value.i);
 }
 

-static int rtl8366rb_sw_set_vlan_enable(struct switch_dev *dev,
+static int rtl8366rb_sw_get_learning_enable(struct switch_dev *dev,

                                       const struct switch_attr *attr,
                                       struct switch_val *val)
 {
        struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
                                       const struct switch_attr *attr,
                                       struct switch_val *val)
 {
        struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);

+       u32 data;

 
 

-       if (attr->ofs == 1)
-               return rtl8366rb_vlan_set_vlan(smi, val->value.i);
-       else
-               return rtl8366rb_vlan_set_4ktable(smi, val->value.i);
+       rtl8366_smi_read_reg(smi, RTL8366RB_SSCR0, &data);
+       val->value.i = !data;
+
+       return 0;
+}
+
+
+static int rtl8366rb_sw_set_learning_enable(struct switch_dev *dev,
+                                      const struct switch_attr *attr,
+                                      struct switch_val *val)
+{
+       struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+       u32 portmask = 0;
+       int err = 0;
+
+       if (!val->value.i)
+               portmask = RTL8366RB_PORT_ALL;
+
+       /* set learning for all ports */
+       REG_WR(smi, RTL8366RB_SSCR0, portmask);
+
+       /* set auto ageing for all ports */
+       REG_WR(smi, RTL8366RB_SSCR1, portmask);
+
+       return 0;

 }
 
 }
 

+

 static const char *rtl8366rb_speed_str(unsigned speed)
 {
        switch (speed) {
 static const char *rtl8366rb_speed_str(unsigned speed)
 {
        switch (speed) {


@@ -1196,82 +700,39 @@ static int rtl8366rb_sw_get_port_link(struct switch_dev *dev,
                                     const struct switch_attr *attr,
                                     struct switch_val *val)
 {
                                     const struct switch_attr *attr,
                                     struct switch_val *val)
 {

-       struct rtl8366rb *rtl = sw_to_rtl8366rb(dev);
-       struct rtl8366_smi *smi = &rtl->smi;
+       struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);

        u32 len = 0, data = 0;
 
        u32 len = 0, data = 0;
 

-       if (val->port_vlan >= RTL8366_NUM_PORTS)
+       if (val->port_vlan >= RTL8366RB_NUM_PORTS)

                return -EINVAL;
 
                return -EINVAL;
 

-       memset(rtl->buf, '\0', sizeof(rtl->buf));
-       rtl8366_smi_read_reg(smi, RTL8366S_PORT_LINK_STATUS_BASE +
+       memset(smi->buf, '\0', sizeof(smi->buf));
+       rtl8366_smi_read_reg(smi, RTL8366RB_PORT_LINK_STATUS_BASE +

                             (val->port_vlan / 2), &data);
 
        if (val->port_vlan % 2)
                data = data >> 8;
 
                             (val->port_vlan / 2), &data);
 
        if (val->port_vlan % 2)
                data = data >> 8;
 

-       if (data & RTL8366S_PORT_STATUS_LINK_MASK) {
-               len = snprintf(rtl->buf, sizeof(rtl->buf),
+       if (data & RTL8366RB_PORT_STATUS_LINK_MASK) {
+               len = snprintf(smi->buf, sizeof(smi->buf),

                                "port:%d link:up speed:%s %s-duplex %s%s%s",
                                val->port_vlan,
                                rtl8366rb_speed_str(data &
                                "port:%d link:up speed:%s %s-duplex %s%s%s",
                                val->port_vlan,
                                rtl8366rb_speed_str(data &

-                                         RTL8366S_PORT_STATUS_SPEED_MASK),
-                               (data & RTL8366S_PORT_STATUS_DUPLEX_MASK) ?
+                                         RTL8366RB_PORT_STATUS_SPEED_MASK),
+                               (data & RTL8366RB_PORT_STATUS_DUPLEX_MASK) ?

                                        "full" : "half",
                                        "full" : "half",

-                               (data & RTL8366S_PORT_STATUS_TXPAUSE_MASK) ?
+                               (data & RTL8366RB_PORT_STATUS_TXPAUSE_MASK) ?

                                        "tx-pause ": "",
                                        "tx-pause ": "",

-                               (data & RTL8366S_PORT_STATUS_RXPAUSE_MASK) ?
+                               (data & RTL8366RB_PORT_STATUS_RXPAUSE_MASK) ?

                                        "rx-pause " : "",
                                        "rx-pause " : "",

-                               (data & RTL8366S_PORT_STATUS_AN_MASK) ?
+                               (data & RTL8366RB_PORT_STATUS_AN_MASK) ?

                                        "nway ": "");
        } else {
                                        "nway ": "");
        } else {

-               len = snprintf(rtl->buf, sizeof(rtl->buf), "port:%d link: down",
+               len = snprintf(smi->buf, sizeof(smi->buf), "port:%d link: down",

                                val->port_vlan);
        }
 
                                val->port_vlan);
        }
 

-       val->value.s = rtl->buf;
-       val->len = len;
-
-       return 0;
-}
-
-static int rtl8366rb_sw_get_vlan_info(struct switch_dev *dev,
-                                    const struct switch_attr *attr,
-                                    struct switch_val *val)
-{
-       int i;
-       u32 len = 0;
-       struct rtl8366_vlan_4k vlan4k;
-       struct rtl8366rb *rtl = sw_to_rtl8366rb(dev);
-       struct rtl8366_smi *smi = &rtl->smi;
-       char *buf = rtl->buf;
-       int err;
-
-       if (val->port_vlan == 0 || val->port_vlan >= RTL8366_NUM_VLANS)
-               return -EINVAL;
-
-       memset(buf, '\0', sizeof(rtl->buf));
-
-       err = rtl8366rb_get_vlan_4k(smi, val->port_vlan, &vlan4k);
-       if (err)
-               return err;
-
-       len += snprintf(buf + len, sizeof(rtl->buf) - len,
-                       "VLAN %d: Ports: '", vlan4k.vid);
-
-       for (i = 0; i < RTL8366_NUM_PORTS; i++) {
-               if (!(vlan4k.member & (1 << i)))
-                       continue;
-
-               len += snprintf(buf + len, sizeof(rtl->buf) - len, "%d%s", i,
-                               (vlan4k.untag & (1 << i)) ? "" : "t");
-       }
-
-       len += snprintf(buf + len, sizeof(rtl->buf) - len,
-                       "', members=%04x, untag=%04x, fid=%u",
-                       vlan4k.member, vlan4k.untag, vlan4k.fid);
-
-       val->value.s = buf;
+       val->value.s = smi->buf;

        val->len = len;
 
        return 0;
        val->len = len;
 
        return 0;


@@ -1286,20 +747,20 @@ static int rtl8366rb_sw_set_port_led(struct switch_dev *dev,
        u32 mask;
        u32 reg;
 
        u32 mask;
        u32 reg;
 

-       if (val->port_vlan >= RTL8366_NUM_PORTS)
+       if (val->port_vlan >= RTL8366RB_NUM_PORTS)

                return -EINVAL;
 
                return -EINVAL;
 

-       if (val->port_vlan == RTL8366_PORT_NUM_CPU) {
-               reg = RTL8366_LED_BLINKRATE_REG;
+       if (val->port_vlan == RTL8366RB_PORT_NUM_CPU) {
+               reg = RTL8366RB_LED_BLINKRATE_REG;

                mask = 0xF << 4;
                data = val->value.i << 4;
        } else {
                mask = 0xF << 4;
                data = val->value.i << 4;
        } else {

-               reg = RTL8366_LED_CTRL_REG;
+               reg = RTL8366RB_LED_CTRL_REG;

                mask = 0xF << (val->port_vlan * 4),
                data = val->value.i << (val->port_vlan * 4);
        }
 
                mask = 0xF << (val->port_vlan * 4),
                data = val->value.i << (val->port_vlan * 4);
        }
 

-       return rtl8366_smi_rmwr(smi, RTL8366_LED_BLINKRATE_REG, mask, data);
+       return rtl8366_smi_rmwr(smi, reg, mask, data);

 }
 
 static int rtl8366rb_sw_get_port_led(struct switch_dev *dev,
 }
 
 static int rtl8366rb_sw_get_port_led(struct switch_dev *dev,


@@ -1309,122 +770,179 @@ static int rtl8366rb_sw_get_port_led(struct switch_dev *dev,
        struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
        u32 data = 0;
 
        struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
        u32 data = 0;
 

-       if (val->port_vlan >= RTL8366_NUM_LEDGROUPS)
+       if (val->port_vlan >= RTL8366RB_NUM_LEDGROUPS)

                return -EINVAL;
 
                return -EINVAL;
 

-       rtl8366_smi_read_reg(smi, RTL8366_LED_CTRL_REG, &data);
+       rtl8366_smi_read_reg(smi, RTL8366RB_LED_CTRL_REG, &data);

        val->value.i = (data >> (val->port_vlan * 4)) & 0x000F;
 
        return 0;
 }
 
        val->value.i = (data >> (val->port_vlan * 4)) & 0x000F;
 
        return 0;
 }
 

-static int rtl8366rb_sw_reset_port_mibs(struct switch_dev *dev,
-                                      const struct switch_attr *attr,
-                                      struct switch_val *val)
+static int rtl8366rb_sw_set_port_disable(struct switch_dev *dev,
+                                   const struct switch_attr *attr,
+                                   struct switch_val *val)

 {
        struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
 {
        struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);

+       u32 mask, data;

 
 

-       if (val->port_vlan >= RTL8366_NUM_PORTS)
+       if (val->port_vlan >= RTL8366RB_NUM_PORTS)

                return -EINVAL;
 
                return -EINVAL;
 

-       return rtl8366_smi_rmwr(smi, RTL8366S_MIB_CTRL_REG,
-                               0, (1 << (val->port_vlan + 3)));
+       mask = 1 << val->port_vlan ;
+       if (val->value.i)
+               data = mask;
+       else
+               data = 0;
+
+       return rtl8366_smi_rmwr(smi, RTL8366RB_PECR, mask, data);

 }
 
 }
 

-static int rtl8366rb_sw_get_port_mib(struct switch_dev *dev,
+static int rtl8366rb_sw_get_port_disable(struct switch_dev *dev,

                                    const struct switch_attr *attr,
                                    struct switch_val *val)
 {
                                    const struct switch_attr *attr,
                                    struct switch_val *val)
 {

-       struct rtl8366rb *rtl = sw_to_rtl8366rb(dev);
-       struct rtl8366_smi *smi = &rtl->smi;
-       int i, len = 0;
-       unsigned long long counter = 0;
-       char *buf = rtl->buf;
+       struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+       u32 data;

 
 

-       if (val->port_vlan >= RTL8366_NUM_PORTS)
+       if (val->port_vlan >= RTL8366RB_NUM_PORTS)

                return -EINVAL;
 
                return -EINVAL;
 

-       len += snprintf(buf + len, sizeof(rtl->buf) - len,
-                       "Port %d MIB counters\n",
-                       val->port_vlan);
-
-       for (i = 0; i < ARRAY_SIZE(rtl8366rb_mib_counters); ++i) {
-               len += snprintf(buf + len, sizeof(rtl->buf) - len,
-                               "%-36s: ", rtl8366rb_mib_counters[i].name);
-               if (!rtl8366_get_mib_counter(smi, i, val->port_vlan, &counter))
-                       len += snprintf(buf + len, sizeof(rtl->buf) - len,
-                                       "%llu\n", counter);
-               else
-                       len += snprintf(buf + len, sizeof(rtl->buf) - len,
-                                       "%s\n", "error");
-       }
+       rtl8366_smi_read_reg(smi, RTL8366RB_PECR, &data);
+       if (data & (1 << val->port_vlan))
+               val->value.i = 1;
+       else
+               val->value.i = 0;

 
 

-       val->value.s = buf;
-       val->len = len;

        return 0;
 }
 
        return 0;
 }
 

-static int rtl8366rb_sw_get_vlan_ports(struct switch_dev *dev,
-                                     struct switch_val *val)
+static int rtl8366rb_sw_set_port_rate_in(struct switch_dev *dev,
+                                   const struct switch_attr *attr,
+                                   struct switch_val *val)

 {
        struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
 {
        struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);

-       struct switch_port *port;
-       struct rtl8366_vlan_4k vlan4k;
-       int i;

 
 

-       if (val->port_vlan == 0 || val->port_vlan >= RTL8366_NUM_VLANS)
+       if (val->port_vlan >= RTL8366RB_NUM_PORTS)

                return -EINVAL;
 
                return -EINVAL;
 

-       rtl8366rb_get_vlan_4k(smi, val->port_vlan, &vlan4k);
+       if (val->value.i > 0 && val->value.i < RTL8366RB_BDTH_SW_MAX)
+               val->value.i = (val->value.i - 1) / RTL8366RB_BDTH_UNIT;
+       else
+               val->value.i = RTL8366RB_BDTH_REG_DEFAULT;

 
 

-       port = &val->value.ports[0];
-       val->len = 0;
-       for (i = 0; i < RTL8366_NUM_PORTS; i++) {
-               if (!(vlan4k.member & BIT(i)))
-                       continue;
+       return rtl8366_smi_rmwr(smi, RTL8366RB_IB_REG(val->port_vlan),
+               RTL8366RB_IB_BDTH_MASK | RTL8366RB_IB_PREIFG_MASK,
+               val->value.i |
+               (RTL8366RB_QOS_DEFAULT_PREIFG << RTL8366RB_IB_PREIFG_OFFSET));
+
+}
+
+static int rtl8366rb_sw_get_port_rate_in(struct switch_dev *dev,
+                                   const struct switch_attr *attr,
+                                   struct switch_val *val)
+{
+       struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+       u32 data;
+
+       if (val->port_vlan >= RTL8366RB_NUM_PORTS)
+               return -EINVAL;
+
+       rtl8366_smi_read_reg(smi, RTL8366RB_IB_REG(val->port_vlan), &data);
+       data &= RTL8366RB_IB_BDTH_MASK;
+       if (data < RTL8366RB_IB_BDTH_MASK)
+               data += 1;
+
+       val->value.i = (int)data * RTL8366RB_BDTH_UNIT;

 
 

-               port->id = i;
-               port->flags = (vlan4k.untag & BIT(i)) ?
-                                       0 : BIT(SWITCH_PORT_FLAG_TAGGED);
-               val->len++;
-               port++;
-       }

        return 0;
 }
 
        return 0;
 }
 

-static int rtl8366rb_sw_set_vlan_ports(struct switch_dev *dev,
-                                     struct switch_val *val)
+static int rtl8366rb_sw_set_port_rate_out(struct switch_dev *dev,
+                                   const struct switch_attr *attr,
+                                   struct switch_val *val)

 {
        struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
 {
        struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);

-       struct switch_port *port;
-       u32 member = 0;
-       u32 untag = 0;
-       int i;

 
 

-       if (val->port_vlan == 0 || val->port_vlan >= RTL8366_NUM_VLANS)
+       if (val->port_vlan >= RTL8366RB_NUM_PORTS)

                return -EINVAL;
 
                return -EINVAL;
 

-       port = &val->value.ports[0];
-       for (i = 0; i < val->len; i++, port++) {
-               member |= BIT(port->id);
+       rtl8366_smi_rmwr(smi, RTL8366RB_EB_PREIFG_REG,
+               RTL8366RB_EB_PREIFG_MASK,
+               (RTL8366RB_QOS_DEFAULT_PREIFG << RTL8366RB_EB_PREIFG_OFFSET));

 
 

-               if (!(port->flags & BIT(SWITCH_PORT_FLAG_TAGGED)))
-                       untag |= BIT(port->id);
-       }
+       if (val->value.i > 0 && val->value.i < RTL8366RB_BDTH_SW_MAX)
+               val->value.i = (val->value.i - 1) / RTL8366RB_BDTH_UNIT;
+       else
+               val->value.i = RTL8366RB_BDTH_REG_DEFAULT;
+
+       return rtl8366_smi_rmwr(smi, RTL8366RB_EB_REG(val->port_vlan),
+                       RTL8366RB_EB_BDTH_MASK, val->value.i );
+
+}
+
+static int rtl8366rb_sw_get_port_rate_out(struct switch_dev *dev,
+                                   const struct switch_attr *attr,
+                                   struct switch_val *val)
+{
+       struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+       u32 data;
+
+       if (val->port_vlan >= RTL8366RB_NUM_PORTS)
+               return -EINVAL;
+
+       rtl8366_smi_read_reg(smi, RTL8366RB_EB_REG(val->port_vlan), &data);
+       data &= RTL8366RB_EB_BDTH_MASK;
+       if (data < RTL8366RB_EB_BDTH_MASK)
+               data += 1;
+
+       val->value.i = (int)data * RTL8366RB_BDTH_UNIT;
+
+       return 0;
+}
+
+static int rtl8366rb_sw_set_qos_enable(struct switch_dev *dev,
+                                   const struct switch_attr *attr,
+                                   struct switch_val *val)
+{
+       struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+       u32 data;

 
 

-       return rtl8366rb_set_vlan(smi, val->port_vlan, member, untag, 0);
+       if (val->value.i)
+               data = RTL8366RB_QOS_MASK;
+       else
+               data = 0;
+
+       return rtl8366_smi_rmwr(smi, RTL8366RB_SGCR, RTL8366RB_QOS_MASK, data);

 }
 
 }
 

-static int rtl8366rb_sw_get_port_pvid(struct switch_dev *dev, int port, int *val)
+static int rtl8366rb_sw_get_qos_enable(struct switch_dev *dev,
+                                   const struct switch_attr *attr,
+                                   struct switch_val *val)

 {
        struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
 {
        struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);

-       return rtl8366rb_get_pvid(smi, port, val);
+       u32 data;
+
+       rtl8366_smi_read_reg(smi, RTL8366RB_SGCR, &data);
+       if (data & RTL8366RB_QOS_MASK)
+               val->value.i = 1;
+       else
+               val->value.i = 0;
+
+       return 0;

 }
 
 }
 

-static int rtl8366rb_sw_set_port_pvid(struct switch_dev *dev, int port, int val)
+static int rtl8366rb_sw_reset_port_mibs(struct switch_dev *dev,
+                                      const struct switch_attr *attr,
+                                      struct switch_val *val)

 {
        struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
 {
        struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);

-       return rtl8366rb_set_pvid(smi, port, val);
+
+       if (val->port_vlan >= RTL8366RB_NUM_PORTS)
+               return -EINVAL;
+
+       return rtl8366_smi_rmwr(smi, RTL8366RB_MIB_CTRL_REG, 0,
+                               RTL8366RB_MIB_CTRL_PORT_RESET(val->port_vlan));

 }
 
 static int rtl8366rb_sw_reset_switch(struct switch_dev *dev)
 }
 
 static int rtl8366rb_sw_reset_switch(struct switch_dev *dev)


@@ -1440,33 +958,46 @@ static int rtl8366rb_sw_reset_switch(struct switch_dev *dev)
        if (err)
                return err;
 
        if (err)
                return err;
 

-       return rtl8366rb_reset_vlan(smi);
+       err = rtl8366_reset_vlan(smi);
+       if (err)
+               return err;
+
+       err = rtl8366_enable_vlan(smi, 1);
+       if (err)
+               return err;
+
+       return rtl8366_enable_all_ports(smi, 1);

 }
 
 static struct switch_attr rtl8366rb_globals[] = {
        {
 }
 
 static struct switch_attr rtl8366rb_globals[] = {
        {

+               .type = SWITCH_TYPE_INT,
+               .name = "enable_learning",
+               .description = "Enable learning, enable aging",
+               .set = rtl8366rb_sw_set_learning_enable,
+               .get = rtl8366rb_sw_get_learning_enable,
+               .max = 1
+       }, {

                .type = SWITCH_TYPE_INT,
                .name = "enable_vlan",
                .description = "Enable VLAN mode",
                .type = SWITCH_TYPE_INT,
                .name = "enable_vlan",
                .description = "Enable VLAN mode",

-               .set = rtl8366rb_sw_set_vlan_enable,
-               .get = rtl8366rb_sw_get_vlan_enable,
+               .set = rtl8366_sw_set_vlan_enable,
+               .get = rtl8366_sw_get_vlan_enable,

                .max = 1,
                .ofs = 1
        }, {
                .type = SWITCH_TYPE_INT,
                .name = "enable_vlan4k",
                .description = "Enable VLAN 4K mode",
                .max = 1,
                .ofs = 1
        }, {
                .type = SWITCH_TYPE_INT,
                .name = "enable_vlan4k",
                .description = "Enable VLAN 4K mode",

-               .set = rtl8366rb_sw_set_vlan_enable,
-               .get = rtl8366rb_sw_get_vlan_enable,
+               .set = rtl8366_sw_set_vlan_enable,
+               .get = rtl8366_sw_get_vlan_enable,

                .max = 1,
                .ofs = 2
        }, {
                .max = 1,
                .ofs = 2
        }, {

-               .type = SWITCH_TYPE_INT,
+               .type = SWITCH_TYPE_NOVAL,

                .name = "reset_mibs",
                .description = "Reset all MIB counters",
                .set = rtl8366rb_sw_reset_mibs,
                .name = "reset_mibs",
                .description = "Reset all MIB counters",
                .set = rtl8366rb_sw_reset_mibs,

-               .get = NULL,
-               .max = 1

        }, {
                .type = SWITCH_TYPE_INT,
                .name = "blinkrate",
        }, {
                .type = SWITCH_TYPE_INT,
                .name = "blinkrate",


@@ -1475,6 +1006,13 @@ static struct switch_attr rtl8366rb_globals[] = {
                .set = rtl8366rb_sw_set_blinkrate,
                .get = rtl8366rb_sw_get_blinkrate,
                .max = 5
                .set = rtl8366rb_sw_set_blinkrate,
                .get = rtl8366rb_sw_get_blinkrate,
                .max = 5

+       }, {
+               .type = SWITCH_TYPE_INT,
+               .name = "enable_qos",
+               .description = "Enable QOS",
+               .set = rtl8366rb_sw_set_qos_enable,
+               .get = rtl8366rb_sw_get_qos_enable,
+               .max = 1

        },
 };
 
        },
 };
 


@@ -1487,19 +1025,17 @@ static struct switch_attr rtl8366rb_port[] = {
                .set = NULL,
                .get = rtl8366rb_sw_get_port_link,
        }, {
                .set = NULL,
                .get = rtl8366rb_sw_get_port_link,
        }, {

-               .type = SWITCH_TYPE_INT,
+               .type = SWITCH_TYPE_NOVAL,

                .name = "reset_mib",
                .description = "Reset single port MIB counters",
                .name = "reset_mib",
                .description = "Reset single port MIB counters",

-               .max = 1,

                .set = rtl8366rb_sw_reset_port_mibs,
                .set = rtl8366rb_sw_reset_port_mibs,

-               .get = NULL,

        }, {
                .type = SWITCH_TYPE_STRING,
                .name = "mib",
                .description = "Get MIB counters for port",
                .max = 33,
                .set = NULL,
        }, {
                .type = SWITCH_TYPE_STRING,
                .name = "mib",
                .description = "Get MIB counters for port",
                .max = 33,
                .set = NULL,

-               .get = rtl8366rb_sw_get_port_mib,
+               .get = rtl8366_sw_get_port_mib,

        }, {
                .type = SWITCH_TYPE_INT,
                .name = "led",
        }, {
                .type = SWITCH_TYPE_INT,
                .name = "led",


@@ -1507,6 +1043,27 @@ static struct switch_attr rtl8366rb_port[] = {
                .max = 15,
                .set = rtl8366rb_sw_set_port_led,
                .get = rtl8366rb_sw_get_port_led,
                .max = 15,
                .set = rtl8366rb_sw_set_port_led,
                .get = rtl8366rb_sw_get_port_led,

+       }, {
+               .type = SWITCH_TYPE_INT,
+               .name = "disable",
+               .description = "Get/Set port state (enabled or disabled)",
+               .max = 1,
+               .set = rtl8366rb_sw_set_port_disable,
+               .get = rtl8366rb_sw_get_port_disable,
+       }, {
+               .type = SWITCH_TYPE_INT,
+               .name = "rate_in",
+               .description = "Get/Set port ingress (incoming) bandwidth limit in kbps",
+               .max = RTL8366RB_BDTH_SW_MAX,
+               .set = rtl8366rb_sw_set_port_rate_in,
+               .get = rtl8366rb_sw_get_port_rate_in,
+       }, {
+               .type = SWITCH_TYPE_INT,
+               .name = "rate_out",
+               .description = "Get/Set port egress (outgoing) bandwidth limit in kbps",
+               .max = RTL8366RB_BDTH_SW_MAX,
+               .set = rtl8366rb_sw_set_port_rate_out,
+               .get = rtl8366rb_sw_get_port_rate_out,

        },
 };
 
        },
 };
 


@@ -1517,16 +1074,18 @@ static struct switch_attr rtl8366rb_vlan[] = {
                .description = "Get vlan information",
                .max = 1,
                .set = NULL,
                .description = "Get vlan information",
                .max = 1,
                .set = NULL,

-               .get = rtl8366rb_sw_get_vlan_info,
+               .get = rtl8366_sw_get_vlan_info,
+       }, {
+               .type = SWITCH_TYPE_INT,
+               .name = "fid",
+               .description = "Get/Set vlan FID",
+               .max = RTL8366RB_FIDMAX,
+               .set = rtl8366_sw_set_vlan_fid,
+               .get = rtl8366_sw_get_vlan_fid,

        },
 };
 
        },
 };
 

-/* template */
-static struct switch_dev rtl8366_switch_dev = {
-       .name = "RTL8366S",
-       .cpu_port = RTL8366_PORT_NUM_CPU,
-       .ports = RTL8366_NUM_PORTS,
-       .vlans = RTL8366_NUM_VLANS,
+static const struct switch_dev_ops rtl8366_ops = {

        .attr_global = {
                .attr = rtl8366rb_globals,
                .n_attr = ARRAY_SIZE(rtl8366rb_globals),
        .attr_global = {
                .attr = rtl8366rb_globals,
                .n_attr = ARRAY_SIZE(rtl8366rb_globals),


@@ -1540,32 +1099,35 @@ static struct switch_dev rtl8366_switch_dev = {
                .n_attr = ARRAY_SIZE(rtl8366rb_vlan),
        },
 
                .n_attr = ARRAY_SIZE(rtl8366rb_vlan),
        },
 

-       .get_vlan_ports = rtl8366rb_sw_get_vlan_ports,
-       .set_vlan_ports = rtl8366rb_sw_set_vlan_ports,
-       .get_port_pvid = rtl8366rb_sw_get_port_pvid,
-       .set_port_pvid = rtl8366rb_sw_set_port_pvid,
+       .get_vlan_ports = rtl8366_sw_get_vlan_ports,
+       .set_vlan_ports = rtl8366_sw_set_vlan_ports,
+       .get_port_pvid = rtl8366_sw_get_port_pvid,
+       .set_port_pvid = rtl8366_sw_set_port_pvid,

        .reset_switch = rtl8366rb_sw_reset_switch,
 };
 
        .reset_switch = rtl8366rb_sw_reset_switch,
 };
 

-static int rtl8366rb_switch_init(struct rtl8366rb *rtl)
+static int rtl8366rb_switch_init(struct rtl8366_smi *smi)

 {
 {

-       struct switch_dev *dev = &rtl->dev;
+       struct switch_dev *dev = &smi->sw_dev;

        int err;
 
        int err;
 

-       memcpy(dev, &rtl8366_switch_dev, sizeof(struct switch_dev));
-       dev->priv = rtl;
-       dev->devname = dev_name(rtl->parent);
+       dev->name = "RTL8366RB";
+       dev->cpu_port = RTL8366RB_PORT_NUM_CPU;
+       dev->ports = RTL8366RB_NUM_PORTS;
+       dev->vlans = RTL8366RB_NUM_VIDS;
+       dev->ops = &rtl8366_ops;
+       dev->devname = dev_name(smi->parent);

 
        err = register_switch(dev, NULL);
        if (err)
 
        err = register_switch(dev, NULL);
        if (err)

-               dev_err(rtl->parent, "switch registration failed\n");
+               dev_err(smi->parent, "switch registration failed\n");

 
        return err;
 }
 
 
        return err;
 }
 

-static void rtl8366rb_switch_cleanup(struct rtl8366rb *rtl)
+static void rtl8366rb_switch_cleanup(struct rtl8366_smi *smi)

 {
 {

-       unregister_switch(&rtl->dev);
+       unregister_switch(&smi->sw_dev);

 }
 
 static int rtl8366rb_mii_read(struct mii_bus *bus, int addr, int reg)
 }
 
 static int rtl8366rb_mii_read(struct mii_bus *bus, int addr, int reg)


@@ -1594,19 +1156,10 @@ static int rtl8366rb_mii_write(struct mii_bus *bus, int addr, int reg, u16 val)
        return err;
 }
 
        return err;
 }
 

-static int rtl8366rb_mii_bus_match(struct mii_bus *bus)
+static int rtl8366rb_setup(struct rtl8366_smi *smi)

 {
 {

-       return (bus->read == rtl8366rb_mii_read &&
-               bus->write == rtl8366rb_mii_write);
-}
-
-static int rtl8366rb_setup(struct rtl8366rb *rtl)
-{
-       struct rtl8366_smi *smi = &rtl->smi;

        int ret;
 
        int ret;
 

-       rtl8366rb_debugfs_init(rtl);
-

        ret = rtl8366rb_reset_chip(smi);
        if (ret)
                return ret;
        ret = rtl8366rb_reset_chip(smi);
        if (ret)
                return ret;


@@ -1621,21 +1174,21 @@ static int rtl8366rb_detect(struct rtl8366_smi *smi)
        u32 chip_ver = 0;
        int ret;
 
        u32 chip_ver = 0;
        int ret;
 

-       ret = rtl8366_smi_read_reg(smi, RTL8366S_CHIP_ID_REG, &chip_id);
+       ret = rtl8366_smi_read_reg(smi, RTL8366RB_CHIP_ID_REG, &chip_id);

        if (ret) {
                dev_err(smi->parent, "unable to read chip id\n");
                return ret;
        }
 
        switch (chip_id) {
        if (ret) {
                dev_err(smi->parent, "unable to read chip id\n");
                return ret;
        }
 
        switch (chip_id) {

-       case RTL8366S_CHIP_ID_8366:
+       case RTL8366RB_CHIP_ID_8366:

                break;
        default:
                dev_err(smi->parent, "unknown chip id (%04x)\n", chip_id);
                return -ENODEV;
        }
 
                break;
        default:
                dev_err(smi->parent, "unknown chip id (%04x)\n", chip_id);
                return -ENODEV;
        }
 

-       ret = rtl8366_smi_read_reg(smi, RTL8366S_CHIP_VERSION_CTRL_REG,
+       ret = rtl8366_smi_read_reg(smi, RTL8366RB_CHIP_VERSION_CTRL_REG,

                                   &chip_ver);
        if (ret) {
                dev_err(smi->parent, "unable to read chip version\n");
                                   &chip_ver);
        if (ret) {
                dev_err(smi->parent, "unable to read chip version\n");


@@ -1643,28 +1196,41 @@ static int rtl8366rb_detect(struct rtl8366_smi *smi)
        }
 
        dev_info(smi->parent, "RTL%04x ver. %u chip found\n",
        }
 
        dev_info(smi->parent, "RTL%04x ver. %u chip found\n",

-                chip_id, chip_ver & RTL8366S_CHIP_VERSION_MASK);
+                chip_id, chip_ver & RTL8366RB_CHIP_VERSION_MASK);

 
        return 0;
 }
 
 static struct rtl8366_smi_ops rtl8366rb_smi_ops = {
        .detect         = rtl8366rb_detect,
 
        return 0;
 }
 
 static struct rtl8366_smi_ops rtl8366rb_smi_ops = {
        .detect         = rtl8366rb_detect,

+       .setup          = rtl8366rb_setup,
+

        .mii_read       = rtl8366rb_mii_read,
        .mii_write      = rtl8366rb_mii_write,
        .mii_read       = rtl8366rb_mii_read,
        .mii_write      = rtl8366rb_mii_write,

+
+       .get_vlan_mc    = rtl8366rb_get_vlan_mc,
+       .set_vlan_mc    = rtl8366rb_set_vlan_mc,
+       .get_vlan_4k    = rtl8366rb_get_vlan_4k,
+       .set_vlan_4k    = rtl8366rb_set_vlan_4k,
+       .get_mc_index   = rtl8366rb_get_mc_index,
+       .set_mc_index   = rtl8366rb_set_mc_index,
+       .get_mib_counter = rtl8366rb_get_mib_counter,
+       .is_vlan_valid  = rtl8366rb_is_vlan_valid,
+       .enable_vlan    = rtl8366rb_enable_vlan,
+       .enable_vlan4k  = rtl8366rb_enable_vlan4k,
+       .enable_port    = rtl8366rb_enable_port,

 };
 
 };
 

-static int __init rtl8366rb_probe(struct platform_device *pdev)
+static int __devinit rtl8366rb_probe(struct platform_device *pdev)

 {
        static int rtl8366_smi_version_printed;
        struct rtl8366rb_platform_data *pdata;
 {
        static int rtl8366_smi_version_printed;
        struct rtl8366rb_platform_data *pdata;

-       struct rtl8366rb *rtl;

        struct rtl8366_smi *smi;
        int err;
 
        if (!rtl8366_smi_version_printed++)
        struct rtl8366_smi *smi;
        int err;
 
        if (!rtl8366_smi_version_printed++)

-               printk(KERN_NOTICE RTL8366S_DRIVER_DESC
-                      " version " RTL8366S_DRIVER_VER"\n");
+               printk(KERN_NOTICE RTL8366RB_DRIVER_DESC
+                      " version " RTL8366RB_DRIVER_VER"\n");

 
        pdata = pdev->dev.platform_data;
        if (!pdata) {
 
        pdata = pdev->dev.platform_data;
        if (!pdata) {


@@ -1673,32 +1239,28 @@ static int __init rtl8366rb_probe(struct platform_device *pdev)
                goto err_out;
        }
 
                goto err_out;
        }
 

-       rtl = kzalloc(sizeof(*rtl), GFP_KERNEL);
-       if (!rtl) {
-               dev_err(&pdev->dev, "no memory for private data\n");
+       smi = rtl8366_smi_alloc(&pdev->dev);
+       if (!smi) {

                err = -ENOMEM;
                goto err_out;
        }
 
                err = -ENOMEM;
                goto err_out;
        }
 

-       rtl->parent = &pdev->dev;
-
-       smi = &rtl->smi;
-       smi->parent = &pdev->dev;

        smi->gpio_sda = pdata->gpio_sda;
        smi->gpio_sck = pdata->gpio_sck;
        smi->ops = &rtl8366rb_smi_ops;
        smi->gpio_sda = pdata->gpio_sda;
        smi->gpio_sck = pdata->gpio_sck;
        smi->ops = &rtl8366rb_smi_ops;

+       smi->cpu_port = RTL8366RB_PORT_NUM_CPU;
+       smi->num_ports = RTL8366RB_NUM_PORTS;
+       smi->num_vlan_mc = RTL8366RB_NUM_VLANS;
+       smi->mib_counters = rtl8366rb_mib_counters;
+       smi->num_mib_counters = ARRAY_SIZE(rtl8366rb_mib_counters);

 
        err = rtl8366_smi_init(smi);
        if (err)
 
        err = rtl8366_smi_init(smi);
        if (err)

-               goto err_free_rtl;
+               goto err_free_smi;

 
 

-       platform_set_drvdata(pdev, rtl);
+       platform_set_drvdata(pdev, smi);

 
 

-       err = rtl8366rb_setup(rtl);
-       if (err)
-               goto err_clear_drvdata;
-
-       err = rtl8366rb_switch_init(rtl);
+       err = rtl8366rb_switch_init(smi);

        if (err)
                goto err_clear_drvdata;
 
        if (err)
                goto err_clear_drvdata;
 


@@ -1707,48 +1269,21 @@ static int __init rtl8366rb_probe(struct platform_device *pdev)
  err_clear_drvdata:
        platform_set_drvdata(pdev, NULL);
        rtl8366_smi_cleanup(smi);
  err_clear_drvdata:
        platform_set_drvdata(pdev, NULL);
        rtl8366_smi_cleanup(smi);

- err_free_rtl:
-       kfree(rtl);
+ err_free_smi:
+       kfree(smi);

  err_out:
        return err;
 }
 
  err_out:
        return err;
 }
 

-static int rtl8366rb_phy_config_init(struct phy_device *phydev)
-{
-       if (!rtl8366rb_mii_bus_match(phydev->bus))
-               return -EINVAL;
-
-       return 0;
-}
-
-static int rtl8366rb_phy_config_aneg(struct phy_device *phydev)
-{
-       return 0;
-}
-
-static struct phy_driver rtl8366rb_phy_driver = {
-       .phy_id         = 0x001cc960,
-       .name           = "Realtek RTL8366RB",
-       .phy_id_mask    = 0x1ffffff0,
-       .features       = PHY_GBIT_FEATURES,
-       .config_aneg    = rtl8366rb_phy_config_aneg,
-       .config_init    = rtl8366rb_phy_config_init,
-       .read_status    = genphy_read_status,
-       .driver         = {
-               .owner = THIS_MODULE,
-       },
-};
-

 static int __devexit rtl8366rb_remove(struct platform_device *pdev)
 {
 static int __devexit rtl8366rb_remove(struct platform_device *pdev)
 {

-       struct rtl8366rb *rtl = platform_get_drvdata(pdev);
+       struct rtl8366_smi *smi = platform_get_drvdata(pdev);

 
 

-       if (rtl) {
-               rtl8366rb_switch_cleanup(rtl);
-               rtl8366rb_debugfs_remove(rtl);
+       if (smi) {
+               rtl8366rb_switch_cleanup(smi);

                platform_set_drvdata(pdev, NULL);
                platform_set_drvdata(pdev, NULL);

-               rtl8366_smi_cleanup(&rtl->smi);
-               kfree(rtl);
+               rtl8366_smi_cleanup(smi);
+               kfree(smi);

        }
 
        return 0;
        }
 
        return 0;


@@ -1765,33 +1300,20 @@ static struct platform_driver rtl8366rb_driver = {
 
 static int __init rtl8366rb_module_init(void)
 {
 
 static int __init rtl8366rb_module_init(void)
 {

-       int ret;
-       ret = platform_driver_register(&rtl8366rb_driver);
-       if (ret)
-               return ret;
-
-       ret = phy_driver_register(&rtl8366rb_phy_driver);
-       if (ret)
-               goto err_platform_unregister;
-
-       return 0;
-
- err_platform_unregister:
-       platform_driver_unregister(&rtl8366rb_driver);
-       return ret;
+       return platform_driver_register(&rtl8366rb_driver);

 }
 module_init(rtl8366rb_module_init);
 
 static void __exit rtl8366rb_module_exit(void)
 {
 }
 module_init(rtl8366rb_module_init);
 
 static void __exit rtl8366rb_module_exit(void)
 {

-       phy_driver_unregister(&rtl8366rb_phy_driver);

        platform_driver_unregister(&rtl8366rb_driver);
 }
 module_exit(rtl8366rb_module_exit);
 
        platform_driver_unregister(&rtl8366rb_driver);
 }
 module_exit(rtl8366rb_module_exit);
 

-MODULE_DESCRIPTION(RTL8366S_DRIVER_DESC);
-MODULE_VERSION(RTL8366S_DRIVER_VER);
+MODULE_DESCRIPTION(RTL8366RB_DRIVER_DESC);
+MODULE_VERSION(RTL8366RB_DRIVER_VER);

 MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
 MODULE_AUTHOR("Antti Seppälä <a.seppala@gmail.com>");
 MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
 MODULE_AUTHOR("Antti Seppälä <a.seppala@gmail.com>");

+MODULE_AUTHOR("Roman Yeryomin <roman@advem.lv>");

 MODULE_LICENSE("GPL v2");
 MODULE_ALIAS("platform:" RTL8366RB_DRIVER_NAME);
 MODULE_LICENSE("GPL v2");
 MODULE_ALIAS("platform:" RTL8366RB_DRIVER_NAME);