X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/221c0d2b2d2a960986dbe0d8ce8b9a085178a22d..62717a96cd66ab5854dac0ec7eca5c6bdbcaced5:/target/linux/ar71xx/files/drivers/net/phy/rtl8366_smi.c?ds=sidebyside 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 0d54126cc..084c3d5a4 100644 --- a/target/linux/ar71xx/files/drivers/net/phy/rtl8366_smi.c +++ b/target/linux/ar71xx/files/drivers/net/phy/rtl8366_smi.c @@ -21,15 +21,13 @@ #include #include -/* #define DEBUG 1 */ - -#ifdef DEBUG +#ifdef CONFIG_RTL8366_SMI_DEBUG_FS #include #endif -#define RTL8366_SMI_DRIVER_NAME "rtl8366-smi" -#define RTL8366_SMI_DRIVER_DESC "Realtek RTL8366 switch driver" -#define RTL8366_SMI_DRIVER_VER "0.1.1" +#define RTL8366S_DRIVER_NAME "rtl8366-smi" +#define RTL8366S_DRIVER_DESC "Realtek RTL8366 switch driver" +#define RTL8366S_DRIVER_VER "0.1.1" #define RTL8366S_PHY_NO_MAX 4 #define RTL8366S_PHY_PAGE_MAX 7 @@ -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,58 +171,70 @@ 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; - spinlock_t lock; - struct mii_bus *mii_bus; - struct switch_dev dev; - int mii_irq[PHY_MAX_ADDR]; -#ifdef DEBUG - struct dentry *debugfs_root; + struct device *parent; + unsigned int gpio_sda; + unsigned int gpio_sck; + spinlock_t lock; +}; + +struct rtl8366s { + struct device *parent; + struct rtl8366_smi smi; + struct mii_bus *mii_bus; + int mii_irq[PHY_MAX_ADDR]; + struct switch_dev dev; + 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 -#define to_rtl8366(_dev) container_of(_dev, struct rtl8366_smi, dev) +static inline struct rtl8366s *sw_to_rtl8366s(struct switch_dev *sw) +{ + return container_of(sw, struct rtl8366s, dev); +} static inline void rtl8366_smi_clk_delay(struct rtl8366_smi *smi) { @@ -227,8 +243,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: @@ -256,8 +272,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); @@ -284,8 +300,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); @@ -306,8 +322,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); @@ -466,9 +482,10 @@ static int rtl8366_smi_write_reg(struct rtl8366_smi *smi, u32 addr, u32 data) return ret; } -static int rtl8366_smi_read_phy_reg(struct rtl8366_smi *smi, - u32 phy_no, u32 page, u32 addr, u32 *data) +static int rtl8366s_read_phy_reg(struct rtl8366s *rtl, + u32 phy_no, u32 page, u32 addr, u32 *data) { + struct rtl8366_smi *smi = &rtl->smi; u32 reg; int ret; @@ -501,9 +518,10 @@ static int rtl8366_smi_read_phy_reg(struct rtl8366_smi *smi, return 0; } -static int rtl8366_smi_write_phy_reg(struct rtl8366_smi *smi, - u32 phy_no, u32 page, u32 addr, u32 data) +static int rtl8366s_write_phy_reg(struct rtl8366s *rtl, + u32 phy_no, u32 page, u32 addr, u32 data) { + struct rtl8366_smi *smi = &rtl->smi; u32 reg; int ret; @@ -532,9 +550,10 @@ static int rtl8366_smi_write_phy_reg(struct rtl8366_smi *smi, return 0; } -static int rtl8366_get_mib_counter(struct rtl8366_smi *smi, int counter, +static int rtl8366_get_mib_counter(struct rtl8366s *rtl, int counter, int port, unsigned long long *val) { + struct rtl8366_smi *smi = &rtl->smi; int i; int err; u32 addr, data, regoffset; @@ -549,20 +568,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; @@ -597,9 +614,10 @@ static int rtl8366_get_mib_counter(struct rtl8366_smi *smi, int counter, return 0; } -static int rtl8366s_get_vlan_4k_entry(struct rtl8366_smi *smi, u32 vid, +static int rtl8366s_get_vlan_4k_entry(struct rtl8366s *rtl, u32 vid, struct rtl8366s_vlan4kentry *vlan4k) { + struct rtl8366_smi *smi = &rtl->smi; int err; u32 data; u16 *tableaddr; @@ -642,9 +660,10 @@ static int rtl8366s_get_vlan_4k_entry(struct rtl8366_smi *smi, u32 vid, return 0; } -static int rtl8366s_set_vlan_4k_entry(struct rtl8366_smi *smi, +static int rtl8366s_set_vlan_4k_entry(struct rtl8366s *rtl, const struct rtl8366s_vlan4kentry *vlan4k) { + struct rtl8366_smi *smi = &rtl->smi; int err; u32 data; u16 *tableaddr; @@ -667,21 +686,22 @@ 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, +static int rtl8366s_get_vlan_member_config(struct rtl8366s *rtl, u32 index, struct rtl8366s_vlanconfig *vlanmc) { + struct rtl8366_smi *smi = &rtl->smi; int err; u32 addr; u32 data; @@ -695,7 +715,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; @@ -704,7 +723,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; @@ -714,26 +732,26 @@ static int rtl8366s_get_vlan_member_config(struct rtl8366_smi *smi, u32 index, return 0; } -static int rtl8366s_set_vlan_member_config(struct rtl8366_smi *smi, u32 index, +static int rtl8366s_set_vlan_member_config(struct rtl8366s *rtl, u32 index, const struct rtl8366s_vlanconfig *vlanmc) { + struct rtl8366_smi *smi = &rtl->smi; int err; u32 addr; u32 data; 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; @@ -753,48 +771,40 @@ static int rtl8366s_set_vlan_member_config(struct rtl8366_smi *smi, u32 index, return 0; } -static int rtl8366_get_port_vlan_index(struct rtl8366_smi *smi, int port, +static int rtl8366s_get_port_vlan_index(struct rtl8366s *rtl, int port, int *val) { - int err; - u32 addr; + struct rtl8366_smi *smi = &rtl->smi; 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; } -static int rtl8366_get_vlan_port_pvid(struct rtl8366_smi *smi, int port, - int *val) +static int rtl8366s_get_vlan_port_pvid(struct rtl8366s *rtl, 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); + err = rtl8366s_get_port_vlan_index(rtl, port, &index); if (err) return err; - err = rtl8366s_get_vlan_member_config(smi, index, &vlanmc); + err = rtl8366s_get_vlan_member_config(rtl, index, &vlanmc); if (err) return err; @@ -802,48 +812,32 @@ static int rtl8366_get_vlan_port_pvid(struct rtl8366_smi *smi, int port, return 0; } -static int rtl8366_set_port_vlan_index(struct rtl8366_smi *smi, int port, - int index) +static int rtl8366s_set_port_vlan_index(struct rtl8366s *rtl, int port, + int index) { - int err; - u32 addr; + struct rtl8366_smi *smi = &rtl->smi; 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, - int val) +static int rtl8366s_set_vlan_port_pvid(struct rtl8366s *rtl, int port, int val) { int i; struct rtl8366s_vlanconfig vlanmc; @@ -852,38 +846,42 @@ 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); + rtl8366s_get_vlan_4k_entry(rtl, val, &vlan4k); vlan4k.member |= ((1 << port) | RTL8366_PORT_CPU); vlan4k.untag = RTL8366_PORT_ALL_BUT_CPU; - rtl8366s_set_vlan_4k_entry(smi, &vlan4k); + rtl8366s_set_vlan_4k_entry(rtl, &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); + rtl8366s_get_vlan_member_config(rtl, 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(smi, i, &vlanmc); + rtl8366s_set_vlan_member_config(rtl, i, &vlanmc); /* Now update PVID register settings */ - rtl8366_set_port_vlan_index(smi, port, i); + rtl8366s_set_port_vlan_index(rtl, port, i); return 0; } } - /* 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); + rtl8366s_get_vlan_member_config(rtl, 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; @@ -891,60 +889,69 @@ static int rtl8366_set_vlan_port_pvid(struct rtl8366_smi *smi, int port, vlanmc.member = ((1 << port) | RTL8366_PORT_CPU); vlanmc.fid = 0; - rtl8366s_set_vlan_member_config(smi, i, &vlanmc); + rtl8366s_set_vlan_member_config(rtl, i, &vlanmc); /* Now update PVID register settings */ - rtl8366_set_port_vlan_index(smi, port, i); + rtl8366s_set_port_vlan_index(rtl, port, i); return 0; } } - dev_err(&smi->pdev->dev, "All 16 vlan member configurations are in " - "use\n"); + dev_err(rtl->parent, + "All 16 vlan member configurations are in use\n"); + return -EINVAL; } -static int rtl8366_vlan_set_vlan(struct rtl8366_smi *smi, int enable) +static int rtl8366s_vlan_set_vlan(struct rtl8366s *rtl, int enable) { + struct rtl8366_smi *smi = &rtl->smi; 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); } -static int rtl8366_vlan_set_4ktable(struct rtl8366_smi *smi, int enable) +static int rtl8366s_vlan_set_4ktable(struct rtl8366s *rtl, int enable) { + struct rtl8366_smi *smi = &rtl->smi; 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); } -static int rtl8366s_reset_vlan(struct rtl8366_smi *smi) +static int rtl8366s_reset_vlan(struct rtl8366s *rtl) { - int i; struct rtl8366s_vlan4kentry vlan4k; struct rtl8366s_vlanconfig vlanmc; + int err; + int i; /* clear 16 VLAN member configuration */ + vlanmc.vid = 0; + vlanmc.priority = 0; + vlanmc.member = 0; + vlanmc.untag = 0; + vlanmc.fid = 0; for (i = 0; i < RTL8366_NUM_VLANS; i++) { - vlanmc.vid = 0; - vlanmc.priority = 0; - vlanmc.member = 0; - vlanmc.untag = 0; - vlanmc.fid = 0; - if (rtl8366s_set_vlan_member_config(smi, i, &vlanmc) != 0) - return -EIO; + err = rtl8366s_set_vlan_member_config(rtl, i, &vlanmc); + if (err) + return err; } /* Set a default VLAN with vid 1 to 4K table for all ports */ @@ -952,147 +959,154 @@ static int rtl8366s_reset_vlan(struct rtl8366_smi *smi) vlan4k.member = RTL8366_PORT_ALL; vlan4k.untag = RTL8366_PORT_ALL; vlan4k.fid = 0; - if (rtl8366s_set_vlan_4k_entry(smi, &vlan4k) != 0) - return -EIO; + err = rtl8366s_set_vlan_4k_entry(rtl, &vlan4k); + if (err) + return err; /* Set all ports PVID to default VLAN */ for (i = 0; i < RTL8366_NUM_PORTS; i++) { - if (rtl8366_set_vlan_port_pvid(smi, i, 0) != 0) - return -EIO; + err = rtl8366s_set_vlan_port_pvid(rtl, i, 0); + if (err) + return err; } return 0; } -#ifdef DEBUG -static int rtl8366_debugfs_open(struct inode *inode, struct file *file) +#ifdef CONFIG_RTL8366_SMI_DEBUG_FS +static int rtl8366s_debugfs_open(struct inode *inode, struct file *file) { file->private_data = inode->i_private; return 0; } -static ssize_t rtl8366_read_debugfs_mibs(struct file *file, - char __user *user_buf, - size_t count, loff_t *ppos) +static ssize_t rtl8366s_read_debugfs_mibs(struct file *file, + char __user *user_buf, + size_t count, loff_t *ppos) { - char buf[4096]; + struct rtl8366s *rtl = (struct rtl8366s *)file->private_data; int i, j, len = 0; - struct rtl8366_smi *smi = (struct rtl8366_smi *)file->private_data; + char *buf = rtl->buf; - len += snprintf(buf + len, sizeof(buf) - len, "MIB Counters:\n"); - len += snprintf(buf + len, sizeof(buf) - len, "Counter" + 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(buf) - len, "%d:%s ", + len += snprintf(buf + len, sizeof(rtl->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(buf) - len, + if (!rtl8366_get_mib_counter(rtl, i, j, &counter)) + len += snprintf(buf + len, + sizeof(rtl->buf) - len, "[%llu]", counter); else - len += snprintf(buf + len, sizeof(buf) - len, + len += snprintf(buf + len, + sizeof(rtl->buf) - len, "[error]"); if (j != RTL8366_NUM_PORTS - 1) { if (counter < 100000) len += snprintf(buf + len, - sizeof(buf) - len, + sizeof(rtl->buf) - len, "\t"); - len += snprintf(buf + len, sizeof(buf) - len, + len += snprintf(buf + len, + sizeof(rtl->buf) - len, "\t"); } } - len += snprintf(buf + len, sizeof(buf) - len, "\n"); + len += snprintf(buf + len, sizeof(rtl->buf) - len, "\n"); } - len += snprintf(buf + len, sizeof(buf) - len, "\n"); + len += snprintf(buf + len, sizeof(rtl->buf) - len, "\n"); return simple_read_from_buffer(user_buf, count, ppos, buf, len); } -static ssize_t rtl8366_read_debugfs_vlan(struct file *file, - char __user *user_buf, - size_t count, loff_t *ppos) +static ssize_t rtl8366s_read_debugfs_vlan(struct file *file, + char __user *user_buf, + size_t count, loff_t *ppos) { - char buf[4096]; + struct rtl8366s *rtl = (struct rtl8366s *)file->private_data; int i, j, len = 0; - struct rtl8366_smi *smi = (struct rtl8366_smi *)file->private_data; + char *buf = rtl->buf; - len += snprintf(buf + len, sizeof(buf) - len, "VLAN Member Config:\n"); - len += snprintf(buf + len, sizeof(buf) - len, + len += snprintf(buf + len, sizeof(rtl->buf) - len, + "VLAN Member Config:\n"); + len += snprintf(buf + len, sizeof(rtl->buf) - len, "\t id \t vid \t prio \t member \t untag \t fid " "\tports\n"); for (i = 0; i < RTL8366_NUM_VLANS; ++i) { struct rtl8366s_vlanconfig vlanmc; - rtl8366s_get_vlan_member_config(smi, i, &vlanmc); + rtl8366s_get_vlan_member_config(rtl, i, &vlanmc); - len += snprintf(buf + len, sizeof(buf) - len, + len += snprintf(buf + len, sizeof(rtl->buf) - len, "\t[%d] \t %d \t %d \t 0x%04x \t 0x%04x \t %d " "\t", i, vlanmc.vid, vlanmc.priority, vlanmc.member, vlanmc.untag, vlanmc.fid); for (j = 0; j < RTL8366_NUM_PORTS; ++j) { int index = 0; - if (!rtl8366_get_port_vlan_index(smi, j, &index)) { + if (!rtl8366s_get_port_vlan_index(rtl, j, &index)) { if (index == i) len += snprintf(buf + len, - sizeof(buf) - len, + sizeof(rtl->buf) - len, "%d", j); } } - len += snprintf(buf + len, sizeof(buf) - len, "\n"); + len += snprintf(buf + len, sizeof(rtl->buf) - len, "\n"); } return simple_read_from_buffer(user_buf, count, ppos, buf, len); } -static ssize_t rtl8366_read_debugfs_reg(struct file *file, - char __user *user_buf, - size_t count, loff_t *ppos) +static ssize_t rtl8366s_read_debugfs_reg(struct file *file, + char __user *user_buf, + size_t count, loff_t *ppos) { + struct rtl8366s *rtl = (struct rtl8366s *)file->private_data; + struct rtl8366_smi *smi = &rtl->smi; u32 t, reg = g_dbg_reg; int err, len = 0; - char buf[512]; - struct rtl8366_smi *smi = (struct rtl8366_smi *)file->private_data; + char *buf = rtl->buf; - memset(buf, '\0', sizeof(buf)); + memset(buf, '\0', sizeof(rtl->buf)); err = rtl8366_smi_read_reg(smi, reg, &t); if (err) { - len += snprintf(buf, sizeof(buf), + 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(buf), "reg = 0x%04x, val = 0x%04x\n", + 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 rtl8366_write_debugfs_reg(struct file *file, - const char __user *user_buf, - size_t count, loff_t *ppos) +static ssize_t rtl8366s_write_debugfs_reg(struct file *file, + const char __user *user_buf, + size_t count, loff_t *ppos) { + struct rtl8366s *rtl = (struct rtl8366s *)file->private_data; + struct rtl8366_smi *smi = &rtl->smi; unsigned long data; u32 reg = g_dbg_reg; int err; - char buf[50]; size_t len; - struct rtl8366_smi *smi = (struct rtl8366_smi *)file->private_data; + char *buf = rtl->buf; - len = min(count, sizeof(buf) - 1); + len = min(count, sizeof(rtl->buf) - 1); if (copy_from_user(buf, user_buf, len)) { - dev_err(&smi->pdev->dev, "copy from user failed\n"); + dev_err(rtl->parent, "copy from user failed\n"); return -EFAULT; } @@ -1102,11 +1116,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(rtl->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(rtl->parent, "writing reg 0x%04x val 0x%04lx failed\n", reg, data); } @@ -1115,88 +1129,89 @@ static ssize_t rtl8366_write_debugfs_reg(struct file *file, return count; } -static const struct file_operations fops_rtl8366_regs = { - .read = rtl8366_read_debugfs_reg, - .write = rtl8366_write_debugfs_reg, - .open = rtl8366_debugfs_open, +static const struct file_operations fops_rtl8366s_regs = { + .read = rtl8366s_read_debugfs_reg, + .write = rtl8366s_write_debugfs_reg, + .open = rtl8366s_debugfs_open, .owner = THIS_MODULE }; -static const struct file_operations fops_rtl8366_vlan = { - .read = rtl8366_read_debugfs_vlan, - .open = rtl8366_debugfs_open, +static const struct file_operations fops_rtl8366s_vlan = { + .read = rtl8366s_read_debugfs_vlan, + .open = rtl8366s_debugfs_open, .owner = THIS_MODULE }; -static const struct file_operations fops_rtl8366_mibs = { - .read = rtl8366_read_debugfs_mibs, - .open = rtl8366_debugfs_open, +static const struct file_operations fops_rtl8366s_mibs = { + .read = rtl8366s_read_debugfs_mibs, + .open = rtl8366s_debugfs_open, .owner = THIS_MODULE }; -static void rtl8366_debugfs_init(struct rtl8366_smi *smi) +static void rtl8366s_debugfs_init(struct rtl8366s *rtl) { struct dentry *node; struct dentry *root; - if (!smi->debugfs_root) - smi->debugfs_root = debugfs_create_dir("rtl8366s", NULL); + if (!rtl->debugfs_root) + rtl->debugfs_root = debugfs_create_dir("rtl8366s", NULL); - if (!smi->debugfs_root) { - dev_err(&smi->pdev->dev, "Unable to create debugfs dir\n"); + if (!rtl->debugfs_root) { + dev_err(rtl->parent, "Unable to create debugfs dir\n"); return; } - root = smi->debugfs_root; + root = rtl->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(rtl->parent, "Creating debugfs file reg failed\n"); return; } - node = debugfs_create_file("val", S_IRUGO | S_IWUSR, root, smi, - &fops_rtl8366_regs); + node = debugfs_create_file("val", S_IRUGO | S_IWUSR, root, rtl, + &fops_rtl8366s_regs); if (!node) { - dev_err(&smi->pdev->dev, "Creating debugfs file val failed\n"); + dev_err(rtl->parent, "Creating debugfs file val failed\n"); return; } - node = debugfs_create_file("vlan", S_IRUSR, root, smi, - &fops_rtl8366_vlan); + node = debugfs_create_file("vlan", S_IRUSR, root, rtl, + &fops_rtl8366s_vlan); if (!node) { - dev_err(&smi->pdev->dev, "Creating debugfs file vlan " - "failed\n"); + dev_err(rtl->parent, + "Creating debugfs file vlan failed\n"); return; } - node = debugfs_create_file("mibs", S_IRUSR, root, smi, - &fops_rtl8366_mibs); + node = debugfs_create_file("mibs", S_IRUSR, root, rtl, + &fops_rtl8366s_mibs); if (!node) { - dev_err(&smi->pdev->dev, "Creating debugfs file mibs " - "xfailed\n"); + dev_err(rtl->parent, + "Creating debugfs file mibs failed\n"); return; } } -static void rtl8366_debugfs_remove(struct rtl8366_smi *smi) +static void rtl8366s_debugfs_remove(struct rtl8366s *rtl) { - if (smi->debugfs_root) { - debugfs_remove_recursive(smi->debugfs_root); - smi->debugfs_root = NULL; + if (rtl->debugfs_root) { + debugfs_remove_recursive(rtl->debugfs_root); + rtl->debugfs_root = NULL; } } #else -static inline void rtl8366_debugfs_init(struct rtl8366_smi *smi) {} -static inline void rtl8366_debugfs_remove(struct rtl8366_smi *smi) {} -#endif +static inline void rtl8366s_debugfs_init(struct rtl8366s *rtl) {} +static inline void rtl8366s_debugfs_remove(struct rtl8366s *rtl) {} +#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 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; u32 data = 0; - struct rtl8366_smi *smi = to_rtl8366(dev); if (val->value.i == 1) { rtl8366_smi_read_reg(smi, RTL8366S_MIB_CTRL_REG, &data); @@ -1207,12 +1222,13 @@ 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 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; u32 data; - struct rtl8366_smi *smi = to_rtl8366(dev); if (attr->ofs == 1) { rtl8366_smi_read_reg(smi, RTL8366_CHIP_GLOBAL_CTRL_REG, &data); @@ -1233,12 +1249,14 @@ 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 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; u32 data; - struct rtl8366_smi *smi = to_rtl8366(dev); + rtl8366_smi_read_reg(smi, RTL8366_LED_BLINKRATE_REG, &data); val->value.i = (data & (RTL8366_LED_BLINKRATE_MASK)); @@ -1246,19 +1264,20 @@ 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 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; u32 data; - struct rtl8366_smi *smi = to_rtl8366(dev); if (val->value.i >= 6) return -EINVAL; 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); @@ -1266,127 +1285,110 @@ 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 rtl8366s_sw_set_vlan_enable(struct switch_dev *dev, + const struct switch_attr *attr, + struct switch_val *val) { - struct rtl8366_smi *smi = to_rtl8366(dev); + struct rtl8366s *rtl = sw_to_rtl8366s(dev); if (attr->ofs == 1) - return rtl8366_vlan_set_vlan(smi, val->value.i); + return rtl8366s_vlan_set_vlan(rtl, val->value.i); else - return rtl8366_vlan_set_4ktable(smi, val->value.i); + return rtl8366s_vlan_set_4ktable(rtl, val->value.i); } -static int rtl8366_init_vlan(struct switch_dev *dev, - const struct switch_attr *attr, - struct switch_val *val) +static const char *rtl8366s_speed_str(unsigned speed) { - struct rtl8366_smi *smi = to_rtl8366(dev); - return rtl8366s_reset_vlan(smi); + switch (speed) { + case 0: + return "10baseT"; + case 1: + return "100baseT"; + case 2: + return "1000baseT"; + } + + return "unknown"; } -static int rtl8366_attr_get_port_link(struct switch_dev *dev, - const struct switch_attr *attr, - struct switch_val *val) +static int rtl8366s_sw_get_port_link(struct switch_dev *dev, + const struct switch_attr *attr, + struct switch_val *val) { - char buf[1024]; + struct rtl8366s *rtl = sw_to_rtl8366s(dev); + struct rtl8366_smi *smi = &rtl->smi; u32 len = 0, data = 0; - int speed, duplex, link, txpause, rxpause, nway; - struct rtl8366_smi *smi = to_rtl8366(dev); if (val->port_vlan >= RTL8366_NUM_PORTS) return -EINVAL; - memset(buf, '\0', sizeof(buf)); + memset(rtl->buf, '\0', sizeof(rtl->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(buf) - len, "Port %d: ", - val->port_vlan); - - if (link) - len += snprintf(buf + len, sizeof(buf) - len, - "Link UP, Speed: "); - else - len += snprintf(buf + len, sizeof(buf) - len, - "Link DOWN, Speed: "); - - if (speed == 0) - len += snprintf(buf + len, sizeof(buf) - len, "10Base-TX "); - else if (speed == 1) - len += snprintf(buf + len, sizeof(buf) - len, "100Base-TX "); - else if (speed == 2) - len += snprintf(buf + len, sizeof(buf) - len, "1000Base-TX "); - - if (duplex) - len += snprintf(buf + len, sizeof(buf) - len, "Full-Duplex, "); - else - len += snprintf(buf + len, sizeof(buf) - len, "Half-Duplex, "); - - if (txpause) - len += snprintf(buf + len, sizeof(buf) - len, "TX-Pause "); - if (rxpause) - len += snprintf(buf + len, sizeof(buf) - len, "RX-Pause "); - if (nway) - len += snprintf(buf + len, sizeof(buf) - len, "nway "); - - val->value.s = buf; + len = snprintf(rtl->buf, sizeof(rtl->buf), + "port:%d link:%s speed:%s %s-duplex %s%s%s", + val->port_vlan, + (data & RTL8366S_PORT_STATUS_LINK_MASK) ? "up" : "down", + rtl8366s_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 = rtl->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 rtl8366s_sw_get_vlan_info(struct switch_dev *dev, + const struct switch_attr *attr, + struct switch_val *val) { int i; - char buf[1024]; u32 len = 0; struct rtl8366s_vlanconfig vlanmc; struct rtl8366s_vlan4kentry vlan4k; - struct rtl8366_smi *smi = to_rtl8366(dev); + struct rtl8366s *rtl = sw_to_rtl8366s(dev); + char *buf = rtl->buf; - if (val->port_vlan >= RTL8366_NUM_PORTS) + if (val->port_vlan >= RTL8366_NUM_VLANS) return -EINVAL; - memset(buf, '\0', sizeof(buf)); + memset(buf, '\0', sizeof(rtl->buf)); - rtl8366s_get_vlan_member_config(smi, val->port_vlan, &vlanmc); - rtl8366s_get_vlan_4k_entry(smi, vlanmc.vid, &vlan4k); + rtl8366s_get_vlan_member_config(rtl, val->port_vlan, &vlanmc); + rtl8366s_get_vlan_4k_entry(rtl, vlanmc.vid, &vlan4k); - len += snprintf(buf + len, sizeof(buf) - len, "VLAN %d: Ports: ", + 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 (!rtl8366_get_port_vlan_index(smi, i, &index) && + if (!rtl8366s_get_port_vlan_index(rtl, i, &index) && index == val->port_vlan) - len += snprintf(buf + len, sizeof(buf) - len, "%d", i); + len += snprintf(buf + len, sizeof(rtl->buf) - len, + "%d", i); } - len += snprintf(buf + len, sizeof(buf) - len, "\n"); + len += snprintf(buf + len, sizeof(rtl->buf) - len, "\n"); - len += snprintf(buf + len, sizeof(buf) - len, + len += snprintf(buf + len, sizeof(rtl->buf) - len, "\t\t vid \t prio \t member \t untag \t fid\n"); - len += snprintf(buf + len, sizeof(buf) - len, "\tMC:\t"); - len += snprintf(buf + len, sizeof(buf) - len, + len += snprintf(buf + len, sizeof(rtl->buf) - len, "\tMC:\t"); + len += snprintf(buf + len, sizeof(rtl->buf) - len, "%d \t %d \t 0x%04x \t 0x%04x \t %d\n", vlanmc.vid, vlanmc.priority, vlanmc.member, vlanmc.untag, vlanmc.fid); - len += snprintf(buf + len, sizeof(buf) - len, "\t4K:\t"); - len += snprintf(buf + len, sizeof(buf) - len, + len += snprintf(buf + len, sizeof(rtl->buf) - len, "\t4K:\t"); + len += snprintf(buf + len, sizeof(rtl->buf) - len, "%d \t \t 0x%04x \t 0x%04x \t %d", vlan4k.vid, vlan4k.member, vlan4k.untag, vlan4k.fid); @@ -1396,12 +1398,14 @@ 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 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; u32 data = 0; - struct rtl8366_smi *smi = to_rtl8366(dev); + if (val->port_vlan >= RTL8366_NUM_PORTS || (1 << val->port_vlan) == RTL8366_PORT_UNKNOWN) return -EINVAL; @@ -1420,12 +1424,14 @@ 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 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; u32 data = 0; - struct rtl8366_smi *smi = to_rtl8366(dev); + if (val->port_vlan >= RTL8366_NUM_LEDGROUPS) return -EINVAL; @@ -1435,12 +1441,14 @@ 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 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; u32 data = 0; - struct rtl8366_smi *smi = to_rtl8366(dev); + if (val->port_vlan >= RTL8366_NUM_PORTS) return -EINVAL; @@ -1451,28 +1459,30 @@ 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 rtl8366s_sw_get_port_mib(struct switch_dev *dev, + const struct switch_attr *attr, + struct switch_val *val) { - char buf[2048]; + struct rtl8366s *rtl = sw_to_rtl8366s(dev); int i, len = 0; unsigned long long counter = 0; - struct rtl8366_smi *smi = to_rtl8366(dev); + char *buf = rtl->buf; + if (val->port_vlan >= RTL8366_NUM_PORTS) return -EINVAL; - len += snprintf(buf + len, sizeof(buf) - len, "Port %d MIB counters\n", + len += snprintf(buf + len, sizeof(rtl->buf) - len, + "Port %d MIB counters\n", val->port_vlan); - for (i = 0; i < RTL8366S_MIB_COUNT; ++i) { - len += snprintf(buf + len, sizeof(buf) - len, + for (i = 0; i < RTL8366S_MIB_COUNT; ++i) { + len += snprintf(buf + len, sizeof(rtl->buf) - len, "%d:%s\t", i, MIBCOUNTERS[i]); - if (!rtl8366_get_mib_counter(smi, i, val->port_vlan, &counter)) - len += snprintf(buf + len, sizeof(buf) - len, + if (!rtl8366_get_mib_counter(rtl, i, val->port_vlan, &counter)) + len += snprintf(buf + len, sizeof(rtl->buf) - len, "[%llu]\n", counter); else - len += snprintf(buf + len, sizeof(buf) - len, + len += snprintf(buf + len, sizeof(rtl->buf) - len, "[error]\n"); } @@ -1481,321 +1491,315 @@ static int rtl8366_get_port_mib(struct switch_dev *dev, return 0; } -static int rtl8366_set_member(struct switch_dev *dev, - const struct switch_attr *attr, - struct switch_val *val) +static int rtl8366s_sw_get_vlan_ports(struct switch_dev *dev, + struct switch_val *val) { struct rtl8366s_vlanconfig vlanmc; - struct rtl8366s_vlan4kentry vlan4k; - struct rtl8366_smi *smi = to_rtl8366(dev); + struct rtl8366s *rtl = sw_to_rtl8366s(dev); + struct switch_port *port; + int i; if (val->port_vlan >= RTL8366_NUM_VLANS) return -EINVAL; - rtl8366s_get_vlan_member_config(smi, val->port_vlan, &vlanmc); - - rtl8366s_get_vlan_4k_entry(smi, vlanmc.vid, &vlan4k); - - vlan4k.member = vlanmc.member = val->value.i; - rtl8366s_set_vlan_member_config(smi, val->port_vlan, &vlanmc); - rtl8366s_set_vlan_4k_entry(smi, &vlan4k); + rtl8366s_get_vlan_member_config(rtl, val->port_vlan, &vlanmc); + port = &val->value.ports[0]; + val->len = 0; + for (i = 0; i < RTL8366_NUM_PORTS; i++) { + if (!(vlanmc.member & BIT(i))) + continue; + + port->id = i; + port->flags = (vlanmc.untag & BIT(i)) ? + 0 : BIT(SWITCH_PORT_FLAG_TAGGED); + val->len++; + port++; + } return 0; } -static int rtl8366_get_member(struct switch_dev *dev, - const struct switch_attr *attr, - struct switch_val *val) +static int rtl8366s_sw_set_vlan_ports(struct switch_dev *dev, + struct switch_val *val) { struct rtl8366s_vlanconfig vlanmc; struct rtl8366s_vlan4kentry vlan4k; - struct rtl8366_smi *smi = to_rtl8366(dev); + struct rtl8366s *rtl = sw_to_rtl8366s(dev); + struct switch_port *port; + int i; if (val->port_vlan >= RTL8366_NUM_VLANS) return -EINVAL; - rtl8366s_get_vlan_member_config(smi, val->port_vlan, &vlanmc); + rtl8366s_get_vlan_member_config(rtl, val->port_vlan, &vlanmc); + rtl8366s_get_vlan_4k_entry(rtl, vlanmc.vid, &vlan4k); - rtl8366s_get_vlan_4k_entry(smi, vlanmc.vid, &vlan4k); + vlanmc.untag = 0; + vlanmc.member = 0; - val->value.i = vlanmc.member; - - return 0; -} + port = &val->value.ports[0]; + for (i = 0; i < val->len; i++, port++) { + vlanmc.member |= BIT(port->id); -static int rtl8366_set_untag(struct switch_dev *dev, - const struct switch_attr *attr, - struct switch_val *val) -{ - struct rtl8366s_vlanconfig vlanmc; - struct rtl8366s_vlan4kentry vlan4k; - struct rtl8366_smi *smi = to_rtl8366(dev); - - if (val->port_vlan >= RTL8366_NUM_VLANS) - return -EINVAL; - - rtl8366s_get_vlan_member_config(smi, val->port_vlan, &vlanmc); - rtl8366s_get_vlan_4k_entry(smi, vlanmc.vid, &vlan4k); + if (!(port->flags & BIT(SWITCH_PORT_FLAG_TAGGED))) + vlanmc.untag |= BIT(port->id); + } - vlan4k.untag = vlanmc.untag = val->value.i; - rtl8366s_set_vlan_member_config(smi, val->port_vlan, &vlanmc); - rtl8366s_set_vlan_4k_entry(smi, &vlan4k); + 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); return 0; } -static int rtl8366_get_untag(struct switch_dev *dev, - const struct switch_attr *attr, - struct switch_val *val) +static int rtl8366s_sw_get_port_pvid(struct switch_dev *dev, int port, int *val) { - struct rtl8366s_vlanconfig vlanmc; - struct rtl8366s_vlan4kentry vlan4k; - struct rtl8366_smi *smi = to_rtl8366(dev); - - if (val->port_vlan >= RTL8366_NUM_VLANS) - return -EINVAL; - - rtl8366s_get_vlan_member_config(smi, val->port_vlan, &vlanmc); - rtl8366s_get_vlan_4k_entry(smi, vlanmc.vid, &vlan4k); - - - val->value.i = vlanmc.untag; - - return 0; + struct rtl8366s *rtl = sw_to_rtl8366s(dev); + return rtl8366s_get_vlan_port_pvid(rtl, port, val); } -static int rtl8366_get_port_pvid(struct switch_dev *dev, int port, int *val) +static int rtl8366s_sw_set_port_pvid(struct switch_dev *dev, int port, int val) { - struct rtl8366_smi *smi = to_rtl8366(dev); - return rtl8366_get_vlan_port_pvid(smi, port, val); + struct rtl8366s *rtl = sw_to_rtl8366s(dev); + return rtl8366s_set_vlan_port_pvid(rtl, port, val); } -static int rtl8366_set_port_pvid(struct switch_dev *dev, int port, int val) +static int rtl8366s_sw_reset_switch(struct switch_dev *dev) { - struct rtl8366_smi *smi = to_rtl8366(dev); - return rtl8366_set_vlan_port_pvid(smi, port, val); -} + struct rtl8366s *rtl = sw_to_rtl8366s(dev); + struct rtl8366_smi *smi = &rtl->smi; + int timeout = 10; + u32 data; -static int rtl8366_reset_switch(struct switch_dev *dev) -{ - struct rtl8366_smi *smi = to_rtl8366(dev); rtl8366_smi_write_reg(smi, RTL8366_RESET_CTRL_REG, RTL8366_CHIP_CTRL_RESET_HW); - return 0; + do { + msleep(1); + if (rtl8366_smi_read_reg(smi, RTL8366_RESET_CTRL_REG, &data)) + return -EIO; + + if (!(data & RTL8366_CHIP_CTRL_RESET_HW)) + break; + } while (--timeout); + + if (!timeout) { + printk("Timeout waiting for the switch to reset\n"); + return -EIO; + } + + return rtl8366s_reset_vlan(rtl); } -static struct switch_attr rtl8366_globals[] = { +static struct switch_attr rtl8366s_globals[] = { { .type = SWITCH_TYPE_INT, .name = "enable_vlan", .description = "Enable VLAN mode", - .set = rtl8366_set_vlan, - .get = rtl8366_get_vlan, + .set = rtl8366s_sw_set_vlan_enable, + .get = rtl8366s_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 = rtl8366s_sw_set_vlan_enable, + .get = rtl8366s_sw_get_vlan_enable, .max = 1, .ofs = 2 - }, - { - .type = SWITCH_TYPE_INT, - .name = "init_vlan", - .description = "Initialize VLAN tables to defaults", - .set = rtl8366_init_vlan, - .get = NULL, - .max = 1 - }, - - { + }, { .type = SWITCH_TYPE_INT, .name = "reset_mibs", .description = "Reset all MIB counters", - .set = rtl8366_global_reset_mibs, + .set = rtl8366s_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 = rtl8366s_sw_set_blinkrate, + .get = rtl8366s_sw_get_blinkrate, .max = 5 }, }; -static struct switch_attr rtl8366_port[] = { +static struct switch_attr rtl8366s_port[] = { { .type = SWITCH_TYPE_STRING, .name = "link", .description = "Get port link information", .max = 1, .set = NULL, - .get = rtl8366_attr_get_port_link - }, - { + .get = rtl8366s_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 = rtl8366s_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 = rtl8366s_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 = rtl8366s_sw_set_port_led, + .get = rtl8366s_sw_get_port_led, }, }; -static struct switch_attr rtl8366_vlan[] = { - { - .type = SWITCH_TYPE_INT, - .name = "untag", - .description = "Get/Set VLAN untag port set (bitmask)", - .set = rtl8366_set_untag, - .get = rtl8366_get_untag, - .max = 63, - }, - { - .type = SWITCH_TYPE_INT, - .name = "member", - .description = "Get/Set VLAN member port set (bitmask)", - .set = rtl8366_set_member, - .get = rtl8366_get_member, - .max = 63, - }, +static struct switch_attr rtl8366s_vlan[] = { { .type = SWITCH_TYPE_STRING, .name = "info", .description = "Get vlan information", .max = 1, .set = NULL, - .get = rtl8366_attr_get_vlan_info + .get = rtl8366s_sw_get_vlan_info, }, }; /* template */ -static struct switch_dev rtldev = { +static struct switch_dev rtl8366_switch_dev = { .name = "RTL8366S", .cpu_port = RTL8366_PORT_NUM_CPU, .ports = RTL8366_NUM_PORTS, .vlans = RTL8366_NUM_VLANS, .attr_global = { - .attr = rtl8366_globals, - .n_attr = ARRAY_SIZE(rtl8366_globals), + .attr = rtl8366s_globals, + .n_attr = ARRAY_SIZE(rtl8366s_globals), }, .attr_port = { - .attr = rtl8366_port, - .n_attr = ARRAY_SIZE(rtl8366_port), + .attr = rtl8366s_port, + .n_attr = ARRAY_SIZE(rtl8366s_port), }, .attr_vlan = { - .attr = rtl8366_vlan, - .n_attr = ARRAY_SIZE(rtl8366_vlan), + .attr = rtl8366s_vlan, + .n_attr = ARRAY_SIZE(rtl8366s_vlan), }, - .get_port_pvid = rtl8366_get_port_pvid, - .set_port_pvid = rtl8366_set_port_pvid, - .reset_switch = rtl8366_reset_switch, + .get_vlan_ports = rtl8366s_sw_get_vlan_ports, + .set_vlan_ports = rtl8366s_sw_set_vlan_ports, + .get_port_pvid = rtl8366s_sw_get_port_pvid, + .set_port_pvid = rtl8366s_sw_set_port_pvid, + .reset_switch = rtl8366s_sw_reset_switch, }; -static int rtl8366_smi_mii_read(struct mii_bus *bus, int addr, int reg) +static int rtl8366s_switch_init(struct rtl8366s *rtl) { - struct rtl8366_smi *smi = bus->priv; + struct switch_dev *dev = &rtl->dev; + int err; + + memcpy(dev, &rtl8366_switch_dev, sizeof(struct switch_dev)); + dev->priv = rtl; + dev->devname = dev_name(rtl->parent); + + err = register_switch(dev, NULL); + if (err) + dev_err(rtl->parent, "switch registration failed\n"); + + return err; +} + +static void rtl8366s_switch_cleanup(struct rtl8366s *rtl) +{ + unregister_switch(&rtl->dev); +} + +static int rtl8366s_mii_read(struct mii_bus *bus, int addr, int reg) +{ + struct rtl8366s *rtl = bus->priv; u32 val = 0; int err; - err = rtl8366_smi_read_phy_reg(smi, addr, 0, reg, &val); + err = rtl8366s_read_phy_reg(rtl, addr, 0, reg, &val); if (err) return 0xffff; return val; } -static int rtl8366_smi_mii_write(struct mii_bus *bus, int addr, int reg, - u16 val) +static int rtl8366s_mii_write(struct mii_bus *bus, int addr, int reg, u16 val) { - struct rtl8366_smi *smi = bus->priv; + struct rtl8366s *rtl = bus->priv; u32 t; int err; - err = rtl8366_smi_write_phy_reg(smi, addr, 0, reg, val); + err = rtl8366s_write_phy_reg(rtl, addr, 0, reg, val); /* flush write */ - (void) rtl8366_smi_read_phy_reg(smi, addr, 0, reg, &t); + (void) rtl8366s_read_phy_reg(rtl, addr, 0, reg, &t); return err; } -static int rtl8366_smi_mii_init(struct rtl8366_smi *smi) +static int rtl8366s_mii_init(struct rtl8366s *rtl) { int ret; int i; - smi->mii_bus = mdiobus_alloc(); - if (smi->mii_bus == NULL) { + rtl->mii_bus = mdiobus_alloc(); + if (rtl->mii_bus == NULL) { ret = -ENOMEM; goto err; } - spin_lock_init(&smi->lock); - smi->mii_bus->priv = (void *) smi; - smi->mii_bus->name = "rtl8366-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; - smi->mii_bus->phy_mask = ~(0x1f); - smi->mii_bus->irq = smi->mii_irq; + rtl->mii_bus->priv = (void *) rtl; + rtl->mii_bus->name = "rtl8366-rtl"; + rtl->mii_bus->read = rtl8366s_mii_read; + rtl->mii_bus->write = rtl8366s_mii_write; + snprintf(rtl->mii_bus->id, MII_BUS_ID_SIZE, "%s", + dev_name(rtl->parent)); + rtl->mii_bus->parent = rtl->parent; + rtl->mii_bus->phy_mask = ~(0x1f); + rtl->mii_bus->irq = rtl->mii_irq; for (i = 0; i < PHY_MAX_ADDR; i++) - smi->mii_irq[i] = PHY_POLL; + rtl->mii_irq[i] = PHY_POLL; - ret = mdiobus_register(smi->mii_bus); + ret = mdiobus_register(rtl->mii_bus); if (ret) goto err_free; return 0; err_free: - mdiobus_free(smi->mii_bus); + mdiobus_free(rtl->mii_bus); err: return ret; } -static void rtl8366_smi_mii_cleanup(struct rtl8366_smi *smi) +static void rtl8366s_mii_cleanup(struct rtl8366s *rtl) +{ + mdiobus_unregister(rtl->mii_bus); + mdiobus_free(rtl->mii_bus); +} + +static int rtl8366s_mii_bus_match(struct mii_bus *bus) { - mdiobus_unregister(smi->mii_bus); - mdiobus_free(smi->mii_bus); + return (bus->read == rtl8366s_mii_read && + bus->write == rtl8366s_mii_write); } -static int rtl8366_smi_setup(struct rtl8366_smi *smi) +static int rtl8366s_setup(struct rtl8366s *rtl) { + struct rtl8366_smi *smi = &rtl->smi; u32 chip_id = 0; u32 chip_ver = 0; int ret; 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(rtl->parent, "unable to read chip id\n"); return ret; } @@ -1803,35 +1807,76 @@ 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(rtl->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(rtl->parent, "unable to read chip version\n"); return ret; } - dev_info(&smi->pdev->dev, "RTL%04x ver. %u chip found\n", + dev_info(rtl->parent, "RTL%04x ver. %u chip found\n", chip_id, chip_ver & RTL8366S_CHIP_VERSION_MASK); - rtl8366_debugfs_init(smi); + rtl8366s_debugfs_init(rtl); + + 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 int __init rtl8366_smi_probe(struct platform_device *pdev) +static void rtl8366_smi_cleanup(struct rtl8366_smi *smi) +{ + gpio_free(smi->gpio_sck); + gpio_free(smi->gpio_sda); +} + +static int __init rtl8366s_probe(struct platform_device *pdev) { static int rtl8366_smi_version_printed; struct rtl8366_smi_platform_data *pdata; + struct rtl8366s *rtl; struct rtl8366_smi *smi; int err; if (!rtl8366_smi_version_printed++) - printk(KERN_NOTICE RTL8366_SMI_DRIVER_DESC - " version " RTL8366_SMI_DRIVER_VER"\n"); + printk(KERN_NOTICE RTL8366S_DRIVER_DESC + " version " RTL8366S_DRIVER_VER"\n"); pdata = pdev->dev.platform_data; if (!pdata) { @@ -1840,160 +1885,131 @@ static int __init rtl8366_smi_probe(struct platform_device *pdev) goto err_out; } - smi = kzalloc(sizeof(struct rtl8366_smi), GFP_KERNEL); - if (!smi) { + rtl = kzalloc(sizeof(*rtl), GFP_KERNEL); + if (!rtl) { dev_err(&pdev->dev, "no memory for private data\n"); err = -ENOMEM; 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; - } + rtl->parent = &pdev->dev; - 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 = &rtl->smi; + 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); - - platform_set_drvdata(pdev, smi); + err = rtl8366_smi_init(smi); + if (err) + goto err_free_rtl; - dev_info(&pdev->dev, "using GPIO pins %u (SDA) and %u (SCK)\n", - pdata->gpio_sda, pdata->gpio_sck); + platform_set_drvdata(pdev, rtl); - err = rtl8366_smi_setup(smi); + err = rtl8366s_setup(rtl); if (err) goto err_clear_drvdata; - err = rtl8366_smi_mii_init(smi); + err = rtl8366s_mii_init(rtl); if (err) goto err_clear_drvdata; + err = rtl8366s_switch_init(rtl); + if (err) + goto err_mii_cleanup; + return 0; + err_mii_cleanup: + rtl8366s_mii_cleanup(rtl); 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); + rtl8366_smi_cleanup(smi); + err_free_rtl: + kfree(rtl); err_out: return err; } -int rtl8366_phy_config_init(struct phy_device *phydev) +static int rtl8366s_phy_config_init(struct phy_device *phydev) { - int err; - struct net_device *netdev = phydev->attached_dev; - struct rtl8366_smi *smi = phydev->bus->priv; - struct switch_dev *dev = &smi->dev; - - /* Only init the switch for the primary PHY */ - if (phydev->addr != 4) { - printk(KERN_INFO "Discarding address: %d\n", phydev->addr); - return 0; - } - - memcpy(&smi->dev, &rtldev, sizeof(struct switch_dev)); - dev->priv = smi; - dev->netdev = netdev; - - err = register_switch(dev, netdev); - if (err < 0) { - printk(KERN_INFO "Switch registration failed\n"); - return err; - } + if (!rtl8366s_mii_bus_match(phydev->bus)) + return -EINVAL; return 0; } -int rtl8366_phy_config_aneg(struct phy_device *phydev) +static int rtl8366s_phy_config_aneg(struct phy_device *phydev) { return 0; } -static struct phy_driver rtl8366_smi_phy_driver = { +static struct phy_driver rtl8366s_phy_driver = { .phy_id = 0x001cc960, .name = "Realtek RTL8366", .phy_id_mask = 0x1ffffff0, .features = PHY_GBIT_FEATURES, - .config_aneg = rtl8366_phy_config_aneg, - .config_init = rtl8366_phy_config_init, + .config_aneg = rtl8366s_phy_config_aneg, + .config_init = rtl8366s_phy_config_init, .read_status = genphy_read_status, .driver = { .owner = THIS_MODULE, }, }; -static int __devexit rtl8366_smi_remove(struct platform_device *pdev) +static int __devexit rtl8366s_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; + struct rtl8366s *rtl = platform_get_drvdata(pdev); - rtl8366_debugfs_remove(smi); - phy_driver_unregister(&rtl8366_smi_phy_driver); - rtl8366_smi_mii_cleanup(smi); + if (rtl) { + rtl8366s_switch_cleanup(rtl); + rtl8366s_debugfs_remove(rtl); + rtl8366s_mii_cleanup(rtl); platform_set_drvdata(pdev, NULL); - gpio_free(pdata->gpio_sck); - gpio_free(pdata->gpio_sda); - kfree(smi); + rtl8366_smi_cleanup(&rtl->smi); + kfree(rtl); } return 0; } -static struct platform_driver rtl8366_smi_driver = { +static struct platform_driver rtl8366s_driver = { .driver = { - .name = RTL8366_SMI_DRIVER_NAME, + .name = RTL8366S_DRIVER_NAME, .owner = THIS_MODULE, }, - .probe = rtl8366_smi_probe, - .remove = __devexit_p(rtl8366_smi_remove), + .probe = rtl8366s_probe, + .remove = __devexit_p(rtl8366s_remove), }; -static int __init rtl8366_smi_init(void) +static int __init rtl8366s_module_init(void) { int ret; - ret = platform_driver_register(&rtl8366_smi_driver); + ret = platform_driver_register(&rtl8366s_driver); if (ret) return ret; - ret = phy_driver_register(&rtl8366_smi_phy_driver); + ret = phy_driver_register(&rtl8366s_phy_driver); if (ret) goto err_platform_unregister; return 0; err_platform_unregister: - platform_driver_unregister(&rtl8366_smi_driver); + platform_driver_unregister(&rtl8366s_driver); return ret; } -module_init(rtl8366_smi_init); +module_init(rtl8366s_module_init); -static void __exit rtl8366_smi_exit(void) +static void __exit rtl8366s_module_exit(void) { - phy_driver_unregister(&rtl8366_smi_phy_driver); - platform_driver_unregister(&rtl8366_smi_driver); + phy_driver_unregister(&rtl8366s_phy_driver); + platform_driver_unregister(&rtl8366s_driver); } -module_exit(rtl8366_smi_exit); +module_exit(rtl8366s_module_exit); -MODULE_DESCRIPTION(RTL8366_SMI_DRIVER_DESC); -MODULE_VERSION(RTL8366_SMI_DRIVER_VER); +MODULE_DESCRIPTION(RTL8366S_DRIVER_DESC); +MODULE_VERSION(RTL8366S_DRIVER_VER); MODULE_AUTHOR("Gabor Juhos "); MODULE_AUTHOR("Antti Seppälä "); MODULE_LICENSE("GPL v2"); -MODULE_ALIAS("platform:" RTL8366_SMI_DRIVER_NAME); +MODULE_ALIAS("platform:" RTL8366S_DRIVER_NAME);