X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=target%2Flinux%2Fgeneric%2Ffiles%2Fdrivers%2Fnet%2Fphy%2Frtl8366s.c;h=7e72164131b6c99fb59f23c790df5423a3e7f177;hp=45da8fd8e582b7ebac0acadc0f6d533d942d2e7c;hb=c451ab4a93642a403eca429a32c2660d08e61fdb;hpb=f9177dd0034e2de4b036426a3bdd2cac775f256f diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366s.c b/target/linux/generic/files/drivers/net/phy/rtl8366s.c index 45da8fd8e5..7e72164131 100644 --- a/target/linux/generic/files/drivers/net/phy/rtl8366s.c +++ b/target/linux/generic/files/drivers/net/phy/rtl8366s.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #include "rtl8366_smi.h" @@ -26,6 +25,7 @@ #define RTL8366S_PHY_NO_MAX 4 #define RTL8366S_PHY_PAGE_MAX 7 #define RTL8366S_PHY_ADDR_MAX 31 +#define RTL8366S_PHY_WAN 4 /* Switch Global Configuration register */ #define RTL8366S_SGCR 0x0000 @@ -110,7 +110,7 @@ #define RTL8366S_TABLE_VLAN_READ_CTRL 0x0E01 #define RTL8366S_TABLE_VLAN_WRITE_CTRL 0x0F01 -#define RTL8366S_VLAN_MEMCONF_BASE 0x0016 +#define RTL8366S_VLAN_MC_BASE(_x) (0x0016 + (_x) * 2) #define RTL8366S_VLAN_MEMBERINGRESS_REG 0x0379 @@ -161,32 +161,14 @@ #define RTL8366S_PORT_ALL_INTERNAL (RTL8366S_PORT_UNKNOWN | \ RTL8366S_PORT_CPU) -struct rtl8366s { - struct device *parent; - struct rtl8366_smi smi; - struct switch_dev dev; -}; - -struct rtl8366s_vlan_mc { - u16 reserved2:1; - u16 priority:3; - u16 vid:12; - - u16 reserved1:1; - u16 fid:3; - u16 untag:6; - u16 member:6; -}; - -struct rtl8366s_vlan_4k { - u16 reserved1:4; - u16 vid:12; - - u16 reserved2:1; - u16 fid:3; - u16 untag:6; - u16 member:6; -}; +#define RTL8366S_VLAN_VID_MASK 0xfff +#define RTL8366S_VLAN_PRIORITY_SHIFT 12 +#define RTL8366S_VLAN_PRIORITY_MASK 0x7 +#define RTL8366S_VLAN_MEMBER_MASK 0x3f +#define RTL8366S_VLAN_UNTAG_SHIFT 6 +#define RTL8366S_VLAN_UNTAG_MASK 0x3f +#define RTL8366S_VLAN_FID_SHIFT 12 +#define RTL8366S_VLAN_FID_MASK 0x7 static struct rtl8366_mib_counter rtl8366s_mib_counters[] = { { 0, 0, 4, "IfInOctets" }, @@ -243,22 +225,6 @@ static struct rtl8366_mib_counter rtl8366s_mib_counters[] = { return err; \ } while (0) -static inline struct rtl8366s *smi_to_rtl8366s(struct rtl8366_smi *smi) -{ - return container_of(smi, struct rtl8366s, smi); -} - -static inline struct rtl8366s *sw_to_rtl8366s(struct switch_dev *sw) -{ - return container_of(sw, struct rtl8366s, dev); -} - -static inline struct rtl8366_smi *sw_to_rtl8366_smi(struct switch_dev *sw) -{ - struct rtl8366s *rtl = sw_to_rtl8366s(sw); - return &rtl->smi; -} - static int rtl8366s_reset_chip(struct rtl8366_smi *smi) { int timeout = 10; @@ -285,20 +251,28 @@ static int rtl8366s_reset_chip(struct rtl8366_smi *smi) static int rtl8366s_hw_init(struct rtl8366_smi *smi) { + struct rtl8366s_platform_data *pdata; int err; + pdata = smi->parent->platform_data; + if (pdata->num_initvals && pdata->initvals) { + unsigned i; + + dev_info(smi->parent, "applying initvals\n"); + for (i = 0; i < pdata->num_initvals; i++) + REG_WR(smi, pdata->initvals[i].reg, + pdata->initvals[i].val); + } + /* set maximum packet length to 1536 bytes */ REG_RMW(smi, RTL8366S_SGCR, RTL8366S_SGCR_MAX_LENGTH_MASK, RTL8366S_SGCR_MAX_LENGTH_1536); - /* enable all ports */ - REG_WR(smi, RTL8366S_PECR, 0); + /* enable learning for all ports */ + REG_WR(smi, RTL8366S_SSCR0, 0); - /* disable learning for all ports */ - REG_WR(smi, RTL8366S_SSCR0, RTL8366S_PORT_ALL); - - /* disable auto ageing for all ports */ - REG_WR(smi, RTL8366S_SSCR1, RTL8366S_PORT_ALL); + /* enable auto ageing for all ports */ + REG_WR(smi, RTL8366S_SSCR1, 0); /* * discard VLAN tagged packets if the port is not a member of @@ -442,22 +416,18 @@ static int rtl8366_get_mib_counter(struct rtl8366_smi *smi, int counter, static int rtl8366s_get_vlan_4k(struct rtl8366_smi *smi, u32 vid, struct rtl8366_vlan_4k *vlan4k) { - struct rtl8366s_vlan_4k vlan4k_priv; + u32 data[2]; int err; - u32 data; - u16 *tableaddr; + int i; memset(vlan4k, '\0', sizeof(struct rtl8366_vlan_4k)); - vlan4k_priv.vid = vid; if (vid >= RTL8366S_NUM_VIDS) return -EINVAL; - tableaddr = (u16 *)&vlan4k_priv; - /* write VID */ - data = *tableaddr; - err = rtl8366_smi_write_reg(smi, RTL8366S_VLAN_TABLE_WRITE_BASE, data); + err = rtl8366_smi_write_reg(smi, RTL8366S_VLAN_TABLE_WRITE_BASE, + vid & RTL8366S_VLAN_VID_MASK); if (err) return err; @@ -467,24 +437,20 @@ static int rtl8366s_get_vlan_4k(struct rtl8366_smi *smi, u32 vid, if (err) return err; - err = rtl8366_smi_read_reg(smi, RTL8366S_VLAN_TABLE_READ_BASE, &data); - if (err) - return err; - - *tableaddr = data; - tableaddr++; - - err = rtl8366_smi_read_reg(smi, RTL8366S_VLAN_TABLE_READ_BASE + 1, - &data); - if (err) - return err; - - *tableaddr = data; + for (i = 0; i < 2; i++) { + err = rtl8366_smi_read_reg(smi, + RTL8366S_VLAN_TABLE_READ_BASE + i, + &data[i]); + if (err) + return err; + } vlan4k->vid = vid; - vlan4k->untag = vlan4k_priv.untag; - vlan4k->member = vlan4k_priv.member; - vlan4k->fid = vlan4k_priv.fid; + vlan4k->untag = (data[1] >> RTL8366S_VLAN_UNTAG_SHIFT) & + RTL8366S_VLAN_UNTAG_MASK; + vlan4k->member = data[1] & RTL8366S_VLAN_MEMBER_MASK; + vlan4k->fid = (data[1] >> RTL8366S_VLAN_FID_SHIFT) & + RTL8366S_VLAN_FID_MASK; return 0; } @@ -492,38 +458,30 @@ static int rtl8366s_get_vlan_4k(struct rtl8366_smi *smi, u32 vid, static int rtl8366s_set_vlan_4k(struct rtl8366_smi *smi, const struct rtl8366_vlan_4k *vlan4k) { - struct rtl8366s_vlan_4k vlan4k_priv; + u32 data[2]; int err; - u32 data; - u16 *tableaddr; + int i; if (vlan4k->vid >= RTL8366S_NUM_VIDS || - vlan4k->member > RTL8366S_PORT_ALL || - vlan4k->untag > RTL8366S_PORT_ALL || + vlan4k->member > RTL8366S_VLAN_MEMBER_MASK || + vlan4k->untag > RTL8366S_VLAN_UNTAG_MASK || vlan4k->fid > RTL8366S_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, RTL8366S_VLAN_TABLE_WRITE_BASE, data); - if (err) - return err; - - tableaddr++; - - data = *tableaddr; - - err = rtl8366_smi_write_reg(smi, RTL8366S_VLAN_TABLE_WRITE_BASE + 1, - data); - if (err) - return err; + data[0] = vlan4k->vid & RTL8366S_VLAN_VID_MASK; + data[1] = (vlan4k->member & RTL8366S_VLAN_MEMBER_MASK) | + ((vlan4k->untag & RTL8366S_VLAN_UNTAG_MASK) << + RTL8366S_VLAN_UNTAG_SHIFT) | + ((vlan4k->fid & RTL8366S_VLAN_FID_MASK) << + RTL8366S_VLAN_FID_SHIFT); + + for (i = 0; i < 2; i++) { + err = rtl8366_smi_write_reg(smi, + RTL8366S_VLAN_TABLE_WRITE_BASE + i, + data[i]); + if (err) + return err; + } /* write table access control word */ err = rtl8366_smi_write_reg(smi, RTL8366S_TABLE_ACCESS_CTRL_REG, @@ -535,39 +493,31 @@ static int rtl8366s_set_vlan_4k(struct rtl8366_smi *smi, static int rtl8366s_get_vlan_mc(struct rtl8366_smi *smi, u32 index, struct rtl8366_vlan_mc *vlanmc) { - struct rtl8366s_vlan_mc vlanmc_priv; + u32 data[2]; int err; - u32 addr; - u32 data; - u16 *tableaddr; + int i; memset(vlanmc, '\0', sizeof(struct rtl8366_vlan_mc)); if (index >= RTL8366S_NUM_VLANS) return -EINVAL; - tableaddr = (u16 *)&vlanmc_priv; - - addr = RTL8366S_VLAN_MEMCONF_BASE + (index << 1); - err = rtl8366_smi_read_reg(smi, addr, &data); - if (err) - return err; - - *tableaddr = data; - tableaddr++; - - addr = RTL8366S_VLAN_MEMCONF_BASE + 1 + (index << 1); - err = rtl8366_smi_read_reg(smi, addr, &data); - if (err) - return err; - - *tableaddr = data; + for (i = 0; i < 2; i++) { + err = rtl8366_smi_read_reg(smi, + RTL8366S_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] & RTL8366S_VLAN_VID_MASK; + vlanmc->priority = (data[0] >> RTL8366S_VLAN_PRIORITY_SHIFT) & + RTL8366S_VLAN_PRIORITY_MASK; + vlanmc->untag = (data[1] >> RTL8366S_VLAN_UNTAG_SHIFT) & + RTL8366S_VLAN_UNTAG_MASK; + vlanmc->member = data[1] & RTL8366S_VLAN_MEMBER_MASK; + vlanmc->fid = (data[1] >> RTL8366S_VLAN_FID_SHIFT) & + RTL8366S_VLAN_FID_MASK; return 0; } @@ -575,43 +525,34 @@ static int rtl8366s_get_vlan_mc(struct rtl8366_smi *smi, u32 index, static int rtl8366s_set_vlan_mc(struct rtl8366_smi *smi, u32 index, const struct rtl8366_vlan_mc *vlanmc) { - struct rtl8366s_vlan_mc vlanmc_priv; + u32 data[2]; int err; - u32 addr; - u32 data; - u16 *tableaddr; + int i; if (index >= RTL8366S_NUM_VLANS || vlanmc->vid >= RTL8366S_NUM_VIDS || vlanmc->priority > RTL8366S_PRIORITYMAX || - vlanmc->member > RTL8366S_PORT_ALL || - vlanmc->untag > RTL8366S_PORT_ALL || + vlanmc->member > RTL8366S_VLAN_MEMBER_MASK || + vlanmc->untag > RTL8366S_VLAN_UNTAG_MASK || vlanmc->fid > RTL8366S_FIDMAX) return -EINVAL; - vlanmc_priv.vid = vlanmc->vid; - vlanmc_priv.priority = vlanmc->priority; - vlanmc_priv.untag = vlanmc->untag; - vlanmc_priv.member = vlanmc->member; - vlanmc_priv.fid = vlanmc->fid; - - addr = RTL8366S_VLAN_MEMCONF_BASE + (index << 1); - - tableaddr = (u16 *)&vlanmc_priv; - data = *tableaddr; - - err = rtl8366_smi_write_reg(smi, addr, data); - if (err) - return err; - - addr = RTL8366S_VLAN_MEMCONF_BASE + 1 + (index << 1); - - tableaddr++; - data = *tableaddr; - - err = rtl8366_smi_write_reg(smi, addr, data); - if (err) - return err; + data[0] = (vlanmc->vid & RTL8366S_VLAN_VID_MASK) | + ((vlanmc->priority & RTL8366S_VLAN_PRIORITY_MASK) << + RTL8366S_VLAN_PRIORITY_SHIFT); + data[1] = (vlanmc->member & RTL8366S_VLAN_MEMBER_MASK) | + ((vlanmc->untag & RTL8366S_VLAN_UNTAG_MASK) << + RTL8366S_VLAN_UNTAG_SHIFT) | + ((vlanmc->fid & RTL8366S_VLAN_FID_MASK) << + RTL8366S_VLAN_FID_SHIFT); + + for (i = 0; i < 2; i++) { + err = rtl8366_smi_write_reg(smi, + RTL8366S_VLAN_MC_BASE(index) + i, + data[i]); + if (err) + return err; + } return 0; } @@ -647,55 +588,44 @@ static int rtl8366s_set_mc_index(struct rtl8366_smi *smi, int port, int index) RTL8366S_PORT_VLAN_CTRL_SHIFT(port)); } -static int rtl8366s_vlan_set_vlan(struct rtl8366_smi *smi, int enable) +static int rtl8366s_enable_vlan(struct rtl8366_smi *smi, int enable) { 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_enable_vlan4k(struct rtl8366_smi *smi, int enable) { return rtl8366_smi_rmwr(smi, RTL8366S_VLAN_TB_CTRL_REG, 1, (enable) ? 1 : 0); } -static int rtl8366s_sw_reset_mibs(struct switch_dev *dev, - const struct switch_attr *attr, - struct switch_val *val) +static int rtl8366s_is_vlan_valid(struct rtl8366_smi *smi, unsigned vlan) { - struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev); - int err = 0; + unsigned max = RTL8366S_NUM_VLANS; - if (val->value.i == 1) - err = rtl8366_smi_rmwr(smi, RTL8366S_MIB_CTRL_REG, 0, (1 << 2)); + if (smi->vlan4k_enabled) + max = RTL8366S_NUM_VIDS - 1; - return err; + if (vlan == 0 || vlan >= max) + return 0; + + return 1; } -static int rtl8366s_sw_get_vlan_enable(struct switch_dev *dev, - const struct switch_attr *attr, - struct switch_val *val) +static int rtl8366s_enable_port(struct rtl8366_smi *smi, int port, int enable) { - struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev); - u32 data; - - if (attr->ofs == 1) { - rtl8366_smi_read_reg(smi, RTL8366S_SGCR, &data); - - if (data & RTL8366S_SGCR_EN_VLAN) - val->value.i = 1; - else - val->value.i = 0; - } else if (attr->ofs == 2) { - rtl8366_smi_read_reg(smi, RTL8366S_VLAN_TB_CTRL_REG, &data); + return rtl8366_smi_rmwr(smi, RTL8366S_PECR, (1 << port), + (enable) ? 0 : (1 << port)); +} - if (data & 0x0001) - val->value.i = 1; - else - val->value.i = 0; - } +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); - return 0; + return rtl8366_smi_rmwr(smi, RTL8366S_MIB_CTRL_REG, 0, (1 << 2)); } static int rtl8366s_sw_get_blinkrate(struct switch_dev *dev, @@ -726,18 +656,41 @@ static int rtl8366s_sw_set_blinkrate(struct switch_dev *dev, val->value.i); } -static int rtl8366s_sw_set_vlan_enable(struct switch_dev *dev, - const struct switch_attr *attr, - struct switch_val *val) +static int rtl8366s_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); + u32 data; + + rtl8366_smi_read_reg(smi,RTL8366S_SSCR0, &data); + val->value.i = !data; + + return 0; +} + + +static int rtl8366s_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 = RTL8366S_PORT_ALL; + + /* set learning for all ports */ + REG_WR(smi, RTL8366S_SSCR0, portmask); + + /* set auto ageing for all ports */ + REG_WR(smi, RTL8366S_SSCR1, portmask); - if (attr->ofs == 1) - return rtl8366s_vlan_set_vlan(smi, val->value.i); - else - return rtl8366s_vlan_set_4ktable(smi, val->value.i); + return 0; } + static const char *rtl8366s_speed_str(unsigned speed) { switch (speed) { @@ -794,47 +747,6 @@ static int rtl8366s_sw_get_port_link(struct switch_dev *dev, return 0; } -static int rtl8366s_sw_get_vlan_info(struct switch_dev *dev, - const struct switch_attr *attr, - struct switch_val *val) -{ - int i; - u32 len = 0; - struct rtl8366_vlan_4k vlan4k; - struct 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; - - memset(buf, '\0', sizeof(smi->buf)); - - err = rtl8366s_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); - - for (i = 0; i < RTL8366S_NUM_PORTS; i++) { - if (!(vlan4k.member & (1 << i))) - continue; - - len += snprintf(buf + len, sizeof(smi->buf) - len, "%d%s", i, - (vlan4k.untag & (1 << i)) ? "" : "t"); - } - - len += snprintf(buf + len, sizeof(smi->buf) - len, - "', members=%04x, untag=%04x, fid=%u", - vlan4k.member, vlan4k.untag, vlan4k.fid); - - val->value.s = buf; - val->len = len; - - return 0; -} - static int rtl8366s_sw_set_port_led(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val) @@ -858,7 +770,7 @@ static int rtl8366s_sw_set_port_led(struct switch_dev *dev, data = val->value.i << (val->port_vlan * 4); } - return rtl8366_smi_rmwr(smi, RTL8366S_LED_BLINKRATE_REG, mask, data); + return rtl8366_smi_rmwr(smi, reg, mask, data); } static int rtl8366s_sw_get_port_led(struct switch_dev *dev, @@ -891,101 +803,6 @@ static int rtl8366s_sw_reset_port_mibs(struct switch_dev *dev, 0, (1 << (val->port_vlan + 3))); } -static int rtl8366s_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 >= RTL8366S_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(rtl8366s_mib_counters); ++i) { - 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)) - 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 rtl8366s_sw_get_vlan_ports(struct switch_dev *dev, - struct switch_val *val) -{ - struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev); - struct switch_port *port; - struct rtl8366_vlan_4k vlan4k; - int i; - - if (val->port_vlan == 0 || val->port_vlan >= RTL8366S_NUM_VLANS) - return -EINVAL; - - rtl8366s_get_vlan_4k(smi, val->port_vlan, &vlan4k); - - port = &val->value.ports[0]; - val->len = 0; - for (i = 0; i < RTL8366S_NUM_PORTS; i++) { - if (!(vlan4k.member & BIT(i))) - continue; - - port->id = i; - port->flags = (vlan4k.untag & BIT(i)) ? - 0 : BIT(SWITCH_PORT_FLAG_TAGGED); - val->len++; - port++; - } - return 0; -} - -static int rtl8366s_sw_set_vlan_ports(struct switch_dev *dev, - struct switch_val *val) -{ - struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev); - struct switch_port *port; - u32 member = 0; - u32 untag = 0; - int i; - - if (val->port_vlan == 0 || val->port_vlan >= RTL8366S_NUM_VLANS) - return -EINVAL; - - port = &val->value.ports[0]; - for (i = 0; i < val->len; i++, port++) { - member |= BIT(port->id); - - if (!(port->flags & BIT(SWITCH_PORT_FLAG_TAGGED))) - untag |= BIT(port->id); - } - - 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); - 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); - return rtl8366_set_pvid(smi, port, val); -} - static int rtl8366s_sw_reset_switch(struct switch_dev *dev) { struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev); @@ -999,33 +816,46 @@ static int rtl8366s_sw_reset_switch(struct switch_dev *dev) 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 rtl8366s_globals[] = { { + .type = SWITCH_TYPE_INT, + .name = "enable_learning", + .description = "Enable learning, enable aging", + .set = rtl8366s_sw_set_learning_enable, + .get = rtl8366s_sw_get_learning_enable, + .max = 1, + }, { .type = SWITCH_TYPE_INT, .name = "enable_vlan", .description = "Enable VLAN mode", - .set = rtl8366s_sw_set_vlan_enable, - .get = rtl8366s_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", - .set = rtl8366s_sw_set_vlan_enable, - .get = rtl8366s_sw_get_vlan_enable, + .set = rtl8366_sw_set_vlan_enable, + .get = rtl8366_sw_get_vlan_enable, .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, - .get = NULL, - .max = 1 }, { .type = SWITCH_TYPE_INT, .name = "blinkrate", @@ -1046,19 +876,17 @@ static struct switch_attr rtl8366s_port[] = { .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", - .max = 1, .set = rtl8366s_sw_reset_port_mibs, - .get = NULL, }, { .type = SWITCH_TYPE_STRING, .name = "mib", .description = "Get MIB counters for port", .max = 33, .set = NULL, - .get = rtl8366s_sw_get_port_mib, + .get = rtl8366_sw_get_port_mib, }, { .type = SWITCH_TYPE_INT, .name = "led", @@ -1076,16 +904,18 @@ static struct switch_attr rtl8366s_vlan[] = { .description = "Get vlan information", .max = 1, .set = NULL, - .get = rtl8366s_sw_get_vlan_info, + .get = rtl8366_sw_get_vlan_info, + }, { + .type = SWITCH_TYPE_INT, + .name = "fid", + .description = "Get/Set vlan FID", + .max = RTL8366S_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 = RTL8366S_PORT_NUM_CPU, - .ports = RTL8366S_NUM_PORTS, - .vlans = RTL8366S_NUM_VLANS, +static const struct switch_dev_ops rtl8366_ops = { .attr_global = { .attr = rtl8366s_globals, .n_attr = ARRAY_SIZE(rtl8366s_globals), @@ -1099,32 +929,35 @@ static struct switch_dev rtl8366_switch_dev = { .n_attr = ARRAY_SIZE(rtl8366s_vlan), }, - .get_vlan_ports = rtl8366s_sw_get_vlan_ports, - .set_vlan_ports = rtl8366s_sw_set_vlan_ports, - .get_port_pvid = rtl8366s_sw_get_port_pvid, - .set_port_pvid = rtl8366s_sw_set_port_pvid, + .get_vlan_ports = rtl8366_sw_get_vlan_ports, + .set_vlan_ports = rtl8366_sw_set_vlan_ports, + .get_port_pvid = rtl8366_sw_get_port_pvid, + .set_port_pvid = rtl8366_sw_set_port_pvid, .reset_switch = rtl8366s_sw_reset_switch, }; -static int rtl8366s_switch_init(struct rtl8366s *rtl) +static int rtl8366s_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)); - dev->priv = rtl; - dev->devname = dev_name(rtl->parent); + dev->name = "RTL8366S"; + dev->cpu_port = RTL8366S_PORT_NUM_CPU; + dev->ports = RTL8366S_NUM_PORTS; + dev->vlans = RTL8366S_NUM_VIDS; + dev->ops = &rtl8366_ops; + dev->devname = dev_name(smi->parent); 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; } -static void rtl8366s_switch_cleanup(struct rtl8366s *rtl) +static void rtl8366s_switch_cleanup(struct rtl8366_smi *smi) { - unregister_switch(&rtl->dev); + unregister_switch(&smi->sw_dev); } static int rtl8366s_mii_read(struct mii_bus *bus, int addr, int reg) @@ -1159,9 +992,8 @@ static int rtl8366s_mii_bus_match(struct mii_bus *bus) bus->write == rtl8366s_mii_write); } -static int rtl8366s_setup(struct rtl8366s *rtl) +static int rtl8366s_setup(struct rtl8366_smi *smi) { - struct rtl8366_smi *smi = &rtl->smi; int ret; ret = rtl8366s_reset_chip(smi); @@ -1207,6 +1039,8 @@ static int rtl8366s_detect(struct rtl8366_smi *smi) static struct rtl8366_smi_ops rtl8366s_smi_ops = { .detect = rtl8366s_detect, + .setup = rtl8366s_setup, + .mii_read = rtl8366s_mii_read, .mii_write = rtl8366s_mii_write, @@ -1217,13 +1051,16 @@ static struct rtl8366_smi_ops rtl8366s_smi_ops = { .get_mc_index = rtl8366s_get_mc_index, .set_mc_index = rtl8366s_set_mc_index, .get_mib_counter = rtl8366_get_mib_counter, + .is_vlan_valid = rtl8366s_is_vlan_valid, + .enable_vlan = rtl8366s_enable_vlan, + .enable_vlan4k = rtl8366s_enable_vlan4k, + .enable_port = rtl8366s_enable_port, }; -static int __init rtl8366s_probe(struct platform_device *pdev) +static int __devinit rtl8366s_probe(struct platform_device *pdev) { static int rtl8366_smi_version_printed; struct rtl8366s_platform_data *pdata; - struct rtl8366s *rtl; struct rtl8366_smi *smi; int err; @@ -1238,17 +1075,12 @@ static int __init rtl8366s_probe(struct platform_device *pdev) 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; } - 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 = &rtl8366s_smi_ops; @@ -1260,15 +1092,11 @@ static int __init rtl8366s_probe(struct platform_device *pdev) err = rtl8366_smi_init(smi); if (err) - goto err_free_rtl; - - platform_set_drvdata(pdev, rtl); + goto err_free_smi; - err = rtl8366s_setup(rtl); - if (err) - goto err_clear_drvdata; + platform_set_drvdata(pdev, smi); - err = rtl8366s_switch_init(rtl); + err = rtl8366s_switch_init(smi); if (err) goto err_clear_drvdata; @@ -1277,8 +1105,8 @@ static int __init rtl8366s_probe(struct platform_device *pdev) 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; } @@ -1293,6 +1121,10 @@ static int rtl8366s_phy_config_init(struct phy_device *phydev) static int rtl8366s_phy_config_aneg(struct phy_device *phydev) { + /* phy 4 might be connected to a second mac, allow aneg config */ + if (phydev->addr == RTL8366S_PHY_WAN) + return genphy_config_aneg(phydev); + return 0; } @@ -1311,13 +1143,13 @@ static struct phy_driver rtl8366s_phy_driver = { static int __devexit rtl8366s_remove(struct platform_device *pdev) { - struct rtl8366s *rtl = platform_get_drvdata(pdev); + struct rtl8366_smi *smi = platform_get_drvdata(pdev); - if (rtl) { - rtl8366s_switch_cleanup(rtl); + if (smi) { + rtl8366s_switch_cleanup(smi); platform_set_drvdata(pdev, NULL); - rtl8366_smi_cleanup(&rtl->smi); - kfree(rtl); + rtl8366_smi_cleanup(smi); + kfree(smi); } return 0;