generic: rtl8366: use SWITCH_TYPE_NOVAL for reset_mib attributes
[openwrt.git] / target / linux / generic / files / drivers / net / phy / rtl8366s.c
index fa3f3cd..5672c42 100644 (file)
 
 #include "rtl8366_smi.h"
 
 
 #include "rtl8366_smi.h"
 
-#ifdef CONFIG_RTL8366S_PHY_DEBUG_FS
-#include <linux/debugfs.h>
-#endif
-
 #define RTL8366S_DRIVER_DESC   "Realtek RTL8366S ethernet switch driver"
 #define RTL8366S_DRIVER_VER    "0.2.2"
 
 #define RTL8366S_DRIVER_DESC   "Realtek RTL8366S ethernet switch driver"
 #define RTL8366S_DRIVER_VER    "0.2.2"
 
@@ -31,9 +27,6 @@
 #define RTL8366S_PHY_PAGE_MAX  7
 #define RTL8366S_PHY_ADDR_MAX  31
 
 #define RTL8366S_PHY_PAGE_MAX  7
 #define RTL8366S_PHY_ADDR_MAX  31
 
-#define RTL8366S_CHIP_GLOBAL_CTRL_REG          0x0000
-#define RTL8366S_CHIP_CTRL_VLAN                        (1 << 13)
-
 /* Switch Global Configuration register */
 #define RTL8366S_SGCR                          0x0000
 #define RTL8366S_SGCR_EN_BC_STORM_CTRL         BIT(0)
 /* Switch Global Configuration register */
 #define RTL8366S_SGCR                          0x0000
 #define RTL8366S_SGCR_EN_BC_STORM_CTRL         BIT(0)
@@ -43,6 +36,7 @@
 #define RTL8366S_SGCR_MAX_LENGTH_1536          RTL8366S_SGCR_MAX_LENGTH(0x1)
 #define RTL8366S_SGCR_MAX_LENGTH_1552          RTL8366S_SGCR_MAX_LENGTH(0x2)
 #define RTL8366S_SGCR_MAX_LENGTH_16000         RTL8366S_SGCR_MAX_LENGTH(0x3)
 #define RTL8366S_SGCR_MAX_LENGTH_1536          RTL8366S_SGCR_MAX_LENGTH(0x1)
 #define RTL8366S_SGCR_MAX_LENGTH_1552          RTL8366S_SGCR_MAX_LENGTH(0x2)
 #define RTL8366S_SGCR_MAX_LENGTH_16000         RTL8366S_SGCR_MAX_LENGTH(0x3)
+#define RTL8366S_SGCR_EN_VLAN                  BIT(13)
 
 /* Port Enable Control register */
 #define RTL8366S_PECR                          0x0001
 
 /* Port Enable Control register */
 #define RTL8366S_PECR                          0x0001
 
 #define RTL8366S_VLAN_MEMCONF_BASE             0x0016
 
 
 #define RTL8366S_VLAN_MEMCONF_BASE             0x0016
 
+#define RTL8366S_VLAN_MEMBERINGRESS_REG                0x0379
 
 #define RTL8366S_PORT_LINK_STATUS_BASE         0x0060
 #define RTL8366S_PORT_STATUS_SPEED_MASK                0x0003
 
 #define RTL8366S_PORT_LINK_STATUS_BASE         0x0060
 #define RTL8366S_PORT_STATUS_SPEED_MASK                0x0003
@@ -170,10 +165,6 @@ struct rtl8366s {
        struct device           *parent;
        struct rtl8366_smi      smi;
        struct switch_dev       dev;
        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
 };
 
 struct rtl8366s_vlan_mc {
 };
 
 struct rtl8366s_vlan_mc {
@@ -197,18 +188,7 @@ struct rtl8366s_vlan_4k {
        u16     member:6;
 };
 
        u16     member:6;
 };
 
