aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2010-02-24 13:39:02 +0000
committerGabor Juhos <juhosg@openwrt.org>2010-02-24 13:39:02 +0000
commitf1509eaf8c7261033ec69fea337bf8015aca6f3f (patch)
treef8a7dd58d21d00a24414b583e6d02dc1039730e0 /target/linux
parent5bc415c2d650dbf21da567415cfc1d8f3477ec72 (diff)
downloadupstream-f1509eaf8c7261033ec69fea337bf8015aca6f3f.tar.gz
upstream-f1509eaf8c7261033ec69fea337bf8015aca6f3f.tar.bz2
upstream-f1509eaf8c7261033ec69fea337bf8015aca6f3f.zip
kernel: add driver for the RTL8366RB switch
Thanks to Andrew Tarabaras. SVN-Revision: 19837
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/generic-2.6/config-2.6.301
-rw-r--r--target/linux/generic-2.6/config-2.6.311
-rw-r--r--target/linux/generic-2.6/config-2.6.321
-rw-r--r--target/linux/generic-2.6/files/drivers/net/phy/rtl8366rb.c1752
-rw-r--r--target/linux/generic-2.6/files/include/linux/rtl8366rb.h21
-rw-r--r--target/linux/generic-2.6/patches-2.6.30/691-phy_rtl8366.patch13
-rw-r--r--target/linux/generic-2.6/patches-2.6.31/691-phy_rtl8366.patch13
-rw-r--r--target/linux/generic-2.6/patches-2.6.32/691-phy_rtl8366.patch13
8 files changed, 1803 insertions, 12 deletions
diff --git a/target/linux/generic-2.6/config-2.6.30 b/target/linux/generic-2.6/config-2.6.30
index 079e9f6e00..72675e0390 100644
--- a/target/linux/generic-2.6/config-2.6.30
+++ b/target/linux/generic-2.6/config-2.6.30
@@ -1752,6 +1752,7 @@ CONFIG_RTC_LIB=y
# CONFIG_RTL8366_SMI is not set
# CONFIG_RTL8366S_PHY_DEBUG_FS is not set
# CONFIG_RTL8366S_PHY is not set
+# CONFIG_RTL8366RB_PHY is not set
CONFIG_RT_MUTEXES=y
# CONFIG_RT_MUTEX_TESTER is not set
# CONFIG_RUNTIME_DEBUG is not set
diff --git a/target/linux/generic-2.6/config-2.6.31 b/target/linux/generic-2.6/config-2.6.31
index 6c8c4d36b7..350f364c94 100644
--- a/target/linux/generic-2.6/config-2.6.31
+++ b/target/linux/generic-2.6/config-2.6.31
@@ -1765,6 +1765,7 @@ CONFIG_RTC_LIB=y
# CONFIG_RTL8366_SMI is not set
# CONFIG_RTL8366S_PHY_DEBUG_FS is not set
# CONFIG_RTL8366S_PHY is not set
+# CONFIG_RTL8366RB_PHY is not set
CONFIG_RT_MUTEXES=y
CONFIG_RWSEM_GENERIC_SPINLOCK=y
# CONFIG_S2IO is not set
diff --git a/target/linux/generic-2.6/config-2.6.32 b/target/linux/generic-2.6/config-2.6.32
index e2555d3a4b..b1f1f7fd14 100644
--- a/target/linux/generic-2.6/config-2.6.32
+++ b/target/linux/generic-2.6/config-2.6.32
@@ -1854,6 +1854,7 @@ CONFIG_RTC_LIB=y
# CONFIG_RTL8366_SMI is not set
# CONFIG_RTL8366S_PHY_DEBUG_FS is not set
# CONFIG_RTL8366S_PHY is not set
+# CONFIG_RTL8366RB_PHY is not set
CONFIG_RT_MUTEXES=y
# CONFIG_RT_MUTEX_TESTER is not set
# CONFIG_RUNTIME_DEBUG is not set
diff --git a/target/linux/generic-2.6/files/drivers/net/phy/rtl8366rb.c b/target/linux/generic-2.6/files/drivers/net/phy/rtl8366rb.c
new file mode 100644
index 0000000000..2739031e21
--- /dev/null
+++ b/target/linux/generic-2.6/files/drivers/net/phy/rtl8366rb.c
@@ -0,0 +1,1752 @@
+/*
+ * Platform driver for the Realtek RTL8366S ethernet switch
+ *
+ * Copyright (C) 2009-2010 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2010 Antti Seppälä <a.seppala@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/delay.h>
+#include <linux/skbuff.h>
+#include <linux/switch.h>
+#include <linux/phy.h>
+#include <linux/rtl8366rb.h>
+
+#include "rtl8366_smi.h"
+
+#ifdef CONFIG_RTL8366S_PHY_DEBUG_FS
+#include <linux/debugfs.h>
+#endif
+
+#define RTL8366S_DRIVER_DESC "Realtek RTL8366RB ethernet switch driver"
+#define RTL8366S_DRIVER_VER "0.2.0"
+
+#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_CHIP_CTRL_VLAN_4KTB (1 << 14)
+
+#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 0x050A
+#define RTL8366S_CHIP_VERSION_MASK 0xf
+#define RTL8366S_CHIP_ID_REG 0x0509
+#define RTL8366S_CHIP_ID_8366 0x5937
+
+/* PHY registers control */
+#define RTL8366S_PHY_ACCESS_CTRL_REG 0x8000
+#define RTL8366S_PHY_ACCESS_DATA_REG 0x8002
+
+#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 (0xf << 5)
+#define RTL8366S_PHY_NO_OFFSET 9
+#define RTL8366S_PHY_NO_MASK (0x1f << 9)
+
+/* LED control registers */
+#define RTL8366_LED_BLINKRATE_REG 0x0430
+#define RTL8366_LED_BLINKRATE_BIT 0
+#define RTL8366_LED_BLINKRATE_MASK 0x0007
+
+#define RTL8366_LED_CTRL_REG 0x0431
+#define RTL8366_LED_0_1_CTRL_REG 0x0432
+#define RTL8366_LED_2_3_CTRL_REG 0x0433
+
+#define RTL8366S_MIB_COUNT 33
+#define RTL8366S_GLOBAL_MIB_COUNT 1
+#define RTL8366S_MIB_COUNTER_PORT_OFFSET 0x0050
+#define RTL8366S_MIB_COUNTER_BASE 0x1000
+#define RTL8366S_MIB_CTRL_REG 0x13F0
+#define RTL8366S_MIB_CTRL_USER_MASK 0x0FFC
+#define RTL8366S_MIB_CTRL_BUSY_MASK 0x0001
+#define RTL8366S_MIB_CTRL_RESET_MASK 0x0001
+
+#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 0x0063
+#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 0x018C
+#define RTL8366S_VLAN_TABLE_WRITE_BASE 0x0185
+
+
+#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 0x0020
+
+
+#define RTL8366S_PORT_LINK_STATUS_BASE 0x0014
+#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_5 (1 << 4) /* In userspace port 4 */
+
+#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_5 | \
+ RTL8366_PORT_CPU)
+
+#define RTL8366_PORT_ALL_BUT_CPU (RTL8366_PORT_1 | \
+ RTL8366_PORT_2 | \
+ RTL8366_PORT_3 | \
+ RTL8366_PORT_4 | \
+ RTL8366_PORT_5)
+
+#define RTL8366_PORT_ALL_EXTERNAL (RTL8366_PORT_1 | \
+ RTL8366_PORT_2 | \
+ RTL8366_PORT_3 | \
+ RTL8366_PORT_4)
+
+#define RTL8366_PORT_ALL_INTERNAL RTL8366_PORT_CPU
+
+struct rtl8366rb {
+ 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 rtl8366rb_vlanconfig {
+ u16 reserved2:1;
+ u16 priority:3;
+ u16 vid:12;
+ u16 untag:8;
+ u16 member:8;
+ u16 stag_mbr:8;
+ u16 stag_idx:3;
+ u16 reserved1:2;
+ u16 fid:3;
+};
+
+struct rtl8366rb_vlan4kentry {
+ u16 reserved1:4;
+ u16 vid:12;
+ u16 untag:8;
+ u16 member:8;
+ u16 reserved2:13;
+ u16 fid:3;
+};
+
+
+#ifdef CONFIG_RTL8366S_PHY_DEBUG_FS
+u16 gl_dbg_reg;
+#endif
+
+struct mib_counter {
+ unsigned offset;
+ unsigned length;
+ const char *name;
+};
+
+static struct mib_counter rtl8366rb_mib_counters[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, 2, "IfOutOctets " },
+ { 46, 2, "Dot3StatsSingleCollisionFrames " },
+ { 48, 2, "Dot3StatMultipleCollisionFrames " },
+ { 50, 2, "Dot3sDeferredTransmissions " },
+ { 52, 2, "Dot3StatsLateCollisions " },
+ { 54, 2, "EtherStatsCollisions " },
+ { 56, 2, "Dot3StatsExcessiveCollisions " },
+ { 58, 2, "Dot3OutPauseFrames " },
+ { 60, 2, "Dot1dBasePortDelayExceededDiscards" },
+ { 62, 2, "Dot1dTpPortInDiscards " },
+ { 64, 2, "IfOutUcastPkts " },
+ { 66, 2, "IfOutMulticastPkts " },
+ { 68, 2, "IfOutBroadcastPkts " },
+};
+
+static inline struct rtl8366rb *sw_to_rtl8366rb(struct switch_dev *sw)
+{
+ return container_of(sw, struct rtl8366rb, dev);
+}
+
+static int rtl8366rb_reset_chip(struct rtl8366rb *rtl)
+{
+ 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);
+ 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 0;
+}
+
+static int rtl8366rb_read_phy_reg(struct rtl8366rb *rtl,
+ u32 phy_no, u32 page, u32 addr, u32 *data)
+{
+ struct rtl8366_smi *smi = &rtl->smi;
+ u32 reg;
+ int ret;
+
+ if (phy_no > RTL8366S_PHY_NO_MAX)
+ return -EINVAL;
+
+ if (page > RTL8366S_PHY_PAGE_MAX)
+ return -EINVAL;
+
+ if (addr > RTL8366S_PHY_ADDR_MAX)
+ return -EINVAL;
+
+ ret = rtl8366_smi_write_reg(smi, RTL8366S_PHY_ACCESS_CTRL_REG,
+ RTL8366S_PHY_CTRL_READ);
+ if (ret)
+ return ret;
+
+ reg = 0x8000 | (1 << (phy_no + RTL8366S_PHY_NO_OFFSET)) |
+ ((page << RTL8366S_PHY_PAGE_OFFSET) & RTL8366S_PHY_PAGE_MASK) |
+ (addr & RTL8366S_PHY_REG_MASK);
+
+ ret = rtl8366_smi_write_reg(smi, reg, 0);
+ if (ret)
+ return ret;
+
+ ret = rtl8366_smi_read_reg(smi, RTL8366S_PHY_ACCESS_DATA_REG, data);
+ if (ret)
+ return ret;
+
+ return 0;
+}
+
+static int rtl8366rb_write_phy_reg(struct rtl8366rb *rtl,
+ u32 phy_no, u32 page, u32 addr, u32 data)
+{
+ struct rtl8366_smi *smi = &rtl->smi;
+ u32 reg;
+ int ret;
+
+ if (phy_no > RTL8366S_PHY_NO_MAX)
+ return -EINVAL;
+
+ if (page > RTL8366S_PHY_PAGE_MAX)
+ return -EINVAL;
+
+ if (addr > RTL8366S_PHY_ADDR_MAX)
+ return -EINVAL;
+
+ ret = rtl8366_smi_write_reg(smi, RTL8366S_PHY_ACCESS_CTRL_REG,
+ RTL8366S_PHY_CTRL_WRITE);
+ if (ret)
+ return ret;
+
+ reg = 0x8000 | (1 << (phy_no + RTL8366S_PHY_NO_OFFSET)) |
+ ((page << RTL8366S_PHY_PAGE_OFFSET) & RTL8366S_PHY_PAGE_MASK) |
+ (addr & RTL8366S_PHY_REG_MASK);
+
+ ret = rtl8366_smi_write_reg(smi, reg, data);
+ if (ret)
+ return ret;
+
+ return 0;
+}
+
+static int rtl8366_get_mib_counter(struct rtl8366rb *rtl, 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)
+ return -EINVAL;
+
+ addr = RTL8366S_MIB_COUNTER_BASE +
+ RTL8366S_MIB_COUNTER_PORT_OFFSET * (port) +
+ rtl8366rb_mib_counters[counter].offset;
+
+ /*
+ * 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;
+
+ /* read MIB control register */
+ err = rtl8366_smi_read_reg(smi, RTL8366S_MIB_CTRL_REG, &data);
+ if (err)
+ return err;
+
+ if (data & RTL8366S_MIB_CTRL_BUSY_MASK)
+ return -EBUSY;
+
+ if (data & RTL8366S_MIB_CTRL_RESET_MASK)
+ return -EIO;
+
+ mibvalue = 0;
+ for (i = rtl8366rb_mib_counters[counter].length; i > 0; i--) {
+ err = rtl8366_smi_read_reg(smi, addr + (i - 1), &data);
+ if (err)
+ return err;
+
+ mibvalue = (mibvalue << 16) | (data & 0xFFFF);
+ }
+
+ *val = mibvalue;
+ return 0;
+}
+
+static int rtl8366rb_get_vlan_4k_entry(struct rtl8366rb *rtl, u32 vid,
+ struct rtl8366rb_vlan4kentry *vlan4k)
+{
+ struct rtl8366_smi *smi = &rtl->smi;
+ int err;
+ u32 data;
+ u16 *tableaddr;
+
+ memset(vlan4k, '\0', sizeof(struct rtl8366rb_vlan4kentry));
+ vlan4k->vid = vid;
+
+ if (vid >= RTL8366_NUM_VIDS)
+ return -EINVAL;
+
+ tableaddr = (u16 *)vlan4k;
+
+ /* write VID */
+ data = *tableaddr;
+ err = rtl8366_smi_write_reg(smi, RTL8366S_VLAN_TABLE_WRITE_BASE, data);
+ if (err)
+ return err;
+
+ /* write table access control word */
+ err = rtl8366_smi_write_reg(smi, RTL8366S_TABLE_ACCESS_CTRL_REG,
+ RTL8366S_TABLE_VLAN_READ_CTRL);
+ 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;
+
+ *tableaddr = data;
+ tableaddr++;
+
+ err = rtl8366_smi_read_reg(smi, RTL8366S_VLAN_TABLE_READ_BASE + 2,
+ &data);
+ if (err)
+ return err;
+ *tableaddr = data;
+ vlan4k->vid = vid;
+
+ return 0;
+}
+
+static int rtl8366rb_set_vlan_4k_entry(struct rtl8366rb *rtl,
+ const struct rtl8366rb_vlan4kentry *vlan4k)
+{
+ struct rtl8366_smi *smi = &rtl->smi;
+ int err;
+ u32 data;
+ u16 *tableaddr;
+
+ if (vlan4k->vid >= RTL8366_NUM_VIDS ||
+ vlan4k->member > RTL8366_PORT_ALL ||
+ vlan4k->untag > RTL8366_PORT_ALL ||
+ 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;
+
+ tableaddr++;
+
+ data = *tableaddr;
+
+ err = rtl8366_smi_write_reg(smi, RTL8366S_VLAN_TABLE_WRITE_BASE + 2,
+ 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);
+
+ return err;
+}
+
+static int rtl8366rb_get_vlan_member_config(struct rtl8366rb *rtl, u32 index,
+ struct rtl8366rb_vlanconfig *vlanmc)
+{
+ struct rtl8366_smi *smi = &rtl->smi;
+ int err;
+ u32 addr;
+ u32 data;
+ u16 *tableaddr;
+
+ memset(vlanmc, '\0', sizeof(struct rtl8366rb_vlanconfig));
+
+ if (index >= RTL8366_NUM_VLANS)
+ return -EINVAL;
+
+ tableaddr = (u16 *)vlanmc;
+
+ addr = RTL8366S_VLAN_MEMCONF_BASE + (index * 3);
+ err = rtl8366_smi_read_reg(smi, addr, &data);
+ if (err)
+ return err;
+
+ *tableaddr = data;
+ tableaddr++;
+
+ addr = RTL8366S_VLAN_MEMCONF_BASE + 1 + (index * 3);
+ err = rtl8366_smi_read_reg(smi, addr, &data);
+ if (err)
+ return err;
+
+ *tableaddr = data;
+ tableaddr++;
+
+ addr = RTL8366S_VLAN_MEMCONF_BASE + 2 + (index * 3);
+ err = rtl8366_smi_read_reg(smi, addr, &data);
+ if (err)
+ return err;
+
+ *tableaddr = data;
+
+ return 0;
+}
+
+static int rtl8366rb_set_vlan_member_config(struct rtl8366rb *rtl, u32 index,
+ const struct rtl8366rb_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)
+ return -EINVAL;
+
+ addr = RTL8366S_VLAN_MEMCONF_BASE + (index * 3);
+
+ tableaddr = (u16 *)vlanmc;
+ data = *tableaddr;
+
+ err = rtl8366_smi_write_reg(smi, addr, data);
+ if (err)
+ return err;
+
+ addr = RTL8366S_VLAN_MEMCONF_BASE + 1 + (index * 3);
+
+ tableaddr++;
+ data = *tableaddr;
+
+ err = rtl8366_smi_write_reg(smi, addr, data);
+ if (err)
+ return err;
+
+ addr = RTL8366S_VLAN_MEMCONF_BASE + 2 + (index * 3);
+
+ tableaddr++;
+ data = *tableaddr;
+
+ err = rtl8366_smi_write_reg(smi, addr, data);
+ if (err)
+ return err;
+ return 0;
+}
+
+static int rtl8366rb_get_port_vlan_index(struct rtl8366rb *rtl, int port,
+ int *val)
+{
+ struct rtl8366_smi *smi = &rtl->smi;
+ u32 data;
+ int err;
+
+ if (port >= RTL8366_NUM_PORTS)
+ return -EINVAL;
+
+ err = rtl8366_smi_read_reg(smi, RTL8366S_PORT_VLAN_CTRL_REG(port),
+ &data);
+ if (err)
+ return err;
+
+ *val = (data >> RTL8366S_PORT_VLAN_CTRL_SHIFT(port)) &
+ RTL8366S_PORT_VLAN_CTRL_MASK;
+
+ return 0;
+
+}
+
+static int rtl8366rb_get_vlan_port_pvid(struct rtl8366rb *rtl, int port,
+ int *val)
+{
+ struct rtl8366rb_vlanconfig vlanmc;
+ int err;
+ int index;
+
+ err = rtl8366rb_get_port_vlan_index(rtl, port, &index);
+ if (err)
+ return err;
+
+ err = rtl8366rb_get_vlan_member_config(rtl, index, &vlanmc);
+ if (err)
+ return err;
+
+ *val = vlanmc.vid;
+ return 0;
+}
+
+static int rtl8366rb_set_port_vlan_index(struct rtl8366rb *rtl, int port,
+ int index)
+{
+ struct rtl8366_smi *smi = &rtl->smi;
+ u32 data;
+ int err;
+
+ if (port >= RTL8366_NUM_PORTS || index >= RTL8366_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;
+}
+
+static int rtl8366rb_set_vlan_port_pvid(struct rtl8366rb *rtl, int port, int val)
+{
+ int i;
+ struct rtl8366rb_vlanconfig vlanmc;
+ struct rtl8366rb_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 */
+ rtl8366rb_get_vlan_4k_entry(rtl, val, &vlan4k);
+ vlan4k.member |= ((1 << port) | RTL8366_PORT_CPU);
+ vlan4k.untag = RTL8366_PORT_ALL_BUT_CPU;
+ rtl8366rb_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) {
+ rtl8366rb_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);
+ rtl8366rb_set_vlan_member_config(rtl, i, &vlanmc);
+
+ /* Now update PVID register settings */
+ rtl8366rb_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) {
+ rtl8366rb_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;
+
+ rtl8366rb_set_vlan_member_config(rtl, i, &vlanmc);
+
+ /* Now update PVID register settings */
+ rtl8366rb_set_port_vlan_index(rtl, port, i);
+
+ return 0;
+ }
+ }
+
+ dev_err(rtl->parent,
+ "All 16 vlan member configurations are in use\n");
+
+ return -EINVAL;
+}
+
+
+static int rtl8366rb_vlan_set_vlan(struct rtl8366rb *rtl, 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);
+}
+
+static int rtl8366rb_vlan_set_4ktable(struct rtl8366rb *rtl, 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_4KTB;
+ else
+ data &= ~RTL8366_CHIP_CTRL_VLAN_4KTB;
+
+ return rtl8366_smi_write_reg(smi, RTL8366_CHIP_GLOBAL_CTRL_REG, data);
+}
+
+static int rtl8366rb_reset_vlan(struct rtl8366rb *rtl)
+{
+ struct rtl8366rb_vlan4kentry vlan4k;
+ struct rtl8366rb_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 = rtl8366rb_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 = rtl8366rb_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 = rtl8366rb_set_vlan_port_pvid(rtl, i, 0);
+ if (err)
+ return err;
+ }
+
+ return 0;
+}
+
+#ifdef CONFIG_RTL8366S_PHY_DEBUG_FS
+static int rtl8366rb_debugfs_open(struct inode *inode, struct file *file)
+{
+ file->private_data = inode->i_private;
+ return 0;
+}
+
+static ssize_t rtl8366rb_read_debugfs_mibs(struct file *file,
+ char __user *user_buf,
+ size_t count, loff_t *ppos)
+{
+ struct rtl8366rb *rtl = (struct rtl8366rb *)file->private_data;
+ 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, rtl8366rb_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 rtl8366rb_read_debugfs_vlan(struct file *file,
+ char __user *user_buf,
+ size_t count, loff_t *ppos)
+{
+ struct rtl8366rb *rtl = (struct rtl8366rb *)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 rtl8366rb_vlanconfig vlanmc;
+
+ rtl8366rb_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 (!rtl8366rb_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 rtl8366rb_read_debugfs_reg(struct file *file,
+ char __user *user_buf,
+ size_t count, loff_t *ppos)
+{
+ struct rtl8366rb *rtl = (struct rtl8366rb *)file->private_data;
+ struct rtl8366_smi *smi = &rtl->smi;
+ u32 t, reg = gl_dbg_reg;
+ int err, len = 0;
+ char *buf = rtl->buf;
+
+ memset(buf, '\0', sizeof(rtl->buf));
+
+ err = rtl8366_smi_read_reg(smi, reg, &t);
+ if (err) {
+ len += snprintf(buf, sizeof(rtl->buf),
+ "Read failed (reg: 0x%04x)\n", reg);
+ return simple_read_from_buffer(user_buf, count, ppos, buf, len);
+ }
+
+ len += snprintf(buf, sizeof(rtl->buf), "reg = 0x%04x, val = 0x%04x\n",
+ reg, t);
+
+ return simple_read_from_buffer(user_buf, count, ppos, buf, len);
+}
+
+static ssize_t rtl8366rb_write_debugfs_reg(struct file *file,
+ const char __user *user_buf,
+ size_t count, loff_t *ppos)
+{
+ struct rtl8366rb *rtl = (struct rtl8366rb *)file->private_data;
+ struct rtl8366_smi *smi = &rtl->smi;
+ unsigned long data;
+ u32 reg = gl_dbg_reg;
+ int err;
+ size_t len;
+ char *buf = rtl->buf;
+
+ len = min(count, sizeof(rtl->buf) - 1);
+ if (copy_from_user(buf, user_buf, len)) {
+ dev_err(rtl->parent, "copy from user failed\n");
+ return -EFAULT;
+ }
+
+ buf[len] = '\0';
+ if (len > 0 && buf[len - 1] == '\n')
+ buf[len - 1] = '\0';
+
+
+ if (strict_strtoul(buf, 16, &data)) {
+ dev_err(rtl->parent, "Invalid reg value %s\n", buf);
+ } else {
+ err = rtl8366_smi_write_reg(smi, reg, data);
+ if (err) {
+ dev_err(rtl->parent,
+ "writing reg 0x%04x val 0x%04lx failed\n",
+ reg, data);
+ }
+ }
+
+ return count;
+}
+
+static const struct file_operations fops_rtl8366rb_regs = {
+ .read = rtl8366rb_read_debugfs_reg,
+ .write = rtl8366rb_write_debugfs_reg,
+ .open = rtl8366rb_debugfs_open,
+ .owner = THIS_MODULE
+};
+
+static const struct file_operations fops_rtl8366rb_vlan = {
+ .read = rtl8366rb_read_debugfs_vlan,
+ .open = rtl8366rb_debugfs_open,
+ .owner = THIS_MODULE
+};
+
+static const struct file_operations fops_rtl8366rb_mibs = {
+ .read = rtl8366rb_read_debugfs_mibs,
+ .open = rtl8366rb_debugfs_open,
+ .owner = THIS_MODULE
+};
+
+static void rtl8366rb_debugfs_init(struct rtl8366rb *rtl)
+{
+ struct dentry *node;
+ struct dentry *root;
+
+ if (!rtl->debugfs_root)
+ rtl->debugfs_root = debugfs_create_dir("rtl8366rb", NULL);
+
+ if (!rtl->debugfs_root) {
+ dev_err(rtl->parent, "Unable to create debugfs dir\n");
+ return;
+ }
+ root = rtl->debugfs_root;
+
+ node = debugfs_create_x16("reg", S_IRUGO | S_IWUSR, root, &gl_dbg_reg);
+ if (!node) {
+ dev_err(rtl->parent, "Creating debugfs file reg failed\n");
+ return;
+ }
+
+ node = debugfs_create_file("val", S_IRUGO | S_IWUSR, root, rtl,
+ &fops_rtl8366rb_regs);
+ if (!node) {
+ dev_err(rtl->parent, "Creating debugfs file val failed\n");
+ return;
+ }
+
+ node = debugfs_create_file("vlan", S_IRUSR, root, rtl,
+ &fops_rtl8366rb_vlan);
+ if (!node) {
+ dev_err(rtl->parent,
+ "Creating debugfs file vlan failed\n");
+ return;
+ }
+
+ node = debugfs_create_file("mibs", S_IRUSR, root, rtl,
+ &fops_rtl8366rb_mibs);
+ if (!node) {
+ dev_err(rtl->parent,
+ "Creating debugfs file mibs failed\n");
+ return;
+ }
+}
+
+static void rtl8366rb_debugfs_remove(struct rtl8366rb *rtl)
+{
+ if (rtl->debugfs_root) {
+ debugfs_remove_recursive(rtl->debugfs_root);
+ rtl->debugfs_root = NULL;
+ }
+}
+
+#else
+static inline void rtl8366rb_debugfs_init(struct rtl8366rb *rtl) {}
+static inline void rtl8366rb_debugfs_remove(struct rtl8366rb *rtl) {}
+#endif /* CONFIG_RTL8366S_PHY_DEBUG_FS */
+
+static int rtl8366rb_sw_reset_mibs(struct switch_dev *dev,
+ const struct switch_attr *attr,
+ struct switch_val *val)
+{
+ struct rtl8366rb *rtl = sw_to_rtl8366rb(dev);
+ struct rtl8366_smi *smi = &rtl->smi;
+ u32 data = 0;
+
+ 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 rtl8366rb_sw_get_vlan_enable(struct switch_dev *dev,
+ const struct switch_attr *attr,
+ struct switch_val *val)
+{
+ struct rtl8366rb *rtl = sw_to_rtl8366rb(dev);
+ struct rtl8366_smi *smi = &rtl->smi;
+ 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, RTL8366_CHIP_GLOBAL_CTRL_REG, &data);
+
+ if (data & RTL8366_CHIP_CTRL_VLAN_4KTB)
+ val->value.i = 1;
+ else
+ val->value.i = 0;
+ }
+
+ return 0;
+}
+
+static int rtl8366rb_sw_get_blinkrate(struct switch_dev *dev,
+ const struct switch_attr *attr,
+ struct switch_val *val)
+{
+ struct rtl8366rb *rtl = sw_to_rtl8366rb(dev);
+ struct rtl8366_smi *smi = &rtl->smi;
+ u32 data;
+
+ rtl8366_smi_read_reg(smi, RTL8366_LED_BLINKRATE_REG, &data);
+
+ val->value.i = (data & (RTL8366_LED_BLINKRATE_MASK));
+
+ return 0;
+}
+
+static int rtl8366rb_sw_set_blinkrate(struct switch_dev *dev,
+ const struct switch_attr *attr,
+ struct switch_val *val)
+{
+ struct rtl8366rb *rtl = sw_to_rtl8366rb(dev);
+ struct rtl8366_smi *smi = &rtl->smi;
+ u32 data;
+
+ if (val->value.i >= 6)
+ return -EINVAL;
+
+ rtl8366_smi_read_reg(smi, RTL8366_LED_BLINKRATE_REG, &data);
+
+ data &= ~RTL8366_LED_BLINKRATE_MASK;
+ data |= val->value.i;
+
+ rtl8366_smi_write_reg(smi, RTL8366_LED_BLINKRATE_REG, data);
+
+ return 0;
+}
+
+static int rtl8366rb_sw_set_vlan_enable(struct switch_dev *dev,
+ const struct switch_attr *attr,
+ struct switch_val *val)
+{
+ struct rtl8366rb *rtl = sw_to_rtl8366rb(dev);
+
+ if (attr->ofs == 1)
+ return rtl8366rb_vlan_set_vlan(rtl, val->value.i);
+ else
+ return rtl8366rb_vlan_set_4ktable(rtl, val->value.i);
+}
+
+static const char *rtl8366rb_speed_str(unsigned speed)
+{
+ switch (speed) {
+ case 0:
+ return "10baseT";
+ case 1:
+ return "100baseT";
+ case 2:
+ return "1000baseT";
+ }
+
+ return "unknown";
+}
+
+static int rtl8366rb_sw_get_port_link(struct switch_dev *dev,
+ const struct switch_attr *attr,
+ struct switch_val *val)
+{
+ struct rtl8366rb *rtl = sw_to_rtl8366rb(dev);
+ struct rtl8366_smi *smi = &rtl->smi;
+ u32 len = 0, data = 0;
+
+ if (val->port_vlan >= RTL8366_NUM_PORTS)
+ return -EINVAL;
+
+ memset(rtl->buf, '\0', sizeof(rtl->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",
+ rtl8366rb_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 rtl8366rb_sw_get_vlan_info(struct switch_dev *dev,
+ const struct switch_attr *attr,
+ struct switch_val *val)
+{
+ int i;
+ u32 len = 0;
+ struct rtl8366rb_vlanconfig vlanmc;
+ struct rtl8366rb_vlan4kentry vlan4k;
+ struct rtl8366rb *rtl = sw_to_rtl8366rb(dev);
+ char *buf = rtl->buf;
+
+ if (val->port_vlan >= RTL8366_NUM_VLANS)
+ return -EINVAL;
+
+ memset(buf, '\0', sizeof(rtl->buf));
+
+ rtl8366rb_get_vlan_member_config(rtl, val->port_vlan, &vlanmc);
+ rtl8366rb_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 (!rtl8366rb_get_port_vlan_index(rtl, i, &index) &&
+ index == val->port_vlan)
+ len += snprintf(buf + len, sizeof(rtl->buf) - len,
+ "%d", i);
+ }
+ 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->len = len;
+
+ return 0;
+}
+
+static int rtl8366rb_sw_set_port_led(struct switch_dev *dev,
+ const struct switch_attr *attr,
+ struct switch_val *val)
+{
+ struct rtl8366rb *rtl = sw_to_rtl8366rb(dev);
+ struct rtl8366_smi *smi = &rtl->smi;
+ u32 data = 0;
+
+ if (val->port_vlan >= RTL8366_NUM_PORTS)
+ 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);
+ } 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);
+ }
+
+ return 0;
+}
+
+static int rtl8366rb_sw_get_port_led(struct switch_dev *dev,
+ const struct switch_attr *attr,
+ struct switch_val *val)
+{
+ struct rtl8366rb *rtl = sw_to_rtl8366rb(dev);
+ struct rtl8366_smi *smi = &rtl->smi;
+ u32 data = 0;
+
+ if (val->port_vlan >= RTL8366_NUM_LEDGROUPS)
+ return -EINVAL;
+
+ rtl8366_smi_read_reg(smi, RTL8366_LED_CTRL_REG, &data);
+ val->value.i = (data >> (val->port_vlan * 4)) & 0x000F;
+
+ return 0;
+}
+
+static int rtl8366rb_sw_reset_port_mibs(struct switch_dev *dev,
+ const struct switch_attr *attr,
+ struct switch_val *val)
+{
+ struct rtl8366rb *rtl = sw_to_rtl8366rb(dev);
+ struct rtl8366_smi *smi = &rtl->smi;
+ 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 rtl8366rb_sw_get_port_mib(struct switch_dev *dev,
+ const struct switch_attr *attr,
+ struct switch_val *val)
+{
+ struct rtl8366rb *rtl = sw_to_rtl8366rb(dev);
+ 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, rtl8366rb_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 rtl8366rb_sw_get_vlan_ports(struct switch_dev *dev,
+ struct switch_val *val)
+{
+ struct rtl8366rb_vlanconfig vlanmc;
+ struct rtl8366rb *rtl = sw_to_rtl8366rb(dev);
+ struct switch_port *port;
+ int i;
+
+ if (val->port_vlan >= RTL8366_NUM_VLANS)
+ return -EINVAL;
+
+ rtl8366rb_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 rtl8366rb_sw_set_vlan_ports(struct switch_dev *dev,
+ struct switch_val *val)
+{
+ struct rtl8366rb_vlanconfig vlanmc;
+ struct rtl8366rb_vlan4kentry vlan4k;
+ struct rtl8366rb *rtl = sw_to_rtl8366rb(dev);
+ struct switch_port *port;
+ int i;
+
+ if (val->port_vlan >= RTL8366_NUM_VLANS)
+ return -EINVAL;
+
+ rtl8366rb_get_vlan_member_config(rtl, val->port_vlan, &vlanmc);
+ rtl8366rb_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;
+
+ rtl8366rb_set_vlan_member_config(rtl, val->port_vlan, &vlanmc);
+ rtl8366rb_set_vlan_4k_entry(rtl, &vlan4k);
+ return 0;
+}
+
+static int rtl8366rb_sw_get_port_pvid(struct switch_dev *dev, int port, int *val)
+{
+ struct rtl8366rb *rtl = sw_to_rtl8366rb(dev);
+ return rtl8366rb_get_vlan_port_pvid(rtl, port, val);
+}
+
+static int rtl8366rb_sw_set_port_pvid(struct switch_dev *dev, int port, int val)
+{
+ struct rtl8366rb *rtl = sw_to_rtl8366rb(dev);
+ return rtl8366rb_set_vlan_port_pvid(rtl, port, val);
+}
+
+static int rtl8366rb_sw_reset_switch(struct switch_dev *dev)
+{
+ struct rtl8366rb *rtl = sw_to_rtl8366rb(dev);
+ int err;
+
+ err = rtl8366rb_reset_chip(rtl);
+ if (err)
+ return err;
+
+ return rtl8366rb_reset_vlan(rtl);
+}
+
+static struct switch_attr rtl8366rb_globals[] = {
+ {
+ .type = SWITCH_TYPE_INT,
+ .name = "enable_vlan",
+ .description = "Enable VLAN mode",
+ .set = rtl8366rb_sw_set_vlan_enable,
+ .get = rtl8366rb_sw_get_vlan_enable,
+ .max = 1,
+ .ofs = 1
+ }, {
+ .type = SWITCH_TYPE_INT,
+ .name = "enable_vlan4k",
+ .description = "Enable VLAN 4K mode",
+ .set = rtl8366rb_sw_set_vlan_enable,
+ .get = rtl8366rb_sw_get_vlan_enable,
+ .max = 1,
+ .ofs = 2
+ }, {
+ .type = SWITCH_TYPE_INT,
+ .name = "reset_mibs",
+ .description = "Reset all MIB counters",
+ .set = rtl8366rb_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 = rtl8366rb_sw_set_blinkrate,
+ .get = rtl8366rb_sw_get_blinkrate,
+ .max = 5
+ },
+};
+
+static struct switch_attr rtl8366rb_port[] = {
+ {
+ .type = SWITCH_TYPE_STRING,
+ .name = "link",
+ .description = "Get port link information",
+ .max = 1,
+ .set = NULL,
+ .get = rtl8366rb_sw_get_port_link,
+ }, {
+ .type = SWITCH_TYPE_INT,
+ .name = "reset_mib",
+ .description = "Reset single port MIB counters",
+ .max = 1,
+ .set = rtl8366rb_sw_reset_port_mibs,
+ .get = NULL,
+ }, {
+ .type = SWITCH_TYPE_STRING,
+ .name = "mib",
+ .description = "Get MIB counters for port",
+ .max = 33,
+ .set = NULL,
+ .get = rtl8366rb_sw_get_port_mib,
+ }, {
+ .type = SWITCH_TYPE_INT,
+ .name = "led",
+ .description = "Get/Set port group (0 - 3) led mode (0 - 15)",
+ .max = 15,
+ .set = rtl8366rb_sw_set_port_led,
+ .get = rtl8366rb_sw_get_port_led,
+ },
+};
+
+static struct switch_attr rtl8366rb_vlan[] = {
+ {
+ .type = SWITCH_TYPE_STRING,
+ .name = "info",
+ .description = "Get vlan information",
+ .max = 1,
+ .set = NULL,
+ .get = rtl8366rb_sw_get_vlan_info,
+ },
+};
+
+/* template */
+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 = rtl8366rb_globals,
+ .n_attr = ARRAY_SIZE(rtl8366rb_globals),
+ },
+ .attr_port = {
+ .attr = rtl8366rb_port,
+ .n_attr = ARRAY_SIZE(rtl8366rb_port),
+ },
+ .attr_vlan = {
+ .attr = rtl8366rb_vlan,
+ .n_attr = ARRAY_SIZE(rtl8366rb_vlan),
+ },
+
+ .get_vlan_ports = rtl8366rb_sw_get_vlan_ports,
+ .set_vlan_ports = rtl8366rb_sw_set_vlan_ports,
+ .get_port_pvid = rtl8366rb_sw_get_port_pvid,
+ .set_port_pvid = rtl8366rb_sw_set_port_pvid,
+ .reset_switch = rtl8366rb_sw_reset_switch,
+};
+
+static int rtl8366rb_switch_init(struct rtl8366rb *rtl)
+{
+ 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 rtl8366rb_switch_cleanup(struct rtl8366rb *rtl)
+{
+ unregister_switch(&rtl->dev);
+}
+
+static int rtl8366rb_mii_read(struct mii_bus *bus, int addr, int reg)
+{
+ struct rtl8366rb *rtl = bus->priv;
+ u32 val = 0;
+ int err;
+
+ err = rtl8366rb_read_phy_reg(rtl, addr, 0, reg, &val);
+ if (err)
+ return 0xffff;
+
+ return val;
+}
+
+static int rtl8366rb_mii_write(struct mii_bus *bus, int addr, int reg, u16 val)
+{
+ struct rtl8366rb *rtl = bus->priv;
+ u32 t;
+ int err;
+
+ err = rtl8366rb_write_phy_reg(rtl, addr, 0, reg, val);
+ /* flush write */
+ (void) rtl8366rb_read_phy_reg(rtl, addr, 0, reg, &t);
+
+ return err;
+}
+
+static int rtl8366rb_mii_init(struct rtl8366rb *rtl)
+{
+ int ret;
+ int i;
+
+ rtl->mii_bus = mdiobus_alloc();
+ if (rtl->mii_bus == NULL) {
+ ret = -ENOMEM;
+ goto err;
+ }
+
+ rtl->mii_bus->priv = (void *) rtl;
+ rtl->mii_bus->name = "rtl8366-rtl";
+ rtl->mii_bus->read = rtl8366rb_mii_read;
+ rtl->mii_bus->write = rtl8366rb_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);
+ if (ret)
+ goto err_free;
+
+ return 0;
+
+ err_free:
+ mdiobus_free(rtl->mii_bus);
+ err:
+ return ret;
+}
+
+static void rtl8366rb_mii_cleanup(struct rtl8366rb *rtl)
+{
+ mdiobus_unregister(rtl->mii_bus);
+ mdiobus_free(rtl->mii_bus);
+}
+
+static int rtl8366rb_mii_bus_match(struct mii_bus *bus)
+{
+ return (bus->read == rtl8366rb_mii_read &&
+ bus->write == rtl8366rb_mii_write);
+}
+
+static int rtl8366rb_setup(struct rtl8366rb *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");
+ return ret;
+ }
+
+ switch (chip_id) {
+ case RTL8366S_CHIP_ID_8366:
+ break;
+ default:
+ 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(rtl->parent, "unable to read chip version\n");
+ return ret;
+ }
+
+ dev_info(rtl->parent, "RTL%04x ver. %u chip found\n",
+ chip_id, chip_ver & RTL8366S_CHIP_VERSION_MASK);
+
+ ret = rtl8366rb_reset_chip(rtl);
+ if (ret)
+ return ret;
+
+ rtl8366rb_debugfs_init(rtl);
+ return 0;
+}
+
+static int __init rtl8366rb_probe(struct platform_device *pdev)
+{
+ static int rtl8366_smi_version_printed;
+ struct rtl8366rb_platform_data *pdata;
+ struct rtl8366rb *rtl;
+ struct rtl8366_smi *smi;
+ int err;
+
+ if (!rtl8366_smi_version_printed++)
+ printk(KERN_NOTICE RTL8366S_DRIVER_DESC
+ " version " RTL8366S_DRIVER_VER"\n");
+
+ pdata = pdev->dev.platform_data;
+ if (!pdata) {
+ dev_err(&pdev->dev, "no platform data specified\n");
+ err = -EINVAL;
+ goto err_out;
+ }
+
+ rtl = kzalloc(sizeof(*rtl), GFP_KERNEL);
+ if (!rtl) {
+ dev_err(&pdev->dev, "no memory for private data\n");
+ 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;
+
+ err = rtl8366_smi_init(smi);
+ if (err)
+ goto err_free_rtl;
+
+ platform_set_drvdata(pdev, rtl);
+
+ err = rtl8366rb_setup(rtl);
+ if (err)
+ goto err_clear_drvdata;
+
+ err = rtl8366rb_mii_init(rtl);
+ if (err)
+ goto err_clear_drvdata;
+
+ err = rtl8366rb_switch_init(rtl);
+ if (err)
+ goto err_mii_cleanup;
+
+ return 0;
+
+ err_mii_cleanup:
+ rtl8366rb_mii_cleanup(rtl);
+ err_clear_drvdata:
+ platform_set_drvdata(pdev, NULL);
+ rtl8366_smi_cleanup(smi);
+ err_free_rtl:
+ kfree(rtl);
+ err_out:
+ return err;
+}
+
+static int rtl8366rb_phy_config_init(struct phy_device *phydev)
+{
+ if (!rtl8366rb_mii_bus_match(phydev->bus))
+ return -EINVAL;
+
+ return 0;
+}
+
+static int rtl8366rb_phy_config_aneg(struct phy_device *phydev)
+{
+ return 0;
+}
+
+static struct phy_driver rtl8366rb_phy_driver = {
+ .phy_id = 0x001cc960,
+ .name = "Realtek RTL8366RB",
+ .phy_id_mask = 0x1ffffff0,
+ .features = PHY_GBIT_FEATURES,
+ .config_aneg = rtl8366rb_phy_config_aneg,
+ .config_init = rtl8366rb_phy_config_init,
+ .read_status = genphy_read_status,
+ .driver = {
+ .owner = THIS_MODULE,
+ },
+};
+
+static int __devexit rtl8366rb_remove(struct platform_device *pdev)
+{
+ struct rtl8366rb *rtl = platform_get_drvdata(pdev);
+
+ if (rtl) {
+ rtl8366rb_switch_cleanup(rtl);
+ rtl8366rb_debugfs_remove(rtl);
+ rtl8366rb_mii_cleanup(rtl);
+ platform_set_drvdata(pdev, NULL);
+ rtl8366_smi_cleanup(&rtl->smi);
+ kfree(rtl);
+ }
+
+ return 0;
+}
+
+static struct platform_driver rtl8366rb_driver = {
+ .driver = {
+ .name = RTL8366RB_DRIVER_NAME,
+ .owner = THIS_MODULE,
+ },
+ .probe = rtl8366rb_probe,
+ .remove = __devexit_p(rtl8366rb_remove),
+};
+
+static int __init rtl8366rb_module_init(void)
+{
+ int ret;
+ ret = platform_driver_register(&rtl8366rb_driver);
+ if (ret)
+ return ret;
+
+ ret = phy_driver_register(&rtl8366rb_phy_driver);
+ if (ret)
+ goto err_platform_unregister;
+
+ return 0;
+
+ err_platform_unregister:
+ platform_driver_unregister(&rtl8366rb_driver);
+ return ret;
+}
+module_init(rtl8366rb_module_init);
+
+static void __exit rtl8366rb_module_exit(void)
+{
+ phy_driver_unregister(&rtl8366rb_phy_driver);
+ platform_driver_unregister(&rtl8366rb_driver);
+}
+module_exit(rtl8366rb_module_exit);
+
+MODULE_DESCRIPTION(RTL8366S_DRIVER_DESC);
+MODULE_VERSION(RTL8366S_DRIVER_VER);
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
+MODULE_AUTHOR("Antti Seppälä <a.seppala@gmail.com>");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" RTL8366RB_DRIVER_NAME);
diff --git a/target/linux/generic-2.6/files/include/linux/rtl8366rb.h b/target/linux/generic-2.6/files/include/linux/rtl8366rb.h
new file mode 100644
index 0000000000..053e2ec04f
--- /dev/null
+++ b/target/linux/generic-2.6/files/include/linux/rtl8366rb.h
@@ -0,0 +1,21 @@
+/*
+ * Platform data definition for the Realtek RTL8366S ethernet switch driver
+ *
+ * Copyright (C) 2009-2010 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#ifndef _RTL8366RB_H
+#define _RTL8366RB_H
+
+#define RTL8366RB_DRIVER_NAME "rtl8366rb"
+
+struct rtl8366rb_platform_data {
+ unsigned gpio_sda;
+ unsigned gpio_sck;
+};
+
+#endif /* _RTL8366RB_SMI_H */
diff --git a/target/linux/generic-2.6/patches-2.6.30/691-phy_rtl8366.patch b/target/linux/generic-2.6/patches-2.6.30/691-phy_rtl8366.patch
index 6223f00fe7..4ce0520b11 100644
--- a/target/linux/generic-2.6/patches-2.6.30/691-phy_rtl8366.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/691-phy_rtl8366.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -135,4 +135,25 @@ config MDIO_GPIO
+@@ -135,4 +135,29 @@ config MDIO_GPIO
To compile this driver as a module, choose M here: the module
will be called mdio-gpio.
@@ -17,9 +17,13 @@
+ tristate "Driver for the Realtek RTL8366S switch"
+ select SWCONFIG
+
++config RTL8366RB_PHY
++ tristate "Driver for the Realtek RTL8366RB switch"
++ select SWCONFIG
++
+config RTL8366S_PHY_DEBUG_FS
-+ bool "RTL8366S switch driver DEBUG_FS support"
-+ depends on RTL8366S_PHY
++ bool "RTL8366 switch driver DEBUG_FS support"
++ depends on RTL8366S_PHY || RTL8366RB_PHY
+ depends on DEBUG_FS
+ default n
+
@@ -28,12 +32,13 @@
endif # PHYLIB
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
-@@ -19,6 +19,8 @@ obj-$(CONFIG_IP175C_PHY) += ip175c.o
+@@ -19,6 +19,9 @@ obj-$(CONFIG_IP175C_PHY) += ip175c.o
obj-$(CONFIG_REALTEK_PHY) += realtek.o
obj-$(CONFIG_AR8216_PHY) += ar8216.o
obj-$(CONFIG_RTL8306_PHY) += rtl8306.o
+obj-$(CONFIG_RTL8366_SMI) += rtl8366_smi.o
+obj-$(CONFIG_RTL8366S_PHY) += rtl8366s.o
++obj-$(CONFIG_RTL8366RB_PHY) += rtl8366rb.o
obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
obj-$(CONFIG_FIXED_PHY) += fixed.o
obj-$(CONFIG_MDIO_BITBANG) += mdio-bitbang.o
diff --git a/target/linux/generic-2.6/patches-2.6.31/691-phy_rtl8366.patch b/target/linux/generic-2.6/patches-2.6.31/691-phy_rtl8366.patch
index 6223f00fe7..4ce0520b11 100644
--- a/target/linux/generic-2.6/patches-2.6.31/691-phy_rtl8366.patch
+++ b/target/linux/generic-2.6/patches-2.6.31/691-phy_rtl8366.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -135,4 +135,25 @@ config MDIO_GPIO
+@@ -135,4 +135,29 @@ config MDIO_GPIO
To compile this driver as a module, choose M here: the module
will be called mdio-gpio.
@@ -17,9 +17,13 @@
+ tristate "Driver for the Realtek RTL8366S switch"
+ select SWCONFIG
+
++config RTL8366RB_PHY
++ tristate "Driver for the Realtek RTL8366RB switch"
++ select SWCONFIG
++
+config RTL8366S_PHY_DEBUG_FS
-+ bool "RTL8366S switch driver DEBUG_FS support"
-+ depends on RTL8366S_PHY
++ bool "RTL8366 switch driver DEBUG_FS support"
++ depends on RTL8366S_PHY || RTL8366RB_PHY
+ depends on DEBUG_FS
+ default n
+
@@ -28,12 +32,13 @@
endif # PHYLIB
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
-@@ -19,6 +19,8 @@ obj-$(CONFIG_IP175C_PHY) += ip175c.o
+@@ -19,6 +19,9 @@ obj-$(CONFIG_IP175C_PHY) += ip175c.o
obj-$(CONFIG_REALTEK_PHY) += realtek.o
obj-$(CONFIG_AR8216_PHY) += ar8216.o
obj-$(CONFIG_RTL8306_PHY) += rtl8306.o
+obj-$(CONFIG_RTL8366_SMI) += rtl8366_smi.o
+obj-$(CONFIG_RTL8366S_PHY) += rtl8366s.o
++obj-$(CONFIG_RTL8366RB_PHY) += rtl8366rb.o
obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
obj-$(CONFIG_FIXED_PHY) += fixed.o
obj-$(CONFIG_MDIO_BITBANG) += mdio-bitbang.o
diff --git a/target/linux/generic-2.6/patches-2.6.32/691-phy_rtl8366.patch b/target/linux/generic-2.6/patches-2.6.32/691-phy_rtl8366.patch
index 2f6b3c49f7..db29760c5b 100644
--- a/target/linux/generic-2.6/patches-2.6.32/691-phy_rtl8366.patch
+++ b/target/linux/generic-2.6/patches-2.6.32/691-phy_rtl8366.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -141,4 +141,25 @@ config MDIO_GPIO
+@@ -141,4 +141,29 @@ config MDIO_GPIO
To compile this driver as a module, choose M here: the module
will be called mdio-gpio.
@@ -17,9 +17,13 @@
+ tristate "Driver for the Realtek RTL8366S switch"
+ select SWCONFIG
+
++config RTL8366RB_PHY
++ tristate "Driver for the Realtek RTL8366RB switch"
++ select SWCONFIG
++
+config RTL8366S_PHY_DEBUG_FS
-+ bool "RTL8366S switch driver DEBUG_FS support"
-+ depends on RTL8366S_PHY
++ bool "RTL8366 switch driver DEBUG_FS support"
++ depends on RTL8366S_PHY || RTL8366RB_PHY
+ depends on DEBUG_FS
+ default n
+
@@ -28,12 +32,13 @@
endif # PHYLIB
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
-@@ -20,6 +20,8 @@ obj-$(CONFIG_IP175C_PHY) += ip175c.o
+@@ -20,6 +20,9 @@ obj-$(CONFIG_IP175C_PHY) += ip175c.o
obj-$(CONFIG_REALTEK_PHY) += realtek.o
obj-$(CONFIG_AR8216_PHY) += ar8216.o
obj-$(CONFIG_RTL8306_PHY) += rtl8306.o
+obj-$(CONFIG_RTL8366_SMI) += rtl8366_smi.o
+obj-$(CONFIG_RTL8366S_PHY) += rtl8366s.o
++obj-$(CONFIG_RTL8366RB_PHY) += rtl8366rb.o
obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
obj-$(CONFIG_FIXED_PHY) += fixed.o
obj-$(CONFIG_MDIO_BITBANG) += mdio-bitbang.o