projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
remove CONFIG_MTD_PARTITIONS references from lantiq 3.0 patches
[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 231e482..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
@@ -20,7 +21,7 @@
 #include "rtl8366_smi.h"
 
 #define RTL8366RB_DRIVER_DESC  "Realtek RTL8366RB ethernet switch driver"
 #include "rtl8366_smi.h"
 
 #define RTL8366RB_DRIVER_DESC  "Realtek RTL8366RB ethernet switch driver"
-#define RTL8366RB_DRIVER_VER   "0.2.2"
+#define RTL8366RB_DRIVER_VER   "0.2.3"
 
 #define RTL8366RB_PHY_NO_MAX   4
 #define RTL8366RB_PHY_PAGE_MAX 7
 
 #define RTL8366RB_PHY_NO_MAX   4
 #define RTL8366RB_PHY_PAGE_MAX 7
@@ -163,6 +164,33 @@
 #define RTL8366RB_VLAN_MEMBER_MASK     0xff
 #define RTL8366RB_VLAN_FID_MASK                0x7
 
 #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"                          },
 static struct rtl8366_mib_counter rtl8366rb_mib_counters[] = {
        { 0,  0, 4, "IfInOctets"                                },
        { 0,  4, 4, "EtherStatsOctets"                          },
@@ -245,14 +273,11 @@ static int rtl8366rb_hw_init(struct rtl8366_smi *smi)
        REG_RMW(smi, RTL8366RB_SGCR, RTL8366RB_SGCR_MAX_LENGTH_MASK,
                RTL8366RB_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, RTL8366RB_PECR, 0);
+       /* enable learning for all ports */
+       REG_WR(smi, RTL8366RB_SSCR0, 0);
 
 
-       /* disable learning for all ports */
-       REG_WR(smi, RTL8366RB_SSCR0, RTL8366RB_PORT_ALL);
-
-       /* disable auto ageing for all ports */
-       REG_WR(smi, RTL8366RB_SSCR1, RTL8366RB_PORT_ALL);
+       /* enable auto ageing for all ports */
+       REG_WR(smi, RTL8366RB_SSCR1, 0);
 
        /*
         * discard VLAN tagged packets if the port is not a member of
 
        /*
         * discard VLAN tagged packets if the port is not a member of
@@ -429,8 +454,8 @@ static int rtl8366rb_set_vlan_4k(struct rtl8366_smi *smi,
        int i;
 
        if (vlan4k->vid >= RTL8366RB_NUM_VIDS ||
        int i;
 
        if (vlan4k->vid >= RTL8366RB_NUM_VIDS ||
-           vlan4k->member > RTL8366RB_PORT_ALL ||
-           vlan4k->untag > RTL8366RB_PORT_ALL ||
+           vlan4k->member > RTL8366RB_VLAN_MEMBER_MASK ||
+           vlan4k->untag > RTL8366RB_VLAN_UNTAG_MASK ||
            vlan4k->fid > RTL8366RB_FIDMAX)
                return -EINVAL;
 
            vlan4k->fid > RTL8366RB_FIDMAX)
                return -EINVAL;
 
@@ -496,8 +521,8 @@ static int rtl8366rb_set_vlan_mc(struct rtl8366_smi *smi, u32 index,
        if (index >= RTL8366RB_NUM_VLANS ||
            vlanmc->vid >= RTL8366RB_NUM_VIDS ||
            vlanmc->priority > RTL8366RB_PRIORITYMAX ||
        if (index >= RTL8366RB_NUM_VLANS ||
            vlanmc->vid >= RTL8366RB_NUM_VIDS ||
            vlanmc->priority > RTL8366RB_PRIORITYMAX ||
-           vlanmc->member > RTL8366RB_PORT_ALL ||
-           vlanmc->untag > RTL8366RB_PORT_ALL ||
+           vlanmc->member > RTL8366RB_VLAN_MEMBER_MASK ||
+           vlanmc->untag > RTL8366RB_VLAN_UNTAG_MASK ||
            vlanmc->fid > RTL8366RB_FIDMAX)
                return -EINVAL;
 
            vlanmc->fid > RTL8366RB_FIDMAX)
                return -EINVAL;
 
@@ -554,25 +579,36 @@ static int rtl8366rb_set_mc_index(struct rtl8366_smi *smi, int port, int index)
 
 static int rtl8366rb_is_vlan_valid(struct rtl8366_smi *smi, unsigned vlan)
 {
 
 static int rtl8366rb_is_vlan_valid(struct rtl8366_smi *smi, unsigned vlan)
 {
-       if (vlan == 0 || vlan >= RTL8366RB_NUM_VLANS)
+       unsigned max = RTL8366RB_NUM_VLANS;
+
+       if (smi->vlan4k_enabled)
+               max = RTL8366RB_NUM_VIDS - 1;
+
+       if (vlan == 0 || vlan >= max)
                return 0;
 
        return 1;
 }
 
                return 0;
 
        return 1;
 }
 
-static int rtl8366rb_vlan_set_vlan(struct rtl8366_smi *smi, int enable)
+static int rtl8366rb_enable_vlan(struct rtl8366_smi *smi, int enable)
 {
        return rtl8366_smi_rmwr(smi, RTL8366RB_SGCR, RTL8366RB_SGCR_EN_VLAN,
                                (enable) ? RTL8366RB_SGCR_EN_VLAN : 0);
 }
 
 {
        return rtl8366_smi_rmwr(smi, RTL8366RB_SGCR, RTL8366RB_SGCR_EN_VLAN,
                                (enable) ? RTL8366RB_SGCR_EN_VLAN : 0);
 }
 
-static int rtl8366rb_vlan_set_4ktable(struct rtl8366_smi *smi, int enable)
+static int rtl8366rb_enable_vlan4k(struct rtl8366_smi *smi, int enable)
 {
        return rtl8366_smi_rmwr(smi, RTL8366RB_SGCR,
                                RTL8366RB_SGCR_EN_VLAN_4KTB,
                                (enable) ? RTL8366RB_SGCR_EN_VLAN_4KTB : 0);
 }
 
 {
        return rtl8366_smi_rmwr(smi, RTL8366RB_SGCR,
                                RTL8366RB_SGCR_EN_VLAN_4KTB,
                                (enable) ? RTL8366RB_SGCR_EN_VLAN_4KTB : 0);
 }
 
+static int rtl8366rb_enable_port(struct rtl8366_smi *smi, int port, int enable)
+{
+       return rtl8366_smi_rmwr(smi, RTL8366RB_PECR, (1 << port),
+                               (enable) ? 0 : (1 << port));
+}
+
 static int rtl8366rb_sw_reset_mibs(struct switch_dev *dev,
                                  const struct switch_attr *attr,
                                  struct switch_val *val)
 static int rtl8366rb_sw_reset_mibs(struct switch_dev *dev,
                                  const struct switch_attr *attr,
                                  struct switch_val *val)
@@ -583,32 +619,6 @@ static int rtl8366rb_sw_reset_mibs(struct switch_dev *dev,
                                RTL8366RB_MIB_CTRL_GLOBAL_RESET);
 }
 
                                RTL8366RB_MIB_CTRL_GLOBAL_RESET);
 }
 
-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, RTL8366RB_SGCR, &data);
-
-               if (data & RTL8366RB_SGCR_EN_VLAN)
-                       val->value.i = 1;
-               else
-                       val->value.i = 0;
-       } else if (attr->ofs == 2) {
-               rtl8366_smi_read_reg(smi, RTL8366RB_SGCR, &data);
-
-               if (data & RTL8366RB_SGCR_EN_VLAN_4KTB)
-                       val->value.i = 1;
-               else
-                       val->value.i = 0;
-       }
-
-       return 0;
-}
-
 static int rtl8366rb_sw_get_blinkrate(struct switch_dev *dev,
                                     const struct switch_attr *attr,
                                     struct switch_val *val)
 static int rtl8366rb_sw_get_blinkrate(struct switch_dev *dev,
                                     const struct switch_attr *attr,
                                     struct switch_val *val)
@@ -637,18 +647,41 @@ static int rtl8366rb_sw_set_blinkrate(struct switch_dev *dev,
                                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) {
@@ -727,7 +760,7 @@ static int rtl8366rb_sw_set_port_led(struct switch_dev *dev,
                data = val->value.i << (val->port_vlan * 4);
        }
 
                data = val->value.i << (val->port_vlan * 4);
        }
 
-       return rtl8366_smi_rmwr(smi, RTL8366RB_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,
@@ -746,68 +779,170 @@ static int rtl8366rb_sw_get_port_led(struct switch_dev *dev,
        return 0;
 }
 
        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 >= RTL8366RB_NUM_PORTS)
                return -EINVAL;
 
 
        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));
+       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_vlan_ports(struct switch_dev *dev,
-                                     struct switch_val *val)
+static int rtl8366rb_sw_get_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);
-       struct switch_port *port;
-       struct rtl8366_vlan_4k vlan4k;
-       int i;
+       u32 data;
 
 
-       if (!smi->ops->is_vlan_valid(smi, val->port_vlan))
+       if (val->port_vlan >= RTL8366RB_NUM_PORTS)
                return -EINVAL;
 
                return -EINVAL;
 
-       smi->ops->get_vlan_4k(smi, val->port_vlan, &vlan4k);
+       rtl8366_smi_read_reg(smi, RTL8366RB_PECR, &data);
+       if (data & (1 << val->port_vlan))
+               val->value.i = 1;
+       else
+               val->value.i = 0;
 
 
-       port = &val->value.ports[0];
-       val->len = 0;
-       for (i = 0; i < smi->num_ports; i++) {
-               if (!(vlan4k.member & BIT(i)))
-                       continue;
+       return 0;
+}
+
+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);
+
+       if (val->port_vlan >= RTL8366RB_NUM_PORTS)
+               return -EINVAL;
+
+       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_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 (!smi->ops->is_vlan_valid(smi, val->port_vlan))
+       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;
+
+       if (val->value.i)
+               data = RTL8366RB_QOS_MASK;
+       else
+               data = 0;
 
 
-       return rtl8366_set_vlan(smi, val->port_vlan, member, untag, 0);
+       return rtl8366_smi_rmwr(smi, RTL8366RB_SGCR, RTL8366RB_QOS_MASK, data);
+}
+
+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);
+       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_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);
+
+       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)
@@ -823,24 +958,39 @@ static int rtl8366rb_sw_reset_switch(struct switch_dev *dev)
        if (err)
                return err;
 
        if (err)
                return err;
 
-       return rtl8366_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
        }, {
@@ -856,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
        },
 };
 
        },
 };
 
@@ -886,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,
        },
 };
 
        },
 };
 
@@ -897,15 +1075,17 @@ static struct switch_attr rtl8366rb_vlan[] = {
                .max = 1,
                .set = NULL,
                .get = rtl8366_sw_get_vlan_info,
                .max = 1,
                .set = NULL,
                .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 = RTL8366RB_PORT_NUM_CPU,
-       .ports = RTL8366RB_NUM_PORTS,
-       .vlans = RTL8366RB_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),
@@ -919,8 +1099,8 @@ 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_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,
        .get_port_pvid = rtl8366_sw_get_port_pvid,
        .set_port_pvid = rtl8366_sw_set_port_pvid,
        .reset_switch = rtl8366rb_sw_reset_switch,
@@ -931,8 +1111,11 @@ static int rtl8366rb_switch_init(struct rtl8366_smi *smi)
        struct switch_dev *dev = &smi->sw_dev;
        int err;
 
        struct switch_dev *dev = &smi->sw_dev;
        int err;
 
-       memcpy(dev, &rtl8366_switch_dev, sizeof(struct switch_dev));
-       dev->priv = smi;
+       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);
        dev->devname = dev_name(smi->parent);
 
        err = register_switch(dev, NULL);
@@ -973,12 +1156,6 @@ 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)
-{
-       return (bus->read == rtl8366rb_mii_read &&
-               bus->write == rtl8366rb_mii_write);
-}
-
 static int rtl8366rb_setup(struct rtl8366_smi *smi)
 {
        int ret;
 static int rtl8366rb_setup(struct rtl8366_smi *smi)
 {
        int ret;
@@ -1039,9 +1216,12 @@ static struct rtl8366_smi_ops rtl8366rb_smi_ops = {
        .set_mc_index   = rtl8366rb_set_mc_index,
        .get_mib_counter = rtl8366rb_get_mib_counter,
        .is_vlan_valid  = rtl8366rb_is_vlan_valid,
        .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;
@@ -1095,32 +1275,6 @@ static int __init rtl8366rb_probe(struct platform_device *pdev)
        return err;
 }
 
        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)
 {
        struct rtl8366_smi *smi = platform_get_drvdata(pdev);
 static int __devexit rtl8366rb_remove(struct platform_device *pdev)
 {
        struct rtl8366_smi *smi = platform_get_drvdata(pdev);
@@ -1146,26 +1300,12 @@ 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);
@@ -1174,5 +1314,6 @@ 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_VERSION(RTL8366RB_DRIVER_VER);
 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);
Personal OpenWRT clone
This page took 0.041607 seconds and 4 git commands to generate.