-#ifdef CONFIG_RTL8366S_PHY_DEBUG_FS
-u16 g_dbg_reg;
-#endif
-
-struct mib_counter {
-       unsigned        base;
-       unsigned        offset;
-       unsigned        length;
-       const char      *name;
-};
-
-static struct mib_counter rtl8366s_mib_counters[RTL8366S_MIB_COUNT] = {
+static struct rtl8366_mib_counter rtl8366s_mib_counters[] = {
        { 0,  0, 4, "IfInOctets"                                },
        { 0,  4, 4, "EtherStatsOctets"                          },
        { 0,  8, 2, "EtherStatsUnderSizePkts"                   },
        { 0,  0, 4, "IfInOctets"                                },
        { 0,  4, 4, "EtherStatsOctets"                          },
        { 0,  8, 2, "EtherStatsUnderSizePkts"                   },
@@ -320,6 +300,12 @@ static int rtl8366s_hw_init(struct rtl8366_smi *smi)
        /* disable auto ageing for all ports */
        REG_WR(smi, RTL8366S_SSCR1, RTL8366S_PORT_ALL);
 
        /* disable auto ageing for all ports */
        REG_WR(smi, RTL8366S_SSCR1, RTL8366S_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, RTL8366S_VLAN_MEMBERINGRESS_REG, RTL8366S_PORT_ALL);
+
        /* don't drop packets whose DA has not been learned */
        REG_RMW(smi, RTL8366S_SSCR2, RTL8366S_SSCR2_DROP_UNKNOWN_DA, 0);
 
        /* don't drop packets whose DA has not been learned */
        REG_RMW(smi, RTL8366S_SSCR2, RTL8366S_SSCR2_DROP_UNKNOWN_DA, 0);
 
@@ -661,175 +647,10 @@ static int rtl8366s_set_mc_index(struct rtl8366_smi *smi, int port, int index)
                                        RTL8366S_PORT_VLAN_CTRL_SHIFT(port));
 }
 
                                        RTL8366S_PORT_VLAN_CTRL_SHIFT(port));
 }
 
-static int rtl8366s_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 = smi->ops->get_vlan_4k(smi, vid, &vlan4k);
-       if (err)
-               return err;
-
-       vlan4k.member = member;
-       vlan4k.untag = untag;
-       vlan4k.fid = fid;
-       err = smi->ops->set_vlan_4k(smi, &vlan4k);
-       if (err)
-               return err;
-
-       /* Try to find an existing MC entry for this VID */
-       for (i = 0; i < smi->num_vlan_mc; i++) {
-               struct rtl8366_vlan_mc vlanmc;
-
-               err = smi->ops->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 = smi->ops->set_vlan_mc(smi, i, &vlanmc);
-                       break;
-               }
-       }
-
-       return err;
-}
-
-static int rtl8366s_get_pvid(struct rtl8366_smi *smi, int port, int *val)
-{
-       struct rtl8366_vlan_mc vlanmc;
-       int err;
-       int index;
-
-       err = smi->ops->get_mc_index(smi, port, &index);
-       if (err)
-               return err;
-
-       err = smi->ops->get_vlan_mc(smi, index, &vlanmc);
-       if (err)
-               return err;
-
-       *val = vlanmc.vid;
-       return 0;
-}
-
-static int rtl8366s_mc_is_used(struct rtl8366_smi *smi, int mc_index,
-                              int *used)
-{
-       int err;
-       int i;
-
-       *used = 0;
-       for (i = 0; i < smi->num_ports; i++) {
-               int index = 0;
-
-               err = smi->ops->get_mc_index(smi, i, &index);
-               if (err)
-                       return err;
-
-               if (mc_index == index) {
-                       *used = 1;
-                       break;
-               }
-       }
-
-       return 0;
-}
-
-static int rtl8366s_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 < smi->num_vlan_mc; i++) {
-               err = smi->ops->get_vlan_mc(smi, i, &vlanmc);
-               if (err)
-                       return err;
-
-               if (vid == vlanmc.vid) {
-                       err = smi->ops->set_vlan_mc(smi, i, &vlanmc);
-                       if (err)
-                               return err;
-
-                       err = smi->ops->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 < smi->num_vlan_mc; i++) {
-               err = smi->ops->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 = smi->ops->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 = smi->ops->set_vlan_mc(smi, i, &vlanmc);
-                       if (err)
-                               return err;
-
-                       err = smi->ops->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 < smi->num_vlan_mc; i++) {
-               int used;
-
-               err = rtl8366s_mc_is_used(smi, i, &used);
-               if (err)
-                       return err;
-
-               if (!used) {
-                       /* Update the entry from the 4K table */
-                       err = smi->ops->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 = smi->ops->set_vlan_mc(smi, i, &vlanmc);
-                       if (err)
-                               return err;
-
-                       err = smi->ops->set_mc_index(smi, port, i);
-                       return err;
-               }
-       }
-
-       dev_err(smi->parent,
-               "all VLAN member configurations are in use\n");
-
-       return -ENOSPC;
-}
-
 static int rtl8366s_vlan_set_vlan(struct rtl8366_smi *smi, int enable)
 {
 static int rtl8366s_vlan_set_vlan(struct rtl8366_smi *smi, int enable)
 {
-       return rtl8366_smi_rmwr(smi, RTL8366S_CHIP_GLOBAL_CTRL_REG,
-                               RTL8366S_CHIP_CTRL_VLAN,
-                               (enable) ? RTL8366S_CHIP_CTRL_VLAN : 0);
+       return rtl8366_smi_rmwr(smi, RTL8366S_SGCR, RTL8366S_SGCR_EN_VLAN,
+                               (enable) ? RTL8366S_SGCR_EN_VLAN : 0);
 }
 
 static int rtl8366s_vlan_set_4ktable(struct rtl8366_smi *smi, int enable)
 }
 
 static int rtl8366s_vlan_set_4ktable(struct rtl8366_smi *smi, int enable)
