summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--target/linux/ar71xx/base-files/etc/defconfig/dir-825-b1/network4
-rw-r--r--target/linux/ar71xx/base-files/etc/defconfig/wndr3700/network4
-rw-r--r--target/linux/ar71xx/base-files/etc/defconfig/wzr-hp-g300nh/network4
-rw-r--r--target/linux/ar71xx/config-2.6.303
-rw-r--r--target/linux/ar71xx/config-2.6.313
-rw-r--r--target/linux/ar71xx/config-2.6.323
-rw-r--r--target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-825-b1.c16
-rw-r--r--target/linux/ar71xx/files/arch/mips/ar71xx/mach-wndr3700.c16
-rw-r--r--target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-g300nh.c16
-rw-r--r--target/linux/ar71xx/files/drivers/net/phy/rtl8366_smi.c1726
-rw-r--r--target/linux/ar71xx/files/drivers/net/phy/rtl8366_smi.h26
-rw-r--r--target/linux/ar71xx/files/drivers/net/phy/rtl8366s.c1717
-rw-r--r--target/linux/ar71xx/files/include/linux/rtl8366s.h (renamed from target/linux/ar71xx/files/include/linux/rtl8366_smi.h)12
-rw-r--r--target/linux/ar71xx/patches-2.6.30/204-rtl8366-smi-driver.patch24
-rw-r--r--target/linux/ar71xx/patches-2.6.31/204-rtl8366-smi-driver.patch24
-rw-r--r--target/linux/ar71xx/patches-2.6.32/204-rtl8366-smi-driver.patch24
16 files changed, 1853 insertions, 1769 deletions
diff --git a/target/linux/ar71xx/base-files/etc/defconfig/dir-825-b1/network b/target/linux/ar71xx/base-files/etc/defconfig/dir-825-b1/network
index 7916286ec..3ab4bc81d 100644
--- a/target/linux/ar71xx/base-files/etc/defconfig/dir-825-b1/network
+++ b/target/linux/ar71xx/base-files/etc/defconfig/dir-825-b1/network
@@ -16,11 +16,11 @@ config interface wan
option proto dhcp
config switch
- option name rtl8366-smi
+ option name rtl8366s
option reset 1
option enable_vlan 1
config switch_vlan
- option device rtl8366-smi
+ option device rtl8366s
option vlan 0
option ports "0 1 2 3 5"
diff --git a/target/linux/ar71xx/base-files/etc/defconfig/wndr3700/network b/target/linux/ar71xx/base-files/etc/defconfig/wndr3700/network
index 7916286ec..3ab4bc81d 100644
--- a/target/linux/ar71xx/base-files/etc/defconfig/wndr3700/network
+++ b/target/linux/ar71xx/base-files/etc/defconfig/wndr3700/network
@@ -16,11 +16,11 @@ config interface wan
option proto dhcp
config switch
- option name rtl8366-smi
+ option name rtl8366s
option reset 1
option enable_vlan 1
config switch_vlan
- option device rtl8366-smi
+ option device rtl8366s
option vlan 0
option ports "0 1 2 3 5"
diff --git a/target/linux/ar71xx/base-files/etc/defconfig/wzr-hp-g300nh/network b/target/linux/ar71xx/base-files/etc/defconfig/wzr-hp-g300nh/network
index 7916286ec..3ab4bc81d 100644
--- a/target/linux/ar71xx/base-files/etc/defconfig/wzr-hp-g300nh/network
+++ b/target/linux/ar71xx/base-files/etc/defconfig/wzr-hp-g300nh/network
@@ -16,11 +16,11 @@ config interface wan
option proto dhcp
config switch
- option name rtl8366-smi
+ option name rtl8366s
option reset 1
option enable_vlan 1
config switch_vlan
- option device rtl8366-smi
+ option device rtl8366s
option vlan 0
option ports "0 1 2 3 5"
diff --git a/target/linux/ar71xx/config-2.6.30 b/target/linux/ar71xx/config-2.6.30
index 22aff9bda..878b6cd91 100644
--- a/target/linux/ar71xx/config-2.6.30
+++ b/target/linux/ar71xx/config-2.6.30
@@ -185,7 +185,8 @@ CONFIG_PHYLIB=y
# CONFIG_PROBE_INITRD_HEADER is not set
CONFIG_RTL8306_PHY=y
CONFIG_RTL8366_SMI=y
-# CONFIG_RTL8366_SMI_DEBUG_FS is not set
+CONFIG_RTL8366S_PHY=y
+# CONFIG_RTL8366S_PHY_DEBUG_FS is not set
CONFIG_SCHED_OMIT_FRAME_POINTER=y
# CONFIG_SCSI_DMA is not set
# CONFIG_SERIAL_8250_EXTENDED is not set
diff --git a/target/linux/ar71xx/config-2.6.31 b/target/linux/ar71xx/config-2.6.31
index ef62b7d17..95bbc55a8 100644
--- a/target/linux/ar71xx/config-2.6.31
+++ b/target/linux/ar71xx/config-2.6.31
@@ -190,7 +190,8 @@ CONFIG_PHYLIB=y
# CONFIG_PROBE_INITRD_HEADER is not set
CONFIG_RTL8306_PHY=y
CONFIG_RTL8366_SMI=y
-# CONFIG_RTL8366_SMI_DEBUG_FS is not set
+CONFIG_RTL8366S_PHY=y
+# CONFIG_RTL8366S_PHY_DEBUG_FS is not set
CONFIG_SCHED_OMIT_FRAME_POINTER=y
# CONFIG_SCSI_DMA is not set
# CONFIG_SERIAL_8250_EXTENDED is not set
diff --git a/target/linux/ar71xx/config-2.6.32 b/target/linux/ar71xx/config-2.6.32
index 8077926b6..2d83f96df 100644
--- a/target/linux/ar71xx/config-2.6.32
+++ b/target/linux/ar71xx/config-2.6.32
@@ -193,7 +193,8 @@ CONFIG_PHYLIB=y
# CONFIG_PROBE_INITRD_HEADER is not set
CONFIG_RTL8306_PHY=y
CONFIG_RTL8366_SMI=y
-# CONFIG_RTL8366_SMI_DEBUG_FS is not set
+CONFIG_RTL8366S_PHY=y
+# CONFIG_RTL8366S_PHY_DEBUG_FS is not set
CONFIG_SCHED_OMIT_FRAME_POINTER=y
# CONFIG_SCSI_DMA is not set
# CONFIG_SERIAL_8250_EXTENDED is not set
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-825-b1.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-825-b1.c
index e80a992b4..d8b26eeb1 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-825-b1.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-825-b1.c
@@ -14,7 +14,7 @@
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
#include <linux/delay.h>
-#include <linux/rtl8366_smi.h>
+#include <linux/rtl8366s.h>
#include <asm/mach-ar71xx/ar71xx.h>
@@ -130,16 +130,16 @@ static struct gpio_button dir825b1_gpio_buttons[] __initdata = {
}
};
-static struct rtl8366_smi_platform_data dir825b1_rtl8366_smi_data = {
+static struct rtl8366s_platform_data dir825b1_rtl8366s_data = {
.gpio_sda = DIR825B1_GPIO_RTL8366_SDA,
.gpio_sck = DIR825B1_GPIO_RTL8366_SCK,
};
-static struct platform_device dir825b1_rtl8366_smi_device = {
- .name = "rtl8366-smi",
+static struct platform_device dir825b1_rtl8366s_device = {
+ .name = RTL8366S_DRIVER_NAME,
.id = -1,
.dev = {
- .platform_data = &dir825b1_rtl8366_smi_data,
+ .platform_data = &dir825b1_rtl8366s_data,
}
};
@@ -155,13 +155,13 @@ static void __init dir825b1_setup(void)
ar71xx_add_device_mdio(0x0);
- ar71xx_eth0_data.mii_bus_dev = &dir825b1_rtl8366_smi_device.dev;
+ ar71xx_eth0_data.mii_bus_dev = &dir825b1_rtl8366s_device.dev;
ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
ar71xx_eth0_data.speed = SPEED_1000;
ar71xx_eth0_data.duplex = DUPLEX_FULL;
ar71xx_eth0_pll_data.pll_1000 = 0x11110000;
- ar71xx_eth1_data.mii_bus_dev = &dir825b1_rtl8366_smi_device.dev;
+ ar71xx_eth1_data.mii_bus_dev = &dir825b1_rtl8366s_device.dev;
ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
ar71xx_eth1_data.phy_mask = 0x10;
ar71xx_eth1_pll_data.pll_1000 = 0x11110000;
@@ -180,7 +180,7 @@ static void __init dir825b1_setup(void)
ar71xx_add_device_usb();
- platform_device_register(&dir825b1_rtl8366_smi_device);
+ platform_device_register(&dir825b1_rtl8366s_device);
ap94_pci_init((u8 *) KSEG1ADDR(DIR825B1_CAL_LOCATION_0),
(u8 *) KSEG1ADDR(DIR825B1_MAC_LOCATION_0),
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wndr3700.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wndr3700.c
index b289d9d72..a0eb8d482 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wndr3700.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wndr3700.c
@@ -13,7 +13,7 @@
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
#include <linux/delay.h>
-#include <linux/rtl8366_smi.h>
+#include <linux/rtl8366s.h>
#include <asm/mach-ar71xx/ar71xx.h>
@@ -143,16 +143,16 @@ static struct gpio_button wndr3700_gpio_buttons[] __initdata = {
}
};
-static struct rtl8366_smi_platform_data wndr3700_rtl8366_smi_data = {
+static struct rtl8366s_platform_data wndr3700_rtl8366s_data = {
.gpio_sda = WNDR3700_GPIO_RTL8366_SDA,
.gpio_sck = WNDR3700_GPIO_RTL8366_SCK,
};
-static struct platform_device wndr3700_rtl8366_smi_device = {
- .name = "rtl8366-smi",
+static struct platform_device wndr3700_rtl8366s_device = {
+ .name = RTL8366S_DRIVER_NAME,
.id = -1,
.dev = {
- .platform_data = &wndr3700_rtl8366_smi_data,
+ .platform_data = &wndr3700_rtl8366s_data,
}
};
@@ -163,14 +163,14 @@ static void __init wndr3700_setup(void)
ar71xx_set_mac_base(art);
ar71xx_eth0_pll_data.pll_1000 = 0x11110000;
- ar71xx_eth0_data.mii_bus_dev = &wndr3700_rtl8366_smi_device.dev;
+ ar71xx_eth0_data.mii_bus_dev = &wndr3700_rtl8366s_device.dev;
ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
ar71xx_eth0_data.phy_mask = 0xf;
ar71xx_eth0_data.speed = SPEED_1000;
ar71xx_eth0_data.duplex = DUPLEX_FULL;
ar71xx_eth1_pll_data.pll_1000 = 0x11110000;
- ar71xx_eth1_data.mii_bus_dev = &wndr3700_rtl8366_smi_device.dev;
+ ar71xx_eth1_data.mii_bus_dev = &wndr3700_rtl8366s_device.dev;
ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
ar71xx_eth1_data.phy_mask = 0x10;
@@ -188,7 +188,7 @@ static void __init wndr3700_setup(void)
ARRAY_SIZE(wndr3700_gpio_buttons),
wndr3700_gpio_buttons);
- platform_device_register(&wndr3700_rtl8366_smi_device);
+ platform_device_register(&wndr3700_rtl8366s_device);
platform_device_register_simple("wndr3700-led-usb", -1, NULL, 0);
ap94_pci_init(art + WNDR3700_CALDATA0_OFFSET,
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-g300nh.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-g300nh.c
index eb1f814d6..c6fb241c5 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-g300nh.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-g300nh.c
@@ -12,7 +12,7 @@
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
#include <linux/nxp_74hc153.h>
-#include <linux/rtl8366_smi.h>
+#include <linux/rtl8366s.h>
#include <asm/mips_machine.h>
#include <asm/mach-ar71xx/ar71xx.h>
@@ -212,16 +212,16 @@ static struct platform_device wzrhpg300nh_74hc153_device = {
}
};
-static struct rtl8366_smi_platform_data wzrhpg300nh_rtl8366_smi_data = {
+static struct rtl8366s_platform_data wzrhpg300nh_rtl8366s_data = {
.gpio_sda = WZRHPG300NH_GPIO_RTL8366_SDA,
.gpio_sck = WZRHPG300NH_GPIO_RTL8366_SCK,
};
-static struct platform_device wzrhpg300nh_rtl8366_smi_device = {
- .name = "rtl8366-smi",
+static struct platform_device wzrhpg300nh_rtl8366s_device = {
+ .name = RTL8366S_DRIVER_NAME,
.id = -1,
.dev = {
- .platform_data = &wzrhpg300nh_rtl8366_smi_data,
+ .platform_data = &wzrhpg300nh_rtl8366s_data,
}
};
@@ -232,14 +232,14 @@ static void __init wzrhpg300nh_setup(void)
ar71xx_set_mac_base(eeprom + WZRHPG300NH_MAC_OFFSET);
ar71xx_eth0_pll_data.pll_1000 = 0x1e000100;
- ar71xx_eth0_data.mii_bus_dev = &wzrhpg300nh_rtl8366_smi_device.dev;
+ ar71xx_eth0_data.mii_bus_dev = &wzrhpg300nh_rtl8366s_device.dev;
ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
ar71xx_eth0_data.phy_mask = 0xf;
ar71xx_eth0_data.speed = SPEED_1000;
ar71xx_eth0_data.duplex = DUPLEX_FULL;
ar71xx_eth1_pll_data.pll_1000 = 0x1e000100;
- ar71xx_eth1_data.mii_bus_dev = &wzrhpg300nh_rtl8366_smi_device.dev;
+ ar71xx_eth1_data.mii_bus_dev = &wzrhpg300nh_rtl8366s_device.dev;
ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
ar71xx_eth1_data.phy_mask = 0x10;
@@ -251,7 +251,7 @@ static void __init wzrhpg300nh_setup(void)
platform_device_register(&wzrhpg300nh_74hc153_device);
platform_device_register(&wzrhpg300nh_flash_device);
- platform_device_register(&wzrhpg300nh_rtl8366_smi_device);
+ platform_device_register(&wzrhpg300nh_rtl8366s_device);
ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(wzrhpg300nh_leds_gpio),
wzrhpg300nh_leds_gpio);
diff --git a/target/linux/ar71xx/files/drivers/net/phy/rtl8366_smi.c b/target/linux/ar71xx/files/drivers/net/phy/rtl8366_smi.c
index 084c3d5a4..70218fc6c 100644
--- a/target/linux/ar71xx/files/drivers/net/phy/rtl8366_smi.c
+++ b/target/linux/ar71xx/files/drivers/net/phy/rtl8366_smi.c
@@ -1,8 +1,7 @@
/*
- * Platform driver for the Realtek RTL8366 ethernet switch
+ * Realtek RTL8366 SMI interface driver
*
- * Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
- * Copyright (C) 2010 Antti Seppälä <a.seppala@gmail.com>
+ * 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
@@ -11,231 +10,16 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
+#include <linux/device.h>
#include <linux/delay.h>
#include <linux/gpio.h>
#include <linux/spinlock.h>
-#include <linux/skbuff.h>
-#include <linux/switch.h>
-#include <linux/phy.h>
-#include <linux/rtl8366_smi.h>
-#ifdef CONFIG_RTL8366_SMI_DEBUG_FS
-#include <linux/debugfs.h>
-#endif
-
-#define RTL8366S_DRIVER_NAME "rtl8366-smi"
-#define RTL8366S_DRIVER_DESC "Realtek RTL8366 switch driver"
-#define RTL8366S_DRIVER_VER "0.1.1"
-
-#define RTL8366S_PHY_NO_MAX 4
-#define RTL8366S_PHY_PAGE_MAX 7
-#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
-
-/* PHY registers control */
-#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_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)
+#include "rtl8366_smi.h"
#define RTL8366_SMI_ACK_RETRY_COUNT 5
#define RTL8366_SMI_CLK_DELAY 10 /* nsec */
-/* 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_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_vlanconfig {
- u16 reserved2:1;
- u16 priority:3;
- u16 vid:12;
-
- 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;
-};
-
-static const char *MIBCOUNTERS[] = {
- "IfInOctets ",
- "EtherStatsOctets ",
- "EtherStatsUnderSizePkts ",
- "EtherFregament ",
- "EtherStatsPkts64Octets ",
- "EtherStatsPkts65to127Octets ",
- "EtherStatsPkts128to255Octets ",
- "EtherStatsPkts256to511Octets ",
- "EtherStatsPkts512to1023Octets ",
- "EtherStatsPkts1024to1518Octets ",
- "EtherOversizeStats ",
- "EtherStatsJabbers ",
- "IfInUcastPkts ",
- "EtherStatsMulticastPkts ",
- "EtherStatsBroadcastPkts ",
- "EtherStatsDropEvents ",
- "Dot3StatsFCSErrors ",
- "Dot3StatsSymbolErrors ",
- "Dot3InPauseFrames ",
- "Dot3ControlInUnknownOpcodes ",
- "IfOutOctets ",
- "Dot3StatsSingleCollisionFrames ",
- "Dot3StatMultipleCollisionFrames ",
- "Dot3sDeferredTransmissions ",
- "Dot3StatsLateCollisions ",
- "EtherStatsCollisions ",
- "Dot3StatsExcessiveCollisions ",
- "Dot3OutPauseFrames ",
- "Dot1dBasePortDelayExceededDiscards",
- "Dot1dTpPortInDiscards ",
- "IfOutUcastPkts ",
- "IfOutMulticastPkts ",
- "IfOutBroadcastPkts ",
- NULL,
-};
-
-struct rtl8366_smi {
- struct device *parent;
- unsigned int gpio_sda;
- unsigned int gpio_sck;
- spinlock_t lock;
-};
-
-struct rtl8366s {
- struct device *parent;
- struct rtl8366_smi smi;
- struct mii_bus *mii_bus;
- int mii_irq[PHY_MAX_ADDR];
- struct switch_dev dev;
- char buf[4096];
-#ifdef CONFIG_RTL8366_SMI_DEBUG_FS
- struct dentry *debugfs_root;
-#endif
-};
-
-#ifdef CONFIG_RTL8366_SMI_DEBUG_FS
-u16 g_dbg_reg;
-#endif
-
-static inline struct rtl8366s *sw_to_rtl8366s(struct switch_dev *sw)
-{
- return container_of(sw, struct rtl8366s, dev);
-}
-
static inline void rtl8366_smi_clk_delay(struct rtl8366_smi *smi)
{
ndelay(RTL8366_SMI_CLK_DELAY);
@@ -397,7 +181,7 @@ static int rtl8366_smi_read_byte1(struct rtl8366_smi *smi, u8 *data)
return 0;
}
-static int rtl8366_smi_read_reg(struct rtl8366_smi *smi, u32 addr, u32 *data)
+int rtl8366_smi_read_reg(struct rtl8366_smi *smi, u32 addr, u32 *data)
{
unsigned long flags;
u8 lo = 0;
@@ -438,8 +222,9 @@ static int rtl8366_smi_read_reg(struct rtl8366_smi *smi, u32 addr, u32 *data)
return ret;
}
+EXPORT_SYMBOL_GPL(rtl8366_smi_read_reg);
-static int rtl8366_smi_write_reg(struct rtl8366_smi *smi, u32 addr, u32 data)
+int rtl8366_smi_write_reg(struct rtl8366_smi *smi, u32 addr, u32 data)
{
unsigned long flags;
int ret;
@@ -481,1352 +266,9 @@ static int rtl8366_smi_write_reg(struct rtl8366_smi *smi, u32 addr, u32 data)
return ret;
}
+EXPORT_SYMBOL_GPL(rtl8366_smi_write_reg);
-static int rtl8366s_read_phy_reg(struct rtl8366s *rtl,
- u32 phy_no, u32 page, u32 addr, u32 *data)
-{
- struct rtl8366_smi *smi = &rtl->smi;
- u32 reg;
- int ret;
-
- 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 rtl8366s_write_phy_reg(struct rtl8366s *rtl,
- u32 phy_no, u32 page, u32 addr, u32 data)
-{
- struct rtl8366_smi *smi = &rtl->smi;
- u32 reg;
- int ret;
-
- 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 rtl8366s *rtl, int counter,
- int port, unsigned long long *val)
-{
- struct rtl8366_smi *smi = &rtl->smi;
- int i;
- int err;
- u32 addr, data, regoffset;
- u64 mibvalue;
-
- /* address offset to MIBs counter */
- const u16 mibLength[RTL8366S_MIB_COUNT] = {4, 4, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 4, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2};
-
- if (port > RTL8366_NUM_PORTS || counter >= RTL8366S_MIB_COUNT)
- return -EINVAL;
-
- regoffset = RTL8366S_MIB_COUNTER_PORT_OFFSET * (port);
-
- for (i = 0; i < counter; i++)
- regoffset += mibLength[i];
-
- addr = RTL8366S_MIB_COUNTER_BASE + regoffset;
-
- /*
- * Writing access counter address first
- * then ASIC will prepare 64bits counter wait for being retrived
- */
- data = 0; /* writing data will be discard by ASIC */
- 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;
- addr = addr + mibLength[counter] - 1;
- i = mibLength[counter];
-
- while (i) {
- err = rtl8366_smi_read_reg(smi, addr, &data);
- if (err)
- return err;
-
- mibvalue = (mibvalue << 16) | (data & 0xFFFF);
-
- addr--;
- i--;
- }
-
- *val = mibvalue;
- return 0;
-}
-
-static int rtl8366s_get_vlan_4k_entry(struct rtl8366s *rtl, u32 vid,
- struct rtl8366s_vlan4kentry *vlan4k)
-{
- struct rtl8366_smi *smi = &rtl->smi;
- int err;
- u32 data;
- u16 *tableaddr;
-
- memset(vlan4k, '\0', sizeof(struct rtl8366s_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;
- vlan4k->vid = vid;
-
- return 0;
-}
-
-static int rtl8366s_set_vlan_4k_entry(struct rtl8366s *rtl,
- const struct rtl8366s_vlan4kentry *vlan4k)
-{
- struct rtl8366_smi *smi = &rtl->smi;
- int err;
- u32 data;
- u16 *tableaddr;
-
- 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;
-
- /* 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 rtl8366s_get_vlan_member_config(struct rtl8366s *rtl, u32 index,
- struct rtl8366s_vlanconfig *vlanmc)
-{
- struct rtl8366_smi *smi = &rtl->smi;
- int err;
- u32 addr;
- u32 data;
- u16 *tableaddr;
-
- memset(vlanmc, '\0', sizeof(struct rtl8366s_vlanconfig));
-
- if (index >= RTL8366_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;
-
- *tableaddr = data;
-
- return 0;
-}
-
-static int rtl8366s_set_vlan_member_config(struct rtl8366s *rtl, u32 index,
- const struct rtl8366s_vlanconfig
- *vlanmc)
-{
- struct rtl8366_smi *smi = &rtl->smi;
- int err;
- u32 addr;
- u32 data;
- u16 *tableaddr;
-
- if (index >= RTL8366_NUM_VLANS ||
- vlanmc->vid >= RTL8366_NUM_VIDS ||
- vlanmc->priority > RTL8366S_PRIORITYMAX ||
- vlanmc->member > RTL8366_PORT_ALL ||
- vlanmc->untag > RTL8366_PORT_ALL ||
- vlanmc->fid > RTL8366S_FIDMAX)
- 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;
-
- return 0;
-}
-
-static int rtl8366s_get_port_vlan_index(struct rtl8366s *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 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)
-{
- 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 rtl8366s_set_vlan_port_pvid(struct rtl8366s *rtl, int port, int val)
-{
- 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;
-}
-
-
-static int rtl8366s_vlan_set_vlan(struct rtl8366s *rtl, int enable)
-{
- struct rtl8366_smi *smi = &rtl->smi;
- u32 data = 0;
-
- rtl8366_smi_read_reg(smi, RTL8366_CHIP_GLOBAL_CTRL_REG, &data);
-
- 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 rtl8366s_vlan_set_4ktable(struct rtl8366s *rtl, int enable)
-{
- struct rtl8366_smi *smi = &rtl->smi;
- u32 data = 0;
-
- rtl8366_smi_read_reg(smi, RTL8366S_VLAN_TB_CTRL_REG, &data);
-
- if (enable)
- data |= 1;
- else
- data &= ~1;
-
- return rtl8366_smi_write_reg(smi, RTL8366S_VLAN_TB_CTRL_REG, data);
-}
-
-static int rtl8366s_reset_vlan(struct 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_RTL8366_SMI_DEBUG_FS
-static int rtl8366s_debugfs_open(struct inode *inode, struct file *file)
-{
- file->private_data = inode->i_private;
- return 0;
-}
-
-static ssize_t 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, MIBCOUNTERS[i]);
- 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_RTL8366_SMI_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;
-
- 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;
-}
-
-static int rtl8366s_sw_get_blinkrate(struct switch_dev *dev,
- const struct switch_attr *attr,
- struct switch_val *val)
-{
- struct rtl8366s *rtl = sw_to_rtl8366s(dev);
- struct rtl8366_smi *smi = &rtl->smi;
- u32 data;
-
- rtl8366_smi_read_reg(smi, RTL8366_LED_BLINKRATE_REG, &data);
-
- val->value.i = (data & (RTL8366_LED_BLINKRATE_MASK));
-
- return 0;
-}
-
-static int rtl8366s_sw_set_blinkrate(struct switch_dev *dev,
- const struct switch_attr *attr,
- struct switch_val *val)
-{
- struct rtl8366s *rtl = sw_to_rtl8366s(dev);
- struct rtl8366_smi *smi = &rtl->smi;
- u32 data;
-
- 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 rtl8366s_sw_set_vlan_enable(struct switch_dev *dev,
- const struct switch_attr *attr,
- struct switch_val *val)
-{
- struct rtl8366s *rtl = sw_to_rtl8366s(dev);
-
- if (attr->ofs == 1)
- return rtl8366s_vlan_set_vlan(rtl, val->value.i);
- else
- return rtl8366s_vlan_set_4ktable(rtl, val->value.i);
-}
-
-static const char *rtl8366s_speed_str(unsigned speed)
-{
- switch (speed) {
- case 0:
- return "10baseT";
- case 1:
- return "100baseT";
- case 2:
- return "1000baseT";
- }
-
- return "unknown";
-}
-
-static int rtl8366s_sw_get_port_link(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 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",
- 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 >= 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);
- }
- 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 rtl8366s_sw_set_port_led(struct switch_dev *dev,
- const struct switch_attr *attr,
- struct switch_val *val)
-{
- struct rtl8366s *rtl = sw_to_rtl8366s(dev);
- struct rtl8366_smi *smi = &rtl->smi;
- u32 data = 0;
-
- if (val->port_vlan >= RTL8366_NUM_PORTS ||
- (1 << val->port_vlan) == RTL8366_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);
- } 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 rtl8366s_sw_get_port_led(struct switch_dev *dev,
- const struct switch_attr *attr,
- struct switch_val *val)
-{
- struct rtl8366s *rtl = sw_to_rtl8366s(dev);
- struct rtl8366_smi *smi = &rtl->smi;
- u32 data = 0;
-
- 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 rtl8366s_sw_reset_port_mibs(struct switch_dev *dev,
- const struct switch_attr *attr,
- struct switch_val *val)
-{
- struct rtl8366s *rtl = sw_to_rtl8366s(dev);
- struct rtl8366_smi *smi = &rtl->smi;
- u32 data = 0;
-
- 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, MIBCOUNTERS[i]);
- 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;
-
- if (val->port_vlan >= RTL8366_NUM_VLANS)
- 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 >= 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);
-}
-
-static int rtl8366s_sw_reset_switch(struct switch_dev *dev)
-{
- struct rtl8366s *rtl = sw_to_rtl8366s(dev);
- 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 rtl8366s_reset_vlan(rtl);
-}
-
-static struct switch_attr rtl8366s_globals[] = {
- {
- .type = SWITCH_TYPE_INT,
- .name = "enable_vlan",
- .description = "Enable VLAN mode",
- .set = rtl8366s_sw_set_vlan_enable,
- .get = rtl8366s_sw_get_vlan_enable,
- .max = 1,
- .ofs = 1
- }, {
- .type = SWITCH_TYPE_INT,
- .name = "enable_vlan4k",
- .description = "Enable VLAN 4K mode",
- .set = rtl8366s_sw_set_vlan_enable,
- .get = rtl8366s_sw_get_vlan_enable,
- .max = 1,
- .ofs = 2
- }, {
- .type = SWITCH_TYPE_INT,
- .name = "reset_mibs",
- .description = "Reset all MIB counters",
- .set = rtl8366s_sw_reset_mibs,
- .get = NULL,
- .max = 1
- }, {
- .type = SWITCH_TYPE_INT,
- .name = "blinkrate",
- .description = "Get/Set LED blinking rate (0 = 43ms, 1 = 84ms,"
- " 2 = 120ms, 3 = 170ms, 4 = 340ms, 5 = 670ms)",
- .set = rtl8366s_sw_set_blinkrate,
- .get = rtl8366s_sw_get_blinkrate,
- .max = 5
- },
-};
-
-static struct switch_attr rtl8366s_port[] = {
- {
- .type = SWITCH_TYPE_STRING,
- .name = "link",
- .description = "Get port link information",
- .max = 1,
- .set = NULL,
- .get = rtl8366s_sw_get_port_link,
- }, {
- .type = SWITCH_TYPE_INT,
- .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,
- }, {
- .type = SWITCH_TYPE_INT,
- .name = "led",
- .description = "Get/Set port group (0 - 3) led mode (0 - 15)",
- .max = 15,
- .set = rtl8366s_sw_set_port_led,
- .get = rtl8366s_sw_get_port_led,
- },
-};
-
-static struct switch_attr rtl8366s_vlan[] = {
- {
- .type = SWITCH_TYPE_STRING,
- .name = "info",
- .description = "Get vlan information",
- .max = 1,
- .set = NULL,
- .get = rtl8366s_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 = rtl8366s_globals,
- .n_attr = ARRAY_SIZE(rtl8366s_globals),
- },
- .attr_port = {
- .attr = rtl8366s_port,
- .n_attr = ARRAY_SIZE(rtl8366s_port),
- },
- .attr_vlan = {
- .attr = rtl8366s_vlan,
- .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,
- .reset_switch = rtl8366s_sw_reset_switch,
-};
-
-static int rtl8366s_switch_init(struct rtl8366s *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 rtl8366s_switch_cleanup(struct rtl8366s *rtl)
-{
- unregister_switch(&rtl->dev);
-}
-
-static int rtl8366s_mii_read(struct mii_bus *bus, int addr, int reg)
-{
- struct rtl8366s *rtl = bus->priv;
- u32 val = 0;
- int err;
-
- err = rtl8366s_read_phy_reg(rtl, addr, 0, reg, &val);
- if (err)
- return 0xffff;
-
- return val;
-}
-
-static int rtl8366s_mii_write(struct mii_bus *bus, int addr, int reg, u16 val)
-{
- struct rtl8366s *rtl = bus->priv;
- u32 t;
- int err;
-
- err = rtl8366s_write_phy_reg(rtl, addr, 0, reg, val);
- /* flush write */
- (void) rtl8366s_read_phy_reg(rtl, addr, 0, reg, &t);
-
- return err;
-}
-
-static int rtl8366s_mii_init(struct rtl8366s *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 = 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);
- if (ret)
- goto err_free;
-
- return 0;
-
- err_free:
- mdiobus_free(rtl->mii_bus);
- err:
- 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)
-{
- 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");
- 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);
-
- rtl8366s_debugfs_init(rtl);
-
- return 0;
-}
-
-static int __init rtl8366_smi_init(struct rtl8366_smi *smi)
+int rtl8366_smi_init(struct rtl8366_smi *smi)
{
int err;
@@ -1859,157 +301,15 @@ static int __init rtl8366_smi_init(struct rtl8366_smi *smi)
err_out:
return err;
}
+EXPORT_SYMBOL_GPL(rtl8366_smi_init);
-static void rtl8366_smi_cleanup(struct rtl8366_smi *smi)
+void rtl8366_smi_cleanup(struct rtl8366_smi *smi)
{
gpio_free(smi->gpio_sck);
gpio_free(smi->gpio_sda);
}
+EXPORT_SYMBOL_GPL(rtl8366_smi_cleanup);
-static int __init rtl8366s_probe(struct platform_device *pdev)
-{
- static int rtl8366_smi_version_printed;
- struct rtl8366_smi_platform_data *pdata;
- struct rtl8366s *rtl;
- struct rtl8366_smi *smi;
- int err;
-
- if (!rtl8366_smi_version_printed++)
- printk(KERN_NOTICE 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 = rtl8366s_setup(rtl);
- 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_out:
- return err;
-}
-
-static int rtl8366s_phy_config_init(struct phy_device *phydev)
-{
- if (!rtl8366s_mii_bus_match(phydev->bus))
- return -EINVAL;
-
- return 0;
-}
-
-static int rtl8366s_phy_config_aneg(struct phy_device *phydev)
-{
- return 0;
-}
-
-static struct phy_driver rtl8366s_phy_driver = {
- .phy_id = 0x001cc960,
- .name = "Realtek RTL8366",
- .phy_id_mask = 0x1ffffff0,
- .features = PHY_GBIT_FEATURES,
- .config_aneg = rtl8366s_phy_config_aneg,
- .config_init = rtl8366s_phy_config_init,
- .read_status = genphy_read_status,
- .driver = {
- .owner = THIS_MODULE,
- },
-};
-
-static int __devexit rtl8366s_remove(struct platform_device *pdev)
-{
- struct rtl8366s *rtl = platform_get_drvdata(pdev);
-
- if (rtl) {
- rtl8366s_switch_cleanup(rtl);
- rtl8366s_debugfs_remove(rtl);
- rtl8366s_mii_cleanup(rtl);
- platform_set_drvdata(pdev, NULL);
- rtl8366_smi_cleanup(&rtl->smi);
- kfree(rtl);
- }
-
- return 0;
-}
-
-static struct platform_driver rtl8366s_driver = {
- .driver = {
- .name = RTL8366S_DRIVER_NAME,
- .owner = THIS_MODULE,
- },
- .probe = rtl8366s_probe,
- .remove = __devexit_p(rtl8366s_remove),
-};
-
-static int __init rtl8366s_module_init(void)
-{
- int ret;
- ret = platform_driver_register(&rtl8366s_driver);
- if (ret)
- return ret;
-
- ret = phy_driver_register(&rtl8366s_phy_driver);
- if (ret)
- goto err_platform_unregister;
-
- return 0;
-
- err_platform_unregister:
- platform_driver_unregister(&rtl8366s_driver);
- return ret;
-}
-module_init(rtl8366s_module_init);
-
-static void __exit rtl8366s_module_exit(void)
-{
- phy_driver_unregister(&rtl8366s_phy_driver);
- platform_driver_unregister(&rtl8366s_driver);
-}
-module_exit(rtl8366s_module_exit);
-
-MODULE_DESCRIPTION(RTL8366S_DRIVER_DESC);
-MODULE_VERSION(RTL8366S_DRIVER_VER);
+MODULE_DESCRIPTION("Realtek RTL8366 SMI interface driver");
MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
-MODULE_AUTHOR("Antti Seppälä <a.seppala@gmail.com>");
MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("platform:" RTL8366S_DRIVER_NAME);
diff --git a/target/linux/ar71xx/files/drivers/net/phy/rtl8366_smi.h b/target/linux/ar71xx/files/drivers/net/phy/rtl8366_smi.h
new file mode 100644
index 000000000..e68fa9a5b
--- /dev/null
+++ b/target/linux/ar71xx/files/drivers/net/phy/rtl8366_smi.h
@@ -0,0 +1,26 @@
+/*
+ * Realtek RTL8366 SMI interface driver defines
+ *
+ * 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 _RTL8366_SMI_H
+#define _RTL8366_SMI_H
+
+struct rtl8366_smi {
+ struct device *parent;
+ unsigned int gpio_sda;
+ unsigned int gpio_sck;
+ spinlock_t lock;
+};
+
+int rtl8366_smi_init(struct rtl8366_smi *smi);
+void rtl8366_smi_cleanup(struct rtl8366_smi *smi);
+int rtl8366_smi_write_reg(struct rtl8366_smi *smi, u32 addr, u32 data);
+int rtl8366_smi_read_reg(struct rtl8366_smi *smi, u32 addr, u32 *data);
+
+#endif /* _RTL8366_SMI_H */
diff --git a/target/linux/ar71xx/files/drivers/net/phy/rtl8366s.c b/target/linux/ar71xx/files/drivers/net/phy/rtl8366s.c
new file mode 100644
index 000000000..68d2d38ab
--- /dev/null
+++ b/target/linux/ar71xx/files/drivers/net/phy/rtl8366s.c
@@ -0,0 +1,1717 @@
+/*
+ * 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/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.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_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
+
+/* PHY registers control */
+#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_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_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;
+
+ 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
+
+static const char *MIBCOUNTERS[] = {
+ "IfInOctets ",
+ "EtherStatsOctets ",
+ "EtherStatsUnderSizePkts ",
+ "EtherFregament ",
+ "EtherStatsPkts64Octets ",
+ "EtherStatsPkts65to127Octets ",
+ "EtherStatsPkts128to255Octets ",
+ "EtherStatsPkts256to511Octets ",
+ "EtherStatsPkts512to1023Octets ",
+ "EtherStatsPkts1024to1518Octets ",
+ "EtherOversizeStats ",
+ "EtherStatsJabbers ",
+ "IfInUcastPkts ",
+ "EtherStatsMulticastPkts ",
+ "EtherStatsBroadcastPkts ",
+ "EtherStatsDropEvents ",
+ "Dot3StatsFCSErrors ",
+ "Dot3StatsSymbolErrors ",
+ "Dot3InPauseFrames ",
+ "Dot3ControlInUnknownOpcodes ",
+ "IfOutOctets ",
+ "Dot3StatsSingleCollisionFrames ",
+ "Dot3StatMultipleCollisionFrames ",
+ "Dot3sDeferredTransmissions ",
+ "Dot3StatsLateCollisions ",
+ "EtherStatsCollisions ",
+ "Dot3StatsExcessiveCollisions ",
+ "Dot3OutPauseFrames ",
+ "Dot1dBasePortDelayExceededDiscards",
+ "Dot1dTpPortInDiscards ",
+ "IfOutUcastPkts ",
+ "IfOutMulticastPkts ",
+ "IfOutBroadcastPkts ",
+ NULL,
+};
+
+static inline struct rtl8366s *sw_to_rtl8366s(struct switch_dev *sw)
+{
+ return container_of(sw, struct rtl8366s, dev);
+}
+
+static int rtl8366s_read_phy_reg(struct rtl8366s *rtl,
+ u32 phy_no, u32 page, u32 addr, u32 *data)
+{
+ struct rtl8366_smi *smi = &rtl->smi;
+ u32 reg;
+ int ret;
+
+ 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 rtl8366s_write_phy_reg(struct rtl8366s *rtl,
+ u32 phy_no, u32 page, u32 addr, u32 data)
+{
+ struct rtl8366_smi *smi = &rtl->smi;
+ u32 reg;
+ int ret;
+
+ 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 rtl8366s *rtl, int counter,
+ int port, unsigned long long *val)
+{
+ struct rtl8366_smi *smi = &rtl->smi;
+ int i;
+ int err;
+ u32 addr, data, regoffset;
+ u64 mibvalue;
+
+ /* address offset to MIBs counter */
+ const u16 mibLength[RTL8366S_MIB_COUNT] = {4, 4, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 4, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2};
+
+ if (port > RTL8366_NUM_PORTS || counter >= RTL8366S_MIB_COUNT)
+ return -EINVAL;
+
+ regoffset = RTL8366S_MIB_COUNTER_PORT_OFFSET * (port);
+
+ for (i = 0; i < counter; i++)
+ regoffset += mibLength[i];
+
+ addr = RTL8366S_MIB_COUNTER_BASE + regoffset;
+
+ /*
+ * Writing access counter address first
+ * then ASIC will prepare 64bits counter wait for being retrived
+ */
+ data = 0; /* writing data will be discard by ASIC */
+ 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;
+ addr = addr + mibLength[counter] - 1;
+ i = mibLength[counter];
+
+ while (i) {
+ err = rtl8366_smi_read_reg(smi, addr, &data);
+ if (err)
+ return err;
+
+ mibvalue = (mibvalue << 16) | (data & 0xFFFF);
+
+ addr--;
+ i--;
+ }
+
+ *val = mibvalue;
+ return 0;
+}
+
+static int rtl8366s_get_vlan_4k_entry(struct rtl8366s *rtl, u32 vid,
+ struct rtl8366s_vlan4kentry *vlan4k)
+{
+ struct rtl8366_smi *smi = &rtl->smi;
+ int err;
+ u32 data;
+ u16 *tableaddr;
+
+ memset(vlan4k, '\0', sizeof(struct rtl8366s_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;
+ vlan4k->vid = vid;
+
+ return 0;
+}
+
+static int rtl8366s_set_vlan_4k_entry(struct rtl8366s *rtl,
+ const struct rtl8366s_vlan4kentry *vlan4k)
+{
+ struct rtl8366_smi *smi = &rtl->smi;
+ int err;
+ u32 data;
+ u16 *tableaddr;
+
+ 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;
+
+ /* 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 rtl8366s_get_vlan_member_config(struct rtl8366s *rtl, u32 index,
+ struct rtl8366s_vlanconfig *vlanmc)
+{
+ struct rtl8366_smi *smi = &rtl->smi;
+ int err;
+ u32 addr;
+ u32 data;
+ u16 *tableaddr;
+
+ memset(vlanmc, '\0', sizeof(struct rtl8366s_vlanconfig));
+
+ if (index >= RTL8366_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;
+
+ *tableaddr = data;
+
+ return 0;
+}
+
+static int rtl8366s_set_vlan_member_config(struct rtl8366s *rtl, u32 index,
+ const struct rtl8366s_vlanconfig
+ *vlanmc)
+{
+ struct rtl8366_smi *smi = &rtl->smi;
+ int err;
+ u32 addr;
+ u32 data;
+ u16 *tableaddr;
+
+ if (index >= RTL8366_NUM_VLANS ||
+ vlanmc->vid >= RTL8366_NUM_VIDS ||
+ vlanmc->priority > RTL8366S_PRIORITYMAX ||
+ vlanmc->member > RTL8366_PORT_ALL ||
+ vlanmc->untag > RTL8366_PORT_ALL ||
+ vlanmc->fid > RTL8366S_FIDMAX)
+ 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;
+
+ return 0;
+}
+
+static int rtl8366s_get_port_vlan_index(struct rtl8366s *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 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)
+{
+ 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 rtl8366s_set_vlan_port_pvid(struct rtl8366s *rtl, int port, int val)
+{
+ 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;
+}
+
+
+static int rtl8366s_vlan_set_vlan(struct rtl8366s *rtl, int enable)
+{
+ struct rtl8366_smi *smi = &rtl->smi;
+ u32 data = 0;
+
+ rtl8366_smi_read_reg(smi, RTL8366_CHIP_GLOBAL_CTRL_REG, &data);
+
+ 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 rtl8366s_vlan_set_4ktable(struct rtl8366s *rtl, int enable)
+{
+ struct rtl8366_smi *smi = &rtl->smi;
+ u32 data = 0;
+
+ rtl8366_smi_read_reg(smi, RTL8366S_VLAN_TB_CTRL_REG, &data);
+
+ if (enable)
+ data |= 1;
+ else
+ data &= ~1;
+
+ return rtl8366_smi_write_reg(smi, RTL8366S_VLAN_TB_CTRL_REG, data);
+}
+
+static int rtl8366s_reset_vlan(struct 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, MIBCOUNTERS[i]);
+ 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;
+
+ 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;
+}
+
+static int rtl8366s_sw_get_blinkrate(struct switch_dev *dev,
+ const struct switch_attr *attr,
+ struct switch_val *val)
+{
+ struct rtl8366s *rtl = sw_to_rtl8366s(dev);
+ struct rtl8366_smi *smi = &rtl->smi;
+ u32 data;
+
+ rtl8366_smi_read_reg(smi, RTL8366_LED_BLINKRATE_REG, &data);
+
+ val->value.i = (data & (RTL8366_LED_BLINKRATE_MASK));
+
+ return 0;
+}
+
+static int rtl8366s_sw_set_blinkrate(struct switch_dev *dev,
+ const struct switch_attr *attr,
+ struct switch_val *val)
+{
+ struct rtl8366s *rtl = sw_to_rtl8366s(dev);
+ struct rtl8366_smi *smi = &rtl->smi;
+ u32 data;
+
+ 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 rtl8366s_sw_set_vlan_enable(struct switch_dev *dev,
+ const struct switch_attr *attr,
+ struct switch_val *val)
+{
+ struct rtl8366s *rtl = sw_to_rtl8366s(dev);
+
+ if (attr->ofs == 1)
+ return rtl8366s_vlan_set_vlan(rtl, val->value.i);
+ else
+ return rtl8366s_vlan_set_4ktable(rtl, val->value.i);
+}
+
+static const char *rtl8366s_speed_str(unsigned speed)
+{
+ switch (speed) {
+ case 0:
+ return "10baseT";
+ case 1:
+ return "100baseT";
+ case 2:
+ return "1000baseT";
+ }
+
+ return "unknown";
+}
+
+static int rtl8366s_sw_get_port_link(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 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",
+ 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 >= 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);
+ }
+ 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 rtl8366s_sw_set_port_led(struct switch_dev *dev,
+ const struct switch_attr *attr,
+ struct switch_val *val)
+{
+ struct rtl8366s *rtl = sw_to_rtl8366s(dev);
+ struct rtl8366_smi *smi = &rtl->smi;
+ u32 data = 0;
+
+ if (val->port_vlan >= RTL8366_NUM_PORTS ||
+ (1 << val->port_vlan) == RTL8366_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);
+ } 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 rtl8366s_sw_get_port_led(struct switch_dev *dev,
+ const struct switch_attr *attr,
+ struct switch_val *val)
+{
+ struct rtl8366s *rtl = sw_to_rtl8366s(dev);
+ struct rtl8366_smi *smi = &rtl->smi;
+ u32 data = 0;
+
+ 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 rtl8366s_sw_reset_port_mibs(struct switch_dev *dev,
+ const struct switch_attr *attr,
+ struct switch_val *val)
+{
+ struct rtl8366s *rtl = sw_to_rtl8366s(dev);
+ struct rtl8366_smi *smi = &rtl->smi;
+ u32 data = 0;
+
+ 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, MIBCOUNTERS[i]);
+ 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;
+
+ if (val->port_vlan >= RTL8366_NUM_VLANS)
+ 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 >= 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);
+}
+
+static int rtl8366s_sw_reset_switch(struct switch_dev *dev)
+{
+ struct rtl8366s *rtl = sw_to_rtl8366s(dev);
+ 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 rtl8366s_reset_vlan(rtl);
+}
+
+static struct switch_attr rtl8366s_globals[] = {
+ {
+ .type = SWITCH_TYPE_INT,
+ .name = "enable_vlan",
+ .description = "Enable VLAN mode",
+ .set = rtl8366s_sw_set_vlan_enable,
+ .get = rtl8366s_sw_get_vlan_enable,
+ .max = 1,
+ .ofs = 1
+ }, {
+ .type = SWITCH_TYPE_INT,
+ .name = "enable_vlan4k",
+ .description = "Enable VLAN 4K mode",
+ .set = rtl8366s_sw_set_vlan_enable,
+ .get = rtl8366s_sw_get_vlan_enable,
+ .max = 1,
+ .ofs = 2
+ }, {
+ .type = SWITCH_TYPE_INT,
+ .name = "reset_mibs",
+ .description = "Reset all MIB counters",
+ .set = rtl8366s_sw_reset_mibs,
+ .get = NULL,
+ .max = 1
+ }, {
+ .type = SWITCH_TYPE_INT,
+ .name = "blinkrate",
+ .description = "Get/Set LED blinking rate (0 = 43ms, 1 = 84ms,"
+ " 2 = 120ms, 3 = 170ms, 4 = 340ms, 5 = 670ms)",
+ .set = rtl8366s_sw_set_blinkrate,
+ .get = rtl8366s_sw_get_blinkrate,
+ .max = 5
+ },
+};
+
+static struct switch_attr rtl8366s_port[] = {
+ {
+ .type = SWITCH_TYPE_STRING,
+ .name = "link",
+ .description = "Get port link information",
+ .max = 1,
+ .set = NULL,
+ .get = rtl8366s_sw_get_port_link,
+ }, {
+ .type = SWITCH_TYPE_INT,
+ .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,
+ }, {
+ .type = SWITCH_TYPE_INT,
+ .name = "led",
+ .description = "Get/Set port group (0 - 3) led mode (0 - 15)",
+ .max = 15,
+ .set = rtl8366s_sw_set_port_led,
+ .get = rtl8366s_sw_get_port_led,
+ },
+};
+
+static struct switch_attr rtl8366s_vlan[] = {
+ {
+ .type = SWITCH_TYPE_STRING,
+ .name = "info",
+ .description = "Get vlan information",
+ .max = 1,
+ .set = NULL,
+ .get = rtl8366s_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 = rtl8366s_globals,
+ .n_attr = ARRAY_SIZE(rtl8366s_globals),
+ },
+ .attr_port = {
+ .attr = rtl8366s_port,
+ .n_attr = ARRAY_SIZE(rtl8366s_port),
+ },
+ .attr_vlan = {
+ .attr = rtl8366s_vlan,
+ .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,
+ .reset_switch = rtl8366s_sw_reset_switch,
+};
+
+static int rtl8366s_switch_init(struct rtl8366s *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 rtl8366s_switch_cleanup(struct rtl8366s *rtl)
+{
+ unregister_switch(&rtl->dev);
+}
+
+static int rtl8366s_mii_read(struct mii_bus *bus, int addr, int reg)
+{
+ struct rtl8366s *rtl = bus->priv;
+ u32 val = 0;
+ int err;
+
+ err = rtl8366s_read_phy_reg(rtl, addr, 0, reg, &val);
+ if (err)
+ return 0xffff;
+
+ return val;
+}
+
+static int rtl8366s_mii_write(struct mii_bus *bus, int addr, int reg, u16 val)
+{
+ struct rtl8366s *rtl = bus->priv;
+ u32 t;
+ int err;
+
+ err = rtl8366s_write_phy_reg(rtl, addr, 0, reg, val);
+ /* flush write */
+ (void) rtl8366s_read_phy_reg(rtl, addr, 0, reg, &t);
+
+ return err;
+}
+
+static int rtl8366s_mii_init(struct rtl8366s *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 = 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);
+ if (ret)
+ goto err_free;
+
+ return 0;
+
+ err_free:
+ mdiobus_free(rtl->mii_bus);
+ err:
+ 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)
+{
+ 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");
+ 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);
+
+ rtl8366s_debugfs_init(rtl);
+
+ return 0;
+}
+
+static int __init 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;
+
+ 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 = rtl8366s_setup(rtl);
+ 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_out:
+ return err;
+}
+
+static int rtl8366s_phy_config_init(struct phy_device *phydev)
+{
+ if (!rtl8366s_mii_bus_match(phydev->bus))
+ return -EINVAL;
+
+ return 0;
+}
+
+static int rtl8366s_phy_config_aneg(struct phy_device *phydev)
+{
+ return 0;
+}
+
+static struct phy_driver rtl8366s_phy_driver = {
+ .phy_id = 0x001cc960,
+ .name = "Realtek RTL8366S",
+ .phy_id_mask = 0x1ffffff0,
+ .features = PHY_GBIT_FEATURES,
+ .config_aneg = rtl8366s_phy_config_aneg,
+ .config_init = rtl8366s_phy_config_init,
+ .read_status = genphy_read_status,
+ .driver = {
+ .owner = THIS_MODULE,
+ },
+};
+
+static int __devexit rtl8366s_remove(struct platform_device *pdev)
+{
+ struct rtl8366s *rtl = platform_get_drvdata(pdev);
+
+ if (rtl) {
+ rtl8366s_switch_cleanup(rtl);
+ rtl8366s_debugfs_remove(rtl);
+ rtl8366s_mii_cleanup(rtl);
+ platform_set_drvdata(pdev, NULL);
+ rtl8366_smi_cleanup(&rtl->smi);
+ kfree(rtl);
+ }
+
+ return 0;
+}
+
+static struct platform_driver rtl8366s_driver = {
+ .driver = {
+ .name = RTL8366S_DRIVER_NAME,
+ .owner = THIS_MODULE,
+ },
+ .probe = rtl8366s_probe,
+ .remove = __devexit_p(rtl8366s_remove),
+};
+
+static int __init rtl8366s_module_init(void)
+{
+ int ret;
+ ret = platform_driver_register(&rtl8366s_driver);
+ if (ret)
+ return ret;
+
+ ret = phy_driver_register(&rtl8366s_phy_driver);
+ if (ret)
+ goto err_platform_unregister;
+
+ return 0;
+
+ err_platform_unregister:
+ platform_driver_unregister(&rtl8366s_driver);
+ return ret;
+}
+module_init(rtl8366s_module_init);
+
+static void __exit rtl8366s_module_exit(void)
+{
+ phy_driver_unregister(&rtl8366s_phy_driver);
+ platform_driver_unregister(&rtl8366s_driver);
+}
+module_exit(rtl8366s_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:" RTL8366S_DRIVER_NAME);
diff --git a/target/linux/ar71xx/files/include/linux/rtl8366_smi.h b/target/linux/ar71xx/files/include/linux/rtl8366s.h
index cd0fcbc45..09173ec20 100644
--- a/target/linux/ar71xx/files/include/linux/rtl8366_smi.h
+++ b/target/linux/ar71xx/files/include/linux/rtl8366s.h
@@ -1,17 +1,19 @@
/*
- * Platform data definition for the Realtek RTL8366 ethernet switch driver
+ * Platform data definition for the Realtek RTL8366S ethernet switch driver
*
- * Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
+ * 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 _RTL8366_SMI_H
-#define _RTL8366_SMI_H
+#ifndef _RTL8366S_H
+#define _RTL8366S_H
-struct rtl8366_smi_platform_data {
+#define RTL8366S_DRIVER_NAME "rtl8366s"
+
+struct rtl8366s_platform_data {
unsigned gpio_sda;
unsigned gpio_sck;
};
diff --git a/target/linux/ar71xx/patches-2.6.30/204-rtl8366-smi-driver.patch b/target/linux/ar71xx/patches-2.6.30/204-rtl8366-smi-driver.patch
index 23dc525ec..6de4af032 100644
--- a/target/linux/ar71xx/patches-2.6.30/204-rtl8366-smi-driver.patch
+++ b/target/linux/ar71xx/patches-2.6.30/204-rtl8366-smi-driver.patch
@@ -1,27 +1,39 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -140,4 +140,14 @@ config MDIO_GPIO
+@@ -140,4 +140,25 @@ config MDIO_GPIO
To compile this driver as a module, choose M here: the module
will be called mdio-gpio.
+config RTL8366_SMI
-+ tristate "Support for RTL8366 switch via SMI interface"
++ tristate "Driver for the RTL8366 SMI interface"
+ depends on GENERIC_GPIO
++ ---help---
++ This module implements the SMI interface protocol which is used
++ by some RTL8366 ethernet switch devices via the generic GPIO API.
+
-+config RTL8366_SMI_DEBUG_FS
-+ bool "RTL8366S driver DEBUG_FS support"
-+ depends on RTL8366_SMI
++if RTL8366_SMI
++
++config RTL8366S_PHY
++ tristate "Driver for the Realtek RTL8366S switch"
++ select SWCONFIG
++
++config RTL8366S_PHY_DEBUG_FS
++ bool "RTL8366S switch driver DEBUG_FS support"
++ depends on RTL8366S_PHY
+ depends on DEBUG_FS
+ default n
+
++endif # RTL8366_SMI
++
endif # PHYLIB
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
-@@ -19,6 +19,7 @@ obj-$(CONFIG_IP175C_PHY) += ip175c.o
+@@ -19,6 +19,8 @@ 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_LSI_ET1011C_PHY) += et1011c.o
obj-$(CONFIG_MICREL) += micrel.o
obj-$(CONFIG_FIXED_PHY) += fixed.o
diff --git a/target/linux/ar71xx/patches-2.6.31/204-rtl8366-smi-driver.patch b/target/linux/ar71xx/patches-2.6.31/204-rtl8366-smi-driver.patch
index 23dc525ec..6de4af032 100644
--- a/target/linux/ar71xx/patches-2.6.31/204-rtl8366-smi-driver.patch
+++ b/target/linux/ar71xx/patches-2.6.31/204-rtl8366-smi-driver.patch
@@ -1,27 +1,39 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -140,4 +140,14 @@ config MDIO_GPIO
+@@ -140,4 +140,25 @@ config MDIO_GPIO
To compile this driver as a module, choose M here: the module
will be called mdio-gpio.
+config RTL8366_SMI
-+ tristate "Support for RTL8366 switch via SMI interface"
++ tristate "Driver for the RTL8366 SMI interface"
+ depends on GENERIC_GPIO
++ ---help---
++ This module implements the SMI interface protocol which is used
++ by some RTL8366 ethernet switch devices via the generic GPIO API.
+
-+config RTL8366_SMI_DEBUG_FS
-+ bool "RTL8366S driver DEBUG_FS support"
-+ depends on RTL8366_SMI
++if RTL8366_SMI
++
++config RTL8366S_PHY
++ tristate "Driver for the Realtek RTL8366S switch"
++ select SWCONFIG
++
++config RTL8366S_PHY_DEBUG_FS
++ bool "RTL8366S switch driver DEBUG_FS support"
++ depends on RTL8366S_PHY
+ depends on DEBUG_FS
+ default n
+
++endif # RTL8366_SMI
++
endif # PHYLIB
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
-@@ -19,6 +19,7 @@ obj-$(CONFIG_IP175C_PHY) += ip175c.o
+@@ -19,6 +19,8 @@ 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_LSI_ET1011C_PHY) += et1011c.o
obj-$(CONFIG_MICREL) += micrel.o
obj-$(CONFIG_FIXED_PHY) += fixed.o
diff --git a/target/linux/ar71xx/patches-2.6.32/204-rtl8366-smi-driver.patch b/target/linux/ar71xx/patches-2.6.32/204-rtl8366-smi-driver.patch
index 383513cda..fbd52c3b7 100644
--- a/target/linux/ar71xx/patches-2.6.32/204-rtl8366-smi-driver.patch
+++ b/target/linux/ar71xx/patches-2.6.32/204-rtl8366-smi-driver.patch
@@ -1,27 +1,39 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -146,4 +146,14 @@ config MDIO_GPIO
+@@ -146,4 +146,25 @@ config MDIO_GPIO
To compile this driver as a module, choose M here: the module
will be called mdio-gpio.
+config RTL8366_SMI
-+ tristate "Support for RTL8366 switch via SMI interface"
++ tristate "Driver for the RTL8366 SMI interface"
+ depends on GENERIC_GPIO
++ ---help---
++ This module implements the SMI interface protocol which is used
++ by some RTL8366 ethernet switch devices via the generic GPIO API.
+
-+config RTL8366_SMI_DEBUG_FS
-+ bool "RTL8366S driver DEBUG_FS support"
-+ depends on RTL8366_SMI
++if RTL8366_SMI
++
++config RTL8366S_PHY
++ tristate "Driver for the Realtek RTL8366S switch"
++ select SWCONFIG
++
++config RTL8366S_PHY_DEBUG_FS
++ bool "RTL8366S switch driver DEBUG_FS support"
++ depends on RTL8366S_PHY
+ depends on DEBUG_FS
+ default n
+
++endif # RTL8366_SMI
++
endif # PHYLIB
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
-@@ -20,6 +20,7 @@ obj-$(CONFIG_IP175C_PHY) += ip175c.o
+@@ -20,6 +20,8 @@ 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_LSI_ET1011C_PHY) += et1011c.o
obj-$(CONFIG_MICREL) += micrel.o
obj-$(CONFIG_FIXED_PHY) += fixed.o