X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=target%2Flinux%2Fgeneric%2Ffiles%2Fdrivers%2Fnet%2Fphy%2Frtl8366rb.c;h=d4fa74a864ef4f75f1083c464d9a38b0cce15892;hb=a072aff468123d37b3a0a178b0557ba9b070e858;hp=02de05575e45147386eb6aab01824a67a6e3e174;hpb=30a7cdf55e203d765e6d75223eec19aed66a44c1;p=openwrt.git diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366rb.c b/target/linux/generic/files/drivers/net/phy/rtl8366rb.c index 02de05575e..d4fa74a864 100644 --- a/target/linux/generic/files/drivers/net/phy/rtl8366rb.c +++ b/target/linux/generic/files/drivers/net/phy/rtl8366rb.c @@ -15,15 +15,10 @@ #include #include #include -#include #include #include "rtl8366_smi.h" -#ifdef CONFIG_RTL8366S_PHY_DEBUG_FS -#include -#endif - #define RTL8366RB_DRIVER_DESC "Realtek RTL8366RB ethernet switch driver" #define RTL8366RB_DRIVER_VER "0.2.2" @@ -31,10 +26,6 @@ #define RTL8366RB_PHY_PAGE_MAX 7 #define RTL8366RB_PHY_ADDR_MAX 31 -#define RTL8366RB_CHIP_GLOBAL_CTRL_REG 0x0000 -#define RTL8366RB_CHIP_CTRL_VLAN (1 << 13) -#define RTL8366RB_CHIP_CTRL_VLAN_4KTB (1 << 14) - /* Switch Global Configuration register */ #define RTL8366RB_SGCR 0x0000 #define RTL8366RB_SGCR_EN_BC_STORM_CTRL BIT(0) @@ -44,6 +35,8 @@ #define RTL8366RB_SGCR_MAX_LENGTH_1536 RTL8366RB_SGCR_MAX_LENGTH(0x1) #define RTL8366RB_SGCR_MAX_LENGTH_1552 RTL8366RB_SGCR_MAX_LENGTH(0x2) #define RTL8366RB_SGCR_MAX_LENGTH_9216 RTL8366RB_SGCR_MAX_LENGTH(0x3) +#define RTL8366RB_SGCR_EN_VLAN BIT(13) +#define RTL8366RB_SGCR_EN_VLAN_4KTB BIT(14) /* Port Enable Control register */ #define RTL8366RB_PECR 0x0001 @@ -76,6 +69,8 @@ #define RTL8366RB_PHY_NO_OFFSET 9 #define RTL8366RB_PHY_NO_MASK (0x1f << 9) +#define RTL8366RB_VLAN_INGRESS_CTRL2_REG 0x037f + /* LED control registers */ #define RTL8366RB_LED_BLINKRATE_REG 0x0430 #define RTL8366RB_LED_BLINKRATE_BIT 0 @@ -111,7 +106,7 @@ #define RTL8366RB_TABLE_VLAN_READ_CTRL 0x0E01 #define RTL8366RB_TABLE_VLAN_WRITE_CTRL 0x0F01 -#define RTL8366RB_VLAN_MEMCONF_BASE 0x0020 +#define RTL8366RB_VLAN_MC_BASE(_x) (0x0020 + (_x) * 3) #define RTL8366RB_PORT_LINK_STATUS_BASE 0x0014 @@ -160,81 +155,48 @@ #define RTL8366RB_PORT_ALL_INTERNAL RTL8366RB_PORT_CPU -struct rtl8366rb { - 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 rtl8366rb_vlan_mc { - u16 reserved2:1; - u16 priority:3; - u16 vid:12; - u16 untag:8; - u16 member:8; - u16 stag_mbr:8; - u16 stag_idx:3; - u16 reserved1:2; - u16 fid:3; -}; - -struct rtl8366rb_vlan_4k { - u16 reserved1:4; - u16 vid:12; - u16 untag:8; - u16 member:8; - u16 reserved2:13; - u16 fid:3; -}; - -#ifdef CONFIG_RTL8366S_PHY_DEBUG_FS -u16 gl_dbg_reg; -#endif - -struct mib_counter { - unsigned offset; - unsigned length; - const char *name; -}; - -static struct mib_counter rtl8366rb_mib_counters[RTL8366RB_MIB_COUNT] = { - { 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" }, +#define RTL8366RB_VLAN_VID_MASK 0xfff +#define RTL8366RB_VLAN_PRIORITY_SHIFT 12 +#define RTL8366RB_VLAN_PRIORITY_MASK 0x7 +#define RTL8366RB_VLAN_UNTAG_SHIFT 8 +#define RTL8366RB_VLAN_UNTAG_MASK 0xff +#define RTL8366RB_VLAN_MEMBER_MASK 0xff +#define RTL8366RB_VLAN_FID_MASK 0x7 + +static struct rtl8366_mib_counter rtl8366rb_mib_counters[] = { + { 0, 0, 4, "IfInOctets" }, + { 0, 4, 4, "EtherStatsOctets" }, + { 0, 8, 2, "EtherStatsUnderSizePkts" }, + { 0, 10, 2, "EtherFragments" }, + { 0, 12, 2, "EtherStatsPkts64Octets" }, + { 0, 14, 2, "EtherStatsPkts65to127Octets" }, + { 0, 16, 2, "EtherStatsPkts128to255Octets" }, + { 0, 18, 2, "EtherStatsPkts256to511Octets" }, + { 0, 20, 2, "EtherStatsPkts512to1023Octets" }, + { 0, 22, 2, "EtherStatsPkts1024to1518Octets" }, + { 0, 24, 2, "EtherOversizeStats" }, + { 0, 26, 2, "EtherStatsJabbers" }, + { 0, 28, 2, "IfInUcastPkts" }, + { 0, 30, 2, "EtherStatsMulticastPkts" }, + { 0, 32, 2, "EtherStatsBroadcastPkts" }, + { 0, 34, 2, "EtherStatsDropEvents" }, + { 0, 36, 2, "Dot3StatsFCSErrors" }, + { 0, 38, 2, "Dot3StatsSymbolErrors" }, + { 0, 40, 2, "Dot3InPauseFrames" }, + { 0, 42, 2, "Dot3ControlInUnknownOpcodes" }, + { 0, 44, 4, "IfOutOctets" }, + { 0, 48, 2, "Dot3StatsSingleCollisionFrames" }, + { 0, 50, 2, "Dot3StatMultipleCollisionFrames" }, + { 0, 52, 2, "Dot3sDeferredTransmissions" }, + { 0, 54, 2, "Dot3StatsLateCollisions" }, + { 0, 56, 2, "EtherStatsCollisions" }, + { 0, 58, 2, "Dot3StatsExcessiveCollisions" }, + { 0, 60, 2, "Dot3OutPauseFrames" }, + { 0, 62, 2, "Dot1dBasePortDelayExceededDiscards" }, + { 0, 64, 2, "Dot1dTpPortInDiscards" }, + { 0, 66, 2, "IfOutUcastPkts" }, + { 0, 68, 2, "IfOutMulticastPkts" }, + { 0, 70, 2, "IfOutBroadcastPkts" }, }; #define REG_WR(_smi, _reg, _val) \ @@ -251,22 +213,6 @@ static struct mib_counter rtl8366rb_mib_counters[RTL8366RB_MIB_COUNT] = { return err; \ } while (0) -static inline struct rtl8366rb *smi_to_rtl8366rb(struct rtl8366_smi *smi) -{ - return container_of(smi, struct rtl8366rb, smi); -} - -static inline struct rtl8366rb *sw_to_rtl8366rb(struct switch_dev *sw) -{ - return container_of(sw, struct rtl8366rb, dev); -} - -static inline struct rtl8366_smi *sw_to_rtl8366_smi(struct switch_dev *sw) -{ - struct rtl8366rb *rtl = sw_to_rtl8366rb(sw); - return &rtl->smi; -} - static int rtl8366rb_reset_chip(struct rtl8366_smi *smi) { int timeout = 10; @@ -308,6 +254,12 @@ static int rtl8366rb_hw_init(struct rtl8366_smi *smi) /* disable auto ageing for all ports */ REG_WR(smi, RTL8366RB_SSCR1, RTL8366RB_PORT_ALL); + /* + * discard VLAN tagged packets if the port is not a member of + * the VLAN with which the packets is associated. + */ + REG_WR(smi, RTL8366RB_VLAN_INGRESS_CTRL2_REG, RTL8366RB_PORT_ALL); + /* don't drop packets whose DA has not been learned */ REG_RMW(smi, RTL8366RB_SSCR2, RTL8366RB_SSCR2_DROP_UNKNOWN_DA, 0); @@ -380,8 +332,8 @@ static int rtl8366rb_write_phy_reg(struct rtl8366_smi *smi, return 0; } -static int rtl8366_get_mib_counter(struct rtl8366_smi *smi, int counter, - int port, unsigned long long *val) +static int rtl8366rb_get_mib_counter(struct rtl8366_smi *smi, int counter, + int port, unsigned long long *val) { int i; int err; @@ -431,22 +383,18 @@ static int rtl8366_get_mib_counter(struct rtl8366_smi *smi, int counter, static int rtl8366rb_get_vlan_4k(struct rtl8366_smi *smi, u32 vid, struct rtl8366_vlan_4k *vlan4k) { - struct rtl8366rb_vlan_4k vlan4k_priv; + u32 data[3]; int err; - u32 data; - u16 *tableaddr; + int i; memset(vlan4k, '\0', sizeof(struct rtl8366_vlan_4k)); - vlan4k_priv.vid = vid; if (vid >= RTL8366RB_NUM_VIDS) return -EINVAL; - tableaddr = (u16 *)&vlan4k_priv; - /* write VID */ - data = *tableaddr; - err = rtl8366_smi_write_reg(smi, RTL8366RB_VLAN_TABLE_WRITE_BASE, data); + err = rtl8366_smi_write_reg(smi, RTL8366RB_VLAN_TABLE_WRITE_BASE, + vid & RTL8366RB_VLAN_VID_MASK); if (err) return err; @@ -456,31 +404,19 @@ static int rtl8366rb_get_vlan_4k(struct rtl8366_smi *smi, u32 vid, if (err) return err; - err = rtl8366_smi_read_reg(smi, RTL8366RB_VLAN_TABLE_READ_BASE, &data); - if (err) - return err; - - *tableaddr = data; - tableaddr++; - - err = rtl8366_smi_read_reg(smi, RTL8366RB_VLAN_TABLE_READ_BASE + 1, - &data); - if (err) - return err; - - *tableaddr = data; - tableaddr++; - - err = rtl8366_smi_read_reg(smi, RTL8366RB_VLAN_TABLE_READ_BASE + 2, - &data); - if (err) - return err; - *tableaddr = data; + for (i = 0; i < 3; i++) { + err = rtl8366_smi_read_reg(smi, + RTL8366RB_VLAN_TABLE_READ_BASE + i, + &data[i]); + if (err) + return err; + } vlan4k->vid = vid; - vlan4k->untag = vlan4k_priv.untag; - vlan4k->member = vlan4k_priv.member; - vlan4k->fid = vlan4k_priv.fid; + vlan4k->untag = (data[1] >> RTL8366RB_VLAN_UNTAG_SHIFT) & + RTL8366RB_VLAN_UNTAG_MASK; + vlan4k->member = data[1] & RTL8366RB_VLAN_MEMBER_MASK; + vlan4k->fid = data[2] & RTL8366RB_VLAN_FID_MASK; return 0; } @@ -488,10 +424,9 @@ static int rtl8366rb_get_vlan_4k(struct rtl8366_smi *smi, u32 vid, static int rtl8366rb_set_vlan_4k(struct rtl8366_smi *smi, const struct rtl8366_vlan_4k *vlan4k) { - struct rtl8366rb_vlan_4k vlan4k_priv; + u32 data[3]; int err; - u32 data; - u16 *tableaddr; + int i; if (vlan4k->vid >= RTL8366RB_NUM_VIDS || vlan4k->member > RTL8366RB_PORT_ALL || @@ -499,36 +434,19 @@ static int rtl8366rb_set_vlan_4k(struct rtl8366_smi *smi, vlan4k->fid > RTL8366RB_FIDMAX) return -EINVAL; - vlan4k_priv.vid = vlan4k->vid; - vlan4k_priv.untag = vlan4k->untag; - vlan4k_priv.member = vlan4k->member; - vlan4k_priv.fid = vlan4k->fid; - - tableaddr = (u16 *)&vlan4k_priv; + data[0] = vlan4k->vid & RTL8366RB_VLAN_VID_MASK; + data[1] = (vlan4k->member & RTL8366RB_VLAN_MEMBER_MASK) | + ((vlan4k->untag & RTL8366RB_VLAN_UNTAG_MASK) << + RTL8366RB_VLAN_UNTAG_SHIFT); + data[2] = vlan4k->fid & RTL8366RB_VLAN_FID_MASK; - data = *tableaddr; - - err = rtl8366_smi_write_reg(smi, RTL8366RB_VLAN_TABLE_WRITE_BASE, data); - if (err) - return err; - - tableaddr++; - - data = *tableaddr; - - err = rtl8366_smi_write_reg(smi, RTL8366RB_VLAN_TABLE_WRITE_BASE + 1, - data); - if (err) - return err; - - tableaddr++; - - data = *tableaddr; - - err = rtl8366_smi_write_reg(smi, RTL8366RB_VLAN_TABLE_WRITE_BASE + 2, - data); - if (err) - return err; + for (i = 0; i < 3; i++) { + err = rtl8366_smi_write_reg(smi, + RTL8366RB_VLAN_TABLE_WRITE_BASE + i, + data[i]); + if (err) + return err; + } /* write table access control word */ err = rtl8366_smi_write_reg(smi, RTL8366RB_TABLE_ACCESS_CTRL_REG, @@ -540,47 +458,30 @@ static int rtl8366rb_set_vlan_4k(struct rtl8366_smi *smi, static int rtl8366rb_get_vlan_mc(struct rtl8366_smi *smi, u32 index, struct rtl8366_vlan_mc *vlanmc) { - struct rtl8366rb_vlan_mc vlanmc_priv; + u32 data[3]; int err; - u32 addr; - u32 data; - u16 *tableaddr; + int i; memset(vlanmc, '\0', sizeof(struct rtl8366_vlan_mc)); if (index >= RTL8366RB_NUM_VLANS) return -EINVAL; - tableaddr = (u16 *)&vlanmc_priv; - - addr = RTL8366RB_VLAN_MEMCONF_BASE + (index * 3); - err = rtl8366_smi_read_reg(smi, addr, &data); - if (err) - return err; - - *tableaddr = data; - tableaddr++; - - addr = RTL8366RB_VLAN_MEMCONF_BASE + 1 + (index * 3); - err = rtl8366_smi_read_reg(smi, addr, &data); - if (err) - return err; - - *tableaddr = data; - tableaddr++; - - addr = RTL8366RB_VLAN_MEMCONF_BASE + 2 + (index * 3); - err = rtl8366_smi_read_reg(smi, addr, &data); - if (err) - return err; - - *tableaddr = data; + for (i = 0; i < 3; i++) { + err = rtl8366_smi_read_reg(smi, + RTL8366RB_VLAN_MC_BASE(index) + i, + &data[i]); + if (err) + return err; + } - vlanmc->vid = vlanmc_priv.vid; - vlanmc->priority = vlanmc_priv.priority; - vlanmc->untag = vlanmc_priv.untag; - vlanmc->member = vlanmc_priv.member; - vlanmc->fid = vlanmc_priv.fid; + vlanmc->vid = data[0] & RTL8366RB_VLAN_VID_MASK; + vlanmc->priority = (data[0] >> RTL8366RB_VLAN_PRIORITY_SHIFT) & + RTL8366RB_VLAN_PRIORITY_MASK; + vlanmc->untag = (data[1] >> RTL8366RB_VLAN_UNTAG_SHIFT) & + RTL8366RB_VLAN_UNTAG_MASK; + vlanmc->member = data[1] & RTL8366RB_VLAN_MEMBER_MASK; + vlanmc->fid = data[2] & RTL8366RB_VLAN_FID_MASK; return 0; } @@ -588,11 +489,9 @@ static int rtl8366rb_get_vlan_mc(struct rtl8366_smi *smi, u32 index, static int rtl8366rb_set_vlan_mc(struct rtl8366_smi *smi, u32 index, const struct rtl8366_vlan_mc *vlanmc) { - struct rtl8366rb_vlan_mc vlanmc_priv; + u32 data[3]; int err; - u32 addr; - u32 data; - u16 *tableaddr; + int i; if (index >= RTL8366RB_NUM_VLANS || vlanmc->vid >= RTL8366RB_NUM_VIDS || @@ -602,40 +501,22 @@ static int rtl8366rb_set_vlan_mc(struct rtl8366_smi *smi, u32 index, vlanmc->fid > RTL8366RB_FIDMAX) return -EINVAL; - vlanmc_priv.vid = vlanmc->vid; - vlanmc_priv.priority = vlanmc->priority; - vlanmc_priv.untag = vlanmc->untag; - vlanmc_priv.member = vlanmc->member; - vlanmc_priv.stag_mbr = 0; - vlanmc_priv.stag_idx = 0; - vlanmc_priv.fid = vlanmc->fid; - - addr = RTL8366RB_VLAN_MEMCONF_BASE + (index * 3); - - tableaddr = (u16 *)&vlanmc_priv; - data = *tableaddr; - - err = rtl8366_smi_write_reg(smi, addr, data); - if (err) - return err; - - addr = RTL8366RB_VLAN_MEMCONF_BASE + 1 + (index * 3); - - tableaddr++; - data = *tableaddr; - - err = rtl8366_smi_write_reg(smi, addr, data); - if (err) - return err; - - addr = RTL8366RB_VLAN_MEMCONF_BASE + 2 + (index * 3); - - tableaddr++; - data = *tableaddr; + data[0] = (vlanmc->vid & RTL8366RB_VLAN_VID_MASK) | + ((vlanmc->priority & RTL8366RB_VLAN_PRIORITY_MASK) << + RTL8366RB_VLAN_PRIORITY_SHIFT); + data[1] = (vlanmc->member & RTL8366RB_VLAN_MEMBER_MASK) | + ((vlanmc->untag & RTL8366RB_VLAN_UNTAG_MASK) << + RTL8366RB_VLAN_UNTAG_SHIFT); + data[2] = vlanmc->fid & RTL8366RB_VLAN_FID_MASK; + + for (i = 0; i < 3; i++) { + err = rtl8366_smi_write_reg(smi, + RTL8366RB_VLAN_MC_BASE(index) + i, + data[i]); + if (err) + return err; + } - err = rtl8366_smi_write_reg(smi, addr, data); - if (err) - return err; return 0; } @@ -673,240 +554,25 @@ static int rtl8366rb_set_mc_index(struct rtl8366_smi *smi, int port, int index) static int rtl8366rb_vlan_set_vlan(struct rtl8366_smi *smi, int enable) { - return rtl8366_smi_rmwr(smi, RTL8366RB_CHIP_GLOBAL_CTRL_REG, - RTL8366RB_CHIP_CTRL_VLAN, - (enable) ? RTL8366RB_CHIP_CTRL_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) { - return rtl8366_smi_rmwr(smi, RTL8366RB_CHIP_GLOBAL_CTRL_REG, - RTL8366RB_CHIP_CTRL_VLAN_4KTB, - (enable) ? RTL8366RB_CHIP_CTRL_VLAN_4KTB : 0); -} - -#ifdef CONFIG_RTL8366S_PHY_DEBUG_FS -static int rtl8366rb_debugfs_open(struct inode *inode, struct file *file) -{ - file->private_data = inode->i_private; - return 0; -} - -static ssize_t rtl8366rb_read_debugfs_mibs(struct file *file, - char __user *user_buf, - size_t count, loff_t *ppos) -{ - struct rtl8366rb *rtl = (struct rtl8366rb *)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(rtl8366rb_mib_counters); ++i) { - len += snprintf(buf + len, sizeof(rtl->buf) - len, "%-36s ", - rtl8366rb_mib_counters[i].name); - for (j = 0; j < RTL8366RB_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); + return rtl8366_smi_rmwr(smi, RTL8366RB_SGCR, + RTL8366RB_SGCR_EN_VLAN_4KTB, + (enable) ? RTL8366RB_SGCR_EN_VLAN_4KTB : 0); } -static ssize_t rtl8366rb_read_debugfs_vlan_mc(struct file *file, - char __user *user_buf, - size_t count, loff_t *ppos) -{ - struct rtl8366rb *rtl = (struct rtl8366rb *)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 < RTL8366RB_NUM_VLANS; ++i) { - struct rtl8366_vlan_mc vlanmc; - - rtl8366rb_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 rtl8366rb_read_debugfs_reg(struct file *file, - char __user *user_buf, - size_t count, loff_t *ppos) -{ - struct rtl8366rb *rtl = (struct rtl8366rb *)file->private_data; - struct rtl8366_smi *smi = &rtl->smi; - u32 t, reg = gl_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 rtl8366rb_write_debugfs_reg(struct file *file, - const char __user *user_buf, - size_t count, loff_t *ppos) -{ - struct rtl8366rb *rtl = (struct rtl8366rb *)file->private_data; - struct rtl8366_smi *smi = &rtl->smi; - unsigned long data; - u32 reg = gl_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_rtl8366rb_regs = { - .read = rtl8366rb_read_debugfs_reg, - .write = rtl8366rb_write_debugfs_reg, - .open = rtl8366rb_debugfs_open, - .owner = THIS_MODULE -}; - -static const struct file_operations fops_rtl8366rb_vlan_mc = { - .read = rtl8366rb_read_debugfs_vlan_mc, - .open = rtl8366rb_debugfs_open, - .owner = THIS_MODULE -}; - -static const struct file_operations fops_rtl8366rb_mibs = { - .read = rtl8366rb_read_debugfs_mibs, - .open = rtl8366rb_debugfs_open, - .owner = THIS_MODULE -}; - -static void rtl8366rb_debugfs_init(struct rtl8366rb *rtl) -{ - struct dentry *node; - struct dentry *root; - - if (!rtl->debugfs_root) - rtl->debugfs_root = debugfs_create_dir("rtl8366rb", 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, &gl_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_rtl8366rb_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_rtl8366rb_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_rtl8366rb_mibs); - if (!node) { - dev_err(rtl->parent, "Creating debugfs file '%s' failed\n", - "mibs"); - return; - } -} - -static void rtl8366rb_debugfs_remove(struct rtl8366rb *rtl) -{ - if (rtl->debugfs_root) { - debugfs_remove_recursive(rtl->debugfs_root); - rtl->debugfs_root = NULL; - } -} - -#else -static inline void rtl8366rb_debugfs_init(struct rtl8366rb *rtl) {} -static inline void rtl8366rb_debugfs_remove(struct rtl8366rb *rtl) {} -#endif /* CONFIG_RTL8366S_PHY_DEBUG_FS */ - static int rtl8366rb_sw_reset_mibs(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val) { struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev); - int err = 0; - - if (val->value.i == 1) - err = rtl8366_smi_rmwr(smi, RTL8366RB_MIB_CTRL_REG, 0, - RTL8366RB_MIB_CTRL_GLOBAL_RESET); - return err; + return rtl8366_smi_rmwr(smi, RTL8366RB_MIB_CTRL_REG, 0, + RTL8366RB_MIB_CTRL_GLOBAL_RESET); } static int rtl8366rb_sw_get_vlan_enable(struct switch_dev *dev, @@ -917,16 +583,16 @@ static int rtl8366rb_sw_get_vlan_enable(struct switch_dev *dev, u32 data; if (attr->ofs == 1) { - rtl8366_smi_read_reg(smi, RTL8366RB_CHIP_GLOBAL_CTRL_REG, &data); + rtl8366_smi_read_reg(smi, RTL8366RB_SGCR, &data); - if (data & RTL8366RB_CHIP_CTRL_VLAN) + if (data & RTL8366RB_SGCR_EN_VLAN) val->value.i = 1; else val->value.i = 0; } else if (attr->ofs == 2) { - rtl8366_smi_read_reg(smi, RTL8366RB_CHIP_GLOBAL_CTRL_REG, &data); + rtl8366_smi_read_reg(smi, RTL8366RB_SGCR, &data); - if (data & RTL8366RB_CHIP_CTRL_VLAN_4KTB) + if (data & RTL8366RB_SGCR_EN_VLAN_4KTB) val->value.i = 1; else val->value.i = 0; @@ -993,14 +659,13 @@ static int rtl8366rb_sw_get_port_link(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val) { - struct rtl8366rb *rtl = sw_to_rtl8366rb(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 >= RTL8366RB_NUM_PORTS) return -EINVAL; - memset(rtl->buf, '\0', sizeof(rtl->buf)); + memset(smi->buf, '\0', sizeof(smi->buf)); rtl8366_smi_read_reg(smi, RTL8366RB_PORT_LINK_STATUS_BASE + (val->port_vlan / 2), &data); @@ -1008,7 +673,7 @@ static int rtl8366rb_sw_get_port_link(struct switch_dev *dev, data = data >> 8; if (data & RTL8366RB_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, rtl8366rb_speed_str(data & @@ -1022,11 +687,11 @@ static int rtl8366rb_sw_get_port_link(struct switch_dev *dev, (data & RTL8366RB_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->value.s = rtl->buf; + val->value.s = smi->buf; val->len = len; return 0; @@ -1039,32 +704,31 @@ static int rtl8366rb_sw_get_vlan_info(struct switch_dev *dev, int i; u32 len = 0; struct rtl8366_vlan_4k vlan4k; - struct rtl8366rb *rtl = sw_to_rtl8366rb(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 >= RTL8366RB_NUM_VLANS) return -EINVAL; - memset(buf, '\0', sizeof(rtl->buf)); + memset(buf, '\0', sizeof(smi->buf)); err = rtl8366rb_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 < RTL8366RB_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"); } - 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); @@ -1132,27 +796,27 @@ static int rtl8366rb_sw_get_port_mib(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val) { - struct rtl8366rb *rtl = sw_to_rtl8366rb(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; - char *buf = rtl->buf; + char *buf = smi->buf; - if (val->port_vlan >= RTL8366RB_NUM_PORTS) + if (val->port_vlan >= smi->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(rtl8366rb_mib_counters); ++i) { - len += snprintf(buf + len, sizeof(rtl->buf) - len, - "%-36s: ", rtl8366rb_mib_counters[i].name); - if (!rtl8366_get_mib_counter(smi, i, val->port_vlan, &counter)) - len += snprintf(buf + len, sizeof(rtl->buf) - len, + for (i = 0; i < smi->num_mib_counters; ++i) { + len += snprintf(buf + len, sizeof(smi->buf) - len, + "%-36s: ", smi->mib_counters[i].name); + if (!smi->ops->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(rtl->buf) - len, + len += snprintf(buf + len, sizeof(smi->buf) - len, "%s\n", "error"); } @@ -1212,18 +876,6 @@ static int rtl8366rb_sw_set_vlan_ports(struct switch_dev *dev, return rtl8366_set_vlan(smi, val->port_vlan, member, untag, 0); } -static int rtl8366rb_sw_get_port_pvid(struct switch_dev *dev, int port, int *val) -{ - struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev); - return rtl8366_get_pvid(smi, port, val); -} - -static int rtl8366rb_sw_set_port_pvid(struct switch_dev *dev, int port, int val) -{ - struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev); - return rtl8366_set_pvid(smi, port, val); -} - static int rtl8366rb_sw_reset_switch(struct switch_dev *dev) { struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev); @@ -1258,12 +910,10 @@ static struct switch_attr rtl8366rb_globals[] = { .max = 1, .ofs = 2 }, { - .type = SWITCH_TYPE_INT, + .type = SWITCH_TYPE_NOVAL, .name = "reset_mibs", .description = "Reset all MIB counters", .set = rtl8366rb_sw_reset_mibs, - .get = NULL, - .max = 1 }, { .type = SWITCH_TYPE_INT, .name = "blinkrate", @@ -1284,12 +934,10 @@ static struct switch_attr rtl8366rb_port[] = { .set = NULL, .get = rtl8366rb_sw_get_port_link, }, { - .type = SWITCH_TYPE_INT, + .type = SWITCH_TYPE_NOVAL, .name = "reset_mib", .description = "Reset single port MIB counters", - .max = 1, .set = rtl8366rb_sw_reset_port_mibs, - .get = NULL, }, { .type = SWITCH_TYPE_STRING, .name = "mib", @@ -1339,30 +987,30 @@ static struct switch_dev rtl8366_switch_dev = { .get_vlan_ports = rtl8366rb_sw_get_vlan_ports, .set_vlan_ports = rtl8366rb_sw_set_vlan_ports, - .get_port_pvid = rtl8366rb_sw_get_port_pvid, - .set_port_pvid = rtl8366rb_sw_set_port_pvid, + .get_port_pvid = rtl8366_sw_get_port_pvid, + .set_port_pvid = rtl8366_sw_set_port_pvid, .reset_switch = rtl8366rb_sw_reset_switch, }; -static int rtl8366rb_switch_init(struct rtl8366rb *rtl) +static int rtl8366rb_switch_init(struct rtl8366_smi *smi) { - struct switch_dev *dev = &rtl->dev; + struct switch_dev *dev = &smi->sw_dev; int err; memcpy(dev, &rtl8366_switch_dev, sizeof(struct switch_dev)); - dev->priv = rtl; - dev->devname = dev_name(rtl->parent); + dev->priv = smi; + dev->devname = dev_name(smi->parent); err = register_switch(dev, NULL); if (err) - dev_err(rtl->parent, "switch registration failed\n"); + dev_err(smi->parent, "switch registration failed\n"); return err; } -static void rtl8366rb_switch_cleanup(struct rtl8366rb *rtl) +static void rtl8366rb_switch_cleanup(struct rtl8366_smi *smi) { - unregister_switch(&rtl->dev); + unregister_switch(&smi->sw_dev); } static int rtl8366rb_mii_read(struct mii_bus *bus, int addr, int reg) @@ -1397,13 +1045,10 @@ static int rtl8366rb_mii_bus_match(struct mii_bus *bus) bus->write == rtl8366rb_mii_write); } -static int rtl8366rb_setup(struct rtl8366rb *rtl) +static int rtl8366rb_setup(struct rtl8366_smi *smi) { - struct rtl8366_smi *smi = &rtl->smi; int ret; - rtl8366rb_debugfs_init(rtl); - ret = rtl8366rb_reset_chip(smi); if (ret) return ret; @@ -1447,6 +1092,8 @@ static int rtl8366rb_detect(struct rtl8366_smi *smi) static struct rtl8366_smi_ops rtl8366rb_smi_ops = { .detect = rtl8366rb_detect, + .setup = rtl8366rb_setup, + .mii_read = rtl8366rb_mii_read, .mii_write = rtl8366rb_mii_write, @@ -1456,13 +1103,13 @@ static struct rtl8366_smi_ops rtl8366rb_smi_ops = { .set_vlan_4k = rtl8366rb_set_vlan_4k, .get_mc_index = rtl8366rb_get_mc_index, .set_mc_index = rtl8366rb_set_mc_index, + .get_mib_counter = rtl8366rb_get_mib_counter, }; static int __init rtl8366rb_probe(struct platform_device *pdev) { static int rtl8366_smi_version_printed; struct rtl8366rb_platform_data *pdata; - struct rtl8366rb *rtl; struct rtl8366_smi *smi; int err; @@ -1477,35 +1124,28 @@ static int __init rtl8366rb_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 = &rtl8366rb_smi_ops; smi->cpu_port = RTL8366RB_PORT_NUM_CPU; smi->num_ports = RTL8366RB_NUM_PORTS; smi->num_vlan_mc = RTL8366RB_NUM_VLANS; + smi->mib_counters = rtl8366rb_mib_counters; + smi->num_mib_counters = ARRAY_SIZE(rtl8366rb_mib_counters); err = rtl8366_smi_init(smi); if (err) - goto err_free_rtl; - - platform_set_drvdata(pdev, rtl); + goto err_free_smi; - err = rtl8366rb_setup(rtl); - if (err) - goto err_clear_drvdata; + platform_set_drvdata(pdev, smi); - err = rtl8366rb_switch_init(rtl); + err = rtl8366rb_switch_init(smi); if (err) goto err_clear_drvdata; @@ -1514,8 +1154,8 @@ static int __init rtl8366rb_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; } @@ -1548,14 +1188,13 @@ static struct phy_driver rtl8366rb_phy_driver = { static int __devexit rtl8366rb_remove(struct platform_device *pdev) { - struct rtl8366rb *rtl = platform_get_drvdata(pdev); + struct rtl8366_smi *smi = platform_get_drvdata(pdev); - if (rtl) { - rtl8366rb_switch_cleanup(rtl); - rtl8366rb_debugfs_remove(rtl); + if (smi) { + rtl8366rb_switch_cleanup(smi); platform_set_drvdata(pdev, NULL); - rtl8366_smi_cleanup(&rtl->smi); - kfree(rtl); + rtl8366_smi_cleanup(smi); + kfree(smi); } return 0;