@@ -838,264 +659,13 @@ static int rtl8366s_vlan_set_4ktable(struct rtl8366_smi *smi, int enable)
                                1, (enable) ? 1 : 0);
 }
 
                                1, (enable) ? 1 : 0);
 }
 
-static int rtl8366s_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 < smi->num_vlan_mc; i++) {
-               err = smi->ops->set_vlan_mc(smi, i, &vlanmc);
-               if (err)
-                       return err;
-       }
-
-       for (i = 0; i < smi->num_ports; i++) {
-               if (i == smi->cpu_port)
-                       continue;
-
-               err = rtl8366s_set_vlan(smi, (i + 1),
-                                        (1 << i) | (1 << smi->cpu_port),
-                                        (1 << i) | (1 << smi->cpu_port),
-                                        0);
-               if (err)
-                       return err;
-
-               err = rtl8366s_set_pvid(smi, i, (i + 1));
-               if (err)
-                       return err;
-       }
-
-       return 0;
-}
-
-#ifdef CONFIG_RTL8366S_PHY_DEBUG_FS
-static int rtl8366s_debugfs_open(struct inode *inode, struct file *file)
-{
-       file->private_data = inode->i_private;
-       return 0;
-}
-
-static ssize_t rtl8366s_read_debugfs_mibs(struct file *file,
-                                         char __user *user_buf,
-                                         size_t count, loff_t *ppos)
-{
-       struct rtl8366s *rtl = (struct rtl8366s *)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(rtl8366s_mib_counters); ++i) {
-               len += snprintf(buf + len, sizeof(rtl->buf) - len, "%-36s ",
-                               rtl8366s_mib_counters[i].name);
-               for (j = 0; j < RTL8366S_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);
-}
-
-static ssize_t rtl8366s_read_debugfs_vlan_mc(struct file *file,
-                                            char __user *user_buf,
-                                            size_t count, loff_t *ppos)
-{
-       struct rtl8366s *rtl = (struct rtl8366s *)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 < RTL8366S_NUM_VLANS; ++i) {
-               struct rtl8366_vlan_mc vlanmc;
-
-               rtl8366s_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);
-}
-
-static ssize_t rtl8366s_read_debugfs_reg(struct file *file,
-                                        char __user *user_buf,
-                                        size_t count, loff_t *ppos)
-{
-       struct rtl8366s *rtl = (struct rtl8366s *)file->private_data;
-       struct rtl8366_smi *smi = &rtl->smi;
-       u32 t, reg = g_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);
-}
-
-static ssize_t rtl8366s_write_debugfs_reg(struct file *file,
-                                         const char __user *user_buf,
-                                         size_t count, loff_t *ppos)
-{
-       struct rtl8366s *rtl = (struct rtl8366s *)file->private_data;
-       struct rtl8366_smi *smi = &rtl->smi;
-       unsigned long data;
-       u32 reg = g_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_rtl8366s_regs = {
-       .read = rtl8366s_read_debugfs_reg,
-       .write = rtl8366s_write_debugfs_reg,
-       .open = rtl8366s_debugfs_open,
-       .owner = THIS_MODULE
-};
-
-static const struct file_operations fops_rtl8366s_vlan_mc = {
-       .read = rtl8366s_read_debugfs_vlan_mc,
-       .open = rtl8366s_debugfs_open,
-       .owner = THIS_MODULE
-};
-
-static const struct file_operations fops_rtl8366s_mibs = {
-       .read = rtl8366s_read_debugfs_mibs,
-       .open = rtl8366s_debugfs_open,
-       .owner = THIS_MODULE
-};
-
-static void rtl8366s_debugfs_init(struct rtl8366s *rtl)
-{
-       struct dentry *node;
-       struct dentry *root;
-
-       if (!rtl->debugfs_root)
-               rtl->debugfs_root = debugfs_create_dir("rtl8366s", 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, &g_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_rtl8366s_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_rtl8366s_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_rtl8366s_mibs);
-       if (!node) {
-               dev_err(rtl->parent, "Creating debugfs file '%s' failed\n",
-                       "mibs");
-               return;
-       }
-}
-
-static void rtl8366s_debugfs_remove(struct rtl8366s *rtl)
-{
-       if (rtl->debugfs_root) {
-               debugfs_remove_recursive(rtl->debugfs_root);
-               rtl->debugfs_root = NULL;
-       }
-}
-
-#else
-static inline void rtl8366s_debugfs_init(struct rtl8366s *rtl) {}
-static inline void rtl8366s_debugfs_remove(struct rtl8366s *rtl) {}
-#endif /* CONFIG_RTL8366S_PHY_DEBUG_FS */
-
 static int rtl8366s_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 rtl8366s_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;
+       return rtl8366_smi_rmwr(smi, RTL8366S_MIB_CTRL_REG, 0, (1 << 2));
 }
 
 static int rtl8366s_sw_get_vlan_enable(struct switch_dev *dev,
 }
 
 static int rtl8366s_sw_get_vlan_enable(struct switch_dev *dev,
@@ -1106,9 +676,9 @@ static int rtl8366s_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, RTL8366S_CHIP_GLOBAL_CTRL_REG, &data);
+               rtl8366_smi_read_reg(smi, RTL8366S_SGCR, &data);
 
 
-               if (data & RTL8366S_CHIP_CTRL_VLAN)
+               if (data & RTL8366S_SGCR_EN_VLAN)
                        val->value.i = 1;
                else
                        val->value.i = 0;
                        val->value.i = 1;
                else
                        val->value.i = 0;
