projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
generic: rtl8366: use smi->num_ports and smi->ops->get_vlan_4k
[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 a4623f0..ae976f4 100644 (file)
--- a/target/linux/generic/files/drivers/net/phy/rtl8366rb.c
+++ b/target/linux/generic/files/drivers/net/phy/rtl8366rb.c
@@ -15,15 +15,10 @@
 #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.2"
 
 #define RTL8366RB_DRIVER_DESC  "Realtek RTL8366RB ethernet switch driver"
 #define RTL8366RB_DRIVER_VER   "0.2.2"
 
@@ -31,10 +26,6 @@
 #define RTL8366RB_PHY_PAGE_MAX 7
 #define RTL8366RB_PHY_ADDR_MAX 31
 
 #define RTL8366RB_PHY_PAGE_MAX 7
 #define RTL8366RB_PHY_ADDR_MAX 31
 
-#define RTL8366RB_CHIP_GLOBAL_CTRL_REG         0x0000
-#define RTL8366RB_CHIP_CTRL_VLAN               (1 << 13)
-#define RTL8366RB_CHIP_CTRL_VLAN_4KTB          (1 << 14)
-
 /* Switch Global Configuration register */
 #define RTL8366RB_SGCR                         0x0000
 #define RTL8366RB_SGCR_EN_BC_STORM_CTRL                BIT(0)
 /* Switch Global Configuration register */
 #define RTL8366RB_SGCR                         0x0000
 #define RTL8366RB_SGCR_EN_BC_STORM_CTRL                BIT(0)
@@ -44,6 +35,8 @@
 #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_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 */
 #define RTL8366RB_PECR                         0x0001
 
 /* Port Enable Control register */
 #define RTL8366RB_PECR                         0x0001
@@ -76,6 +69,8 @@
 #define RTL8366RB_PHY_NO_OFFSET                        9
 #define RTL8366RB_PHY_NO_MASK                  (0x1f << 9)
 
 #define RTL8366RB_PHY_NO_OFFSET                        9
 #define RTL8366RB_PHY_NO_MASK                  (0x1f << 9)
 
+#define RTL8366RB_VLAN_INGRESS_CTRL2_REG       0x037f
+
 /* LED control registers */
 #define RTL8366RB_LED_BLINKRATE_REG            0x0430
 #define RTL8366RB_LED_BLINKRATE_BIT            0
 /* LED control registers */
 #define RTL8366RB_LED_BLINKRATE_REG            0x0430
 #define RTL8366RB_LED_BLINKRATE_BIT            0
@@ -111,7 +106,7 @@
 #define RTL8366RB_TABLE_VLAN_READ_CTRL         0x0E01
 #define RTL8366RB_TABLE_VLAN_WRITE_CTRL                0x0F01
 
 #define RTL8366RB_TABLE_VLAN_READ_CTRL         0x0E01
 #define RTL8366RB_TABLE_VLAN_WRITE_CTRL                0x0F01
 
-#define RTL8366RB_VLAN_MEMCONF_BASE            0x0020
+#define RTL8366RB_VLAN_MC_BASE(_x)             (0x0020 + (_x) * 3)
 
 
 #define RTL8366RB_PORT_LINK_STATUS_BASE                0x0014
 
 
 #define RTL8366RB_PORT_LINK_STATUS_BASE                0x0014
@@ -160,32 +155,13 @@
 
 #define RTL8366RB_PORT_ALL_INTERNAL     RTL8366RB_PORT_CPU
 
 
 #define RTL8366RB_PORT_ALL_INTERNAL     RTL8366RB_PORT_CPU
 
-struct rtl8366rb {
-       struct device           *parent;
-       struct rtl8366_smi      smi;
-       struct switch_dev       dev;
-};
-
-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_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
 
 static struct rtl8366_mib_counter rtl8366rb_mib_counters[] = {
        { 0,  0, 4, "IfInOctets"                                },
 
 static struct rtl8366_mib_counter rtl8366rb_mib_counters[] = {
        { 0,  0, 4, "IfInOctets"                                },
@@ -237,22 +213,6 @@ static struct rtl8366_mib_counter rtl8366rb_mib_counters[] = {
                        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;
 static int rtl8366rb_reset_chip(struct rtl8366_smi *smi)
 {
        int timeout = 10;
@@ -294,6 +254,12 @@ static int rtl8366rb_hw_init(struct rtl8366_smi *smi)
        /* disable auto ageing for all ports */
        REG_WR(smi, RTL8366RB_SSCR1, RTL8366RB_PORT_ALL);
 
        /* disable auto ageing for all ports */
        REG_WR(smi, RTL8366RB_SSCR1, RTL8366RB_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 */
        REG_RMW(smi, RTL8366RB_SSCR2, RTL8366RB_SSCR2_DROP_UNKNOWN_DA, 0);
 
        /* don't drop packets whose DA has not been learned */
        REG_RMW(smi, RTL8366RB_SSCR2, RTL8366RB_SSCR2_DROP_UNKNOWN_DA, 0);
 
@@ -417,22 +383,18 @@ static int rtl8366rb_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 >= RTL8366RB_NUM_VIDS)
                return -EINVAL;
 
 
        if (vid >= RTL8366RB_NUM_VIDS)
                return -EINVAL;
 
-       tableaddr = (u16 *)&vlan4k_priv;
-
        /* write VID */
        /* write VID */
-       data = *tableaddr;
-       err = rtl8366_smi_write_reg(smi, RTL8366RB_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;
 
        if (err)
                return err;
 
@@ -442,31 +404,19 @@ static int rtl8366rb_get_vlan_4k(struct rtl8366_smi *smi, u32 vid,
        if (err)
                return err;
 
        if (err)
                return err;
 
-       err = rtl8366_smi_read_reg(smi, RTL8366RB_VLAN_TABLE_READ_BASE, &data);
-       if (err)
-               return err;
-
-       *tableaddr = data;
-       tableaddr++;
-
-       err = rtl8366_smi_read_reg(smi, RTL8366RB_VLAN_TABLE_READ_BASE + 1,
-                                  &data);
-       if (err)
-               return err;
-
-       *tableaddr = data;
-       tableaddr++;
-
-       err = rtl8366_smi_read_reg(smi, RTL8366RB_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;
 }
@@ -474,10 +424,9 @@ 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 >= RTL8366RB_NUM_VIDS ||
            vlan4k->member > RTL8366RB_PORT_ALL ||
 
        if (vlan4k->vid >= RTL8366RB_NUM_VIDS ||
            vlan4k->member > RTL8366RB_PORT_ALL ||
@@ -485,36 +434,19 @@ static int rtl8366rb_set_vlan_4k(struct rtl8366_smi *smi,
            vlan4k->fid > RTL8366RB_FIDMAX)
                return -EINVAL;
 
            vlan4k->fid > RTL8366RB_FIDMAX)
                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, RTL8366RB_VLAN_TABLE_WRITE_BASE, data);
-       if (err)
-               return err;
-
-       tableaddr++;
-
-       data = *tableaddr;
-
-       err = rtl8366_smi_write_reg(smi, RTL8366RB_VLAN_TABLE_WRITE_BASE + 1,
-                                   data);
-       if (err)
-               return err;
-
-       tableaddr++;
-
-       data = *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;
 
 
-       err = rtl8366_smi_write_reg(smi, RTL8366RB_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 */
        err = rtl8366_smi_write_reg(smi, RTL8366RB_TABLE_ACCESS_CTRL_REG,
 
        /* write table access control word */
        err = rtl8366_smi_write_reg(smi, RTL8366RB_TABLE_ACCESS_CTRL_REG,
@@ -526,47 +458,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));
 
        if (index >= RTL8366RB_NUM_VLANS)
                return -EINVAL;
 
 
        memset(vlanmc, '\0', sizeof(struct rtl8366_vlan_mc));
 
        if (index >= RTL8366RB_NUM_VLANS)
                return -EINVAL;
 
-       tableaddr = (u16 *)&vlanmc_priv;
-
-       addr = RTL8366RB_VLAN_MEMCONF_BASE + (index * 3);
-       err = rtl8366_smi_read_reg(smi, addr, &data);
-       if (err)
-               return err;
-
-       *tableaddr = data;
-       tableaddr++;
-
-       addr = RTL8366RB_VLAN_MEMCONF_BASE + 1 + (index * 3);
-       err = rtl8366_smi_read_reg(smi, addr, &data);
-       if (err)
-               return err;
-
-       *tableaddr = data;
-       tableaddr++;
-
-       addr = RTL8366RB_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;
 }
@@ -574,11 +489,9 @@ 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;
+       int i;
 
        if (index >= RTL8366RB_NUM_VLANS ||
            vlanmc->vid >= RTL8366RB_NUM_VIDS ||
 
        if (index >= RTL8366RB_NUM_VLANS ||
            vlanmc->vid >= RTL8366RB_NUM_VIDS ||
@@ -588,40 +501,22 @@ static int rtl8366rb_set_vlan_mc(struct rtl8366_smi *smi, u32 index,
            vlanmc->fid > RTL8366RB_FIDMAX)
                return -EINVAL;
 
            vlanmc->fid > RTL8366RB_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 = RTL8366RB_VLAN_MEMCONF_BASE + (index * 3);
-
-       tableaddr = (u16 *)&vlanmc_priv;
-       data = *tableaddr;
-
-       err = rtl8366_smi_write_reg(smi, addr, data);
-       if (err)
-               return err;
-
-       addr = RTL8366RB_VLAN_MEMCONF_BASE + 1 + (index * 3);
-
-       tableaddr++;
-       data = *tableaddr;
-
-       err = rtl8366_smi_write_reg(smi, addr, data);
-       if (err)
-               return err;
-
-       addr = RTL8366RB_VLAN_MEMCONF_BASE + 2 + (index * 3);
-
-       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;
 }
 
@@ -657,98 +552,35 @@ static int rtl8366rb_set_mc_index(struct rtl8366_smi *smi, int port, int index)
                                        RTL8366RB_PORT_VLAN_CTRL_SHIFT(port));
 }
 
                                        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, RTL8366RB_CHIP_GLOBAL_CTRL_REG,
-                               RTL8366RB_CHIP_CTRL_VLAN,
-                               (enable) ? RTL8366RB_CHIP_CTRL_VLAN : 0);
-}
+       if (vlan == 0 || vlan >= RTL8366RB_NUM_VLANS)
+               return 0;
 
 
-static int rtl8366rb_vlan_set_4ktable(struct rtl8366_smi *smi, int enable)
-{
-       return rtl8366_smi_rmwr(smi, RTL8366RB_CHIP_GLOBAL_CTRL_REG,
-                               RTL8366RB_CHIP_CTRL_VLAN_4KTB,
-                               (enable) ? RTL8366RB_CHIP_CTRL_VLAN_4KTB : 0);
+       return 1;
 }
 
 }
 
-#ifdef CONFIG_RTL8366S_PHY_DEBUG_FS
-static ssize_t rtl8366rb_read_debugfs_mibs(struct file *file,
-                                         char __user *user_buf,
-                                         size_t count, loff_t *ppos)
+static int rtl8366rb_vlan_set_vlan(struct rtl8366_smi *smi, int enable)
 {
 {
-       struct rtl8366_smi *smi = file->private_data;
-       int i, j, len = 0;
-       char *buf = smi->buf;
-
-       len += snprintf(buf + len, sizeof(smi->buf) - len, "%-36s",
-                       "Counter");
-
-       for (i = 0; i < smi->num_ports; i++) {
-               char port_buf[10];
-
-               snprintf(port_buf, sizeof(port_buf), "Port %d", i);
-               len += snprintf(buf + len, sizeof(smi->buf) - len, " %12s",
-                               port_buf);
-       }
-       len += snprintf(buf + len, sizeof(smi->buf) - len, "\n");
-
-       for (i = 0; i < smi->num_mib_counters; i++) {
-               len += snprintf(buf + len, sizeof(smi->buf) - len, "%-36s ",
-                               smi->mib_counters[i].name);
-               for (j = 0; j < smi->num_ports; j++) {
-                       unsigned long long counter = 0;
-
-                       if (!smi->ops->get_mib_counter(smi, i, j, &counter))
-                               len += snprintf(buf + len,
-                                               sizeof(smi->buf) - len,
-                                               "%12llu ", counter);
-                       else
-                               len += snprintf(buf + len,
-                                               sizeof(smi->buf) - len,
-                                               "%12s ", "error");
-               }
-               len += snprintf(buf + len, sizeof(smi->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 const struct file_operations fops_rtl8366rb_mibs = {
-       .read = rtl8366rb_read_debugfs_mibs,
-       .open = rtl8366_debugfs_open,
-       .owner = THIS_MODULE
-};
-
-static void rtl8366rb_debugfs_init(struct rtl8366_smi *smi)
+static int rtl8366rb_vlan_set_4ktable(struct rtl8366_smi *smi, int enable)
 {
 {
-       struct dentry *node;
-
-       if (!smi->debugfs_root)
-               return;
-
-       node = debugfs_create_file("mibs", S_IRUSR, smi->debugfs_root, smi,
-                                  &fops_rtl8366rb_mibs);
-       if (!node)
-               dev_err(smi->parent, "Creating debugfs file '%s' failed\n",
-                       "mibs");
+       return rtl8366_smi_rmwr(smi, RTL8366RB_SGCR,
+                               RTL8366RB_SGCR_EN_VLAN_4KTB,
+                               (enable) ? RTL8366RB_SGCR_EN_VLAN_4KTB : 0);
 }
 
 }
 
-#else
-static inline void rtl8366rb_debugfs_init(struct rtl8366_smi *smi) {}
-#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, RTL8366RB_MIB_CTRL_REG, 0,
-                                      RTL8366RB_MIB_CTRL_GLOBAL_RESET);
-
-       return err;
+       return rtl8366_smi_rmwr(smi, RTL8366RB_MIB_CTRL_REG, 0,
+                               RTL8366RB_MIB_CTRL_GLOBAL_RESET);
 }
 
 static int rtl8366rb_sw_get_vlan_enable(struct switch_dev *dev,
 }
 
 static int rtl8366rb_sw_get_vlan_enable(struct switch_dev *dev,
@@ -759,16 +591,16 @@ static int rtl8366rb_sw_get_vlan_enable(struct switch_dev *dev,
        u32 data;
 
        if (attr->ofs == 1) {
        u32 data;
 
        if (attr->ofs == 1) {
-               rtl8366_smi_read_reg(smi, RTL8366RB_CHIP_GLOBAL_CTRL_REG, &data);
+               rtl8366_smi_read_reg(smi, RTL8366RB_SGCR, &data);
 
 
-               if (data & RTL8366RB_CHIP_CTRL_VLAN)
+               if (data & RTL8366RB_SGCR_EN_VLAN)
                        val->value.i = 1;
                else
                        val->value.i = 0;
        } else if (attr->ofs == 2) {
                        val->value.i = 1;
                else
                        val->value.i = 0;
        } else if (attr->ofs == 2) {
-               rtl8366_smi_read_reg(smi, RTL8366RB_CHIP_GLOBAL_CTRL_REG, &data);
+               rtl8366_smi_read_reg(smi, RTL8366RB_SGCR, &data);
 
 
-               if (data & RTL8366RB_CHIP_CTRL_VLAN_4KTB)
+               if (data & RTL8366RB_SGCR_EN_VLAN_4KTB)
                        val->value.i = 1;
                else
                        val->value.i = 0;
                        val->value.i = 1;
                else
                        val->value.i = 0;
@@ -884,19 +716,19 @@ static int rtl8366rb_sw_get_vlan_info(struct switch_dev *dev,
        char *buf = smi->buf;
        int err;
 
        char *buf = smi->buf;
        int err;
 
-       if (val->port_vlan == 0 || val->port_vlan >= RTL8366RB_NUM_VLANS)
+       if (!smi->ops->is_vlan_valid(smi, val->port_vlan))
                return -EINVAL;
 
        memset(buf, '\0', sizeof(smi->buf));
 
                return -EINVAL;
 
        memset(buf, '\0', sizeof(smi->buf));
 
-       err = rtl8366rb_get_vlan_4k(smi, val->port_vlan, &vlan4k);
+       err = smi->ops->get_vlan_4k(smi, val->port_vlan, &vlan4k);
        if (err)
                return err;
 
        len += snprintf(buf + len, sizeof(smi->buf) - len,
                        "VLAN %d: Ports: '", vlan4k.vid);
 
        if (err)
                return err;
 
        len += snprintf(buf + len, sizeof(smi->buf) - len,
                        "VLAN %d: Ports: '", vlan4k.vid);
 
-       for (i = 0; i < RTL8366RB_NUM_PORTS; i++) {
+       for (i = 0; i < smi->num_ports; i++) {
                if (!(vlan4k.member & (1 << i)))
                        continue;
 
                if (!(vlan4k.member & (1 << i)))
                        continue;
 
@@ -968,38 +800,6 @@ static int rtl8366rb_sw_reset_port_mibs(struct switch_dev *dev,
                                RTL8366RB_MIB_CTRL_PORT_RESET(val->port_vlan));
 }
 
                                RTL8366RB_MIB_CTRL_PORT_RESET(val->port_vlan));
 }
 
-static int rtl8366rb_sw_get_port_mib(struct switch_dev *dev,
-                                   const struct switch_attr *attr,
-                                   struct switch_val *val)
-{
-       struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-       int i, len = 0;
-       unsigned long long counter = 0;
-       char *buf = smi->buf;
-
-       if (val->port_vlan >= RTL8366RB_NUM_PORTS)
-               return -EINVAL;
-
-       len += snprintf(buf + len, sizeof(smi->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(smi->buf) - len,
-                               "%-36s: ", rtl8366rb_mib_counters[i].name);
-               if (!rtl8366rb_get_mib_counter(smi, i, val->port_vlan, &counter))
-                       len += snprintf(buf + len, sizeof(smi->buf) - len,
-                                       "%llu\n", counter);
-               else
-                       len += snprintf(buf + len, sizeof(smi->buf) - len,
-                                       "%s\n", "error");
-       }
-
-       val->value.s = buf;
-       val->len = len;
-       return 0;
-}
-
 static int rtl8366rb_sw_get_vlan_ports(struct switch_dev *dev,
                                      struct switch_val *val)
 {
 static int rtl8366rb_sw_get_vlan_ports(struct switch_dev *dev,
                                      struct switch_val *val)
 {
@@ -1008,14 +808,14 @@ static int rtl8366rb_sw_get_vlan_ports(struct switch_dev *dev,
        struct rtl8366_vlan_4k vlan4k;
        int i;
 
        struct rtl8366_vlan_4k vlan4k;
        int i;
 
-       if (val->port_vlan == 0 || val->port_vlan >= RTL8366RB_NUM_VLANS)
+       if (!smi->ops->is_vlan_valid(smi, val->port_vlan))
                return -EINVAL;
 
                return -EINVAL;
 
-       rtl8366rb_get_vlan_4k(smi, val->port_vlan, &vlan4k);
+       smi->ops->get_vlan_4k(smi, val->port_vlan, &vlan4k);
 
        port = &val->value.ports[0];
        val->len = 0;
 
        port = &val->value.ports[0];
        val->len = 0;
-       for (i = 0; i < RTL8366RB_NUM_PORTS; i++) {
+       for (i = 0; i < smi->num_ports; i++) {
                if (!(vlan4k.member & BIT(i)))
                        continue;
 
                if (!(vlan4k.member & BIT(i)))
                        continue;
 
@@ -1037,7 +837,7 @@ static int rtl8366rb_sw_set_vlan_ports(struct switch_dev *dev,
        u32 untag = 0;
        int i;
 
        u32 untag = 0;
        int i;
 
-       if (val->port_vlan == 0 || val->port_vlan >= RTL8366RB_NUM_VLANS)
+       if (!smi->ops->is_vlan_valid(smi, val->port_vlan))
                return -EINVAL;
 
        port = &val->value.ports[0];
                return -EINVAL;
 
        port = &val->value.ports[0];
@@ -1051,18 +851,6 @@ static int rtl8366rb_sw_set_vlan_ports(struct switch_dev *dev,
        return rtl8366_set_vlan(smi, val->port_vlan, member, untag, 0);
 }
 
        return rtl8366_set_vlan(smi, val->port_vlan, member, untag, 0);
 }
 
-static int rtl8366rb_sw_get_port_pvid(struct switch_dev *dev, int port, int *val)
-{
-       struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-       return rtl8366_get_pvid(smi, port, val);
-}
-
-static int rtl8366rb_sw_set_port_pvid(struct switch_dev *dev, int port, int val)
-{
-       struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-       return rtl8366_set_pvid(smi, port, val);
-}
-
 static int rtl8366rb_sw_reset_switch(struct switch_dev *dev)
 {
        struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
 static int rtl8366rb_sw_reset_switch(struct switch_dev *dev)
 {
        struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
@@ -1097,12 +885,10 @@ static struct switch_attr rtl8366rb_globals[] = {
                .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",
@@ -1123,19 +909,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",
@@ -1178,30 +962,30 @@ static struct switch_dev rtl8366_switch_dev = {
 
        .get_vlan_ports = rtl8366rb_sw_get_vlan_ports,
        .set_vlan_ports = rtl8366rb_sw_set_vlan_ports,
 
        .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_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;
 
        memcpy(dev, &rtl8366_switch_dev, sizeof(struct switch_dev));
        int err;
 
        memcpy(dev, &rtl8366_switch_dev, sizeof(struct switch_dev));
-       dev->priv = rtl;
-       dev->devname = dev_name(rtl->parent);
+       dev->priv = smi;
+       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)
@@ -1236,13 +1020,10 @@ static int rtl8366rb_mii_bus_match(struct mii_bus *bus)
                bus->write == rtl8366rb_mii_write);
 }
 
                bus->write == rtl8366rb_mii_write);
 }
 
-static int rtl8366rb_setup(struct rtl8366rb *rtl)
+static int rtl8366rb_setup(struct rtl8366_smi *smi)
 {
 {
-       struct rtl8366_smi *smi = &rtl->smi;
        int ret;
 
        int ret;
 
-       rtl8366rb_debugfs_init(smi);
-
        ret = rtl8366rb_reset_chip(smi);
        if (ret)
                return ret;
        ret = rtl8366rb_reset_chip(smi);
        if (ret)
                return ret;
@@ -1286,6 +1067,8 @@ static int rtl8366rb_detect(struct rtl8366_smi *smi)
 
 static struct rtl8366_smi_ops rtl8366rb_smi_ops = {
        .detect         = rtl8366rb_detect,
 
 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,
 
@@ -1296,13 +1079,13 @@ static struct rtl8366_smi_ops rtl8366rb_smi_ops = {
        .get_mc_index   = rtl8366rb_get_mc_index,
        .set_mc_index   = rtl8366rb_set_mc_index,
        .get_mib_counter = rtl8366rb_get_mib_counter,
        .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,
 };
 
 static int __init rtl8366rb_probe(struct platform_device *pdev)
 {
        static int rtl8366_smi_version_printed;
        struct rtl8366rb_platform_data *pdata;
 };
 
 static int __init rtl8366rb_probe(struct platform_device *pdev)
 {
        static int rtl8366_smi_version_printed;
        struct rtl8366rb_platform_data *pdata;
-       struct rtl8366rb *rtl;
        struct rtl8366_smi *smi;
        int err;
 
        struct rtl8366_smi *smi;
        int err;
 
@@ -1317,17 +1100,12 @@ 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;
@@ -1339,15 +1117,11 @@ static int __init rtl8366rb_probe(struct platform_device *pdev)
 
        err = rtl8366_smi_init(smi);
        if (err)
 
        err = rtl8366_smi_init(smi);
        if (err)
-               goto err_free_rtl;
-
-       platform_set_drvdata(pdev, rtl);
+               goto err_free_smi;
 
 
-       err = rtl8366rb_setup(rtl);
-       if (err)
-               goto err_clear_drvdata;
+       platform_set_drvdata(pdev, smi);
 
 
-       err = rtl8366rb_switch_init(rtl);
+       err = rtl8366rb_switch_init(smi);
        if (err)
                goto err_clear_drvdata;
 
        if (err)
                goto err_clear_drvdata;
 
@@ -1356,8 +1130,8 @@ 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;
 }
@@ -1390,13 +1164,13 @@ static struct phy_driver rtl8366rb_phy_driver = {
 
 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);
+       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;
Personal OpenWRT clone
This page took 0.048633 seconds and 4 git commands to generate.