X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/72607e76c7dd22869ae985371d1d261456f2f28c..878e6fafb080eab3d49672d0b7c1a4908596b609:/target/linux/ar71xx/files/drivers/net/phy/rtl8366_smi.c diff --git a/target/linux/ar71xx/files/drivers/net/phy/rtl8366_smi.c b/target/linux/ar71xx/files/drivers/net/phy/rtl8366_smi.c index 6c807bc02..abd1af0ae 100644 --- a/target/linux/ar71xx/files/drivers/net/phy/rtl8366_smi.c +++ b/target/linux/ar71xx/files/drivers/net/phy/rtl8366_smi.c @@ -21,9 +21,7 @@ #include #include -/* #define DEBUG 1 */ - -#ifdef DEBUG +#ifdef CONFIG_RTL8366_SMI_DEBUG_FS #include #endif @@ -87,6 +85,12 @@ #define RTL8366S_PORT_VLAN_CTRL_BASE 0x0058 +#define RTL8366S_PORT_VLAN_CTRL_REG(_p) \ + (RTL8366S_PORT_VLAN_CTRL_BASE + (_p) / 4) +#define RTL8366S_PORT_VLAN_CTRL_MASK 0xf +#define RTL8366S_PORT_VLAN_CTRL_SHIFT(_p) (4 * ((_p) % 4)) + + #define RTL8366S_VLAN_TABLE_READ_BASE 0x018B #define RTL8366S_VLAN_TABLE_WRITE_BASE 0x0185 @@ -167,55 +171,58 @@ struct rtl8366s_vlan4kentry { u16 member:6; }; -static const char *MIBCOUNTERS[] = { "IfInOctets ", - "EtherStatsOctets ", - "EtherStatsUnderSizePkts ", - "EtherFregament ", - "EtherStatsPkts64Octets ", - "EtherStatsPkts65to127Octets ", - "EtherStatsPkts128to255Octets ", - "EtherStatsPkts256to511Octets ", - "EtherStatsPkts512to1023Octets ", - "EtherStatsPkts1024to1518Octets ", - "EtherOversizeStats ", - "EtherStatsJabbers ", - "IfInUcastPkts ", - "EtherStatsMulticastPkts ", - "EtherStatsBroadcastPkts ", - "EtherStatsDropEvents ", - "Dot3StatsFCSErrors ", - "Dot3StatsSymbolErrors ", - "Dot3InPauseFrames ", - "Dot3ControlInUnknownOpcodes ", - "IfOutOctets ", - "Dot3StatsSingleCollisionFrames ", - "Dot3StatMultipleCollisionFrames ", - "Dot3sDeferredTransmissions ", - "Dot3StatsLateCollisions ", - "EtherStatsCollisions ", - "Dot3StatsExcessiveCollisions ", - "Dot3OutPauseFrames ", - "Dot1dBasePortDelayExceededDiscards", - "Dot1dTpPortInDiscards ", - "IfOutUcastPkts ", - "IfOutMulticastPkts ", - "IfOutBroadcastPkts ", - NULL }; +static const char *MIBCOUNTERS[] = { + "IfInOctets ", + "EtherStatsOctets ", + "EtherStatsUnderSizePkts ", + "EtherFregament ", + "EtherStatsPkts64Octets ", + "EtherStatsPkts65to127Octets ", + "EtherStatsPkts128to255Octets ", + "EtherStatsPkts256to511Octets ", + "EtherStatsPkts512to1023Octets ", + "EtherStatsPkts1024to1518Octets ", + "EtherOversizeStats ", + "EtherStatsJabbers ", + "IfInUcastPkts ", + "EtherStatsMulticastPkts ", + "EtherStatsBroadcastPkts ", + "EtherStatsDropEvents ", + "Dot3StatsFCSErrors ", + "Dot3StatsSymbolErrors ", + "Dot3InPauseFrames ", + "Dot3ControlInUnknownOpcodes ", + "IfOutOctets ", + "Dot3StatsSingleCollisionFrames ", + "Dot3StatMultipleCollisionFrames ", + "Dot3sDeferredTransmissions ", + "Dot3StatsLateCollisions ", + "EtherStatsCollisions ", + "Dot3StatsExcessiveCollisions ", + "Dot3OutPauseFrames ", + "Dot1dBasePortDelayExceededDiscards", + "Dot1dTpPortInDiscards ", + "IfOutUcastPkts ", + "IfOutMulticastPkts ", + "IfOutBroadcastPkts ", + NULL, +}; struct rtl8366_smi { - struct platform_device *pdev; - struct rtl8366_smi_platform_data *pdata; + struct device *parent; + unsigned int gpio_sda; + unsigned int gpio_sck; spinlock_t lock; struct mii_bus *mii_bus; struct switch_dev dev; int mii_irq[PHY_MAX_ADDR]; - char buf[4096]; -#ifdef DEBUG + char buf[4096]; +#ifdef CONFIG_RTL8366_SMI_DEBUG_FS struct dentry *debugfs_root; #endif }; -#ifdef DEBUG +#ifdef CONFIG_RTL8366_SMI_DEBUG_FS u16 g_dbg_reg; #endif @@ -231,8 +238,8 @@ static inline void rtl8366_smi_clk_delay(struct rtl8366_smi *smi) static void rtl8366_smi_start(struct rtl8366_smi *smi) { - unsigned int sda = smi->pdata->gpio_sda; - unsigned int sck = smi->pdata->gpio_sck; + unsigned int sda = smi->gpio_sda; + unsigned int sck = smi->gpio_sck; /* * Set GPIO pins to output mode, with initial state: @@ -260,8 +267,8 @@ static void rtl8366_smi_start(struct rtl8366_smi *smi) static void rtl8366_smi_stop(struct rtl8366_smi *smi) { - unsigned int sda = smi->pdata->gpio_sda; - unsigned int sck = smi->pdata->gpio_sck; + unsigned int sda = smi->gpio_sda; + unsigned int sck = smi->gpio_sck; rtl8366_smi_clk_delay(smi); gpio_set_value(sda, 0); @@ -288,8 +295,8 @@ static void rtl8366_smi_stop(struct rtl8366_smi *smi) static void rtl8366_smi_write_bits(struct rtl8366_smi *smi, u32 data, u32 len) { - unsigned int sda = smi->pdata->gpio_sda; - unsigned int sck = smi->pdata->gpio_sck; + unsigned int sda = smi->gpio_sda; + unsigned int sck = smi->gpio_sck; for (; len > 0; len--) { rtl8366_smi_clk_delay(smi); @@ -310,8 +317,8 @@ static void rtl8366_smi_write_bits(struct rtl8366_smi *smi, u32 data, u32 len) static void rtl8366_smi_read_bits(struct rtl8366_smi *smi, u32 len, u32 *data) { - unsigned int sda = smi->pdata->gpio_sda; - unsigned int sck = smi->pdata->gpio_sck; + unsigned int sda = smi->gpio_sda; + unsigned int sck = smi->gpio_sck; gpio_direction_input(sda); @@ -553,20 +560,18 @@ static int rtl8366_get_mib_counter(struct rtl8366_smi *smi, int counter, if (port > RTL8366_NUM_PORTS || counter >= RTL8366S_MIB_COUNT) return -EINVAL; - i = 0; regoffset = RTL8366S_MIB_COUNTER_PORT_OFFSET * (port); - while (i < counter) { + for (i = 0; i < counter; i++) regoffset += mibLength[i]; - i++; - } addr = RTL8366S_MIB_COUNTER_BASE + regoffset; - - /* writing access counter address first */ - /* then ASIC will prepare 64bits counter wait for being retrived */ - data = 0;/* writing data will be discard by ASIC */ + /* + * Writing access counter address first + * then ASIC will prepare 64bits counter wait for being retrived + */ + data = 0; /* writing data will be discard by ASIC */ err = rtl8366_smi_write_reg(smi, addr, data); if (err) return err; @@ -671,16 +676,16 @@ static int rtl8366s_set_vlan_4k_entry(struct rtl8366_smi *smi, data = *tableaddr; - rtl8366_smi_write_reg(smi, RTL8366S_VLAN_TABLE_WRITE_BASE + 1, data); - + err = rtl8366_smi_write_reg(smi, RTL8366S_VLAN_TABLE_WRITE_BASE + 1, + data); + if (err) + return err; /* write table access control word */ err = rtl8366_smi_write_reg(smi, RTL8366S_TABLE_ACCESS_CTRL_REG, RTL8366S_TABLE_VLAN_WRITE_CTRL); - if (err) - return err; - return 0; + return err; } static int rtl8366s_get_vlan_member_config(struct rtl8366_smi *smi, u32 index, @@ -699,7 +704,6 @@ static int rtl8366s_get_vlan_member_config(struct rtl8366_smi *smi, u32 index, tableaddr = (u16 *)vlanmc; addr = RTL8366S_VLAN_MEMCONF_BASE + (index << 1); - err = rtl8366_smi_read_reg(smi, addr, &data); if (err) return err; @@ -708,7 +712,6 @@ static int rtl8366s_get_vlan_member_config(struct rtl8366_smi *smi, u32 index, tableaddr++; addr = RTL8366S_VLAN_MEMCONF_BASE + 1 + (index << 1); - err = rtl8366_smi_read_reg(smi, addr, &data); if (err) return err; @@ -728,16 +731,15 @@ static int rtl8366s_set_vlan_member_config(struct rtl8366_smi *smi, u32 index, u16 *tableaddr; if (index >= RTL8366_NUM_VLANS || - vlanmc->vid >= RTL8366_NUM_VIDS || - vlanmc->priority > RTL8366S_PRIORITYMAX || - vlanmc->member > RTL8366_PORT_ALL || - vlanmc->untag > RTL8366_PORT_ALL || - vlanmc->fid > RTL8366S_FIDMAX) + vlanmc->vid >= RTL8366_NUM_VIDS || + vlanmc->priority > RTL8366S_PRIORITYMAX || + vlanmc->member > RTL8366_PORT_ALL || + vlanmc->untag > RTL8366_PORT_ALL || + vlanmc->fid > RTL8366S_FIDMAX) return -EINVAL; addr = RTL8366S_VLAN_MEMCONF_BASE + (index << 1); - tableaddr = (u16 *)vlanmc; data = *tableaddr; @@ -760,28 +762,19 @@ static int rtl8366s_set_vlan_member_config(struct rtl8366_smi *smi, u32 index, static int rtl8366_get_port_vlan_index(struct rtl8366_smi *smi, int port, int *val) { - int err; - u32 addr; u32 data; - - /* bits mapping to port vlan control register of port n */ - const u16 bits[RTL8366_NUM_PORTS] = { 0x000F, 0x00F0, 0x0F00, - 0xF000, 0x000F, 0x00F0 }; - /* bits offset to port vlan control register of port n */ - const u16 bitoffset[RTL8366_NUM_PORTS] = { 0, 4, 8, 12, 0, 4 }; - /* address offset to port vlan control register of port n */ - const u16 addroffset[RTL8366_NUM_PORTS] = { 0, 0, 0, 0, 1, 1 }; + int err; if (port >= RTL8366_NUM_PORTS) return -EINVAL; - addr = RTL8366S_PORT_VLAN_CTRL_BASE + addroffset[port]; - - err = rtl8366_smi_read_reg(smi, addr, &data); + err = rtl8366_smi_read_reg(smi, RTL8366S_PORT_VLAN_CTRL_REG(port), + &data); if (err) return err; - *val = (data & bits[port]) >> bitoffset[port]; + *val = (data >> RTL8366S_PORT_VLAN_CTRL_SHIFT(port)) & + RTL8366S_PORT_VLAN_CTRL_MASK; return 0; @@ -790,9 +783,9 @@ static int rtl8366_get_port_vlan_index(struct rtl8366_smi *smi, int port, static int rtl8366_get_vlan_port_pvid(struct rtl8366_smi *smi, int port, int *val) { + struct rtl8366s_vlanconfig vlanmc; int err; int index; - struct rtl8366s_vlanconfig vlanmc; err = rtl8366_get_port_vlan_index(smi, port, &index); if (err) @@ -809,41 +802,25 @@ static int rtl8366_get_vlan_port_pvid(struct rtl8366_smi *smi, int port, static int rtl8366_set_port_vlan_index(struct rtl8366_smi *smi, int port, int index) { - int err; - u32 addr; u32 data; - u32 vlan_data; - u32 bits; - - /* bits mapping to port vlan control register of port n */ - const u16 bitmasks[6] = { 0x000F, 0x00F0, 0x0F00, - 0xF000, 0x000F, 0x00F0 }; - /* bits offset to port vlan control register of port n */ - const u16 bitOff[6] = { 0, 4, 8, 12, 0, 4 }; - /* address offset to port vlan control register of port n */ - const u16 addrOff[6] = { 0, 0, 0, 0, 1, 1 }; + int err; if (port >= RTL8366_NUM_PORTS || index >= RTL8366_NUM_VLANS) return -EINVAL; - addr = RTL8366S_PORT_VLAN_CTRL_BASE + addrOff[port]; - - bits = bitmasks[port]; - - data = (index << bitOff[port]) & bits; - - err = rtl8366_smi_read_reg(smi, addr, &vlan_data); + err = rtl8366_smi_read_reg(smi, RTL8366S_PORT_VLAN_CTRL_REG(port), + &data); if (err) return err; - vlan_data &= ~(vlan_data & bits); - vlan_data |= data; + data &= ~(RTL8366S_PORT_VLAN_CTRL_MASK << + RTL8366S_PORT_VLAN_CTRL_SHIFT(port)); + data |= (index & RTL8366S_PORT_VLAN_CTRL_MASK) << + RTL8366S_PORT_VLAN_CTRL_SHIFT(port); - err = rtl8366_smi_write_reg(smi, addr, vlan_data); - if (err) - return err; - - return 0; + err = rtl8366_smi_write_reg(smi, RTL8366S_PORT_VLAN_CTRL_REG(port), + data); + return err; } static int rtl8366_set_vlan_port_pvid(struct rtl8366_smi *smi, int port, @@ -856,16 +833,16 @@ static int rtl8366_set_vlan_port_pvid(struct rtl8366_smi *smi, int port, 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(smi, val, &vlan4k); vlan4k.member |= ((1 << port) | RTL8366_PORT_CPU); vlan4k.untag = RTL8366_PORT_ALL_BUT_CPU; rtl8366s_set_vlan_4k_entry(smi, &vlan4k); - /* For the 16 entries more work needs to be done. First see if such - VID is already there and change it */ + /* + * 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(smi, i, &vlanmc); @@ -881,13 +858,17 @@ static int rtl8366_set_vlan_port_pvid(struct rtl8366_smi *smi, int port, } } - /* PVID could not be found from vlan table. Replace unused (one that - has no member ports) with new one */ + /* + * PVID could not be found from vlan table. Replace unused (one that + * has no member ports) with new one + */ for (i = 0; i < RTL8366_NUM_VLANS; ++i) { rtl8366s_get_vlan_member_config(smi, i, &vlanmc); - /* See if this vlan member configuration is unused. It is - unused if member set contains no ports or CPU port only */ + /* + * See if this vlan member configuration is unused. It is + * unused if member set contains no ports or CPU port only + */ if (!vlanmc.member || vlanmc.member == RTL8366_PORT_CPU) { vlanmc.vid = val; vlanmc.priority = 0; @@ -904,8 +885,9 @@ static int rtl8366_set_vlan_port_pvid(struct rtl8366_smi *smi, int port, } } - dev_err(&smi->pdev->dev, "All 16 vlan member configurations are in " - "use\n"); + dev_err(smi->parent, + "All 16 vlan member configurations are in use\n"); + return -EINVAL; } @@ -913,11 +895,13 @@ static int rtl8366_set_vlan_port_pvid(struct rtl8366_smi *smi, int port, static int rtl8366_vlan_set_vlan(struct rtl8366_smi *smi, int enable) { u32 data = 0; + rtl8366_smi_read_reg(smi, RTL8366_CHIP_GLOBAL_CTRL_REG, &data); - data &= ~(data & RTL8366_CHIP_CTRL_VLAN); if (enable) data |= RTL8366_CHIP_CTRL_VLAN; + else + data &= ~RTL8366_CHIP_CTRL_VLAN; return rtl8366_smi_write_reg(smi, RTL8366_CHIP_GLOBAL_CTRL_REG, data); } @@ -925,11 +909,13 @@ static int rtl8366_vlan_set_vlan(struct rtl8366_smi *smi, int enable) static int rtl8366_vlan_set_4ktable(struct rtl8366_smi *smi, int enable) { u32 data = 0; + rtl8366_smi_read_reg(smi, RTL8366S_VLAN_TB_CTRL_REG, &data); - data &= ~(data & 1); if (enable) data |= 1; + else + data &= ~1; return rtl8366_smi_write_reg(smi, RTL8366S_VLAN_TB_CTRL_REG, data); } @@ -972,7 +958,7 @@ static int rtl8366s_reset_vlan(struct rtl8366_smi *smi) return 0; } -#ifdef DEBUG +#ifdef CONFIG_RTL8366_SMI_DEBUG_FS static int rtl8366_debugfs_open(struct inode *inode, struct file *file) { file->private_data = inode->i_private; @@ -983,8 +969,8 @@ static ssize_t rtl8366_read_debugfs_mibs(struct file *file, char __user *user_buf, size_t count, loff_t *ppos) { - int i, j, len = 0; struct rtl8366_smi *smi = (struct rtl8366_smi *)file->private_data; + int i, j, len = 0; char *buf = smi->buf; len += snprintf(buf + len, sizeof(smi->buf) - len, "MIB Counters:\n"); @@ -994,17 +980,18 @@ static ssize_t rtl8366_read_debugfs_mibs(struct file *file, "Port 4\n"); for (i = 0; i < 33; ++i) { - len += snprintf(buf + len, sizeof(smi->buf) - len, "%d:%s ", i, MIBCOUNTERS[i]); for (j = 0; j < RTL8366_NUM_PORTS; ++j) { unsigned long long counter = 0; if (!rtl8366_get_mib_counter(smi, i, j, &counter)) - len += snprintf(buf + len, sizeof(smi->buf) - len, + len += snprintf(buf + len, + sizeof(smi->buf) - len, "[%llu]", counter); else - len += snprintf(buf + len, sizeof(smi->buf) - len, + len += snprintf(buf + len, + sizeof(smi->buf) - len, "[error]"); if (j != RTL8366_NUM_PORTS - 1) { @@ -1013,7 +1000,8 @@ static ssize_t rtl8366_read_debugfs_mibs(struct file *file, sizeof(smi->buf) - len, "\t"); - len += snprintf(buf + len, sizeof(smi->buf) - len, + len += snprintf(buf + len, + sizeof(smi->buf) - len, "\t"); } } @@ -1029,11 +1017,12 @@ static ssize_t rtl8366_read_debugfs_vlan(struct file *file, char __user *user_buf, size_t count, loff_t *ppos) { - int i, j, len = 0; struct rtl8366_smi *smi = (struct rtl8366_smi *)file->private_data; + int i, j, len = 0; char *buf = smi->buf; - len += snprintf(buf + len, sizeof(smi->buf) - len, "VLAN Member Config:\n"); + len += snprintf(buf + len, sizeof(smi->buf) - len, + "VLAN Member Config:\n"); len += snprintf(buf + len, sizeof(smi->buf) - len, "\t id \t vid \t prio \t member \t untag \t fid " "\tports\n"); @@ -1067,9 +1056,9 @@ static ssize_t rtl8366_read_debugfs_reg(struct file *file, char __user *user_buf, size_t count, loff_t *ppos) { + struct rtl8366_smi *smi = (struct rtl8366_smi *)file->private_data; u32 t, reg = g_dbg_reg; int err, len = 0; - struct rtl8366_smi *smi = (struct rtl8366_smi *)file->private_data; char *buf = smi->buf; memset(buf, '\0', sizeof(smi->buf)); @@ -1091,16 +1080,16 @@ static ssize_t rtl8366_write_debugfs_reg(struct file *file, const char __user *user_buf, size_t count, loff_t *ppos) { + struct rtl8366_smi *smi = (struct rtl8366_smi *)file->private_data; unsigned long data; u32 reg = g_dbg_reg; int err; size_t len; - struct rtl8366_smi *smi = (struct rtl8366_smi *)file->private_data; char *buf = smi->buf; len = min(count, sizeof(smi->buf) - 1); if (copy_from_user(buf, user_buf, len)) { - dev_err(&smi->pdev->dev, "copy from user failed\n"); + dev_err(smi->parent, "copy from user failed\n"); return -EFAULT; } @@ -1110,11 +1099,11 @@ static ssize_t rtl8366_write_debugfs_reg(struct file *file, if (strict_strtoul(buf, 16, &data)) { - dev_err(&smi->pdev->dev, "Invalid reg value %s\n", buf); + dev_err(smi->parent, "Invalid reg value %s\n", buf); } else { err = rtl8366_smi_write_reg(smi, reg, data); if (err) { - dev_err(&smi->pdev->dev, + dev_err(smi->parent, "writing reg 0x%04x val 0x%04lx failed\n", reg, data); } @@ -1151,37 +1140,37 @@ static void rtl8366_debugfs_init(struct rtl8366_smi *smi) smi->debugfs_root = debugfs_create_dir("rtl8366s", NULL); if (!smi->debugfs_root) { - dev_err(&smi->pdev->dev, "Unable to create debugfs dir\n"); + dev_err(smi->parent, "Unable to create debugfs dir\n"); return; } root = smi->debugfs_root; node = debugfs_create_x16("reg", S_IRUGO | S_IWUSR, root, &g_dbg_reg); if (!node) { - dev_err(&smi->pdev->dev, "Creating debugfs file reg failed\n"); + dev_err(smi->parent, "Creating debugfs file reg failed\n"); return; } node = debugfs_create_file("val", S_IRUGO | S_IWUSR, root, smi, &fops_rtl8366_regs); if (!node) { - dev_err(&smi->pdev->dev, "Creating debugfs file val failed\n"); + dev_err(smi->parent, "Creating debugfs file val failed\n"); return; } node = debugfs_create_file("vlan", S_IRUSR, root, smi, &fops_rtl8366_vlan); if (!node) { - dev_err(&smi->pdev->dev, "Creating debugfs file vlan " - "failed\n"); + dev_err(smi->parent, + "Creating debugfs file vlan failed\n"); return; } node = debugfs_create_file("mibs", S_IRUSR, root, smi, &fops_rtl8366_mibs); if (!node) { - dev_err(&smi->pdev->dev, "Creating debugfs file mibs " - "xfailed\n"); + dev_err(smi->parent, + "Creating debugfs file mibs failed\n"); return; } } @@ -1197,14 +1186,14 @@ static void rtl8366_debugfs_remove(struct rtl8366_smi *smi) #else static inline void rtl8366_debugfs_init(struct rtl8366_smi *smi) {} static inline void rtl8366_debugfs_remove(struct rtl8366_smi *smi) {} -#endif +#endif /* CONFIG_RTL8366_SMI_DEBUG_FS */ -static int rtl8366_global_reset_mibs(struct switch_dev *dev, - const struct switch_attr *attr, - struct switch_val *val) +static int rtl8366_sw_reset_mibs(struct switch_dev *dev, + const struct switch_attr *attr, + struct switch_val *val) { - u32 data = 0; struct rtl8366_smi *smi = sw_to_rtl8366(dev); + u32 data = 0; if (val->value.i == 1) { rtl8366_smi_read_reg(smi, RTL8366S_MIB_CTRL_REG, &data); @@ -1215,12 +1204,12 @@ static int rtl8366_global_reset_mibs(struct switch_dev *dev, return 0; } -static int rtl8366_get_vlan(struct switch_dev *dev, - const struct switch_attr *attr, - struct switch_val *val) +static int rtl8366_sw_get_vlan_enable(struct switch_dev *dev, + const struct switch_attr *attr, + struct switch_val *val) { - u32 data; struct rtl8366_smi *smi = sw_to_rtl8366(dev); + u32 data; if (attr->ofs == 1) { rtl8366_smi_read_reg(smi, RTL8366_CHIP_GLOBAL_CTRL_REG, &data); @@ -1241,12 +1230,13 @@ static int rtl8366_get_vlan(struct switch_dev *dev, return 0; } -static int rtl8366_global_get_blinkrate(struct switch_dev *dev, - const struct switch_attr *attr, - struct switch_val *val) +static int rtl8366_sw_get_blinkrate(struct switch_dev *dev, + const struct switch_attr *attr, + struct switch_val *val) { - u32 data; struct rtl8366_smi *smi = sw_to_rtl8366(dev); + u32 data; + rtl8366_smi_read_reg(smi, RTL8366_LED_BLINKRATE_REG, &data); val->value.i = (data & (RTL8366_LED_BLINKRATE_MASK)); @@ -1254,9 +1244,9 @@ static int rtl8366_global_get_blinkrate(struct switch_dev *dev, return 0; } -static int rtl8366_global_set_blinkrate(struct switch_dev *dev, - const struct switch_attr *attr, - struct switch_val *val) +static int rtl8366_sw_set_blinkrate(struct switch_dev *dev, + const struct switch_attr *attr, + struct switch_val *val) { u32 data; struct rtl8366_smi *smi = sw_to_rtl8366(dev); @@ -1266,7 +1256,7 @@ static int rtl8366_global_set_blinkrate(struct switch_dev *dev, rtl8366_smi_read_reg(smi, RTL8366_LED_BLINKRATE_REG, &data); - data &= ~(data & RTL8366_LED_BLINKRATE_MASK); + data &= ~RTL8366_LED_BLINKRATE_MASK; data |= val->value.i; rtl8366_smi_write_reg(smi, RTL8366_LED_BLINKRATE_REG, data); @@ -1274,9 +1264,9 @@ static int rtl8366_global_set_blinkrate(struct switch_dev *dev, return 0; } -static int rtl8366_set_vlan(struct switch_dev *dev, - const struct switch_attr *attr, - struct switch_val *val) +static int rtl8366_sw_set_vlan_enable(struct switch_dev *dev, + const struct switch_attr *attr, + struct switch_val *val) { struct rtl8366_smi *smi = sw_to_rtl8366(dev); @@ -1286,71 +1276,60 @@ static int rtl8366_set_vlan(struct switch_dev *dev, return rtl8366_vlan_set_4ktable(smi, val->value.i); } -static int rtl8366_attr_get_port_link(struct switch_dev *dev, - const struct switch_attr *attr, - struct switch_val *val) +static const char *rtl8366_speed_str(unsigned speed) +{ + switch (speed) { + case 0: + return "10baseT"; + case 1: + return "100baseT"; + case 2: + return "1000baseT"; + } + + return "unknown"; +} + +static int rtl8366_sw_get_port_link(struct switch_dev *dev, + const struct switch_attr *attr, + struct switch_val *val) { - u32 len = 0, data = 0; - int speed, duplex, link, txpause, rxpause, nway; struct rtl8366_smi *smi = sw_to_rtl8366(dev); - char *buf = smi->buf; + u32 len = 0, data = 0; if (val->port_vlan >= RTL8366_NUM_PORTS) return -EINVAL; - memset(buf, '\0', sizeof(smi->buf)); + memset(smi->buf, '\0', sizeof(smi->buf)); rtl8366_smi_read_reg(smi, RTL8366S_PORT_LINK_STATUS_BASE + - (val->port_vlan >> 1), - &data); + (val->port_vlan / 2), &data); - if (val->port_vlan & 0x1) + if (val->port_vlan % 2) data = data >> 8; - speed = (data & RTL8366S_PORT_STATUS_SPEED_MASK); - duplex = (data & RTL8366S_PORT_STATUS_DUPLEX_MASK) >> 2; - link = (data & RTL8366S_PORT_STATUS_LINK_MASK) >> 4; - txpause = (data & RTL8366S_PORT_STATUS_TXPAUSE_MASK) >> 5; - rxpause = (data & RTL8366S_PORT_STATUS_RXPAUSE_MASK) >> 6; - nway = (data & RTL8366S_PORT_STATUS_AN_MASK) >> 7; - - len += snprintf(buf + len, sizeof(smi->buf) - len, "Port %d: ", - val->port_vlan); - - if (link) - len += snprintf(buf + len, sizeof(smi->buf) - len, - "Link UP, Speed: "); - else - len += snprintf(buf + len, sizeof(smi->buf) - len, - "Link DOWN, Speed: "); - - if (speed == 0) - len += snprintf(buf + len, sizeof(smi->buf) - len, "10Base-TX "); - else if (speed == 1) - len += snprintf(buf + len, sizeof(smi->buf) - len, "100Base-TX "); - else if (speed == 2) - len += snprintf(buf + len, sizeof(smi->buf) - len, "1000Base-TX "); - - if (duplex) - len += snprintf(buf + len, sizeof(smi->buf) - len, "Full-Duplex, "); - else - len += snprintf(buf + len, sizeof(smi->buf) - len, "Half-Duplex, "); - - if (txpause) - len += snprintf(buf + len, sizeof(smi->buf) - len, "TX-Pause "); - if (rxpause) - len += snprintf(buf + len, sizeof(smi->buf) - len, "RX-Pause "); - if (nway) - len += snprintf(buf + len, sizeof(smi->buf) - len, "nway "); - - val->value.s = buf; + len = snprintf(smi->buf, sizeof(smi->buf), + "port:%d link:%s speed:%s %s-duplex %s%s%s", + val->port_vlan, + (data & RTL8366S_PORT_STATUS_LINK_MASK) ? "up" : "down", + rtl8366_speed_str(data & + RTL8366S_PORT_STATUS_SPEED_MASK), + (data & RTL8366S_PORT_STATUS_DUPLEX_MASK) ? + "full" : "half", + (data & RTL8366S_PORT_STATUS_TXPAUSE_MASK) ? + "tx-pause ": "", + (data & RTL8366S_PORT_STATUS_RXPAUSE_MASK) ? + "rx-pause " : "", + (data & RTL8366S_PORT_STATUS_AN_MASK) ? "nway ": ""); + + val->value.s = smi->buf; val->len = len; return 0; } -static int rtl8366_attr_get_vlan_info(struct switch_dev *dev, - const struct switch_attr *attr, - struct switch_val *val) +static int rtl8366_sw_get_vlan_info(struct switch_dev *dev, + const struct switch_attr *attr, + struct switch_val *val) { int i; u32 len = 0; @@ -1359,7 +1338,7 @@ static int rtl8366_attr_get_vlan_info(struct switch_dev *dev, struct rtl8366_smi *smi = sw_to_rtl8366(dev); char *buf = smi->buf; - if (val->port_vlan >= RTL8366_NUM_PORTS) + if (val->port_vlan >= RTL8366_NUM_VLANS) return -EINVAL; memset(buf, '\0', sizeof(smi->buf)); @@ -1374,7 +1353,8 @@ static int rtl8366_attr_get_vlan_info(struct switch_dev *dev, int index = 0; if (!rtl8366_get_port_vlan_index(smi, i, &index) && index == val->port_vlan) - len += snprintf(buf + len, sizeof(smi->buf) - len, "%d", i); + len += snprintf(buf + len, sizeof(smi->buf) - len, + "%d", i); } len += snprintf(buf + len, sizeof(smi->buf) - len, "\n"); @@ -1396,12 +1376,13 @@ static int rtl8366_attr_get_vlan_info(struct switch_dev *dev, return 0; } -static int rtl8366_set_port_led(struct switch_dev *dev, - const struct switch_attr *attr, - struct switch_val *val) +static int rtl8366_sw_set_port_led(struct switch_dev *dev, + const struct switch_attr *attr, + struct switch_val *val) { - u32 data = 0; struct rtl8366_smi *smi = sw_to_rtl8366(dev); + u32 data = 0; + if (val->port_vlan >= RTL8366_NUM_PORTS || (1 << val->port_vlan) == RTL8366_PORT_UNKNOWN) return -EINVAL; @@ -1420,12 +1401,13 @@ static int rtl8366_set_port_led(struct switch_dev *dev, return 0; } -static int rtl8366_get_port_led(struct switch_dev *dev, - const struct switch_attr *attr, - struct switch_val *val) +static int rtl8366_sw_get_port_led(struct switch_dev *dev, + const struct switch_attr *attr, + struct switch_val *val) { - u32 data = 0; struct rtl8366_smi *smi = sw_to_rtl8366(dev); + u32 data = 0; + if (val->port_vlan >= RTL8366_NUM_LEDGROUPS) return -EINVAL; @@ -1435,12 +1417,13 @@ static int rtl8366_get_port_led(struct switch_dev *dev, return 0; } -static int rtl8366_reset_port_mibs(struct switch_dev *dev, - const struct switch_attr *attr, - struct switch_val *val) +static int rtl8366_sw_reset_port_mibs(struct switch_dev *dev, + const struct switch_attr *attr, + struct switch_val *val) { - u32 data = 0; struct rtl8366_smi *smi = sw_to_rtl8366(dev); + u32 data = 0; + if (val->port_vlan >= RTL8366_NUM_PORTS) return -EINVAL; @@ -1451,22 +1434,23 @@ static int rtl8366_reset_port_mibs(struct switch_dev *dev, return 0; } -static int rtl8366_get_port_mib(struct switch_dev *dev, - const struct switch_attr *attr, - struct switch_val *val) +static int rtl8366_sw_get_port_mib(struct switch_dev *dev, + const struct switch_attr *attr, + struct switch_val *val) { + struct rtl8366_smi *smi = sw_to_rtl8366(dev); int i, len = 0; unsigned long long counter = 0; - struct rtl8366_smi *smi = sw_to_rtl8366(dev); char *buf = smi->buf; if (val->port_vlan >= RTL8366_NUM_PORTS) return -EINVAL; - len += snprintf(buf + len, sizeof(smi->buf) - len, "Port %d MIB counters\n", + len += snprintf(buf + len, sizeof(smi->buf) - len, + "Port %d MIB counters\n", val->port_vlan); - for (i = 0; i < RTL8366S_MIB_COUNT; ++i) { + for (i = 0; i < RTL8366S_MIB_COUNT; ++i) { len += snprintf(buf + len, sizeof(smi->buf) - len, "%d:%s\t", i, MIBCOUNTERS[i]); if (!rtl8366_get_mib_counter(smi, i, val->port_vlan, &counter)) @@ -1482,8 +1466,8 @@ static int rtl8366_get_port_mib(struct switch_dev *dev, return 0; } -static int rtl8366_get_ports(struct switch_dev *dev, - struct switch_val *val) +static int rtl8366_sw_get_vlan_ports(struct switch_dev *dev, + struct switch_val *val) { struct rtl8366s_vlanconfig vlanmc; struct rtl8366_smi *smi = sw_to_rtl8366(dev); @@ -1510,8 +1494,8 @@ static int rtl8366_get_ports(struct switch_dev *dev, return 0; } -static int rtl8366_set_ports(struct switch_dev *dev, - struct switch_val *val) +static int rtl8366_sw_set_vlan_ports(struct switch_dev *dev, + struct switch_val *val) { struct rtl8366s_vlanconfig vlanmc; struct rtl8366s_vlan4kentry vlan4k; @@ -1544,19 +1528,19 @@ static int rtl8366_set_ports(struct switch_dev *dev, return 0; } -static int rtl8366_get_port_pvid(struct switch_dev *dev, int port, int *val) +static int rtl8366_sw_get_port_pvid(struct switch_dev *dev, int port, int *val) { struct rtl8366_smi *smi = sw_to_rtl8366(dev); return rtl8366_get_vlan_port_pvid(smi, port, val); } -static int rtl8366_set_port_pvid(struct switch_dev *dev, int port, int val) +static int rtl8366_sw_set_port_pvid(struct switch_dev *dev, int port, int val) { struct rtl8366_smi *smi = sw_to_rtl8366(dev); return rtl8366_set_vlan_port_pvid(smi, port, val); } -static int rtl8366_reset_switch(struct switch_dev *dev) +static int rtl8366_sw_reset_switch(struct switch_dev *dev) { struct rtl8366_smi *smi = sw_to_rtl8366(dev); int timeout = 10; @@ -1586,35 +1570,32 @@ static struct switch_attr rtl8366_globals[] = { .type = SWITCH_TYPE_INT, .name = "enable_vlan", .description = "Enable VLAN mode", - .set = rtl8366_set_vlan, - .get = rtl8366_get_vlan, + .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 = rtl8366_set_vlan, - .get = rtl8366_get_vlan, + .set = rtl8366_sw_set_vlan_enable, + .get = rtl8366_sw_get_vlan_enable, .max = 1, .ofs = 2 - }, - { + }, { .type = SWITCH_TYPE_INT, .name = "reset_mibs", .description = "Reset all MIB counters", - .set = rtl8366_global_reset_mibs, + .set = rtl8366_sw_reset_mibs, .get = NULL, .max = 1 - }, - { + }, { .type = SWITCH_TYPE_INT, .name = "blinkrate", .description = "Get/Set LED blinking rate (0 = 43ms, 1 = 84ms," " 2 = 120ms, 3 = 170ms, 4 = 340ms, 5 = 670ms)", - .set = rtl8366_global_set_blinkrate, - .get = rtl8366_global_get_blinkrate, + .set = rtl8366_sw_set_blinkrate, + .get = rtl8366_sw_get_blinkrate, .max = 5 }, }; @@ -1626,31 +1607,28 @@ static struct switch_attr rtl8366_port[] = { .description = "Get port link information", .max = 1, .set = NULL, - .get = rtl8366_attr_get_port_link - }, - { + .get = rtl8366_sw_get_port_link, + }, { .type = SWITCH_TYPE_INT, .name = "reset_mib", .description = "Reset single port MIB counters", .max = 1, - .set = rtl8366_reset_port_mibs, - .get = NULL - }, - { + .set = rtl8366_sw_reset_port_mibs, + .get = NULL, + }, { .type = SWITCH_TYPE_STRING, .name = "mib", .description = "Get MIB counters for port", .max = 33, .set = NULL, - .get = rtl8366_get_port_mib - }, - { + .get = rtl8366_sw_get_port_mib, + }, { .type = SWITCH_TYPE_INT, .name = "led", .description = "Get/Set port group (0 - 3) led mode (0 - 15)", .max = 15, - .set = rtl8366_set_port_led, - .get = rtl8366_get_port_led + .set = rtl8366_sw_set_port_led, + .get = rtl8366_sw_get_port_led, }, }; @@ -1661,7 +1639,7 @@ static struct switch_attr rtl8366_vlan[] = { .description = "Get vlan information", .max = 1, .set = NULL, - .get = rtl8366_attr_get_vlan_info + .get = rtl8366_sw_get_vlan_info, }, }; @@ -1685,11 +1663,11 @@ static struct switch_dev rtldev = { .n_attr = ARRAY_SIZE(rtl8366_vlan), }, - .get_vlan_ports = rtl8366_get_ports, - .set_vlan_ports = rtl8366_set_ports, - .get_port_pvid = rtl8366_get_port_pvid, - .set_port_pvid = rtl8366_set_port_pvid, - .reset_switch = rtl8366_reset_switch, + .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 = rtl8366_sw_reset_switch, }; static int rtl8366_smi_switch_init(struct rtl8366_smi *smi) @@ -1699,11 +1677,11 @@ static int rtl8366_smi_switch_init(struct rtl8366_smi *smi) memcpy(dev, &rtldev, sizeof(struct switch_dev)); dev->priv = smi; - dev->devname = dev_name(&smi->pdev->dev); + dev->devname = dev_name(smi->parent); err = register_switch(dev, NULL); if (err) - dev_err(&smi->pdev->dev, "switch registration failed\n"); + dev_err(smi->parent, "switch registration failed\n"); return err; } @@ -1757,8 +1735,8 @@ static int rtl8366_smi_mii_init(struct rtl8366_smi *smi) smi->mii_bus->read = rtl8366_smi_mii_read; smi->mii_bus->write = rtl8366_smi_mii_write; snprintf(smi->mii_bus->id, MII_BUS_ID_SIZE, "%s", - dev_name(&smi->pdev->dev)); - smi->mii_bus->parent = &smi->pdev->dev; + dev_name(smi->parent)); + smi->mii_bus->parent = smi->parent; smi->mii_bus->phy_mask = ~(0x1f); smi->mii_bus->irq = smi->mii_irq; for (i = 0; i < PHY_MAX_ADDR; i++) @@ -1796,7 +1774,7 @@ static int rtl8366_smi_setup(struct rtl8366_smi *smi) ret = rtl8366_smi_read_reg(smi, RTL8366S_CHIP_ID_REG, &chip_id); if (ret) { - dev_err(&smi->pdev->dev, "unable to read chip id\n"); + dev_err(smi->parent, "unable to read chip id\n"); return ret; } @@ -1804,18 +1782,18 @@ static int rtl8366_smi_setup(struct rtl8366_smi *smi) case RTL8366S_CHIP_ID_8366: break; default: - dev_err(&smi->pdev->dev, "unknown chip id (%04x)\n", chip_id); + dev_err(smi->parent, "unknown chip id (%04x)\n", chip_id); return -ENODEV; } ret = rtl8366_smi_read_reg(smi, RTL8366S_CHIP_VERSION_CTRL_REG, &chip_ver); if (ret) { - dev_err(&smi->pdev->dev, "unable to read chip version\n"); + dev_err(smi->parent, "unable to read chip version\n"); return ret; } - dev_info(&smi->pdev->dev, "RTL%04x ver. %u chip found\n", + dev_info(smi->parent, "RTL%04x ver. %u chip found\n", chip_id, chip_ver & RTL8366S_CHIP_VERSION_MASK); rtl8366_debugfs_init(smi); @@ -1823,6 +1801,46 @@ static int rtl8366_smi_setup(struct rtl8366_smi *smi) return 0; } +static int __init rtl8366_smi_init(struct rtl8366_smi *smi) +{ + int err; + + if (!smi->parent) + return -EINVAL; + + err = gpio_request(smi->gpio_sda, dev_name(smi->parent)); + if (err) { + dev_err(smi->parent, "gpio_request failed for %u, err=%d\n", + smi->gpio_sda, err); + goto err_out; + } + + err = gpio_request(smi->gpio_sck, dev_name(smi->parent)); + if (err) { + dev_err(smi->parent, "gpio_request failed for %u, err=%d\n", + smi->gpio_sck, err); + goto err_free_sda; + } + + spin_lock_init(&smi->lock); + + dev_info(smi->parent, "using GPIO pins %u (SDA) and %u (SCK)\n", + smi->gpio_sda, smi->gpio_sck); + + return 0; + + err_free_sda: + gpio_free(smi->gpio_sda); + err_out: + return err; +} + +static void rtl8366_smi_cleanup(struct rtl8366_smi *smi) +{ + gpio_free(smi->gpio_sck); + gpio_free(smi->gpio_sda); +} + static int __init rtl8366_smi_probe(struct platform_device *pdev) { static int rtl8366_smi_version_printed; @@ -1848,29 +1866,16 @@ static int __init rtl8366_smi_probe(struct platform_device *pdev) goto err_out; } - err = gpio_request(pdata->gpio_sda, dev_name(&pdev->dev)); - if (err) { - dev_err(&pdev->dev, "gpio_request failed for %u, err=%d\n", - pdata->gpio_sda, err); - goto err_free_smi; - } - - err = gpio_request(pdata->gpio_sck, dev_name(&pdev->dev)); - if (err) { - dev_err(&pdev->dev, "gpio_request failed for %u, err=%d\n", - pdata->gpio_sck, err); - goto err_free_sda; - } + smi->parent = &pdev->dev; + smi->gpio_sda = pdata->gpio_sda; + smi->gpio_sck = pdata->gpio_sck; - smi->pdev = pdev; - smi->pdata = pdata; - spin_lock_init(&smi->lock); + err = rtl8366_smi_init(smi); + if (err) + goto err_free_smi; platform_set_drvdata(pdev, smi); - dev_info(&pdev->dev, "using GPIO pins %u (SDA) and %u (SCK)\n", - pdata->gpio_sda, pdata->gpio_sck); - err = rtl8366_smi_setup(smi); if (err) goto err_clear_drvdata; @@ -1889,16 +1894,13 @@ static int __init rtl8366_smi_probe(struct platform_device *pdev) rtl8366_smi_mii_cleanup(smi); err_clear_drvdata: platform_set_drvdata(pdev, NULL); - gpio_free(pdata->gpio_sck); - err_free_sda: - gpio_free(pdata->gpio_sda); err_free_smi: kfree(smi); err_out: return err; } -int rtl8366_phy_config_init(struct phy_device *phydev) +static int rtl8366_phy_config_init(struct phy_device *phydev) { if (!rtl8366_smi_mii_bus_match(phydev->bus)) return -EINVAL; @@ -1906,7 +1908,7 @@ int rtl8366_phy_config_init(struct phy_device *phydev) return 0; } -int rtl8366_phy_config_aneg(struct phy_device *phydev) +static int rtl8366_phy_config_aneg(struct phy_device *phydev) { return 0; } @@ -1929,16 +1931,11 @@ static int __devexit rtl8366_smi_remove(struct platform_device *pdev) struct rtl8366_smi *smi = platform_get_drvdata(pdev); if (smi) { - struct rtl8366_smi_platform_data *pdata; - - pdata = pdev->dev.platform_data; - rtl8366_smi_switch_cleanup(smi); rtl8366_debugfs_remove(smi); rtl8366_smi_mii_cleanup(smi); platform_set_drvdata(pdev, NULL); - gpio_free(pdata->gpio_sck); - gpio_free(pdata->gpio_sda); + rtl8366_smi_cleanup(smi); kfree(smi); } @@ -1954,7 +1951,7 @@ static struct platform_driver rtl8366_smi_driver = { .remove = __devexit_p(rtl8366_smi_remove), }; -static int __init rtl8366_smi_init(void) +static int __init rtl8366_smi_module_init(void) { int ret; ret = platform_driver_register(&rtl8366_smi_driver); @@ -1971,7 +1968,7 @@ static int __init rtl8366_smi_init(void) platform_driver_unregister(&rtl8366_smi_driver); return ret; } -module_init(rtl8366_smi_init); +module_init(rtl8366_smi_module_init); static void __exit rtl8366_smi_exit(void) {