#include <linux/platform_device.h>
#include <linux/delay.h>
#include <linux/skbuff.h>
-#include <linux/switch.h>
-#include <linux/phy.h>
#include <linux/rtl8366s.h>
#include "rtl8366_smi.h"
-#ifdef CONFIG_RTL8366S_PHY_DEBUG_FS
-#include <linux/debugfs.h>
-#endif
-
#define RTL8366S_DRIVER_DESC "Realtek RTL8366S ethernet switch driver"
-#define RTL8366S_DRIVER_VER "0.2.1"
-
-#define RTL8366S_PHY_NO_MAX 4
-#define RTL8366S_PHY_PAGE_MAX 7
-#define RTL8366S_PHY_ADDR_MAX 31
-
-#define RTL8366_CHIP_GLOBAL_CTRL_REG 0x0000
-#define RTL8366_CHIP_CTRL_VLAN (1 << 13)
-
-#define RTL8366_RESET_CTRL_REG 0x0100
-#define RTL8366_CHIP_CTRL_RESET_HW 1
-#define RTL8366_CHIP_CTRL_RESET_SW (1 << 1)
-
-#define RTL8366S_CHIP_VERSION_CTRL_REG 0x0104
-#define RTL8366S_CHIP_VERSION_MASK 0xf
-#define RTL8366S_CHIP_ID_REG 0x0105
-#define RTL8366S_CHIP_ID_8366 0x8366
+#define RTL8366S_DRIVER_VER "0.2.2"
+
+#define RTL8366S_PHY_NO_MAX 4
+#define RTL8366S_PHY_PAGE_MAX 7
+#define RTL8366S_PHY_ADDR_MAX 31
+#define RTL8366S_PHY_WAN 4
+
+/* Switch Global Configuration register */
+#define RTL8366S_SGCR 0x0000
+#define RTL8366S_SGCR_EN_BC_STORM_CTRL BIT(0)
+#define RTL8366S_SGCR_MAX_LENGTH(_x) (_x << 4)
+#define RTL8366S_SGCR_MAX_LENGTH_MASK RTL8366S_SGCR_MAX_LENGTH(0x3)
+#define RTL8366S_SGCR_MAX_LENGTH_1522 RTL8366S_SGCR_MAX_LENGTH(0x0)
+#define RTL8366S_SGCR_MAX_LENGTH_1536 RTL8366S_SGCR_MAX_LENGTH(0x1)
+#define RTL8366S_SGCR_MAX_LENGTH_1552 RTL8366S_SGCR_MAX_LENGTH(0x2)
+#define RTL8366S_SGCR_MAX_LENGTH_16000 RTL8366S_SGCR_MAX_LENGTH(0x3)
+#define RTL8366S_SGCR_EN_VLAN BIT(13)
+
+/* Port Enable Control register */
+#define RTL8366S_PECR 0x0001
+
+/* Switch Security Control registers */
+#define RTL8366S_SSCR0 0x0002
+#define RTL8366S_SSCR1 0x0003
+#define RTL8366S_SSCR2 0x0004
+#define RTL8366S_SSCR2_DROP_UNKNOWN_DA BIT(0)
+
+#define RTL8366S_RESET_CTRL_REG 0x0100
+#define RTL8366S_CHIP_CTRL_RESET_HW 1
+#define RTL8366S_CHIP_CTRL_RESET_SW (1 << 1)
+
+#define RTL8366S_CHIP_VERSION_CTRL_REG 0x0104
+#define RTL8366S_CHIP_VERSION_MASK 0xf
+#define RTL8366S_CHIP_ID_REG 0x0105
+#define RTL8366S_CHIP_ID_8366 0x8366
/* PHY registers control */
-#define RTL8366S_PHY_ACCESS_CTRL_REG 0x8028
-#define RTL8366S_PHY_ACCESS_DATA_REG 0x8029
+#define RTL8366S_PHY_ACCESS_CTRL_REG 0x8028
+#define RTL8366S_PHY_ACCESS_DATA_REG 0x8029
-#define RTL8366S_PHY_CTRL_READ 1
-#define RTL8366S_PHY_CTRL_WRITE 0
+#define RTL8366S_PHY_CTRL_READ 1
+#define RTL8366S_PHY_CTRL_WRITE 0
-#define RTL8366S_PHY_REG_MASK 0x1f
-#define RTL8366S_PHY_PAGE_OFFSET 5
-#define RTL8366S_PHY_PAGE_MASK (0x7 << 5)
-#define RTL8366S_PHY_NO_OFFSET 9
-#define RTL8366S_PHY_NO_MASK (0x1f << 9)
+#define RTL8366S_PHY_REG_MASK 0x1f
+#define RTL8366S_PHY_PAGE_OFFSET 5
+#define RTL8366S_PHY_PAGE_MASK (0x7 << 5)
+#define RTL8366S_PHY_NO_OFFSET 9
+#define RTL8366S_PHY_NO_MASK (0x1f << 9)
/* LED control registers */
-#define RTL8366_LED_BLINKRATE_REG 0x0420
-#define RTL8366_LED_BLINKRATE_BIT 0
-#define RTL8366_LED_BLINKRATE_MASK 0x0007
-
-#define RTL8366_LED_CTRL_REG 0x0421
-#define RTL8366_LED_0_1_CTRL_REG 0x0422
-#define RTL8366_LED_2_3_CTRL_REG 0x0423
-
-#define RTL8366S_MIB_COUNT 33
-#define RTL8366S_GLOBAL_MIB_COUNT 1
-#define RTL8366S_MIB_COUNTER_PORT_OFFSET 0x0040
-#define RTL8366S_MIB_COUNTER_BASE 0x1000
-#define RTL8366S_MIB_CTRL_REG 0x11F0
-#define RTL8366S_MIB_CTRL_USER_MASK 0x01FF
-#define RTL8366S_MIB_CTRL_BUSY_MASK 0x0001
-#define RTL8366S_MIB_CTRL_RESET_MASK 0x0002
-
-#define RTL8366S_MIB_CTRL_GLOBAL_RESET_MASK 0x0004
-#define RTL8366S_MIB_CTRL_PORT_RESET_BIT 0x0003
-#define RTL8366S_MIB_CTRL_PORT_RESET_MASK 0x01FC
-
-
-#define RTL8366S_PORT_VLAN_CTRL_BASE 0x0058
+#define RTL8366S_LED_BLINKRATE_REG 0x0420
+#define RTL8366S_LED_BLINKRATE_BIT 0
+#define RTL8366S_LED_BLINKRATE_MASK 0x0007
+
+#define RTL8366S_LED_CTRL_REG 0x0421
+#define RTL8366S_LED_0_1_CTRL_REG 0x0422
+#define RTL8366S_LED_2_3_CTRL_REG 0x0423
+
+#define RTL8366S_MIB_COUNT 33
+#define RTL8366S_GLOBAL_MIB_COUNT 1
+#define RTL8366S_MIB_COUNTER_PORT_OFFSET 0x0040
+#define RTL8366S_MIB_COUNTER_BASE 0x1000
+#define RTL8366S_MIB_COUNTER_PORT_OFFSET2 0x0008
+#define RTL8366S_MIB_COUNTER_BASE2 0x1180
+#define RTL8366S_MIB_CTRL_REG 0x11F0
+#define RTL8366S_MIB_CTRL_USER_MASK 0x01FF
+#define RTL8366S_MIB_CTRL_BUSY_MASK 0x0001
+#define RTL8366S_MIB_CTRL_RESET_MASK 0x0002
+
+#define RTL8366S_MIB_CTRL_GLOBAL_RESET_MASK 0x0004
+#define RTL8366S_MIB_CTRL_PORT_RESET_BIT 0x0003
+#define RTL8366S_MIB_CTRL_PORT_RESET_MASK 0x01FC
+
+
+#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
-
-#define RTL8366S_VLAN_TB_CTRL_REG 0x010F
-
-#define RTL8366S_TABLE_ACCESS_CTRL_REG 0x0180
-#define RTL8366S_TABLE_VLAN_READ_CTRL 0x0E01
-#define RTL8366S_TABLE_VLAN_WRITE_CTRL 0x0F01
-
-#define RTL8366S_VLAN_MEMCONF_BASE 0x0016
-
-
-#define RTL8366S_PORT_LINK_STATUS_BASE 0x0060
-#define RTL8366S_PORT_STATUS_SPEED_MASK 0x0003
-#define RTL8366S_PORT_STATUS_DUPLEX_MASK 0x0004
-#define RTL8366S_PORT_STATUS_LINK_MASK 0x0010
-#define RTL8366S_PORT_STATUS_TXPAUSE_MASK 0x0020
-#define RTL8366S_PORT_STATUS_RXPAUSE_MASK 0x0040
-#define RTL8366S_PORT_STATUS_AN_MASK 0x0080
-
-
-#define RTL8366_PORT_NUM_CPU 5
-#define RTL8366_NUM_PORTS 6
-#define RTL8366_NUM_VLANS 16
-#define RTL8366_NUM_LEDGROUPS 4
-#define RTL8366_NUM_VIDS 4096
-#define RTL8366S_PRIORITYMAX 7
-#define RTL8366S_FIDMAX 7
-
-
-#define RTL8366_PORT_1 (1 << 0) /* In userspace port 0 */
-#define RTL8366_PORT_2 (1 << 1) /* In userspace port 1 */
-#define RTL8366_PORT_3 (1 << 2) /* In userspace port 2 */
-#define RTL8366_PORT_4 (1 << 3) /* In userspace port 3 */
-
-#define RTL8366_PORT_UNKNOWN (1 << 4) /* No known connection */
-#define RTL8366_PORT_CPU (1 << 5) /* CPU port */
-
-#define RTL8366_PORT_ALL (RTL8366_PORT_1 | \
- RTL8366_PORT_2 | \
- RTL8366_PORT_3 | \
- RTL8366_PORT_4 | \
- RTL8366_PORT_UNKNOWN | \
- RTL8366_PORT_CPU)
-
-#define RTL8366_PORT_ALL_BUT_CPU (RTL8366_PORT_1 | \
- RTL8366_PORT_2 | \
- RTL8366_PORT_3 | \
- RTL8366_PORT_4 | \
- RTL8366_PORT_UNKNOWN)
-
-#define RTL8366_PORT_ALL_EXTERNAL (RTL8366_PORT_1 | \
- RTL8366_PORT_2 | \
- RTL8366_PORT_3 | \
- RTL8366_PORT_4)
-
-#define RTL8366_PORT_ALL_INTERNAL (RTL8366_PORT_UNKNOWN | \
- RTL8366_PORT_CPU)
-
-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_RTL8366S_PHY_DEBUG_FS
- struct dentry *debugfs_root;
-#endif
-};
-
-struct rtl8366s_vlanconfig {
- u16 reserved2:1;
- u16 priority:3;
- u16 vid:12;
+#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
+
+#define RTL8366S_VLAN_TB_CTRL_REG 0x010F
+
+#define RTL8366S_TABLE_ACCESS_CTRL_REG 0x0180
+#define RTL8366S_TABLE_VLAN_READ_CTRL 0x0E01
+#define RTL8366S_TABLE_VLAN_WRITE_CTRL 0x0F01
+
+#define RTL8366S_VLAN_MC_BASE(_x) (0x0016 + (_x) * 2)
+
+#define RTL8366S_VLAN_MEMBERINGRESS_REG 0x0379
+
+#define RTL8366S_PORT_LINK_STATUS_BASE 0x0060
+#define RTL8366S_PORT_STATUS_SPEED_MASK 0x0003
+#define RTL8366S_PORT_STATUS_DUPLEX_MASK 0x0004
+#define RTL8366S_PORT_STATUS_LINK_MASK 0x0010
+#define RTL8366S_PORT_STATUS_TXPAUSE_MASK 0x0020
+#define RTL8366S_PORT_STATUS_RXPAUSE_MASK 0x0040
+#define RTL8366S_PORT_STATUS_AN_MASK 0x0080
+
+
+#define RTL8366S_PORT_NUM_CPU 5
+#define RTL8366S_NUM_PORTS 6
+#define RTL8366S_NUM_VLANS 16
+#define RTL8366S_NUM_LEDGROUPS 4
+#define RTL8366S_NUM_VIDS 4096
+#define RTL8366S_PRIORITYMAX 7
+#define RTL8366S_FIDMAX 7
+
+
+#define RTL8366S_PORT_1 (1 << 0) /* In userspace port 0 */
+#define RTL8366S_PORT_2 (1 << 1) /* In userspace port 1 */
+#define RTL8366S_PORT_3 (1 << 2) /* In userspace port 2 */
+#define RTL8366S_PORT_4 (1 << 3) /* In userspace port 3 */
+
+#define RTL8366S_PORT_UNKNOWN (1 << 4) /* No known connection */
+#define RTL8366S_PORT_CPU (1 << 5) /* CPU port */
+
+#define RTL8366S_PORT_ALL (RTL8366S_PORT_1 | \
+ RTL8366S_PORT_2 | \
+ RTL8366S_PORT_3 | \
+ RTL8366S_PORT_4 | \
+ RTL8366S_PORT_UNKNOWN | \
+ RTL8366S_PORT_CPU)
+
+#define RTL8366S_PORT_ALL_BUT_CPU (RTL8366S_PORT_1 | \
+ RTL8366S_PORT_2 | \
+ RTL8366S_PORT_3 | \
+ RTL8366S_PORT_4 | \
+ RTL8366S_PORT_UNKNOWN)
+
+#define RTL8366S_PORT_ALL_EXTERNAL (RTL8366S_PORT_1 | \
+ RTL8366S_PORT_2 | \
+ RTL8366S_PORT_3 | \
+ RTL8366S_PORT_4)
+
+#define RTL8366S_PORT_ALL_INTERNAL (RTL8366S_PORT_UNKNOWN | \
+ RTL8366S_PORT_CPU)
+
+#define RTL8366S_VLAN_VID_MASK 0xfff
+#define RTL8366S_VLAN_PRIORITY_SHIFT 12
+#define RTL8366S_VLAN_PRIORITY_MASK 0x7
+#define RTL8366S_VLAN_MEMBER_MASK 0x3f
+#define RTL8366S_VLAN_UNTAG_SHIFT 6
+#define RTL8366S_VLAN_UNTAG_MASK 0x3f
+#define RTL8366S_VLAN_FID_SHIFT 12
+#define RTL8366S_VLAN_FID_MASK 0x7
+
+static struct rtl8366_mib_counter rtl8366s_mib_counters[] = {
+ { 0, 0, 4, "IfInOctets" },
+ { 0, 4, 4, "EtherStatsOctets" },
+ { 0, 8, 2, "EtherStatsUnderSizePkts" },
+ { 0, 10, 2, "EtherFragments" },
+ { 0, 12, 2, "EtherStatsPkts64Octets" },
+ { 0, 14, 2, "EtherStatsPkts65to127Octets" },
+ { 0, 16, 2, "EtherStatsPkts128to255Octets" },
+ { 0, 18, 2, "EtherStatsPkts256to511Octets" },
+ { 0, 20, 2, "EtherStatsPkts512to1023Octets" },
+ { 0, 22, 2, "EtherStatsPkts1024to1518Octets" },
+ { 0, 24, 2, "EtherOversizeStats" },
+ { 0, 26, 2, "EtherStatsJabbers" },
+ { 0, 28, 2, "IfInUcastPkts" },
+ { 0, 30, 2, "EtherStatsMulticastPkts" },
+ { 0, 32, 2, "EtherStatsBroadcastPkts" },
+ { 0, 34, 2, "EtherStatsDropEvents" },
+ { 0, 36, 2, "Dot3StatsFCSErrors" },
+ { 0, 38, 2, "Dot3StatsSymbolErrors" },
+ { 0, 40, 2, "Dot3InPauseFrames" },
+ { 0, 42, 2, "Dot3ControlInUnknownOpcodes" },
+ { 0, 44, 4, "IfOutOctets" },
+ { 0, 48, 2, "Dot3StatsSingleCollisionFrames" },
+ { 0, 50, 2, "Dot3StatMultipleCollisionFrames" },
+ { 0, 52, 2, "Dot3sDeferredTransmissions" },
+ { 0, 54, 2, "Dot3StatsLateCollisions" },
+ { 0, 56, 2, "EtherStatsCollisions" },
+ { 0, 58, 2, "Dot3StatsExcessiveCollisions" },
+ { 0, 60, 2, "Dot3OutPauseFrames" },
+ { 0, 62, 2, "Dot1dBasePortDelayExceededDiscards" },
- u16 reserved1:1;
- u16 fid:3;
- u16 untag:6;
- u16 member:6;
-};
-
-struct rtl8366s_vlan4kentry {
- u16 reserved1:4;
- u16 vid:12;
-
- u16 reserved2:1;
- u16 fid:3;
- u16 untag:6;
- u16 member:6;
-};
-
-#ifdef CONFIG_RTL8366S_PHY_DEBUG_FS
-u16 g_dbg_reg;
-#endif
-
-struct mib_counter {
- unsigned offset;
- unsigned length;
- const char *name;
-};
-
-static struct mib_counter rtl8366s_mib_counters[RTL8366S_MIB_COUNT] = {
- { 0, 4, "IfInOctets " },
- { 4, 4, "EtherStatsOctets " },
- { 8, 2, "EtherStatsUnderSizePkts " },
- { 10, 2, "EtherFregament " },
- { 12, 2, "EtherStatsPkts64Octets " },
- { 14, 2, "EtherStatsPkts65to127Octets " },
- { 16, 2, "EtherStatsPkts128to255Octets " },
- { 18, 2, "EtherStatsPkts256to511Octets " },
- { 20, 2, "EtherStatsPkts512to1023Octets " },
- { 22, 2, "EtherStatsPkts1024to1518Octets " },
- { 24, 2, "EtherOversizeStats " },
- { 26, 2, "EtherStatsJabbers " },
- { 28, 2, "IfInUcastPkts " },
- { 30, 2, "EtherStatsMulticastPkts " },
- { 32, 2, "EtherStatsBroadcastPkts " },
- { 34, 2, "EtherStatsDropEvents " },
- { 36, 2, "Dot3StatsFCSErrors " },
- { 38, 2, "Dot3StatsSymbolErrors " },
- { 40, 2, "Dot3InPauseFrames " },
- { 42, 2, "Dot3ControlInUnknownOpcodes " },
- { 44, 4, "IfOutOctets " },
- { 48, 2, "Dot3StatsSingleCollisionFrames " },
- { 50, 2, "Dot3StatMultipleCollisionFrames " },
- { 52, 2, "Dot3sDeferredTransmissions " },
- { 54, 2, "Dot3StatsLateCollisions " },
- { 56, 2, "EtherStatsCollisions " },
- { 58, 2, "Dot3StatsExcessiveCollisions " },
- { 60, 2, "Dot3OutPauseFrames " },
- { 62, 2, "Dot1dBasePortDelayExceededDiscards" },
- { 64, 2, "Dot1dTpPortInDiscards " },
- { 66, 2, "IfOutUcastPkts " },
- { 68, 2, "IfOutMulticastPkts " },
- { 70, 2, "IfOutBroadcastPkts " },
+ /*
+ * The following counters are accessible at a different
+ * base address.
+ */
+ { 1, 0, 2, "Dot1dTpPortInDiscards" },
+ { 1, 2, 2, "IfOutUcastPkts" },
+ { 1, 4, 2, "IfOutMulticastPkts" },
+ { 1, 6, 2, "IfOutBroadcastPkts" },
};
-static inline struct rtl8366s *sw_to_rtl8366s(struct switch_dev *sw)
-{
- return container_of(sw, struct rtl8366s, dev);
-}
-
-static int rtl8366s_reset_chip(struct rtl8366s *rtl)
+#define REG_WR(_smi, _reg, _val) \
+ do { \
+ err = rtl8366_smi_write_reg(_smi, _reg, _val); \
+ if (err) \
+ return err; \
+ } while (0)
+
+#define REG_RMW(_smi, _reg, _mask, _val) \
+ do { \
+ err = rtl8366_smi_rmwr(_smi, _reg, _mask, _val); \
+ if (err) \
+ return err; \
+ } while (0)
+
+static int rtl8366s_reset_chip(struct rtl8366_smi *smi)
{
- struct rtl8366_smi *smi = &rtl->smi;
int timeout = 10;
u32 data;
- rtl8366_smi_write_reg(smi, RTL8366_RESET_CTRL_REG,
- RTL8366_CHIP_CTRL_RESET_HW);
+ rtl8366_smi_write_reg(smi, RTL8366S_RESET_CTRL_REG,
+ RTL8366S_CHIP_CTRL_RESET_HW);
do {
msleep(1);
- if (rtl8366_smi_read_reg(smi, RTL8366_RESET_CTRL_REG, &data))
+ if (rtl8366_smi_read_reg(smi, RTL8366S_RESET_CTRL_REG, &data))
return -EIO;
- if (!(data & RTL8366_CHIP_CTRL_RESET_HW))
+ if (!(data & RTL8366S_CHIP_CTRL_RESET_HW))
break;
} while (--timeout);
return 0;
}
-static int rtl8366s_read_phy_reg(struct rtl8366s *rtl,
+static int rtl8366s_hw_init(struct rtl8366_smi *smi)
+{
+ int err;
+
+ /* set maximum packet length to 1536 bytes */
+ REG_RMW(smi, RTL8366S_SGCR, RTL8366S_SGCR_MAX_LENGTH_MASK,
+ RTL8366S_SGCR_MAX_LENGTH_1536);
+
+ /* enable all ports */
+ REG_WR(smi, RTL8366S_PECR, 0);
+
+ /* enable learning for all ports */
+ REG_WR(smi, RTL8366S_SSCR0, 0);
+
+ /* enable auto ageing for all ports */
+ REG_WR(smi, RTL8366S_SSCR1, 0);
+
+ /*
+ * discard VLAN tagged packets if the port is not a member of
+ * the VLAN with which the packets is associated.
+ */
+ REG_WR(smi, RTL8366S_VLAN_MEMBERINGRESS_REG, RTL8366S_PORT_ALL);
+
+ /* don't drop packets whose DA has not been learned */
+ REG_RMW(smi, RTL8366S_SSCR2, RTL8366S_SSCR2_DROP_UNKNOWN_DA, 0);
+
+ return 0;
+}
+
+static int rtl8366s_read_phy_reg(struct rtl8366_smi *smi,
u32 phy_no, u32 page, u32 addr, u32 *data)
{
- struct rtl8366_smi *smi = &rtl->smi;
u32 reg;
int ret;
return 0;
}
-static int rtl8366s_write_phy_reg(struct rtl8366s *rtl,
+static int rtl8366s_write_phy_reg(struct rtl8366_smi *smi,
u32 phy_no, u32 page, u32 addr, u32 data)
{
- struct rtl8366_smi *smi = &rtl->smi;
u32 reg;
int ret;
return 0;
}
-static int rtl8366_get_mib_counter(struct rtl8366s *rtl, int counter,
+static int rtl8366_get_mib_counter(struct rtl8366_smi *smi, int counter,
int port, unsigned long long *val)
{
- struct rtl8366_smi *smi = &rtl->smi;
int i;
int err;
u32 addr, data;
u64 mibvalue;
- if (port > RTL8366_NUM_PORTS || counter >= RTL8366S_MIB_COUNT)
+ if (port > RTL8366S_NUM_PORTS || counter >= RTL8366S_MIB_COUNT)
+ return -EINVAL;
+
+ switch (rtl8366s_mib_counters[counter].base) {
+ case 0:
+ addr = RTL8366S_MIB_COUNTER_BASE +
+ RTL8366S_MIB_COUNTER_PORT_OFFSET * port;
+ break;
+
+ case 1:
+ addr = RTL8366S_MIB_COUNTER_BASE2 +
+ RTL8366S_MIB_COUNTER_PORT_OFFSET2 * port;
+ break;
+
+ default:
return -EINVAL;
+ }
- addr = RTL8366S_MIB_COUNTER_BASE +
- RTL8366S_MIB_COUNTER_PORT_OFFSET * (port) +
- rtl8366s_mib_counters[counter].offset;
+ addr += rtl8366s_mib_counters[counter].offset;
/*
* Writing access counter address first
return 0;
}
-static int rtl8366s_get_vlan_4k_entry(struct rtl8366s *rtl, u32 vid,
- struct rtl8366s_vlan4kentry *vlan4k)
+static int rtl8366s_get_vlan_4k(struct rtl8366_smi *smi, u32 vid,
+ struct rtl8366_vlan_4k *vlan4k)
{
- struct rtl8366_smi *smi = &rtl->smi;
+ u32 data[2];
int err;
- u32 data;
- u16 *tableaddr;
+ int i;
- memset(vlan4k, '\0', sizeof(struct rtl8366s_vlan4kentry));
- vlan4k->vid = vid;
+ memset(vlan4k, '\0', sizeof(struct rtl8366_vlan_4k));
- if (vid >= RTL8366_NUM_VIDS)
+ if (vid >= RTL8366S_NUM_VIDS)
return -EINVAL;
- tableaddr = (u16 *)vlan4k;
-
/* write VID */
- data = *tableaddr;
- err = rtl8366_smi_write_reg(smi, RTL8366S_VLAN_TABLE_WRITE_BASE, data);
+ err = rtl8366_smi_write_reg(smi, RTL8366S_VLAN_TABLE_WRITE_BASE,
+ vid & RTL8366S_VLAN_VID_MASK);
if (err)
return err;
if (err)
return err;
- err = rtl8366_smi_read_reg(smi, RTL8366S_VLAN_TABLE_READ_BASE, &data);
- if (err)
- return err;
-
- *tableaddr = data;
- tableaddr++;
-
- err = rtl8366_smi_read_reg(smi, RTL8366S_VLAN_TABLE_READ_BASE + 1,
- &data);
- if (err)
- return err;
+ for (i = 0; i < 2; i++) {
+ err = rtl8366_smi_read_reg(smi,
+ RTL8366S_VLAN_TABLE_READ_BASE + i,
+ &data[i]);
+ if (err)
+ return err;
+ }
- *tableaddr = data;
vlan4k->vid = vid;
+ vlan4k->untag = (data[1] >> RTL8366S_VLAN_UNTAG_SHIFT) &
+ RTL8366S_VLAN_UNTAG_MASK;
+ vlan4k->member = data[1] & RTL8366S_VLAN_MEMBER_MASK;
+ vlan4k->fid = (data[1] >> RTL8366S_VLAN_FID_SHIFT) &
+ RTL8366S_VLAN_FID_MASK;
return 0;
}
-static int rtl8366s_set_vlan_4k_entry(struct rtl8366s *rtl,
- const struct rtl8366s_vlan4kentry *vlan4k)
+static int rtl8366s_set_vlan_4k(struct rtl8366_smi *smi,
+ const struct rtl8366_vlan_4k *vlan4k)
{
- struct rtl8366_smi *smi = &rtl->smi;
+ u32 data[2];
int err;
- u32 data;
- u16 *tableaddr;
+ int i;
- if (vlan4k->vid >= RTL8366_NUM_VIDS ||
- vlan4k->member > RTL8366_PORT_ALL ||
- vlan4k->untag > RTL8366_PORT_ALL ||
+ if (vlan4k->vid >= RTL8366S_NUM_VIDS ||
+ vlan4k->member > RTL8366S_VLAN_MEMBER_MASK ||
+ vlan4k->untag > RTL8366S_VLAN_UNTAG_MASK ||
vlan4k->fid > RTL8366S_FIDMAX)
return -EINVAL;
- tableaddr = (u16 *)vlan4k;
-
- data = *tableaddr;
-
- err = rtl8366_smi_write_reg(smi, RTL8366S_VLAN_TABLE_WRITE_BASE, data);
- if (err)
- return err;
-
- tableaddr++;
-
- data = *tableaddr;
-
- err = rtl8366_smi_write_reg(smi, RTL8366S_VLAN_TABLE_WRITE_BASE + 1,
- data);
- if (err)
- return err;
+ data[0] = vlan4k->vid & RTL8366S_VLAN_VID_MASK;
+ data[1] = (vlan4k->member & RTL8366S_VLAN_MEMBER_MASK) |
+ ((vlan4k->untag & RTL8366S_VLAN_UNTAG_MASK) <<
+ RTL8366S_VLAN_UNTAG_SHIFT) |
+ ((vlan4k->fid & RTL8366S_VLAN_FID_MASK) <<
+ RTL8366S_VLAN_FID_SHIFT);
+
+ for (i = 0; i < 2; i++) {
+ err = rtl8366_smi_write_reg(smi,
+ RTL8366S_VLAN_TABLE_WRITE_BASE + i,
+ data[i]);
+ if (err)
+ return err;
+ }
/* write table access control word */
err = rtl8366_smi_write_reg(smi, RTL8366S_TABLE_ACCESS_CTRL_REG,
return err;
}
-static int rtl8366s_get_vlan_member_config(struct rtl8366s *rtl, u32 index,
- struct rtl8366s_vlanconfig *vlanmc)
+static int rtl8366s_get_vlan_mc(struct rtl8366_smi *smi, u32 index,
+ struct rtl8366_vlan_mc *vlanmc)
{
- struct rtl8366_smi *smi = &rtl->smi;
+ u32 data[2];
int err;
- u32 addr;
- u32 data;
- u16 *tableaddr;
+ int i;
- memset(vlanmc, '\0', sizeof(struct rtl8366s_vlanconfig));
+ memset(vlanmc, '\0', sizeof(struct rtl8366_vlan_mc));
- if (index >= RTL8366_NUM_VLANS)
+ if (index >= RTL8366S_NUM_VLANS)
return -EINVAL;
- tableaddr = (u16 *)vlanmc;
-
- addr = RTL8366S_VLAN_MEMCONF_BASE + (index << 1);
- err = rtl8366_smi_read_reg(smi, addr, &data);
- if (err)
- return err;
-
- *tableaddr = data;
- tableaddr++;
-
- addr = RTL8366S_VLAN_MEMCONF_BASE + 1 + (index << 1);
- err = rtl8366_smi_read_reg(smi, addr, &data);
- if (err)
- return err;
+ for (i = 0; i < 2; i++) {
+ err = rtl8366_smi_read_reg(smi,
+ RTL8366S_VLAN_MC_BASE(index) + i,
+ &data[i]);
+ if (err)
+ return err;
+ }
- *tableaddr = data;
+ vlanmc->vid = data[0] & RTL8366S_VLAN_VID_MASK;
+ vlanmc->priority = (data[0] >> RTL8366S_VLAN_PRIORITY_SHIFT) &
+ RTL8366S_VLAN_PRIORITY_MASK;
+ vlanmc->untag = (data[1] >> RTL8366S_VLAN_UNTAG_SHIFT) &
+ RTL8366S_VLAN_UNTAG_MASK;
+ vlanmc->member = data[1] & RTL8366S_VLAN_MEMBER_MASK;
+ vlanmc->fid = (data[1] >> RTL8366S_VLAN_FID_SHIFT) &
+ RTL8366S_VLAN_FID_MASK;
return 0;
}
-static int rtl8366s_set_vlan_member_config(struct rtl8366s *rtl, u32 index,
- const struct rtl8366s_vlanconfig
- *vlanmc)
+static int rtl8366s_set_vlan_mc(struct rtl8366_smi *smi, u32 index,
+ const struct rtl8366_vlan_mc *vlanmc)
{
- struct rtl8366_smi *smi = &rtl->smi;
+ u32 data[2];
int err;
- u32 addr;
- u32 data;
- u16 *tableaddr;
+ int i;
- if (index >= RTL8366_NUM_VLANS ||
- vlanmc->vid >= RTL8366_NUM_VIDS ||
+ if (index >= RTL8366S_NUM_VLANS ||
+ vlanmc->vid >= RTL8366S_NUM_VIDS ||
vlanmc->priority > RTL8366S_PRIORITYMAX ||
- vlanmc->member > RTL8366_PORT_ALL ||
- vlanmc->untag > RTL8366_PORT_ALL ||
+ vlanmc->member > RTL8366S_VLAN_MEMBER_MASK ||
+ vlanmc->untag > RTL8366S_VLAN_UNTAG_MASK ||
vlanmc->fid > RTL8366S_FIDMAX)
return -EINVAL;
- addr = RTL8366S_VLAN_MEMCONF_BASE + (index << 1);
-
- tableaddr = (u16 *)vlanmc;
- data = *tableaddr;
-
- err = rtl8366_smi_write_reg(smi, addr, data);
- if (err)
- return err;
-
- addr = RTL8366S_VLAN_MEMCONF_BASE + 1 + (index << 1);
-
- tableaddr++;
- data = *tableaddr;
-
- err = rtl8366_smi_write_reg(smi, addr, data);
- if (err)
- return err;
+ data[0] = (vlanmc->vid & RTL8366S_VLAN_VID_MASK) |
+ ((vlanmc->priority & RTL8366S_VLAN_PRIORITY_MASK) <<
+ RTL8366S_VLAN_PRIORITY_SHIFT);
+ data[1] = (vlanmc->member & RTL8366S_VLAN_MEMBER_MASK) |
+ ((vlanmc->untag & RTL8366S_VLAN_UNTAG_MASK) <<
+ RTL8366S_VLAN_UNTAG_SHIFT) |
+ ((vlanmc->fid & RTL8366S_VLAN_FID_MASK) <<
+ RTL8366S_VLAN_FID_SHIFT);
+
+ for (i = 0; i < 2; i++) {
+ err = rtl8366_smi_write_reg(smi,
+ RTL8366S_VLAN_MC_BASE(index) + i,
+ data[i]);
+ if (err)
+ return err;
+ }
return 0;
}
-static int rtl8366s_get_port_vlan_index(struct rtl8366s *rtl, int port,
- int *val)
+static int rtl8366s_get_mc_index(struct rtl8366_smi *smi, int port, int *val)
{
- struct rtl8366_smi *smi = &rtl->smi;
u32 data;
int err;
- if (port >= RTL8366_NUM_PORTS)
+ if (port >= RTL8366S_NUM_PORTS)
return -EINVAL;
err = rtl8366_smi_read_reg(smi, RTL8366S_PORT_VLAN_CTRL_REG(port),
RTL8366S_PORT_VLAN_CTRL_MASK;
return 0;
-
-}
-
-static int rtl8366s_get_vlan_port_pvid(struct rtl8366s *rtl, int port,
- int *val)
-{
- struct rtl8366s_vlanconfig vlanmc;
- int err;
- int index;
-
- err = rtl8366s_get_port_vlan_index(rtl, port, &index);
- if (err)
- return err;
-
- err = rtl8366s_get_vlan_member_config(rtl, index, &vlanmc);
- if (err)
- return err;
-
- *val = vlanmc.vid;
- return 0;
}
-static int rtl8366s_set_port_vlan_index(struct rtl8366s *rtl, int port,
- int index)
+static int rtl8366s_set_mc_index(struct rtl8366_smi *smi, int port, int index)
{
- struct rtl8366_smi *smi = &rtl->smi;
- u32 data;
- int err;
-
- if (port >= RTL8366_NUM_PORTS || index >= RTL8366_NUM_VLANS)
+ if (port >= RTL8366S_NUM_PORTS || index >= RTL8366S_NUM_VLANS)
return -EINVAL;
- err = rtl8366_smi_read_reg(smi, RTL8366S_PORT_VLAN_CTRL_REG(port),
- &data);
- if (err)
- return err;
-
- 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, RTL8366S_PORT_VLAN_CTRL_REG(port),
- data);
- return err;
+ return rtl8366_smi_rmwr(smi, RTL8366S_PORT_VLAN_CTRL_REG(port),
+ RTL8366S_PORT_VLAN_CTRL_MASK <<
+ RTL8366S_PORT_VLAN_CTRL_SHIFT(port),
+ (index & RTL8366S_PORT_VLAN_CTRL_MASK) <<
+ RTL8366S_PORT_VLAN_CTRL_SHIFT(port));
}
-static int rtl8366s_set_vlan_port_pvid(struct rtl8366s *rtl, int port, int val)
+static int rtl8366s_enable_vlan(struct rtl8366_smi *smi, int enable)
{
- int i;
- struct rtl8366s_vlanconfig vlanmc;
- struct rtl8366s_vlan4kentry vlan4k;
-
- if (port >= RTL8366_NUM_PORTS || val >= RTL8366_NUM_VIDS)
- return -EINVAL;
-
- /* Updating the 4K entry; lookup it and change the port member set */
- rtl8366s_get_vlan_4k_entry(rtl, val, &vlan4k);
- vlan4k.member |= ((1 << port) | RTL8366_PORT_CPU);
- vlan4k.untag = RTL8366_PORT_ALL_BUT_CPU;
- 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 (i = 0; i < RTL8366_NUM_VLANS; ++i) {
- 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(rtl, i, &vlanmc);
-
- /* Now update PVID register settings */
- 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
- */
- for (i = 0; i < RTL8366_NUM_VLANS; ++i) {
- 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
- */
- if (!vlanmc.member || vlanmc.member == RTL8366_PORT_CPU) {
- vlanmc.vid = val;
- vlanmc.priority = 0;
- vlanmc.untag = RTL8366_PORT_ALL_BUT_CPU;
- vlanmc.member = ((1 << port) | RTL8366_PORT_CPU);
- vlanmc.fid = 0;
-
- rtl8366s_set_vlan_member_config(rtl, i, &vlanmc);
-
- /* Now update PVID register settings */
- rtl8366s_set_port_vlan_index(rtl, port, i);
-
- return 0;
- }
- }
-
- dev_err(rtl->parent,
- "All 16 vlan member configurations are in use\n");
-
- return -EINVAL;
+ return rtl8366_smi_rmwr(smi, RTL8366S_SGCR, RTL8366S_SGCR_EN_VLAN,
+ (enable) ? RTL8366S_SGCR_EN_VLAN : 0);
}
-
-static int rtl8366s_vlan_set_vlan(struct rtl8366s *rtl, int enable)
+static int rtl8366s_enable_vlan4k(struct rtl8366_smi *smi, int enable)
{
- struct rtl8366_smi *smi = &rtl->smi;
- u32 data = 0;
-
- rtl8366_smi_read_reg(smi, RTL8366_CHIP_GLOBAL_CTRL_REG, &data);
-
- 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);
+ return rtl8366_smi_rmwr(smi, RTL8366S_VLAN_TB_CTRL_REG,
+ 1, (enable) ? 1 : 0);
}
-static int rtl8366s_vlan_set_4ktable(struct rtl8366s *rtl, int enable)
+static int rtl8366s_is_vlan_valid(struct rtl8366_smi *smi, unsigned vlan)
{
- struct rtl8366_smi *smi = &rtl->smi;
- u32 data = 0;
+ unsigned max = RTL8366S_NUM_VLANS;
- rtl8366_smi_read_reg(smi, RTL8366S_VLAN_TB_CTRL_REG, &data);
+ if (smi->vlan4k_enabled)
+ max = RTL8366S_NUM_VIDS - 1;
- if (enable)
- data |= 1;
- else
- data &= ~1;
+ if (vlan == 0 || vlan >= max)
+ return 0;
- return rtl8366_smi_write_reg(smi, RTL8366S_VLAN_TB_CTRL_REG, data);
+ return 1;
}
-static int rtl8366s_reset_vlan(struct rtl8366s *rtl)
-{
- 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++) {
- 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 */
- vlan4k.vid = 1;
- vlan4k.member = RTL8366_PORT_ALL;
- vlan4k.untag = RTL8366_PORT_ALL;
- vlan4k.fid = 0;
- 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++) {
- err = rtl8366s_set_vlan_port_pvid(rtl, i, 0);
- if (err)
- return err;
- }
-
- return 0;
-}
-
-#ifdef CONFIG_RTL8366S_PHY_DEBUG_FS
-static int rtl8366s_debugfs_open(struct inode *inode, struct file *file)
-{
- file->private_data = inode->i_private;
- return 0;
-}
-
-static ssize_t rtl8366s_read_debugfs_mibs(struct file *file,
- char __user *user_buf,
- size_t count, loff_t *ppos)
-{
- struct rtl8366s *rtl = (struct rtl8366s *)file->private_data;
- int i, j, len = 0;
- char *buf = rtl->buf;
-
- len += snprintf(buf + len, sizeof(rtl->buf) - len, "MIB Counters:\n");
- len += snprintf(buf + len, sizeof(rtl->buf) - len, "Counter"
- " "
- "Port 0 \t\t Port 1 \t\t Port 2 \t\t Port 3 \t\t "
- "Port 4\n");
-
- for (i = 0; i < 33; ++i) {
- len += snprintf(buf + len, sizeof(rtl->buf) - len, "%d:%s ",
- i, rtl8366s_mib_counters[i].name);
- for (j = 0; j < RTL8366_NUM_PORTS; ++j) {
- unsigned long long counter = 0;
-
- 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(rtl->buf) - len,
- "[error]");
-
- if (j != RTL8366_NUM_PORTS - 1) {
- if (counter < 100000)
- len += snprintf(buf + len,
- sizeof(rtl->buf) - len,
- "\t");
-
- len += snprintf(buf + len,
- sizeof(rtl->buf) - len,
- "\t");
- }
- }
- len += snprintf(buf + len, sizeof(rtl->buf) - len, "\n");
- }
-
- len += snprintf(buf + len, sizeof(rtl->buf) - len, "\n");
-
- return simple_read_from_buffer(user_buf, count, ppos, buf, len);
-}
-
-static ssize_t rtl8366s_read_debugfs_vlan(struct file *file,
- char __user *user_buf,
- size_t count, loff_t *ppos)
-{
- struct rtl8366s *rtl = (struct rtl8366s *)file->private_data;
- int i, j, len = 0;
- char *buf = rtl->buf;
-
- 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(rtl, i, &vlanmc);
-
- 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 (!rtl8366s_get_port_vlan_index(rtl, j, &index)) {
- if (index == i)
- len += snprintf(buf + len,
- sizeof(rtl->buf) - len,
- "%d", j);
- }
- }
- len += snprintf(buf + len, sizeof(rtl->buf) - len, "\n");
- }
-
- return simple_read_from_buffer(user_buf, count, ppos, buf, len);
-}
-
-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 = rtl->buf;
-
- memset(buf, '\0', sizeof(rtl->buf));
-
- err = rtl8366_smi_read_reg(smi, reg, &t);
- if (err) {
- len += snprintf(buf, sizeof(rtl->buf),
- "Read failed (reg: 0x%04x)\n", reg);
- return simple_read_from_buffer(user_buf, count, ppos, buf, len);
- }
-
- len += snprintf(buf, sizeof(rtl->buf), "reg = 0x%04x, val = 0x%04x\n",
- reg, t);
-
- return simple_read_from_buffer(user_buf, count, ppos, buf, len);
-}
-
-static ssize_t 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;
- size_t len;
- char *buf = rtl->buf;
-
- len = min(count, sizeof(rtl->buf) - 1);
- if (copy_from_user(buf, user_buf, len)) {
- dev_err(rtl->parent, "copy from user failed\n");
- return -EFAULT;
- }
-
- buf[len] = '\0';
- if (len > 0 && buf[len - 1] == '\n')
- buf[len - 1] = '\0';
-
-
- if (strict_strtoul(buf, 16, &data)) {
- dev_err(rtl->parent, "Invalid reg value %s\n", buf);
- } else {
- err = rtl8366_smi_write_reg(smi, reg, data);
- if (err) {
- dev_err(rtl->parent,
- "writing reg 0x%04x val 0x%04lx failed\n",
- reg, data);
- }
- }
-
- return count;
-}
-
-static const struct file_operations fops_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_rtl8366s_vlan = {
- .read = rtl8366s_read_debugfs_vlan,
- .open = rtl8366s_debugfs_open,
- .owner = THIS_MODULE
-};
-
-static const struct file_operations fops_rtl8366s_mibs = {
- .read = rtl8366s_read_debugfs_mibs,
- .open = rtl8366s_debugfs_open,
- .owner = THIS_MODULE
-};
-
-static void rtl8366s_debugfs_init(struct rtl8366s *rtl)
-{
- struct dentry *node;
- struct dentry *root;
-
- if (!rtl->debugfs_root)
- rtl->debugfs_root = debugfs_create_dir("rtl8366s", NULL);
-
- if (!rtl->debugfs_root) {
- dev_err(rtl->parent, "Unable to create debugfs dir\n");
- return;
- }
- root = rtl->debugfs_root;
-
- node = debugfs_create_x16("reg", S_IRUGO | S_IWUSR, root, &g_dbg_reg);
- if (!node) {
- dev_err(rtl->parent, "Creating debugfs file reg failed\n");
- return;
- }
-
- node = debugfs_create_file("val", S_IRUGO | S_IWUSR, root, rtl,
- &fops_rtl8366s_regs);
- if (!node) {
- dev_err(rtl->parent, "Creating debugfs file val failed\n");
- return;
- }
-
- node = debugfs_create_file("vlan", S_IRUSR, root, rtl,
- &fops_rtl8366s_vlan);
- if (!node) {
- dev_err(rtl->parent,
- "Creating debugfs file vlan failed\n");
- return;
- }
-
- node = debugfs_create_file("mibs", S_IRUSR, root, rtl,
- &fops_rtl8366s_mibs);
- if (!node) {
- dev_err(rtl->parent,
- "Creating debugfs file mibs failed\n");
- return;
- }
-}
-
-static void rtl8366s_debugfs_remove(struct rtl8366s *rtl)
-{
- if (rtl->debugfs_root) {
- debugfs_remove_recursive(rtl->debugfs_root);
- rtl->debugfs_root = NULL;
- }
-}
-
-#else
-static inline void rtl8366s_debugfs_init(struct rtl8366s *rtl) {}
-static inline void rtl8366s_debugfs_remove(struct rtl8366s *rtl) {}
-#endif /* CONFIG_RTL8366S_PHY_DEBUG_FS */
-
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 = sw_to_rtl8366_smi(dev);
- if (val->value.i == 1) {
- rtl8366_smi_read_reg(smi, RTL8366S_MIB_CTRL_REG, &data);
- data |= (1 << 2);
- rtl8366_smi_write_reg(smi, RTL8366S_MIB_CTRL_REG, data);
- }
-
- return 0;
-}
-
-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;
-
- if (attr->ofs == 1) {
- rtl8366_smi_read_reg(smi, RTL8366_CHIP_GLOBAL_CTRL_REG, &data);
-
- if (data & RTL8366_CHIP_CTRL_VLAN)
- val->value.i = 1;
- else
- val->value.i = 0;
- } else if (attr->ofs == 2) {
- rtl8366_smi_read_reg(smi, RTL8366S_VLAN_TB_CTRL_REG, &data);
-
- if (data & 0x0001)
- val->value.i = 1;
- else
- val->value.i = 0;
- }
-
- return 0;
+ return rtl8366_smi_rmwr(smi, RTL8366S_MIB_CTRL_REG, 0, (1 << 2));
}
static int rtl8366s_sw_get_blinkrate(struct switch_dev *dev,
const struct switch_attr *attr,
struct switch_val *val)
{
- struct rtl8366s *rtl = sw_to_rtl8366s(dev);
- struct rtl8366_smi *smi = &rtl->smi;
+ struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
u32 data;
- rtl8366_smi_read_reg(smi, RTL8366_LED_BLINKRATE_REG, &data);
+ rtl8366_smi_read_reg(smi, RTL8366S_LED_BLINKRATE_REG, &data);
- val->value.i = (data & (RTL8366_LED_BLINKRATE_MASK));
+ val->value.i = (data & (RTL8366S_LED_BLINKRATE_MASK));
return 0;
}
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 = sw_to_rtl8366_smi(dev);
if (val->value.i >= 6)
return -EINVAL;
- rtl8366_smi_read_reg(smi, RTL8366_LED_BLINKRATE_REG, &data);
+ return rtl8366_smi_rmwr(smi, RTL8366S_LED_BLINKRATE_REG,
+ RTL8366S_LED_BLINKRATE_MASK,
+ val->value.i);
+}
- data &= ~RTL8366_LED_BLINKRATE_MASK;
- data |= val->value.i;
+static int rtl8366s_sw_get_learning_enable(struct switch_dev *dev,
+ const struct switch_attr *attr,
+ struct switch_val *val)
+{
+ struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+ u32 data;
- rtl8366_smi_write_reg(smi, RTL8366_LED_BLINKRATE_REG, data);
+ rtl8366_smi_read_reg(smi,RTL8366S_SSCR0, &data);
+ val->value.i = !data;
return 0;
}
-static int rtl8366s_sw_set_vlan_enable(struct switch_dev *dev,
- const struct switch_attr *attr,
- struct switch_val *val)
+
+static int rtl8366s_sw_set_learning_enable(struct switch_dev *dev,
+ const struct switch_attr *attr,
+ struct switch_val *val)
{
- struct rtl8366s *rtl = sw_to_rtl8366s(dev);
+ struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+ u32 portmask = 0;
+ int err = 0;
+
+ if (!val->value.i)
+ portmask = RTL8366S_PORT_ALL;
+
+ /* set learning for all ports */
+ REG_WR(smi, RTL8366S_SSCR0, portmask);
- if (attr->ofs == 1)
- return rtl8366s_vlan_set_vlan(rtl, val->value.i);
- else
- return rtl8366s_vlan_set_4ktable(rtl, val->value.i);
+ /* set auto ageing for all ports */
+ REG_WR(smi, RTL8366S_SSCR1, portmask);
+
+ return 0;
}
+
static const char *rtl8366s_speed_str(unsigned speed)
{
switch (speed) {
const struct switch_attr *attr,
struct switch_val *val)
{
- struct rtl8366s *rtl = sw_to_rtl8366s(dev);
- struct rtl8366_smi *smi = &rtl->smi;
+ struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
u32 len = 0, data = 0;
- if (val->port_vlan >= RTL8366_NUM_PORTS)
+ if (val->port_vlan >= RTL8366S_NUM_PORTS)
return -EINVAL;
- memset(rtl->buf, '\0', sizeof(rtl->buf));
+ memset(smi->buf, '\0', sizeof(smi->buf));
rtl8366_smi_read_reg(smi, RTL8366S_PORT_LINK_STATUS_BASE +
(val->port_vlan / 2), &data);
if (val->port_vlan % 2)
data = data >> 8;
- 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 &
+ if (data & RTL8366S_PORT_STATUS_LINK_MASK) {
+ len = snprintf(smi->buf, sizeof(smi->buf),
+ "port:%d link:up speed:%s %s-duplex %s%s%s",
+ val->port_vlan,
+ 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 rtl8366s_sw_get_vlan_info(struct switch_dev *dev,
- const struct switch_attr *attr,
- struct switch_val *val)
-{
- int i;
- u32 len = 0;
- struct rtl8366s_vlanconfig vlanmc;
- struct rtl8366s_vlan4kentry vlan4k;
- struct rtl8366s *rtl = sw_to_rtl8366s(dev);
- char *buf = rtl->buf;
-
- if (val->port_vlan == 0 || val->port_vlan >= RTL8366_NUM_VLANS)
- return -EINVAL;
-
- memset(buf, '\0', sizeof(rtl->buf));
-
- rtl8366s_get_vlan_member_config(rtl, val->port_vlan, &vlanmc);
- rtl8366s_get_vlan_4k_entry(rtl, vlanmc.vid, &vlan4k);
-
- len += snprintf(buf + len, sizeof(rtl->buf) - len, "VLAN %d: Ports: ",
- val->port_vlan);
-
- for (i = 0; i < RTL8366_NUM_PORTS; ++i) {
- int index = 0;
- if (!rtl8366s_get_port_vlan_index(rtl, i, &index) &&
- index == val->port_vlan)
- len += snprintf(buf + len, sizeof(rtl->buf) - len,
- "%d", i);
+ (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 ": "");
+ } else {
+ len = snprintf(smi->buf, sizeof(smi->buf), "port:%d link: down",
+ val->port_vlan);
}
- len += snprintf(buf + len, sizeof(rtl->buf) - len, "\n");
-
- 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(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(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);
-
- val->value.s = buf;
+
+ val->value.s = smi->buf;
val->len = len;
return 0;
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 = sw_to_rtl8366_smi(dev);
+ u32 data;
+ u32 mask;
+ u32 reg;
- if (val->port_vlan >= RTL8366_NUM_PORTS ||
- (1 << val->port_vlan) == RTL8366_PORT_UNKNOWN)
+ if (val->port_vlan >= RTL8366S_NUM_PORTS ||
+ (1 << val->port_vlan) == RTL8366S_PORT_UNKNOWN)
return -EINVAL;
- if (val->port_vlan == RTL8366_PORT_NUM_CPU) {
- rtl8366_smi_read_reg(smi, RTL8366_LED_BLINKRATE_REG, &data);
- data = (data & (~(0xF << 4))) | (val->value.i << 4);
- rtl8366_smi_write_reg(smi, RTL8366_LED_BLINKRATE_REG, data);
+ if (val->port_vlan == RTL8366S_PORT_NUM_CPU) {
+ reg = RTL8366S_LED_BLINKRATE_REG;
+ mask = 0xF << 4;
+ data = val->value.i << 4;
} else {
- rtl8366_smi_read_reg(smi, RTL8366_LED_CTRL_REG, &data);
- data = (data & (~(0xF << (val->port_vlan * 4)))) |
- (val->value.i << (val->port_vlan * 4));
- rtl8366_smi_write_reg(smi, RTL8366_LED_CTRL_REG, data);
+ reg = RTL8366S_LED_CTRL_REG;
+ mask = 0xF << (val->port_vlan * 4),
+ data = val->value.i << (val->port_vlan * 4);
}
- return 0;
+ return rtl8366_smi_rmwr(smi, reg, mask, data);
}
static int rtl8366s_sw_get_port_led(struct switch_dev *dev,
const struct switch_attr *attr,
struct switch_val *val)
{
- struct rtl8366s *rtl = sw_to_rtl8366s(dev);
- struct rtl8366_smi *smi = &rtl->smi;
+ struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
u32 data = 0;
- if (val->port_vlan >= RTL8366_NUM_LEDGROUPS)
+ if (val->port_vlan >= RTL8366S_NUM_LEDGROUPS)
return -EINVAL;
- rtl8366_smi_read_reg(smi, RTL8366_LED_CTRL_REG, &data);
+ rtl8366_smi_read_reg(smi, RTL8366S_LED_CTRL_REG, &data);
val->value.i = (data >> (val->port_vlan * 4)) & 0x000F;
return 0;
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;
-
- if (val->port_vlan >= RTL8366_NUM_PORTS)
- return -EINVAL;
-
- rtl8366_smi_read_reg(smi, RTL8366S_MIB_CTRL_REG, &data);
- data |= (1 << (val->port_vlan + 3));
- rtl8366_smi_write_reg(smi, RTL8366S_MIB_CTRL_REG, data);
-
- return 0;
-}
-
-static int rtl8366s_sw_get_port_mib(struct switch_dev *dev,
- const struct switch_attr *attr,
- struct switch_val *val)
-{
- struct rtl8366s *rtl = sw_to_rtl8366s(dev);
- int i, len = 0;
- unsigned long long counter = 0;
- char *buf = rtl->buf;
-
- if (val->port_vlan >= RTL8366_NUM_PORTS)
- return -EINVAL;
-
- 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(rtl->buf) - len,
- "%d:%s\t", i, rtl8366s_mib_counters[i].name);
- 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(rtl->buf) - len,
- "[error]\n");
- }
-
- val->value.s = buf;
- val->len = len;
- return 0;
-}
-
-static int rtl8366s_sw_get_vlan_ports(struct switch_dev *dev,
- struct switch_val *val)
-{
- struct rtl8366s_vlanconfig vlanmc;
- struct rtl8366s *rtl = sw_to_rtl8366s(dev);
- struct switch_port *port;
- int i;
+ struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
- if (val->port_vlan == 0 || val->port_vlan >= RTL8366_NUM_VLANS)
+ if (val->port_vlan >= RTL8366S_NUM_PORTS)
return -EINVAL;
- 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 rtl8366s_sw_set_vlan_ports(struct switch_dev *dev,
- struct switch_val *val)
-{
- struct rtl8366s_vlanconfig vlanmc;
- struct rtl8366s_vlan4kentry vlan4k;
- struct rtl8366s *rtl = sw_to_rtl8366s(dev);
- struct switch_port *port;
- int i;
-
- if (val->port_vlan == 0 || val->port_vlan >= RTL8366_NUM_VLANS)
- return -EINVAL;
-
- rtl8366s_get_vlan_member_config(rtl, val->port_vlan, &vlanmc);
- rtl8366s_get_vlan_4k_entry(rtl, vlanmc.vid, &vlan4k);
-
- vlanmc.untag = 0;
- vlanmc.member = 0;
-
- port = &val->value.ports[0];
- for (i = 0; i < val->len; i++, port++) {
- vlanmc.member |= BIT(port->id);
-
- if (!(port->flags & BIT(SWITCH_PORT_FLAG_TAGGED)))
- vlanmc.untag |= BIT(port->id);
- }
-
- 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 rtl8366s_sw_get_port_pvid(struct switch_dev *dev, int port, int *val)
-{
- struct rtl8366s *rtl = sw_to_rtl8366s(dev);
- return rtl8366s_get_vlan_port_pvid(rtl, port, val);
-}
-
-static int rtl8366s_sw_set_port_pvid(struct switch_dev *dev, int port, int val)
-{
- struct rtl8366s *rtl = sw_to_rtl8366s(dev);
- return rtl8366s_set_vlan_port_pvid(rtl, port, val);
+ return rtl8366_smi_rmwr(smi, RTL8366S_MIB_CTRL_REG,
+ 0, (1 << (val->port_vlan + 3)));
}
static int rtl8366s_sw_reset_switch(struct switch_dev *dev)
{
- struct rtl8366s *rtl = sw_to_rtl8366s(dev);
+ struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
int err;
- err = rtl8366s_reset_chip(rtl);
+ err = rtl8366s_reset_chip(smi);
+ if (err)
+ return err;
+
+ err = rtl8366s_hw_init(smi);
if (err)
return err;
- return rtl8366s_reset_vlan(rtl);
+ return rtl8366_reset_vlan(smi);
}
static struct switch_attr rtl8366s_globals[] = {
{
.type = SWITCH_TYPE_INT,
+ .name = "enable_learning",
+ .description = "Enable learning, enable aging",
+ .set = rtl8366s_sw_set_learning_enable,
+ .get = rtl8366s_sw_get_learning_enable,
+ .max = 1,
+ }, {
+ .type = SWITCH_TYPE_INT,
.name = "enable_vlan",
.description = "Enable VLAN mode",
- .set = rtl8366s_sw_set_vlan_enable,
- .get = rtl8366s_sw_get_vlan_enable,
+ .set = rtl8366_sw_set_vlan_enable,
+ .get = rtl8366_sw_get_vlan_enable,
.max = 1,
.ofs = 1
}, {
.type = SWITCH_TYPE_INT,
.name = "enable_vlan4k",
.description = "Enable VLAN 4K mode",
- .set = rtl8366s_sw_set_vlan_enable,
- .get = rtl8366s_sw_get_vlan_enable,
+ .set = rtl8366_sw_set_vlan_enable,
+ .get = rtl8366_sw_get_vlan_enable,
.max = 1,
.ofs = 2
}, {
- .type = SWITCH_TYPE_INT,
+ .type = SWITCH_TYPE_NOVAL,
.name = "reset_mibs",
.description = "Reset all MIB counters",
.set = rtl8366s_sw_reset_mibs,
- .get = NULL,
- .max = 1
}, {
.type = SWITCH_TYPE_INT,
.name = "blinkrate",
.set = NULL,
.get = rtl8366s_sw_get_port_link,
}, {
- .type = SWITCH_TYPE_INT,
+ .type = SWITCH_TYPE_NOVAL,
.name = "reset_mib",
.description = "Reset single port MIB counters",
- .max = 1,
.set = rtl8366s_sw_reset_port_mibs,
- .get = NULL,
}, {
.type = SWITCH_TYPE_STRING,
.name = "mib",
.description = "Get MIB counters for port",
.max = 33,
.set = NULL,
- .get = rtl8366s_sw_get_port_mib,
+ .get = rtl8366_sw_get_port_mib,
}, {
.type = SWITCH_TYPE_INT,
.name = "led",
.description = "Get vlan information",
.max = 1,
.set = NULL,
- .get = rtl8366s_sw_get_vlan_info,
+ .get = rtl8366_sw_get_vlan_info,
+ }, {
+ .type = SWITCH_TYPE_INT,
+ .name = "fid",
+ .description = "Get/Set vlan FID",
+ .max = RTL8366S_FIDMAX,
+ .set = rtl8366_sw_set_vlan_fid,
+ .get = rtl8366_sw_get_vlan_fid,
},
};
-/* template */
-static struct switch_dev rtl8366_switch_dev = {
- .name = "RTL8366S",
- .cpu_port = RTL8366_PORT_NUM_CPU,
- .ports = RTL8366_NUM_PORTS,
- .vlans = RTL8366_NUM_VLANS,
+static const struct switch_dev_ops rtl8366_ops = {
.attr_global = {
.attr = rtl8366s_globals,
.n_attr = ARRAY_SIZE(rtl8366s_globals),
.n_attr = ARRAY_SIZE(rtl8366s_vlan),
},
- .get_vlan_ports = rtl8366s_sw_get_vlan_ports,
- .set_vlan_ports = rtl8366s_sw_set_vlan_ports,
- .get_port_pvid = rtl8366s_sw_get_port_pvid,
- .set_port_pvid = rtl8366s_sw_set_port_pvid,
+ .get_vlan_ports = rtl8366_sw_get_vlan_ports,
+ .set_vlan_ports = rtl8366_sw_set_vlan_ports,
+ .get_port_pvid = rtl8366_sw_get_port_pvid,
+ .set_port_pvid = rtl8366_sw_set_port_pvid,
.reset_switch = rtl8366s_sw_reset_switch,
};
-static int rtl8366s_switch_init(struct rtl8366s *rtl)
+static int rtl8366s_switch_init(struct rtl8366_smi *smi)
{
- struct switch_dev *dev = &rtl->dev;
+ struct switch_dev *dev = &smi->sw_dev;
int err;
- memcpy(dev, &rtl8366_switch_dev, sizeof(struct switch_dev));
- dev->priv = rtl;
- dev->devname = dev_name(rtl->parent);
+ dev->name = "RTL8366S";
+ dev->cpu_port = RTL8366S_PORT_NUM_CPU;
+ dev->ports = RTL8366S_NUM_PORTS;
+ dev->vlans = RTL8366S_NUM_VIDS;
+ dev->ops = &rtl8366_ops;
+ dev->devname = dev_name(smi->parent);
err = register_switch(dev, NULL);
if (err)
- dev_err(rtl->parent, "switch registration failed\n");
+ dev_err(smi->parent, "switch registration failed\n");
return err;
}
-static void rtl8366s_switch_cleanup(struct rtl8366s *rtl)
+static void rtl8366s_switch_cleanup(struct rtl8366_smi *smi)
{
- unregister_switch(&rtl->dev);
+ unregister_switch(&smi->sw_dev);
}
static int rtl8366s_mii_read(struct mii_bus *bus, int addr, int reg)
{
- struct rtl8366s *rtl = bus->priv;
+ struct rtl8366_smi *smi = bus->priv;
u32 val = 0;
int err;
- err = rtl8366s_read_phy_reg(rtl, addr, 0, reg, &val);
+ err = rtl8366s_read_phy_reg(smi, addr, 0, reg, &val);
if (err)
return 0xffff;
static int rtl8366s_mii_write(struct mii_bus *bus, int addr, int reg, u16 val)
{
- struct rtl8366s *rtl = bus->priv;
+ struct rtl8366_smi *smi = bus->priv;
u32 t;
int err;
- err = rtl8366s_write_phy_reg(rtl, addr, 0, reg, val);
+ err = rtl8366s_write_phy_reg(smi, addr, 0, reg, val);
/* flush write */
- (void) rtl8366s_read_phy_reg(rtl, addr, 0, reg, &t);
+ (void) rtl8366s_read_phy_reg(smi, addr, 0, reg, &t);
return err;
}
-static int rtl8366s_mii_init(struct rtl8366s *rtl)
+static int rtl8366s_mii_bus_match(struct mii_bus *bus)
{
- int ret;
- int i;
+ return (bus->read == rtl8366s_mii_read &&
+ bus->write == rtl8366s_mii_write);
+}
- rtl->mii_bus = mdiobus_alloc();
- if (rtl->mii_bus == NULL) {
- ret = -ENOMEM;
- goto err;
- }
+static int rtl8366s_setup(struct rtl8366_smi *smi)
+{
+ int ret;
- 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++)
- rtl->mii_irq[i] = PHY_POLL;
-
- ret = mdiobus_register(rtl->mii_bus);
+ ret = rtl8366s_reset_chip(smi);
if (ret)
- goto err_free;
-
- return 0;
+ return ret;
- err_free:
- mdiobus_free(rtl->mii_bus);
- err:
+ ret = rtl8366s_hw_init(smi);
return ret;
}
-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)
+static int rtl8366s_detect(struct rtl8366_smi *smi)
{
- return (bus->read == rtl8366s_mii_read &&
- bus->write == rtl8366s_mii_write);
-}
-
-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(rtl->parent, "unable to read chip id\n");
+ dev_err(smi->parent, "unable to read chip id\n");
return ret;
}
case RTL8366S_CHIP_ID_8366:
break;
default:
- dev_err(rtl->parent, "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(rtl->parent, "unable to read chip version\n");
+ dev_err(smi->parent, "unable to read chip version\n");
return ret;
}
- dev_info(rtl->parent, "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);
- ret = rtl8366s_reset_chip(rtl);
- if (ret)
- return ret;
-
- rtl8366s_debugfs_init(rtl);
return 0;
}
-static int __init rtl8366s_probe(struct platform_device *pdev)
+static struct rtl8366_smi_ops rtl8366s_smi_ops = {
+ .detect = rtl8366s_detect,
+ .setup = rtl8366s_setup,
+
+ .mii_read = rtl8366s_mii_read,
+ .mii_write = rtl8366s_mii_write,
+
+ .get_vlan_mc = rtl8366s_get_vlan_mc,
+ .set_vlan_mc = rtl8366s_set_vlan_mc,
+ .get_vlan_4k = rtl8366s_get_vlan_4k,
+ .set_vlan_4k = rtl8366s_set_vlan_4k,
+ .get_mc_index = rtl8366s_get_mc_index,
+ .set_mc_index = rtl8366s_set_mc_index,
+ .get_mib_counter = rtl8366_get_mib_counter,
+ .is_vlan_valid = rtl8366s_is_vlan_valid,
+ .enable_vlan = rtl8366s_enable_vlan,
+ .enable_vlan4k = rtl8366s_enable_vlan4k,
+};
+
+static int __devinit rtl8366s_probe(struct platform_device *pdev)
{
static int rtl8366_smi_version_printed;
struct rtl8366s_platform_data *pdata;
- struct rtl8366s *rtl;
struct rtl8366_smi *smi;
int err;
goto err_out;
}
- rtl = kzalloc(sizeof(*rtl), GFP_KERNEL);
- if (!rtl) {
- dev_err(&pdev->dev, "no memory for private data\n");
+ smi = rtl8366_smi_alloc(&pdev->dev);
+ if (!smi) {
err = -ENOMEM;
goto err_out;
}
- rtl->parent = &pdev->dev;
-
- smi = &rtl->smi;
- smi->parent = &pdev->dev;
smi->gpio_sda = pdata->gpio_sda;
smi->gpio_sck = pdata->gpio_sck;
+ smi->ops = &rtl8366s_smi_ops;
+ smi->cpu_port = RTL8366S_PORT_NUM_CPU;
+ smi->num_ports = RTL8366S_NUM_PORTS;
+ smi->num_vlan_mc = RTL8366S_NUM_VLANS;
+ smi->mib_counters = rtl8366s_mib_counters;
+ smi->num_mib_counters = ARRAY_SIZE(rtl8366s_mib_counters);
err = rtl8366_smi_init(smi);
if (err)
- goto err_free_rtl;
+ goto err_free_smi;
- platform_set_drvdata(pdev, rtl);
+ platform_set_drvdata(pdev, smi);
- err = rtl8366s_setup(rtl);
+ err = rtl8366s_switch_init(smi);
if (err)
goto err_clear_drvdata;
- 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);
rtl8366_smi_cleanup(smi);
- err_free_rtl:
- kfree(rtl);
+ err_free_smi:
+ kfree(smi);
err_out:
return err;
}
static int rtl8366s_phy_config_aneg(struct phy_device *phydev)
{
+ /* phy 4 might be connected to a second mac, allow aneg config */
+ if (phydev->addr == RTL8366S_PHY_WAN)
+ return genphy_config_aneg(phydev);
+
return 0;
}
static int __devexit rtl8366s_remove(struct platform_device *pdev)
{
- struct rtl8366s *rtl = platform_get_drvdata(pdev);
+ struct rtl8366_smi *smi = platform_get_drvdata(pdev);
- if (rtl) {
- rtl8366s_switch_cleanup(rtl);
- rtl8366s_debugfs_remove(rtl);
- rtl8366s_mii_cleanup(rtl);
+ if (smi) {
+ rtl8366s_switch_cleanup(smi);
platform_set_drvdata(pdev, NULL);
- rtl8366_smi_cleanup(&rtl->smi);
- kfree(rtl);
+ rtl8366_smi_cleanup(smi);
+ kfree(smi);
}
return 0;
projects / 10.03 / openwrt.git / blobdiff