X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/5e66606678426ebb01fbd81d6212fb6fff2f896c..22a6beb304aeb2cce935c238c2d51b3fac451e85:/target/linux/generic-2.6/files/drivers/net/phy/rtl8366s.c diff --git a/target/linux/generic-2.6/files/drivers/net/phy/rtl8366s.c b/target/linux/generic-2.6/files/drivers/net/phy/rtl8366s.c index 9f378657f..5636a62c1 100644 --- a/target/linux/generic-2.6/files/drivers/net/phy/rtl8366s.c +++ b/target/linux/generic-2.6/files/drivers/net/phy/rtl8366s.c @@ -155,7 +155,7 @@ struct rtl8366s { #endif }; -struct rtl8366s_vlanconfig { +struct rtl8366s_vlan_mc { u16 reserved2:1; u16 priority:3; u16 vid:12; @@ -166,7 +166,7 @@ struct rtl8366s_vlanconfig { u16 member:6; }; -struct rtl8366s_vlan4kentry { +struct rtl8366s_vlan_4k { u16 reserved1:4; u16 vid:12; @@ -187,39 +187,39 @@ struct mib_counter { }; static struct mib_counter rtl8366s_mib_counters[RTL8366S_MIB_COUNT] = { - { 0, 4, "IfInOctets " }, - { 4, 4, "EtherStatsOctets " }, - { 8, 2, "EtherStatsUnderSizePkts " }, - { 10, 2, "EtherFregament " }, - { 12, 2, "EtherStatsPkts64Octets " }, - { 14, 2, "EtherStatsPkts65to127Octets " }, - { 16, 2, "EtherStatsPkts128to255Octets " }, - { 18, 2, "EtherStatsPkts256to511Octets " }, - { 20, 2, "EtherStatsPkts512to1023Octets " }, - { 22, 2, "EtherStatsPkts1024to1518Octets " }, - { 24, 2, "EtherOversizeStats " }, - { 26, 2, "EtherStatsJabbers " }, - { 28, 2, "IfInUcastPkts " }, - { 30, 2, "EtherStatsMulticastPkts " }, - { 32, 2, "EtherStatsBroadcastPkts " }, - { 34, 2, "EtherStatsDropEvents " }, - { 36, 2, "Dot3StatsFCSErrors " }, - { 38, 2, "Dot3StatsSymbolErrors " }, - { 40, 2, "Dot3InPauseFrames " }, - { 42, 2, "Dot3ControlInUnknownOpcodes " }, - { 44, 4, "IfOutOctets " }, - { 48, 2, "Dot3StatsSingleCollisionFrames " }, - { 50, 2, "Dot3StatMultipleCollisionFrames " }, - { 52, 2, "Dot3sDeferredTransmissions " }, - { 54, 2, "Dot3StatsLateCollisions " }, - { 56, 2, "EtherStatsCollisions " }, - { 58, 2, "Dot3StatsExcessiveCollisions " }, - { 60, 2, "Dot3OutPauseFrames " }, - { 62, 2, "Dot1dBasePortDelayExceededDiscards" }, - { 64, 2, "Dot1dTpPortInDiscards " }, - { 66, 2, "IfOutUcastPkts " }, - { 68, 2, "IfOutMulticastPkts " }, - { 70, 2, "IfOutBroadcastPkts " }, + { 0, 4, "IfInOctets" }, + { 4, 4, "EtherStatsOctets" }, + { 8, 2, "EtherStatsUnderSizePkts" }, + { 10, 2, "EtherFragments" }, + { 12, 2, "EtherStatsPkts64Octets" }, + { 14, 2, "EtherStatsPkts65to127Octets" }, + { 16, 2, "EtherStatsPkts128to255Octets" }, + { 18, 2, "EtherStatsPkts256to511Octets" }, + { 20, 2, "EtherStatsPkts512to1023Octets" }, + { 22, 2, "EtherStatsPkts1024to1518Octets" }, + { 24, 2, "EtherOversizeStats" }, + { 26, 2, "EtherStatsJabbers" }, + { 28, 2, "IfInUcastPkts" }, + { 30, 2, "EtherStatsMulticastPkts" }, + { 32, 2, "EtherStatsBroadcastPkts" }, + { 34, 2, "EtherStatsDropEvents" }, + { 36, 2, "Dot3StatsFCSErrors" }, + { 38, 2, "Dot3StatsSymbolErrors" }, + { 40, 2, "Dot3InPauseFrames" }, + { 42, 2, "Dot3ControlInUnknownOpcodes" }, + { 44, 4, "IfOutOctets" }, + { 48, 2, "Dot3StatsSingleCollisionFrames" }, + { 50, 2, "Dot3StatMultipleCollisionFrames" }, + { 52, 2, "Dot3sDeferredTransmissions" }, + { 54, 2, "Dot3StatsLateCollisions" }, + { 56, 2, "EtherStatsCollisions" }, + { 58, 2, "Dot3StatsExcessiveCollisions" }, + { 60, 2, "Dot3OutPauseFrames" }, + { 62, 2, "Dot1dBasePortDelayExceededDiscards" }, + { 64, 2, "Dot1dTpPortInDiscards" }, + { 66, 2, "IfOutUcastPkts" }, + { 68, 2, "IfOutMulticastPkts" }, + { 70, 2, "IfOutBroadcastPkts" }, }; static inline struct rtl8366s *smi_to_rtl8366s(struct rtl8366_smi *smi) @@ -232,9 +232,14 @@ static inline struct rtl8366s *sw_to_rtl8366s(struct switch_dev *sw) return container_of(sw, struct rtl8366s, dev); } -static int rtl8366s_reset_chip(struct rtl8366s *rtl) +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) { - struct rtl8366_smi *smi = &rtl->smi; int timeout = 10; u32 data; @@ -257,10 +262,9 @@ static int rtl8366s_reset_chip(struct rtl8366s *rtl) return 0; } -static int rtl8366s_read_phy_reg(struct rtl8366s *rtl, +static int rtl8366s_read_phy_reg(struct rtl8366_smi *smi, u32 phy_no, u32 page, u32 addr, u32 *data) { - struct rtl8366_smi *smi = &rtl->smi; u32 reg; int ret; @@ -293,10 +297,9 @@ static int rtl8366s_read_phy_reg(struct rtl8366s *rtl, return 0; } -static int rtl8366s_write_phy_reg(struct rtl8366s *rtl, +static int rtl8366s_write_phy_reg(struct rtl8366_smi *smi, u32 phy_no, u32 page, u32 addr, u32 data) { - struct rtl8366_smi *smi = &rtl->smi; u32 reg; int ret; @@ -325,10 +328,9 @@ static int rtl8366s_write_phy_reg(struct rtl8366s *rtl, return 0; } -static int rtl8366_get_mib_counter(struct rtl8366s *rtl, int counter, +static int rtl8366_get_mib_counter(struct rtl8366_smi *smi, int counter, int port, unsigned long long *val) { - struct rtl8366_smi *smi = &rtl->smi; int i; int err; u32 addr, data; @@ -374,21 +376,21 @@ static int rtl8366_get_mib_counter(struct rtl8366s *rtl, int counter, return 0; } -static int rtl8366s_get_vlan_4k_entry(struct rtl8366s *rtl, u32 vid, - struct rtl8366s_vlan4kentry *vlan4k) +static int rtl8366s_get_vlan_4k(struct rtl8366_smi *smi, u32 vid, + struct rtl8366_vlan_4k *vlan4k) { - struct rtl8366_smi *smi = &rtl->smi; + struct rtl8366s_vlan_4k vlan4k_priv; int err; u32 data; u16 *tableaddr; - memset(vlan4k, '\0', sizeof(struct rtl8366s_vlan4kentry)); - vlan4k->vid = vid; + memset(vlan4k, '\0', sizeof(struct rtl8366_vlan_4k)); + vlan4k_priv.vid = vid; if (vid >= RTL8366_NUM_VIDS) return -EINVAL; - tableaddr = (u16 *)vlan4k; + tableaddr = (u16 *)&vlan4k_priv; /* write VID */ data = *tableaddr; @@ -415,15 +417,19 @@ static int rtl8366s_get_vlan_4k_entry(struct rtl8366s *rtl, u32 vid, return err; *tableaddr = data; + vlan4k->vid = vid; + vlan4k->untag = vlan4k_priv.untag; + vlan4k->member = vlan4k_priv.member; + vlan4k->fid = vlan4k_priv.fid; return 0; } -static int rtl8366s_set_vlan_4k_entry(struct rtl8366s *rtl, - const struct rtl8366s_vlan4kentry *vlan4k) +static int rtl8366s_set_vlan_4k(struct rtl8366_smi *smi, + const struct rtl8366_vlan_4k *vlan4k) { - struct rtl8366_smi *smi = &rtl->smi; + struct rtl8366s_vlan_4k vlan4k_priv; int err; u32 data; u16 *tableaddr; @@ -434,7 +440,12 @@ static int rtl8366s_set_vlan_4k_entry(struct rtl8366s *rtl, vlan4k->fid > RTL8366S_FIDMAX) return -EINVAL; - tableaddr = (u16 *)vlan4k; + 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; @@ -458,21 +469,21 @@ static int rtl8366s_set_vlan_4k_entry(struct rtl8366s *rtl, return err; } -static int rtl8366s_get_vlan_member_config(struct rtl8366s *rtl, u32 index, - struct rtl8366s_vlanconfig *vlanmc) +static int rtl8366s_get_vlan_mc(struct rtl8366_smi *smi, u32 index, + struct rtl8366_vlan_mc *vlanmc) { - struct rtl8366_smi *smi = &rtl->smi; + struct rtl8366s_vlan_mc vlanmc_priv; int err; u32 addr; u32 data; u16 *tableaddr; - memset(vlanmc, '\0', sizeof(struct rtl8366s_vlanconfig)); + memset(vlanmc, '\0', sizeof(struct rtl8366_vlan_mc)); if (index >= RTL8366_NUM_VLANS) return -EINVAL; - tableaddr = (u16 *)vlanmc; + tableaddr = (u16 *)&vlanmc_priv; addr = RTL8366S_VLAN_MEMCONF_BASE + (index << 1); err = rtl8366_smi_read_reg(smi, addr, &data); @@ -489,14 +500,19 @@ static int rtl8366s_get_vlan_member_config(struct rtl8366s *rtl, u32 index, *tableaddr = data; + 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; + return 0; } -static int rtl8366s_set_vlan_member_config(struct rtl8366s *rtl, u32 index, - const struct rtl8366s_vlanconfig - *vlanmc) +static int rtl8366s_set_vlan_mc(struct rtl8366_smi *smi, u32 index, + const struct rtl8366_vlan_mc *vlanmc) { - struct rtl8366_smi *smi = &rtl->smi; + struct rtl8366s_vlan_mc vlanmc_priv; int err; u32 addr; u32 data; @@ -510,9 +526,15 @@ static int rtl8366s_set_vlan_member_config(struct rtl8366s *rtl, u32 index, 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; + tableaddr = (u16 *)&vlanmc_priv; data = *tableaddr; err = rtl8366_smi_write_reg(smi, addr, data); @@ -531,10 +553,9 @@ static int rtl8366s_set_vlan_member_config(struct rtl8366s *rtl, u32 index, return 0; } -static int rtl8366s_get_port_vlan_index(struct rtl8366s *rtl, int port, +static int rtl8366s_get_port_vlan_index(struct rtl8366_smi *smi, int port, int *val) { - struct rtl8366_smi *smi = &rtl->smi; u32 data; int err; @@ -553,18 +574,18 @@ static int rtl8366s_get_port_vlan_index(struct rtl8366s *rtl, int port, } -static int rtl8366s_get_vlan_port_pvid(struct rtl8366s *rtl, int port, +static int rtl8366s_get_vlan_port_pvid(struct rtl8366_smi *smi, int port, int *val) { - struct rtl8366s_vlanconfig vlanmc; + struct rtl8366_vlan_mc vlanmc; int err; int index; - err = rtl8366s_get_port_vlan_index(rtl, port, &index); + err = rtl8366s_get_port_vlan_index(smi, port, &index); if (err) return err; - err = rtl8366s_get_vlan_member_config(rtl, index, &vlanmc); + err = rtl8366s_get_vlan_mc(smi, index, &vlanmc); if (err) return err; @@ -572,10 +593,9 @@ static int rtl8366s_get_vlan_port_pvid(struct rtl8366s *rtl, int port, return 0; } -static int rtl8366s_set_port_vlan_index(struct rtl8366s *rtl, int port, +static int rtl8366s_set_port_vlan_index(struct rtl8366_smi *smi, int port, int index) { - struct rtl8366_smi *smi = &rtl->smi; u32 data; int err; @@ -597,35 +617,35 @@ static int rtl8366s_set_port_vlan_index(struct rtl8366s *rtl, int port, return err; } -static int rtl8366s_set_vlan_port_pvid(struct rtl8366s *rtl, int port, int val) +static int rtl8366s_set_vlan_port_pvid(struct rtl8366_smi *smi, int port, int val) { int i; - struct rtl8366s_vlanconfig vlanmc; - struct rtl8366s_vlan4kentry vlan4k; + struct rtl8366_vlan_mc vlanmc; + struct rtl8366_vlan_4k vlan4k; if (port >= RTL8366_NUM_PORTS || val >= RTL8366_NUM_VIDS) return -EINVAL; /* Updating the 4K entry; lookup it and change the port member set */ - rtl8366s_get_vlan_4k_entry(rtl, val, &vlan4k); + rtl8366s_get_vlan_4k(smi, val, &vlan4k); vlan4k.member |= ((1 << port) | RTL8366_PORT_CPU); vlan4k.untag = RTL8366_PORT_ALL_BUT_CPU; - rtl8366s_set_vlan_4k_entry(rtl, &vlan4k); + rtl8366s_set_vlan_4k(smi, &vlan4k); /* * For the 16 entries more work needs to be done. First see if such * VID is already there and change it */ for (i = 0; i < RTL8366_NUM_VLANS; ++i) { - rtl8366s_get_vlan_member_config(rtl, i, &vlanmc); + rtl8366s_get_vlan_mc(smi, i, &vlanmc); /* Try to find an existing vid and update port member set */ if (val == vlanmc.vid) { vlanmc.member |= ((1 << port) | RTL8366_PORT_CPU); - rtl8366s_set_vlan_member_config(rtl, i, &vlanmc); + rtl8366s_set_vlan_mc(smi, i, &vlanmc); /* Now update PVID register settings */ - rtl8366s_set_port_vlan_index(rtl, port, i); + rtl8366s_set_port_vlan_index(smi, port, i); return 0; } @@ -636,7 +656,7 @@ static int rtl8366s_set_vlan_port_pvid(struct rtl8366s *rtl, int port, int val) * has no member ports) with new one */ for (i = 0; i < RTL8366_NUM_VLANS; ++i) { - rtl8366s_get_vlan_member_config(rtl, i, &vlanmc); + rtl8366s_get_vlan_mc(smi, i, &vlanmc); /* * See if this vlan member configuration is unused. It is @@ -649,25 +669,24 @@ static int rtl8366s_set_vlan_port_pvid(struct rtl8366s *rtl, int port, int val) vlanmc.member = ((1 << port) | RTL8366_PORT_CPU); vlanmc.fid = 0; - rtl8366s_set_vlan_member_config(rtl, i, &vlanmc); + rtl8366s_set_vlan_mc(smi, i, &vlanmc); /* Now update PVID register settings */ - rtl8366s_set_port_vlan_index(rtl, port, i); + rtl8366s_set_port_vlan_index(smi, port, i); return 0; } } - dev_err(rtl->parent, + dev_err(smi->parent, "All 16 vlan member configurations are in use\n"); return -EINVAL; } -static int rtl8366s_vlan_set_vlan(struct rtl8366s *rtl, int enable) +static int rtl8366s_vlan_set_vlan(struct rtl8366_smi *smi, int enable) { - struct rtl8366_smi *smi = &rtl->smi; u32 data = 0; rtl8366_smi_read_reg(smi, RTL8366_CHIP_GLOBAL_CTRL_REG, &data); @@ -680,9 +699,8 @@ static int rtl8366s_vlan_set_vlan(struct rtl8366s *rtl, int enable) return rtl8366_smi_write_reg(smi, RTL8366_CHIP_GLOBAL_CTRL_REG, data); } -static int rtl8366s_vlan_set_4ktable(struct rtl8366s *rtl, int enable) +static int rtl8366s_vlan_set_4ktable(struct rtl8366_smi *smi, int enable) { - struct rtl8366_smi *smi = &rtl->smi; u32 data = 0; rtl8366_smi_read_reg(smi, RTL8366S_VLAN_TB_CTRL_REG, &data); @@ -695,10 +713,10 @@ static int rtl8366s_vlan_set_4ktable(struct rtl8366s *rtl, int enable) return rtl8366_smi_write_reg(smi, RTL8366S_VLAN_TB_CTRL_REG, data); } -static int rtl8366s_reset_vlan(struct rtl8366s *rtl) +static int rtl8366s_reset_vlan(struct rtl8366_smi *smi) { - struct rtl8366s_vlan4kentry vlan4k; - struct rtl8366s_vlanconfig vlanmc; + struct rtl8366_vlan_4k vlan4k; + struct rtl8366_vlan_mc vlanmc; int err; int i; @@ -709,7 +727,7 @@ static int rtl8366s_reset_vlan(struct rtl8366s *rtl) vlanmc.untag = 0; vlanmc.fid = 0; for (i = 0; i < RTL8366_NUM_VLANS; i++) { - err = rtl8366s_set_vlan_member_config(rtl, i, &vlanmc); + err = rtl8366s_set_vlan_mc(smi, i, &vlanmc); if (err) return err; } @@ -719,13 +737,13 @@ static int rtl8366s_reset_vlan(struct rtl8366s *rtl) vlan4k.member = RTL8366_PORT_ALL; vlan4k.untag = RTL8366_PORT_ALL; vlan4k.fid = 0; - err = rtl8366s_set_vlan_4k_entry(rtl, &vlan4k); + err = rtl8366s_set_vlan_4k(smi, &vlan4k); if (err) return err; /* Set all ports PVID to default VLAN */ for (i = 0; i < RTL8366_NUM_PORTS; i++) { - err = rtl8366s_set_vlan_port_pvid(rtl, i, 0); + err = rtl8366s_set_vlan_port_pvid(smi, i, 0); if (err) return err; } @@ -745,46 +763,34 @@ static ssize_t rtl8366s_read_debugfs_mibs(struct file *file, 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, "MIB Counters:\n"); - len += snprintf(buf + len, sizeof(rtl->buf) - len, "Counter" - " " - "Port 0 \t\t Port 1 \t\t Port 2 \t\t Port 3 \t\t " - "Port 4\n"); - - for (i = 0; i < 33; ++i) { - len += snprintf(buf + len, sizeof(rtl->buf) - len, "%d:%s ", - i, rtl8366s_mib_counters[i].name); + 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 < RTL8366_NUM_PORTS; ++j) { unsigned long long counter = 0; - if (!rtl8366_get_mib_counter(rtl, i, j, &counter)) + if (!rtl8366_get_mib_counter(smi, i, j, &counter)) len += snprintf(buf + len, sizeof(rtl->buf) - len, - "[%llu]", counter); + "%12llu ", counter); else len += snprintf(buf + len, sizeof(rtl->buf) - len, - "[error]"); - - if (j != RTL8366_NUM_PORTS - 1) { - if (counter < 100000) - len += snprintf(buf + len, - sizeof(rtl->buf) - len, - "\t"); - - len += snprintf(buf + len, - sizeof(rtl->buf) - len, - "\t"); - } + "%12s ", "error"); } len += snprintf(buf + len, sizeof(rtl->buf) - len, "\n"); } - len += snprintf(buf + len, sizeof(rtl->buf) - len, "\n"); - return simple_read_from_buffer(user_buf, count, ppos, buf, len); } @@ -793,6 +799,7 @@ static ssize_t rtl8366s_read_debugfs_vlan(struct file *file, 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; @@ -803,9 +810,9 @@ static ssize_t rtl8366s_read_debugfs_vlan(struct file *file, "\tports\n"); for (i = 0; i < RTL8366_NUM_VLANS; ++i) { - struct rtl8366s_vlanconfig vlanmc; + struct rtl8366_vlan_mc vlanmc; - rtl8366s_get_vlan_member_config(rtl, i, &vlanmc); + rtl8366s_get_vlan_mc(smi, i, &vlanmc); len += snprintf(buf + len, sizeof(rtl->buf) - len, "\t[%d] \t %d \t %d \t 0x%04x \t 0x%04x \t %d " @@ -814,7 +821,7 @@ static ssize_t rtl8366s_read_debugfs_vlan(struct file *file, for (j = 0; j < RTL8366_NUM_PORTS; ++j) { int index = 0; - if (!rtl8366s_get_port_vlan_index(rtl, j, &index)) { + if (!rtl8366s_get_port_vlan_index(smi, j, &index)) { if (index == i) len += snprintf(buf + len, sizeof(rtl->buf) - len, @@ -971,8 +978,7 @@ static int rtl8366s_sw_reset_mibs(struct switch_dev *dev, 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 data = 0; if (val->value.i == 1) { @@ -988,8 +994,7 @@ static int rtl8366s_sw_get_vlan_enable(struct switch_dev *dev, 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 data; if (attr->ofs == 1) { @@ -1015,8 +1020,7 @@ static int rtl8366s_sw_get_blinkrate(struct switch_dev *dev, 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 data; rtl8366_smi_read_reg(smi, RTL8366_LED_BLINKRATE_REG, &data); @@ -1030,8 +1034,7 @@ static int rtl8366s_sw_set_blinkrate(struct switch_dev *dev, 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 data; if (val->value.i >= 6) @@ -1051,12 +1054,12 @@ static int rtl8366s_sw_set_vlan_enable(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val) { - struct rtl8366s *rtl = sw_to_rtl8366s(dev); + struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev); if (attr->ofs == 1) - return rtl8366s_vlan_set_vlan(rtl, val->value.i); + return rtl8366s_vlan_set_vlan(smi, val->value.i); else - return rtl8366s_vlan_set_4ktable(rtl, val->value.i); + return rtl8366s_vlan_set_4ktable(smi, val->value.i); } static const char *rtl8366s_speed_str(unsigned speed) @@ -1122,9 +1125,10 @@ static int rtl8366s_sw_get_vlan_info(struct switch_dev *dev, { int i; u32 len = 0; - struct rtl8366s_vlanconfig vlanmc; - struct rtl8366s_vlan4kentry vlan4k; + struct rtl8366_vlan_mc vlanmc; + struct rtl8366_vlan_4k vlan4k; struct rtl8366s *rtl = sw_to_rtl8366s(dev); + struct rtl8366_smi *smi = &rtl->smi; char *buf = rtl->buf; if (val->port_vlan == 0 || val->port_vlan >= RTL8366_NUM_VLANS) @@ -1132,15 +1136,15 @@ static int rtl8366s_sw_get_vlan_info(struct switch_dev *dev, memset(buf, '\0', sizeof(rtl->buf)); - rtl8366s_get_vlan_member_config(rtl, val->port_vlan, &vlanmc); - rtl8366s_get_vlan_4k_entry(rtl, vlanmc.vid, &vlan4k); + rtl8366s_get_vlan_mc(smi, val->port_vlan, &vlanmc); + rtl8366s_get_vlan_4k(smi, vlanmc.vid, &vlan4k); len += snprintf(buf + len, sizeof(rtl->buf) - len, "VLAN %d: Ports: ", val->port_vlan); for (i = 0; i < RTL8366_NUM_PORTS; ++i) { int index = 0; - if (!rtl8366s_get_port_vlan_index(rtl, i, &index) && + if (!rtl8366s_get_port_vlan_index(smi, i, &index) && index == val->port_vlan) len += snprintf(buf + len, sizeof(rtl->buf) - len, "%d", i); @@ -1169,8 +1173,7 @@ static int rtl8366s_sw_set_port_led(struct switch_dev *dev, 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 data = 0; if (val->port_vlan >= RTL8366_NUM_PORTS || @@ -1195,8 +1198,7 @@ static int rtl8366s_sw_get_port_led(struct switch_dev *dev, 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 data = 0; if (val->port_vlan >= RTL8366_NUM_LEDGROUPS) @@ -1212,8 +1214,7 @@ static int rtl8366s_sw_reset_port_mibs(struct switch_dev *dev, 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 data = 0; if (val->port_vlan >= RTL8366_NUM_PORTS) @@ -1231,6 +1232,7 @@ static int rtl8366s_sw_get_port_mib(struct switch_dev *dev, struct switch_val *val) { struct rtl8366s *rtl = sw_to_rtl8366s(dev); + struct rtl8366_smi *smi = &rtl->smi; int i, len = 0; unsigned long long counter = 0; char *buf = rtl->buf; @@ -1242,15 +1244,15 @@ static int rtl8366s_sw_get_port_mib(struct switch_dev *dev, "Port %d MIB counters\n", val->port_vlan); - for (i = 0; i < RTL8366S_MIB_COUNT; ++i) { + for (i = 0; i < ARRAY_SIZE(rtl8366s_mib_counters); ++i) { len += snprintf(buf + len, sizeof(rtl->buf) - len, - "%d:%s\t", i, rtl8366s_mib_counters[i].name); - if (!rtl8366_get_mib_counter(rtl, 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, - "[%llu]\n", counter); + "%llu\n", counter); else len += snprintf(buf + len, sizeof(rtl->buf) - len, - "[error]\n"); + "%s\n", "error"); } val->value.s = buf; @@ -1261,15 +1263,15 @@ static int rtl8366s_sw_get_port_mib(struct switch_dev *dev, static int rtl8366s_sw_get_vlan_ports(struct switch_dev *dev, struct switch_val *val) { - struct rtl8366s_vlanconfig vlanmc; - struct rtl8366s *rtl = sw_to_rtl8366s(dev); + struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev); + struct rtl8366_vlan_mc vlanmc; struct switch_port *port; int i; if (val->port_vlan == 0 || val->port_vlan >= RTL8366_NUM_VLANS) return -EINVAL; - rtl8366s_get_vlan_member_config(rtl, val->port_vlan, &vlanmc); + rtl8366s_get_vlan_mc(smi, val->port_vlan, &vlanmc); port = &val->value.ports[0]; val->len = 0; @@ -1289,17 +1291,17 @@ static int rtl8366s_sw_get_vlan_ports(struct switch_dev *dev, static int rtl8366s_sw_set_vlan_ports(struct switch_dev *dev, struct switch_val *val) { - struct rtl8366s_vlanconfig vlanmc; - struct rtl8366s_vlan4kentry vlan4k; - struct rtl8366s *rtl = sw_to_rtl8366s(dev); + struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev); + struct rtl8366_vlan_mc vlanmc; + struct rtl8366_vlan_4k vlan4k; struct switch_port *port; int i; if (val->port_vlan == 0 || val->port_vlan >= RTL8366_NUM_VLANS) return -EINVAL; - rtl8366s_get_vlan_member_config(rtl, val->port_vlan, &vlanmc); - rtl8366s_get_vlan_4k_entry(rtl, vlanmc.vid, &vlan4k); + rtl8366s_get_vlan_mc(smi, val->port_vlan, &vlanmc); + rtl8366s_get_vlan_4k(smi, vlanmc.vid, &vlan4k); vlanmc.untag = 0; vlanmc.member = 0; @@ -1315,33 +1317,33 @@ static int rtl8366s_sw_set_vlan_ports(struct switch_dev *dev, vlan4k.member = vlanmc.member; vlan4k.untag = vlanmc.untag; - rtl8366s_set_vlan_member_config(rtl, val->port_vlan, &vlanmc); - rtl8366s_set_vlan_4k_entry(rtl, &vlan4k); + rtl8366s_set_vlan_mc(smi, val->port_vlan, &vlanmc); + rtl8366s_set_vlan_4k(smi, &vlan4k); return 0; } static int rtl8366s_sw_get_port_pvid(struct switch_dev *dev, int port, int *val) { - struct rtl8366s *rtl = sw_to_rtl8366s(dev); - return rtl8366s_get_vlan_port_pvid(rtl, port, val); + struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev); + return rtl8366s_get_vlan_port_pvid(smi, port, val); } static int rtl8366s_sw_set_port_pvid(struct switch_dev *dev, int port, int val) { - struct rtl8366s *rtl = sw_to_rtl8366s(dev); - return rtl8366s_set_vlan_port_pvid(rtl, port, val); + struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev); + return rtl8366s_set_vlan_port_pvid(smi, port, val); } static int rtl8366s_sw_reset_switch(struct switch_dev *dev) { - struct rtl8366s *rtl = sw_to_rtl8366s(dev); + struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev); int err; - err = rtl8366s_reset_chip(rtl); + err = rtl8366s_reset_chip(smi); if (err) return err; - return rtl8366s_reset_vlan(rtl); + return rtl8366s_reset_vlan(smi); } static struct switch_attr rtl8366s_globals[] = { @@ -1471,11 +1473,11 @@ static void rtl8366s_switch_cleanup(struct rtl8366s *rtl) static int rtl8366s_mii_read(struct mii_bus *bus, int addr, int reg) { - struct rtl8366s *rtl = smi_to_rtl8366s(bus->priv); + struct rtl8366_smi *smi = bus->priv; u32 val = 0; int err; - err = rtl8366s_read_phy_reg(rtl, addr, 0, reg, &val); + err = rtl8366s_read_phy_reg(smi, addr, 0, reg, &val); if (err) return 0xffff; @@ -1484,13 +1486,13 @@ static int rtl8366s_mii_read(struct mii_bus *bus, int addr, int reg) static int rtl8366s_mii_write(struct mii_bus *bus, int addr, int reg, u16 val) { - struct rtl8366s *rtl = smi_to_rtl8366s(bus->priv); + struct rtl8366_smi *smi = bus->priv; u32 t; int err; - err = rtl8366s_write_phy_reg(rtl, addr, 0, reg, val); + err = rtl8366s_write_phy_reg(smi, addr, 0, reg, val); /* flush write */ - (void) rtl8366s_read_phy_reg(rtl, addr, 0, reg, &t); + (void) rtl8366s_read_phy_reg(smi, addr, 0, reg, &t); return err; } @@ -1503,9 +1505,10 @@ static int rtl8366s_mii_bus_match(struct mii_bus *bus) static int rtl8366s_setup(struct rtl8366s *rtl) { + struct rtl8366_smi *smi = &rtl->smi; int ret; - ret = rtl8366s_reset_chip(rtl); + ret = rtl8366s_reset_chip(smi); if (ret) return ret;