@@ -1182,14 +752,13 @@ static int rtl8366s_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 rtl8366s *rtl = sw_to_rtl8366s(dev);
-       struct rtl8366_smi *smi = &rtl->smi;
+       struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
        u32 len = 0, data = 0;
 
        if (val->port_vlan >= RTL8366S_NUM_PORTS)
                return -EINVAL;
 
        u32 len = 0, data = 0;
 
        if (val->port_vlan >= RTL8366S_NUM_PORTS)
                return -EINVAL;
 
-       memset(rtl->buf, '\0', sizeof(rtl->buf));
+       memset(smi->buf, '\0', sizeof(smi->buf));
        rtl8366_smi_read_reg(smi, RTL8366S_PORT_LINK_STATUS_BASE +
                             (val->port_vlan / 2), &data);
 
        rtl8366_smi_read_reg(smi, RTL8366S_PORT_LINK_STATUS_BASE +
                             (val->port_vlan / 2), &data);
 
@@ -1197,7 +766,7 @@ static int rtl8366s_sw_get_port_link(struct switch_dev *dev,
                data = data >> 8;
 
        if (data & RTL8366S_PORT_STATUS_LINK_MASK) {
                data = data >> 8;
 
        if (data & RTL8366S_PORT_STATUS_LINK_MASK) {
-               len = snprintf(rtl->buf, sizeof(rtl->buf),
+               len = snprintf(smi->buf, sizeof(smi->buf),
                                "port:%d link:up speed:%s %s-duplex %s%s%s",
                                val->port_vlan,
                                rtl8366s_speed_str(data &
                                "port:%d link:up speed:%s %s-duplex %s%s%s",
                                val->port_vlan,
                                rtl8366s_speed_str(data &
@@ -1211,11 +780,11 @@ static int rtl8366s_sw_get_port_link(struct switch_dev *dev,
                                (data & RTL8366S_PORT_STATUS_AN_MASK) ?
                                        "nway ": "");
        } else {
                                (data & RTL8366S_PORT_STATUS_AN_MASK) ?
                                        "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->value.s = smi->buf;
        val->len = len;
 
        return 0;
        val->len = len;
 
        return 0;
@@ -1228,32 +797,31 @@ static int rtl8366s_sw_get_vlan_info(struct switch_dev *dev,
        int i;
        u32 len = 0;
        struct rtl8366_vlan_4k vlan4k;
        int i;
        u32 len = 0;
        struct rtl8366_vlan_4k vlan4k;
-       struct rtl8366s *rtl = sw_to_rtl8366s(dev);
-       struct rtl8366_smi *smi = &rtl->smi;
-       char *buf = rtl->buf;
+       struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+       char *buf = smi->buf;
        int err;
 
        if (val->port_vlan == 0 || val->port_vlan >= RTL8366S_NUM_VLANS)
                return -EINVAL;
 
        int err;
 
        if (val->port_vlan == 0 || val->port_vlan >= RTL8366S_NUM_VLANS)
                return -EINVAL;
 
-       memset(buf, '\0', sizeof(rtl->buf));
+       memset(buf, '\0', sizeof(smi->buf));
 
        err = rtl8366s_get_vlan_4k(smi, val->port_vlan, &vlan4k);
        if (err)
                return err;
 
 
        err = rtl8366s_get_vlan_4k(smi, val->port_vlan, &vlan4k);
        if (err)
                return err;
 
-       len += snprintf(buf + len, sizeof(rtl->buf) - len,
+       len += snprintf(buf + len, sizeof(smi->buf) - len,
                        "VLAN %d: Ports: '", vlan4k.vid);
 
        for (i = 0; i < RTL8366S_NUM_PORTS; i++) {
                if (!(vlan4k.member & (1 << i)))
                        continue;
 
                        "VLAN %d: Ports: '", vlan4k.vid);
 
        for (i = 0; i < RTL8366S_NUM_PORTS; i++) {
                if (!(vlan4k.member & (1 << i)))
                        continue;
 
-               len += snprintf(buf + len, sizeof(rtl->buf) - len, "%d%s", i,
+               len += snprintf(buf + len, sizeof(smi->buf) - len, "%d%s", i,
                                (vlan4k.untag & (1 << i)) ? "" : "t");
        }
 
                                (vlan4k.untag & (1 << i)) ? "" : "t");
        }
 
-       len += snprintf(buf + len, sizeof(rtl->buf) - len,
+       len += snprintf(buf + len, sizeof(smi->buf) - len,
                        "', members=%04x, untag=%04x, fid=%u",
                        vlan4k.member, vlan4k.untag, vlan4k.fid);
 
                        "', members=%04x, untag=%04x, fid=%u",
                        vlan4k.member, vlan4k.untag, vlan4k.fid);
 
@@ -1323,27 +891,26 @@ static int rtl8366s_sw_get_port_mib(struct switch_dev *dev,
                                    const struct switch_attr *attr,
                                    struct switch_val *val)
 {
                                    const struct switch_attr *attr,
                                    struct switch_val *val)
 {
-       struct rtl8366s *rtl = sw_to_rtl8366s(dev);
-       struct rtl8366_smi *smi = &rtl->smi;
+       struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
        int i, len = 0;
        unsigned long long counter = 0;
        int i, len = 0;
        unsigned long long counter = 0;
-       char *buf = rtl->buf;
+       char *buf = smi->buf;
 
        if (val->port_vlan >= RTL8366S_NUM_PORTS)
                return -EINVAL;
 
 
        if (val->port_vlan >= RTL8366S_NUM_PORTS)
                return -EINVAL;
 
-       len += snprintf(buf + len, sizeof(rtl->buf) - len,
+       len += snprintf(buf + len, sizeof(smi->buf) - len,
                        "Port %d MIB counters\n",
                        val->port_vlan);
 
        for (i = 0; i < ARRAY_SIZE(rtl8366s_mib_counters); ++i) {
                        "Port %d MIB counters\n",
                        val->port_vlan);
 
        for (i = 0; i < ARRAY_SIZE(rtl8366s_mib_counters); ++i) {
-               len += snprintf(buf + len, sizeof(rtl->buf) - len,
+               len += snprintf(buf + len, sizeof(smi->buf) - len,
                                "%-36s: ", rtl8366s_mib_counters[i].name);
                if (!rtl8366_get_mib_counter(smi, i, val->port_vlan, &counter))
                                "%-36s: ", rtl8366s_mib_counters[i].name);
                if (!rtl8366_get_mib_counter(smi, i, val->port_vlan, &counter))
-                       len += snprintf(buf + len, sizeof(rtl->buf) - len,
+                       len += snprintf(buf + len, sizeof(smi->buf) - len,
                                        "%llu\n", counter);
                else
                                        "%llu\n", counter);
                else
-                       len += snprintf(buf + len, sizeof(rtl->buf) - len,
+                       len += snprintf(buf + len, sizeof(smi->buf) - len,
                                        "%s\n", "error");
        }
 
                                        "%s\n", "error");
        }
 
@@ -1400,19 +967,19 @@ static int rtl8366s_sw_set_vlan_ports(struct switch_dev *dev,
                        untag |= BIT(port->id);
        }
 
                        untag |= BIT(port->id);
        }
 
-       return rtl8366s_set_vlan(smi, val->port_vlan, member, untag, 0);
+       return rtl8366_set_vlan(smi, val->port_vlan, member, untag, 0);
 }
 
 static int rtl8366s_sw_get_port_pvid(struct switch_dev *dev, int port, int *val)
 {
        struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
 }
 
 static int rtl8366s_sw_get_port_pvid(struct switch_dev *dev, int port, int *val)
 {
        struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-       return rtl8366s_get_pvid(smi, port, val);
+       return rtl8366_get_pvid(smi, port, val);
 }
 
 static int rtl8366s_sw_set_port_pvid(struct switch_dev *dev, int port, int val)
 {
        struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
 }
 
 static int rtl8366s_sw_set_port_pvid(struct switch_dev *dev, int port, int val)
 {
        struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-       return rtl8366s_set_pvid(smi, port, val);
+       return rtl8366_set_pvid(smi, port, val);
 }
 
 static int rtl8366s_sw_reset_switch(struct switch_dev *dev)
 }
 
 static int rtl8366s_sw_reset_switch(struct switch_dev *dev)
@@ -1428,7 +995,7 @@ static int rtl8366s_sw_reset_switch(struct switch_dev *dev)
        if (err)
                return err;
 
        if (err)
                return err;
 
-       return rtl8366s_reset_vlan(smi);
+       return rtl8366_reset_vlan(smi);
 }
 
 static struct switch_attr rtl8366s_globals[] = {
 }
 
 static struct switch_attr rtl8366s_globals[] = {
@@ -1449,12 +1016,10 @@ static struct switch_attr rtl8366s_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 = rtl8366s_sw_reset_mibs,
                .name = "reset_mibs",
                .description = "Reset all MIB counters",
                .set = rtl8366s_sw_reset_mibs,
-               .get = NULL,
-               .max = 1
        }, {
                .type = SWITCH_TYPE_INT,
                .name = "blinkrate",
        }, {
                .type = SWITCH_TYPE_INT,
                .name = "blinkrate",
@@ -1475,12 +1040,10 @@ static struct switch_attr rtl8366s_port[] = {
                .set = NULL,
                .get = rtl8366s_sw_get_port_link,
        }, {
                .set = NULL,
                .get = rtl8366s_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 = rtl8366s_sw_reset_port_mibs,
                .set = rtl8366s_sw_reset_port_mibs,
-               .get = NULL,
        }, {
                .type = SWITCH_TYPE_STRING,
                .name = "mib",
        }, {
                .type = SWITCH_TYPE_STRING,
                .name = "mib",
@@ -1593,8 +1156,6 @@ static int rtl8366s_setup(struct rtl8366s *rtl)
        struct rtl8366_smi *smi = &rtl->smi;
        int ret;
 
        struct rtl8366_smi *smi = &rtl->smi;
        int ret;
 
-       rtl8366s_debugfs_init(rtl);
-
        ret = rtl8366s_reset_chip(smi);
        if (ret)
                return ret;
        ret = rtl8366s_reset_chip(smi);
        if (ret)
                return ret;
@@ -1647,6 +1208,7 @@ static struct rtl8366_smi_ops rtl8366s_smi_ops = {
        .set_vlan_4k    = rtl8366s_set_vlan_4k,
        .get_mc_index   = rtl8366s_get_mc_index,
        .set_mc_index   = rtl8366s_set_mc_index,
        .set_vlan_4k    = rtl8366s_set_vlan_4k,
        .get_mc_index   = rtl8366s_get_mc_index,
        .set_mc_index   = rtl8366s_set_mc_index,
+       .get_mib_counter = rtl8366_get_mib_counter,
 };
 
 static int __init rtl8366s_probe(struct platform_device *pdev)
 };
 
 static int __init rtl8366s_probe(struct platform_device *pdev)
@@ -1685,6 +1247,8 @@ static int __init rtl8366s_probe(struct platform_device *pdev)
        smi->cpu_port = RTL8366S_PORT_NUM_CPU;
        smi->num_ports = RTL8366S_NUM_PORTS;
        smi->num_vlan_mc = RTL8366S_NUM_VLANS;
        smi->cpu_port = RTL8366S_PORT_NUM_CPU;
        smi->num_ports = RTL8366S_NUM_PORTS;
        smi->num_vlan_mc = RTL8366S_NUM_VLANS;
+       smi->mib_counters = rtl8366s_mib_counters;
+       smi->num_mib_counters = ARRAY_SIZE(rtl8366s_mib_counters);
 
        err = rtl8366_smi_init(smi);
        if (err)
 
        err = rtl8366_smi_init(smi);
        if (err)
@@ -1743,7 +1307,6 @@ static int __devexit rtl8366s_remove(struct platform_device *pdev)
 
        if (rtl) {
                rtl8366s_switch_cleanup(rtl);
 
        if (rtl) {
                rtl8366s_switch_cleanup(rtl);
-               rtl8366s_debugfs_remove(rtl);
                platform_set_drvdata(pdev, NULL);
                rtl8366_smi_cleanup(&rtl->smi);
                kfree(rtl);
                platform_set_drvdata(pdev, NULL);
                rtl8366_smi_cleanup(&rtl->smi);
                kfree(rtl);
This page took 0.037876 seconds and 4 git commands to generate.