lantiq: Tune the XWAY subtarget cflags
[openwrt/staging/yousong.git] / package / switch / src / switch-robo.c
index ec9e3373375ac3dea59359121430969a51c6aad3..f7159729b8842191aaf8b93c4f4b9ae4234eeccd 100644 (file)
@@ -3,6 +3,7 @@
  *
  * Copyright (C) 2005 Felix Fietkau <nbd@nbd.name>
  * Copyright (C) 2008 Michael Buesch <mb@bu3sch.de>
+ * Copyright (C) 2013 Hauke Mehrtens <hauke@hauke-m.de>
  * Based on 'robocfg' by Oleg I. Vdovikin
  *
  * This program is free software; you can redistribute it and/or
@@ -17,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA.
  */
 
 #include <linux/ethtool.h>
 #include <linux/mii.h>
 #include <linux/delay.h>
+#include <linux/gpio.h>
 #include <asm/uaccess.h>
 
 #include "switch-core.h"
 #include "etc53xx.h"
 
 #ifdef CONFIG_BCM47XX
-#include <nvram.h>
+#include <bcm47xx_nvram.h>
 #endif
 
 #define DRIVER_NAME            "bcm53xx"
-#define DRIVER_VERSION         "0.02"
+#define DRIVER_VERSION         "0.03"
 #define PFX                    "roboswitch: "
 
 #define ROBO_PHY_ADDR          0x1E    /* robo switch phy address */
@@ -62,6 +64,7 @@
 #define  ROBO_DEVICE_ID_5397   0x97
 #define  ROBO_DEVICE_ID_5398   0x98
 #define  ROBO_DEVICE_ID_53115  0x3115
+#define  ROBO_DEVICE_ID_53125  0x3125
 
 /* Private et.o ioctls */
 #define SIOCGETCPHYRD           (SIOCDEVPRIVATE + 9)
 struct robo_switch {
        char *device;                   /* The device name string (ethX) */
        u16 devid;                      /* ROBO_DEVICE_ID_53xx */
-       bool use_et;
-       bool is_5350;
-       u8 phy_addr;                    /* PHY address of the device */
+       bool is_5365;
+       bool gmii;                      /* gigabit mii */
+       u8 corerev;
+       int gpio_robo_reset;
+       int gpio_lanports_enable;
        struct ifreq ifr;
        struct net_device *dev;
-       unsigned char port[6];
+       unsigned char port[9];
 };
 
 /* Currently we can only have one device in the system. */
 static struct robo_switch robo;
 
 
-static int do_ioctl(int cmd, void *buf)
+static int do_ioctl(int cmd)
 {
        mm_segment_t old_fs = get_fs();
        int ret;
 
-       if (buf != NULL)
-               robo.ifr.ifr_data = (caddr_t) buf;
-
        set_fs(KERNEL_DS);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
        ret = robo.dev->netdev_ops->ndo_do_ioctl(robo.dev, &robo.ifr, cmd);
-#else
-       ret = robo.dev->do_ioctl(robo.dev, &robo.ifr, cmd);
-#endif
        set_fs(old_fs);
 
        return ret;
@@ -104,71 +102,35 @@ static int do_ioctl(int cmd, void *buf)
 
 static u16 mdio_read(__u16 phy_id, __u8 reg)
 {
-       if (robo.use_et) {
-               int args[2] = { reg };
-
-               if (phy_id != robo.phy_addr) {
-                       printk(KERN_ERR PFX
-                               "Access to real 'phy' registers unavaliable.\n"
-                               "Upgrade kernel driver.\n");
-
-                       return 0xffff;
-               }
-
+       struct mii_ioctl_data *mii = if_mii(&robo.ifr);
+       int err;
 
-               if (do_ioctl(SIOCGETCPHYRD, &args) < 0) {
-                       printk(KERN_ERR PFX
-                              "[%s:%d] SIOCGETCPHYRD failed!\n", __FILE__, __LINE__);
-                       return 0xffff;
-               }
-
-               return args[1];
-       } else {
-               struct mii_ioctl_data *mii = (struct mii_ioctl_data *) &robo.ifr.ifr_data;
-               mii->phy_id = phy_id;
-               mii->reg_num = reg;
+       mii->phy_id = phy_id;
+       mii->reg_num = reg;
 
-               if (do_ioctl(SIOCGMIIREG, NULL) < 0) {
-                       printk(KERN_ERR PFX
-                              "[%s:%d] SIOCGMIIREG failed!\n", __FILE__, __LINE__);
+       err = do_ioctl(SIOCGMIIREG);
+       if (err < 0) {
+               printk(KERN_ERR PFX "failed to read mdio reg %i with err %i.\n", reg, err);
 
-                       return 0xffff;
-               }
-
-               return mii->val_out;
+               return 0xffff;
        }
+
+       return mii->val_out;
 }
 
 static void mdio_write(__u16 phy_id, __u8 reg, __u16 val)
 {
-       if (robo.use_et) {
-               int args[2] = { reg, val };
+       struct mii_ioctl_data *mii = if_mii(&robo.ifr);
+       int err;
 
-               if (phy_id != robo.phy_addr) {
-                       printk(KERN_ERR PFX
-                               "Access to real 'phy' registers unavaliable.\n"
-                               "Upgrade kernel driver.\n");
+       mii->phy_id = phy_id;
+       mii->reg_num = reg;
+       mii->val_in = val;
 
-                       return;
-               }
-
-               if (do_ioctl(SIOCSETCPHYWR, args) < 0) {
-                       printk(KERN_ERR PFX
-                              "[%s:%d] SIOCGETCPHYWR failed!\n", __FILE__, __LINE__);
-                       return;
-               }
-       } else {
-               struct mii_ioctl_data *mii = (struct mii_ioctl_data *)&robo.ifr.ifr_data;
-
-               mii->phy_id = phy_id;
-               mii->reg_num = reg;
-               mii->val_in = val;
-
-               if (do_ioctl(SIOCSMIIREG, NULL) < 0) {
-                       printk(KERN_ERR PFX
-                              "[%s:%d] SIOCSMIIREG failed!\n", __FILE__, __LINE__);
-                       return;
-               }
+       err = do_ioctl(SIOCSMIIREG);
+       if (err < 0) {
+               printk(KERN_ERR PFX "failed to write mdio reg: %i with err %i.\n", reg, err);
+               return;
        }
 }
 
@@ -177,22 +139,22 @@ static int robo_reg(__u8 page, __u8 reg, __u8 op)
        int i = 3;
 
        /* set page number */
-       mdio_write(robo.phy_addr, REG_MII_PAGE,
+       mdio_write(ROBO_PHY_ADDR, REG_MII_PAGE,
                (page << 8) | REG_MII_PAGE_ENABLE);
 
        /* set register address */
-       mdio_write(robo.phy_addr, REG_MII_ADDR,
+       mdio_write(ROBO_PHY_ADDR, REG_MII_ADDR,
                (reg << 8) | op);
 
        /* check if operation completed */
        while (i--) {
-               if ((mdio_read(robo.phy_addr, REG_MII_ADDR) & 3) == 0)
+               if ((mdio_read(ROBO_PHY_ADDR, REG_MII_ADDR) & 3) == 0)
                        return 0;
        }
 
-       printk(KERN_ERR PFX "[%s:%d] timeout in robo_reg!\n", __FILE__, __LINE__);
+       printk(KERN_ERR PFX "timeout in robo_reg on page %i and reg %i with op %i.\n", page, reg, op);
 
-       return 0;
+       return 1;
 }
 
 /*
@@ -203,7 +165,7 @@ static void robo_read(__u8 page, __u8 reg, __u16 *val, int count)
        robo_reg(page, reg, REG_MII_ADDR_READ);
 
        for (i = 0; i < count; i++)
-               val[i] = mdio_read(robo.phy_addr, REG_MII_DATA0 + i);
+               val[i] = mdio_read(ROBO_PHY_ADDR, REG_MII_DATA0 + i);
 }
 */
 
@@ -211,21 +173,21 @@ static __u16 robo_read16(__u8 page, __u8 reg)
 {
        robo_reg(page, reg, REG_MII_ADDR_READ);
 
-       return mdio_read(robo.phy_addr, REG_MII_DATA0);
+       return mdio_read(ROBO_PHY_ADDR, REG_MII_DATA0);
 }
 
 static __u32 robo_read32(__u8 page, __u8 reg)
 {
        robo_reg(page, reg, REG_MII_ADDR_READ);
 
-       return mdio_read(robo.phy_addr, REG_MII_DATA0) +
-               (mdio_read(robo.phy_addr, REG_MII_DATA0 + 1) << 16);
+       return mdio_read(ROBO_PHY_ADDR, REG_MII_DATA0) |
+               (mdio_read(ROBO_PHY_ADDR, REG_MII_DATA0 + 1) << 16);
 }
 
 static void robo_write16(__u8 page, __u8 reg, __u16 val16)
 {
        /* write data */
-       mdio_write(robo.phy_addr, REG_MII_DATA0, val16);
+       mdio_write(ROBO_PHY_ADDR, REG_MII_DATA0, val16);
 
        robo_reg(page, reg, REG_MII_ADDR_WRITE);
 }
@@ -233,21 +195,28 @@ static void robo_write16(__u8 page, __u8 reg, __u16 val16)
 static void robo_write32(__u8 page, __u8 reg, __u32 val32)
 {
        /* write data */
-       mdio_write(robo.phy_addr, REG_MII_DATA0, val32 & 65535);
-       mdio_write(robo.phy_addr, REG_MII_DATA0 + 1, val32 >> 16);
+       mdio_write(ROBO_PHY_ADDR, REG_MII_DATA0, val32 & 0xFFFF);
+       mdio_write(ROBO_PHY_ADDR, REG_MII_DATA0 + 1, val32 >> 16);
 
        robo_reg(page, reg, REG_MII_ADDR_WRITE);
 }
 
-/* checks that attached switch is 5325E/5350 */
-static int robo_vlan5350(void)
+/* checks that attached switch is 5365 */
+static bool robo_bcm5365(void)
 {
        /* set vlan access id to 15 and read it back */
        __u16 val16 = 15;
-       robo_write16(ROBO_VLAN_PAGE, ROBO_VLAN_TABLE_ACCESS_5350, val16);
+       robo_write16(ROBO_VLAN_PAGE, ROBO_VLAN_TABLE_ACCESS, val16);
 
        /* 5365 will refuse this as it does not have this reg */
-       return (robo_read16(ROBO_VLAN_PAGE, ROBO_VLAN_TABLE_ACCESS_5350) == val16);
+       return robo_read16(ROBO_VLAN_PAGE, ROBO_VLAN_TABLE_ACCESS) != val16;
+}
+
+static bool robo_gmii(void)
+{
+       if (mdio_read(0, ROBO_MII_STAT) & 0x0100)
+               return ((mdio_read(0, 0x0f) & 0xf000) != 0);
+       return false;
 }
 
 static int robo_switch_enable(void)
@@ -267,19 +236,30 @@ static int robo_switch_enable(void)
                robo_write16(ROBO_CTRL_PAGE, ROBO_SWITCH_MODE, val);
                val = robo_read16(ROBO_CTRL_PAGE, ROBO_SWITCH_MODE);
                if (!(val & (1 << 1))) {
-                       printk("Failed to enable switch\n");
+                       printk(KERN_ERR PFX "Failed to enable switch\n");
                        return -EBUSY;
                }
 
+               /* No spanning tree for unmanaged mode */
                last_port = (robo.devid == ROBO_DEVICE_ID_5398) ?
-                               ROBO_PORT6_CTRL : ROBO_PORT3_CTRL;
-               for (i = ROBO_PORT0_CTRL; i < last_port + 1; i++)
+                               ROBO_PORT7_CTRL : ROBO_PORT4_CTRL;
+               for (i = ROBO_PORT0_CTRL; i <= last_port; i++)
                        robo_write16(ROBO_CTRL_PAGE, i, 0);
+
+               /* No spanning tree on IMP port too */
+               robo_write16(ROBO_CTRL_PAGE, ROBO_IM_PORT_CTRL, 0);
+       }
+
+       if (robo.devid == ROBO_DEVICE_ID_53125) {
+               /* Make IM port status link by default */
+               val = robo_read16(ROBO_CTRL_PAGE, ROBO_PORT_OVERRIDE_CTRL) | 0xb1;
+               robo_write16(ROBO_CTRL_PAGE, ROBO_PORT_OVERRIDE_CTRL, val);
+               // TODO: init EEE feature
        }
 
 #ifdef CONFIG_BCM47XX
        /* WAN port LED, except for Netgear WGT634U */
-       if (nvram_getenv("nvram_type", buf, sizeof(buf)) >= 0) {
+       if (bcm47xx_nvram_getenv("nvram_type", buf, sizeof(buf)) >= 0) {
                if (strcmp(buf, "cfe") != 0)
                        robo_write16(ROBO_CTRL_PAGE, 0x16, 0x1F);
        }
@@ -299,54 +279,107 @@ static void robo_switch_reset(void)
        }
 }
 
+#ifdef CONFIG_BCM47XX
+static int get_gpio_pin(const char *name)
+{
+       int i, err;
+       char nvram_var[10];
+       char buf[30];
+
+       for (i = 0; i < 16; i++) {
+               err = snprintf(nvram_var, sizeof(nvram_var), "gpio%i", i);
+               if (err <= 0)
+                       continue;
+               err = bcm47xx_nvram_getenv(nvram_var, buf, sizeof(buf));
+               if (err <= 0)
+                       continue;
+               if (!strcmp(name, buf))
+                       return i;
+       }
+       return -1;
+}
+#endif
+
 static int robo_probe(char *devname)
 {
        __u32 phyid;
        unsigned int i;
-       int err = 1;
+       int err = -1;
+       struct mii_ioctl_data *mii;
 
-       printk(KERN_INFO PFX "Probing device %s: ", devname);
+       printk(KERN_INFO PFX "Probing device '%s'\n", devname);
        strcpy(robo.ifr.ifr_name, devname);
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
-       if ((robo.dev = dev_get_by_name(devname)) == NULL) {
-#else
        if ((robo.dev = dev_get_by_name(&init_net, devname)) == NULL) {
-#endif
-               printk("No such device\n");
-               return 1;
+               printk(KERN_ERR PFX "No such device\n");
+               err = -ENODEV;
+               goto err_done;
+       }
+       if (!robo.dev->netdev_ops || !robo.dev->netdev_ops->ndo_do_ioctl) {
+               printk(KERN_ERR PFX "ndo_do_ioctl not implemented in ethernet driver\n");
+               err = -ENXIO;
+               goto err_put;
        }
 
        robo.device = devname;
-       for (i = 0; i < 5; i++)
-               robo.port[i] = i;
-       robo.port[5] = 8;
 
        /* try access using MII ioctls - get phy address */
-       if (do_ioctl(SIOCGMIIPHY, NULL) < 0) {
-               robo.use_et = 1;
-               robo.phy_addr = ROBO_PHY_ADDR;
-       } else {
-               /* got phy address check for robo address */
-               struct mii_ioctl_data *mii = (struct mii_ioctl_data *) &robo.ifr.ifr_data;
-               if ((mii->phy_id != ROBO_PHY_ADDR) &&
-                   (mii->phy_id != ROBO_PHY_ADDR_BCM63XX) &&
-                   (mii->phy_id != ROBO_PHY_ADDR_TG3)) {
-                       printk("Invalid phy address (%d)\n", mii->phy_id);
-                       goto done;
+       err = do_ioctl(SIOCGMIIPHY);
+       if (err < 0) {
+               printk(KERN_ERR PFX "error (%i) while accessing MII phy registers with ioctls\n", err);
+               goto err_put;
+       }
+
+       /* got phy address check for robo address */
+       mii = if_mii(&robo.ifr);
+       if ((mii->phy_id != ROBO_PHY_ADDR) &&
+           (mii->phy_id != ROBO_PHY_ADDR_BCM63XX) &&
+           (mii->phy_id != ROBO_PHY_ADDR_TG3)) {
+               printk(KERN_ERR PFX "Invalid phy address (%d)\n", mii->phy_id);
+               err = -ENODEV;
+               goto err_put;
+       }
+
+#ifdef CONFIG_BCM47XX
+       robo.gpio_lanports_enable = get_gpio_pin("lanports_enable");
+       if (robo.gpio_lanports_enable >= 0) {
+               err = gpio_request(robo.gpio_lanports_enable, "lanports_enable");
+               if (err) {
+                       printk(KERN_ERR PFX "error (%i) requesting lanports_enable gpio (%i)\n",
+                              err, robo.gpio_lanports_enable);
+                       goto err_put;
+               }
+               gpio_direction_output(robo.gpio_lanports_enable, 1);
+               mdelay(5);
+       }
+
+       robo.gpio_robo_reset = get_gpio_pin("robo_reset");
+       if (robo.gpio_robo_reset >= 0) {
+               err = gpio_request(robo.gpio_robo_reset, "robo_reset");
+               if (err) {
+                       printk(KERN_ERR PFX "error (%i) requesting robo_reset gpio (%i)\n",
+                              err, robo.gpio_robo_reset);
+                       goto err_gpio_robo;
                }
-               robo.use_et = 0;
-               /* The robo has a fixed PHY address that is different from the
-                * Tigon3 and BCM63xx PHY address. */
-               robo.phy_addr = ROBO_PHY_ADDR;
+               gpio_set_value(robo.gpio_robo_reset, 0);
+               gpio_direction_output(robo.gpio_robo_reset, 1);
+               gpio_set_value(robo.gpio_robo_reset, 0);
+               mdelay(50);
+
+               gpio_set_value(robo.gpio_robo_reset, 1);
+               mdelay(20);
+       } else {
+               // TODO: reset the internal robo switch
        }
+#endif
 
-       phyid = mdio_read(robo.phy_addr, 0x2) | 
-               (mdio_read(robo.phy_addr, 0x3) << 16);
+       phyid = mdio_read(ROBO_PHY_ADDR, 0x2) |
+               (mdio_read(ROBO_PHY_ADDR, 0x3) << 16);
 
        if (phyid == 0xffffffff || phyid == 0x55210022) {
-               printk("No Robo switch in managed mode found, phy_id = 0x%08x\n", phyid);
-               goto done;
+               printk(KERN_ERR PFX "No Robo switch in managed mode found, phy_id = 0x%08x\n", phyid);
+               err = -ENODEV;
+               goto err_gpio_lanports;
        }
 
        /* Get the device ID */
@@ -358,27 +391,45 @@ static int robo_probe(char *devname)
        }
        if (!robo.devid)
                robo.devid = ROBO_DEVICE_ID_5325; /* Fake it */
-       robo.is_5350 = robo_vlan5350();
+       if (robo.devid == ROBO_DEVICE_ID_5325)
+               robo.is_5365 = robo_bcm5365();
+       else
+               robo.is_5365 = false;
+
+       robo.gmii = robo_gmii();
+       if (robo.devid == ROBO_DEVICE_ID_5325) {
+               for (i = 0; i < 5; i++)
+                       robo.port[i] = i;
+       } else {
+               for (i = 0; i < 8; i++)
+                       robo.port[i] = i;
+       }
+       robo.port[i] = ROBO_IM_PORT_CTRL;
 
        robo_switch_reset();
        err = robo_switch_enable();
        if (err)
-               goto done;
-       err = 0;
+               goto err_gpio_lanports;
 
-       printk("found a 5%s%x!%s\n", robo.devid & 0xff00 ? "" : "3", robo.devid,
-               robo.is_5350 ? " It's a 5350." : "");
+       printk(KERN_INFO PFX "found a 5%s%x!%s at %s\n", robo.devid & 0xff00 ? "" : "3", robo.devid,
+               robo.is_5365 ? " It's a BCM5365." : "", devname);
 
-done:
-       if (err) {
-               dev_put(robo.dev);
-               robo.dev = NULL;
-       }
+       return 0;
+
+err_gpio_lanports:
+       if (robo.gpio_lanports_enable >= 0)
+               gpio_free(robo.gpio_lanports_enable);
+err_gpio_robo:
+       if (robo.gpio_robo_reset >= 0)
+               gpio_free(robo.gpio_robo_reset);
+err_put:
+       dev_put(robo.dev);
+       robo.dev = NULL;
+err_done:
        return err;
 }
 
-
-static int handle_vlan_port_read(void *driver, char *buf, int nr)
+static int handle_vlan_port_read_old(switch_driver *d, char *buf, int nr)
 {
        __u16 val16;
        int len = 0;
@@ -386,17 +437,17 @@ static int handle_vlan_port_read(void *driver, char *buf, int nr)
 
        val16 = (nr) /* vlan */ | (0 << 12) /* read */ | (1 << 13) /* enable */;
 
-       if (robo.is_5350) {
-               u32 val32;
-               robo_write16(ROBO_VLAN_PAGE, ROBO_VLAN_TABLE_ACCESS_5350, val16);
+       if (robo.is_5365) {
+               robo_write16(ROBO_VLAN_PAGE, ROBO_VLAN_TABLE_ACCESS_5365, val16);
                /* actual read */
-               val32 = robo_read32(ROBO_VLAN_PAGE, ROBO_VLAN_READ);
-               if ((val32 & (1 << 20)) /* valid */) {
-                       for (j = 0; j < 6; j++) {
-                               if (val32 & (1 << j)) {
+               val16 = robo_read16(ROBO_VLAN_PAGE, ROBO_VLAN_READ);
+               if ((val16 & (1 << 14)) /* valid */) {
+                       for (j = 0; j < d->ports; j++) {
+                               if (val16 & (1 << j)) {
                                        len += sprintf(buf + len, "%d", j);
-                                       if (val32 & (1 << (j + 6))) {
-                                               if (j == 5) buf[len++] = 'u';
+                                       if (val16 & (1 << (j + 7))) {
+                                               if (j == d->cpuport)
+                                                       buf[len++] = 'u';
                                        } else {
                                                buf[len++] = 't';
                                                if (robo_read16(ROBO_VLAN_PAGE, ROBO_VLAN_PORT0_DEF_TAG + (j << 1)) == nr)
@@ -408,15 +459,17 @@ static int handle_vlan_port_read(void *driver, char *buf, int nr)
                        len += sprintf(buf + len, "\n");
                }
        } else {
+               u32 val32;
                robo_write16(ROBO_VLAN_PAGE, ROBO_VLAN_TABLE_ACCESS, val16);
                /* actual read */
-               val16 = robo_read16(ROBO_VLAN_PAGE, ROBO_VLAN_READ);
-               if ((val16 & (1 << 14)) /* valid */) {
-                       for (j = 0; j < 6; j++) {
-                               if (val16 & (1 << j)) {
+               val32 = robo_read32(ROBO_VLAN_PAGE, ROBO_VLAN_READ);
+               if ((val32 & (1 << 20)) /* valid */) {
+                       for (j = 0; j < d->ports; j++) {
+                               if (val32 & (1 << j)) {
                                        len += sprintf(buf + len, "%d", j);
-                                       if (val16 & (1 << (j + 7))) {
-                                               if (j == 5) buf[len++] = 'u';
+                                       if (val32 & (1 << (j + d->ports))) {
+                                               if (j == d->cpuport)
+                                                       buf[len++] = 'u';
                                        } else {
                                                buf[len++] = 't';
                                                if (robo_read16(ROBO_VLAN_PAGE, ROBO_VLAN_PORT0_DEF_TAG + (j << 1)) == nr)
@@ -434,45 +487,124 @@ static int handle_vlan_port_read(void *driver, char *buf, int nr)
        return len;
 }
 
-static int handle_vlan_port_write(void *driver, char *buf, int nr)
+static int handle_vlan_port_read_new(switch_driver *d, char *buf, int nr)
 {
-       switch_driver *d = (switch_driver *) driver;
-       switch_vlan_config *c = switch_parse_vlan(d, buf);
+       __u8 vtbl_entry, vtbl_index, vtbl_access;
+       __u32 val32;
+       int len = 0;
        int j;
-       __u16 val16;
 
-       if (c == NULL)
-               return -EINVAL;
+       if ((robo.devid == ROBO_DEVICE_ID_5395) ||
+           (robo.devid == ROBO_DEVICE_ID_53115) ||
+           (robo.devid == ROBO_DEVICE_ID_53125)) {
+               vtbl_access = ROBO_VTBL_ACCESS_5395;
+               vtbl_index = ROBO_VTBL_INDX_5395;
+               vtbl_entry = ROBO_VTBL_ENTRY_5395;
+       } else {
+               vtbl_access = ROBO_VTBL_ACCESS;
+               vtbl_index = ROBO_VTBL_INDX;
+               vtbl_entry = ROBO_VTBL_ENTRY;
+       }
 
+       robo_write16(ROBO_ARLIO_PAGE, vtbl_index, nr);
+       robo_write16(ROBO_ARLIO_PAGE, vtbl_access, (1 << 7) | (1 << 0));
+       val32 = robo_read32(ROBO_ARLIO_PAGE, vtbl_entry);
        for (j = 0; j < d->ports; j++) {
-               if ((c->untag | c->pvid) & (1 << j))
-                       /* change default vlan tag */
-                       robo_write16(ROBO_VLAN_PAGE, ROBO_VLAN_PORT0_DEF_TAG + (j << 1), nr);
+               if (val32 & (1 << j)) {
+                       len += sprintf(buf + len, "%d", j);
+                       if (val32 & (1 << (j + d->ports))) {
+                               if (j == d->cpuport)
+                                       buf[len++] = 'u';
+                       } else {
+                               buf[len++] = 't';
+                               if (robo_read16(ROBO_VLAN_PAGE, ROBO_VLAN_PORT0_DEF_TAG + (j << 1)) == nr)
+                                       buf[len++] = '*';
+                       }
+                       buf[len++] = '\t';
+               }
        }
+       len += sprintf(buf + len, "\n");
+       buf[len] = '\0';
+       return len;
+}
 
-       /* write config now */
+static int handle_vlan_port_read(void *driver, char *buf, int nr)
+{
+       switch_driver *d = (switch_driver *) driver;
 
-       if (robo.devid != ROBO_DEVICE_ID_5325) {
-               __u8 regoff = ((robo.devid == ROBO_DEVICE_ID_5395) ||
-                       (robo.devid == ROBO_DEVICE_ID_53115)) ? 0x20 : 0;
+       if (robo.devid != ROBO_DEVICE_ID_5325)
+               return handle_vlan_port_read_new(d, buf, nr);
+       else
+               return handle_vlan_port_read_old(d, buf, nr);
+}
 
-               robo_write32(ROBO_ARLIO_PAGE, 0x63 + regoff, (c->untag << 9) | c->port);
-               robo_write16(ROBO_ARLIO_PAGE, 0x61 + regoff, nr);
-               robo_write16(ROBO_ARLIO_PAGE, 0x60 + regoff, 1 << 7);
-               return 0;
-       }
+static void handle_vlan_port_write_old(switch_driver *d, switch_vlan_config *c, int nr)
+{
+       __u16 val16;
+       __u32 val32;
+       __u32 untag = ((c->untag  & ~(1 << d->cpuport)) << d->ports);
 
+       /* write config now */
        val16 = (nr) /* vlan */ | (1 << 12) /* write */ | (1 << 13) /* enable */;
-       if (robo.is_5350) {
-               robo_write32(ROBO_VLAN_PAGE, ROBO_VLAN_WRITE_5350,
-                       (1 << 20) /* valid */ | (c->untag << 6) | c->port);
-               robo_write16(ROBO_VLAN_PAGE, ROBO_VLAN_TABLE_ACCESS_5350, val16);
+       if (robo.is_5365) {
+               robo_write32(ROBO_VLAN_PAGE, ROBO_VLAN_WRITE_5365,
+                       (1 << 14)  /* valid */ | (untag << 1 ) | c->port);
+               robo_write16(ROBO_VLAN_PAGE, ROBO_VLAN_TABLE_ACCESS_5365, val16);
        } else {
-               robo_write16(ROBO_VLAN_PAGE, ROBO_VLAN_WRITE,
-                       (1 << 14)  /* valid */ | (c->untag << 7) | c->port);
+               if (robo.corerev < 3)
+                       val32 = (1 << 20) | ((nr >> 4) << 12) | untag | c->port;
+               else
+                       val32 = (1 << 24) | (nr << 12) | untag | c->port;
+               robo_write32(ROBO_VLAN_PAGE, ROBO_VLAN_WRITE, val32);
                robo_write16(ROBO_VLAN_PAGE, ROBO_VLAN_TABLE_ACCESS, val16);
        }
+}
+
+static void handle_vlan_port_write_new(switch_driver *d, switch_vlan_config *c, int nr)
+{
+       __u8 vtbl_entry, vtbl_index, vtbl_access;
+       __u32 untag = ((c->untag  & ~(1 << d->cpuport)) << d->ports);
+
+       /* write config now */
+       if ((robo.devid == ROBO_DEVICE_ID_5395) ||
+           (robo.devid == ROBO_DEVICE_ID_53115) ||
+           (robo.devid == ROBO_DEVICE_ID_53125)) {
+               vtbl_access = ROBO_VTBL_ACCESS_5395;
+               vtbl_index = ROBO_VTBL_INDX_5395;
+               vtbl_entry = ROBO_VTBL_ENTRY_5395;
+       } else {
+               vtbl_access = ROBO_VTBL_ACCESS;
+               vtbl_index = ROBO_VTBL_INDX;
+               vtbl_entry = ROBO_VTBL_ENTRY;
+       }
+
+       robo_write32(ROBO_ARLIO_PAGE, vtbl_entry, untag | c->port);
+       robo_write16(ROBO_ARLIO_PAGE, vtbl_index, nr);
+       robo_write16(ROBO_ARLIO_PAGE, vtbl_access, 1 << 7);
+}
+
+static int handle_vlan_port_write(void *driver, char *buf, int nr)
+{
+       switch_driver *d = (switch_driver *)driver;
+       switch_vlan_config *c = switch_parse_vlan(d, buf);
+       int j;
+
+       if (c == NULL)
+               return -EINVAL;
+
+       for (j = 0; j < d->ports; j++) {
+               if ((c->untag | c->pvid) & (1 << j)) {
+                       /* change default vlan tag */
+                       robo_write16(ROBO_VLAN_PAGE, ROBO_VLAN_PORT0_DEF_TAG + (j << 1), nr);
+               }
+       }
 
+       if (robo.devid != ROBO_DEVICE_ID_5325)
+               handle_vlan_port_write_new(d, c, nr);
+       else
+               handle_vlan_port_write_old(d, c, nr);
+
+       kfree(c);
        return 0;
 }
 
@@ -491,6 +623,80 @@ static int handle_enable_write(void *driver, char *buf, int nr)
        return 0;
 }
 
+static int handle_port_enable_read(void *driver, char *buf, int nr)
+{
+       return sprintf(buf, "%d\n", ((robo_read16(ROBO_CTRL_PAGE, robo.port[nr]) & 3) == 3 ? 0 : 1));
+}
+
+static int handle_port_enable_write(void *driver, char *buf, int nr)
+{
+       u16 val16;
+
+       if (buf[0] == '0')
+               val16 = 3; /* disabled */
+       else if (buf[0] == '1')
+               val16 = 0; /* enabled */
+       else
+               return -EINVAL;
+
+       robo_write16(ROBO_CTRL_PAGE, robo.port[nr],
+               (robo_read16(ROBO_CTRL_PAGE, robo.port[nr]) & ~3) | val16);
+
+       return 0;
+}
+
+static int handle_port_media_read(void *driver, char *buf, int nr)
+{
+       u16 bmcr = mdio_read(robo.port[nr], MII_BMCR);
+       int media, len;
+
+       if (bmcr & BMCR_ANENABLE)
+               media = SWITCH_MEDIA_AUTO;
+       else {
+               if (bmcr & BMCR_SPEED1000)
+                       media = SWITCH_MEDIA_1000;
+               else if (bmcr & BMCR_SPEED100)
+                       media = SWITCH_MEDIA_100;
+               else
+                       media = 0;
+
+               if (bmcr & BMCR_FULLDPLX)
+                       media |= SWITCH_MEDIA_FD;
+       }
+
+       len = switch_print_media(buf, media);
+       return len + sprintf(buf + len, "\n");
+}
+
+static int handle_port_media_write(void *driver, char *buf, int nr)
+{
+       int media = switch_parse_media(buf);
+       u16 bmcr, bmcr_mask;
+
+       if (media & SWITCH_MEDIA_AUTO)
+               bmcr = BMCR_ANENABLE | BMCR_ANRESTART;
+       else {
+               if (media & SWITCH_MEDIA_1000) {
+                       if (!robo.gmii)
+                               return -EINVAL;
+                       bmcr = BMCR_SPEED1000;
+               }
+               else if (media & SWITCH_MEDIA_100)
+                       bmcr = BMCR_SPEED100;
+               else
+                       bmcr = 0;
+
+               if (media & SWITCH_MEDIA_FD)
+                       bmcr |= BMCR_FULLDPLX;
+       }
+
+       bmcr_mask = ~(BMCR_SPEED1000 | BMCR_SPEED100 | BMCR_FULLDPLX | BMCR_ANENABLE | BMCR_ANRESTART);
+       mdio_write(robo.port[nr], MII_BMCR,
+               (mdio_read(robo.port[nr], MII_BMCR) & bmcr_mask) | bmcr);
+
+       return 0;
+}
+
 static int handle_enable_vlan_read(void *driver, char *buf, int nr)
 {
        return sprintf(buf, "%d\n", (((robo_read16(ROBO_VLAN_PAGE, ROBO_VLAN_CTRL0) & (1 << 7)) == (1 << 7)) ? 1 : 0));
@@ -498,12 +704,16 @@ static int handle_enable_vlan_read(void *driver, char *buf, int nr)
 
 static int handle_enable_vlan_write(void *driver, char *buf, int nr)
 {
+       __u16 val16;
        int disable = ((buf[0] != '1') ? 1 : 0);
 
+       val16 = robo_read16(ROBO_VLAN_PAGE, ROBO_VLAN_CTRL0);
        robo_write16(ROBO_VLAN_PAGE, ROBO_VLAN_CTRL0, disable ? 0 :
-               (1 << 7) /* 802.1Q VLAN */ | (3 << 5) /* mac check and hash */);
+               val16 | (1 << 7) /* 802.1Q VLAN */ | (3 << 5) /* mac check and hash */);
+
+       val16 = robo_read16(ROBO_VLAN_PAGE, ROBO_VLAN_CTRL1);
        robo_write16(ROBO_VLAN_PAGE, ROBO_VLAN_CTRL1, disable ? 0 :
-               (robo.devid == ROBO_DEVICE_ID_5325 ? (1 << 1) :
+               val16 | (robo.devid == ROBO_DEVICE_ID_5325 ? (1 << 1) :
                0) | (1 << 2) | (1 << 3)); /* RSV multicast */
 
        if (robo.devid != ROBO_DEVICE_ID_5325)
@@ -517,31 +727,62 @@ static int handle_enable_vlan_write(void *driver, char *buf, int nr)
        return 0;
 }
 
-static int handle_reset(void *driver, char *buf, int nr)
+static void handle_reset_old(switch_driver *d, char *buf, int nr)
 {
-       switch_driver *d = (switch_driver *) driver;
-       switch_vlan_config *c = switch_parse_vlan(d, buf);
        int j;
        __u16 val16;
 
-       if (c == NULL)
-               return -EINVAL;
-
-       /* disable switching */
-       set_switch(0);
-
        /* reset vlans */
-       for (j = 0; j <= ((robo.is_5350) ? VLAN_ID_MAX5350 : VLAN_ID_MAX); j++) {
+       for (j = 0; j <= ((robo.is_5365) ? VLAN_ID_MAX_5365 : VLAN_ID_MAX); j++) {
                /* write config now */
                val16 = (j) /* vlan */ | (1 << 12) /* write */ | (1 << 13) /* enable */;
-               if (robo.is_5350)
-                       robo_write32(ROBO_VLAN_PAGE, ROBO_VLAN_WRITE_5350, 0);
+               if (robo.is_5365)
+                       robo_write16(ROBO_VLAN_PAGE, ROBO_VLAN_WRITE_5365, 0);
                else
-                       robo_write16(ROBO_VLAN_PAGE, ROBO_VLAN_WRITE, 0);
-               robo_write16(ROBO_VLAN_PAGE, robo.is_5350 ? ROBO_VLAN_TABLE_ACCESS_5350 :
+                       robo_write32(ROBO_VLAN_PAGE, ROBO_VLAN_WRITE, 0);
+               robo_write16(ROBO_VLAN_PAGE, robo.is_5365 ? ROBO_VLAN_TABLE_ACCESS_5365 :
                                                            ROBO_VLAN_TABLE_ACCESS,
                             val16);
        }
+}
+
+static void handle_reset_new(switch_driver *d, char *buf, int nr)
+{
+       int j;
+       __u8 vtbl_entry, vtbl_index, vtbl_access;
+
+       if ((robo.devid == ROBO_DEVICE_ID_5395) ||
+           (robo.devid == ROBO_DEVICE_ID_53115) ||
+           (robo.devid == ROBO_DEVICE_ID_53125)) {
+               vtbl_access = ROBO_VTBL_ACCESS_5395;
+               vtbl_index = ROBO_VTBL_INDX_5395;
+               vtbl_entry = ROBO_VTBL_ENTRY_5395;
+       } else {
+               vtbl_access = ROBO_VTBL_ACCESS;
+               vtbl_index = ROBO_VTBL_INDX;
+               vtbl_entry = ROBO_VTBL_ENTRY;
+       }
+
+       for (j = 0; j <= VLAN_ID_MAX; j++) {
+               /* write config now */
+               robo_write32(ROBO_ARLIO_PAGE, vtbl_entry, 0);
+               robo_write16(ROBO_ARLIO_PAGE, vtbl_index, j);
+               robo_write16(ROBO_ARLIO_PAGE, vtbl_access, 1 << 7);
+       }
+}
+
+static int handle_reset(void *driver, char *buf, int nr)
+{
+       int j;
+       switch_driver *d = (switch_driver *) driver;
+
+       /* disable switching */
+       set_switch(0);
+
+       if (robo.devid != ROBO_DEVICE_ID_5325)
+               handle_reset_new(d, buf, nr);
+       else
+               handle_reset_old(d, buf, nr);
 
        /* reset ports to a known good state */
        for (j = 0; j < d->ports; j++) {
@@ -589,6 +830,17 @@ static int __init robo_init(void)
                                .write  = handle_reset
                        }, { NULL, },
                };
+               static const switch_config port[] = {
+                       {
+                               .name   = "enable",
+                               .read   = handle_port_enable_read,
+                               .write  = handle_port_enable_write
+                       }, {
+                               .name   = "media",
+                               .read   = handle_port_media_read,
+                               .write  = handle_port_media_write
+                       }, { NULL, },
+               };
                static const switch_config vlan[] = {
                        {
                                .name   = "ports",
@@ -604,13 +856,17 @@ static int __init robo_init(void)
                        .ports                  = 6,
                        .vlans                  = 16,
                        .driver_handlers        = cfg,
-                       .port_handlers          = NULL,
+                       .port_handlers          = port,
                        .vlan_handlers          = vlan,
                };
                if (robo.devid != ROBO_DEVICE_ID_5325) {
                        driver.ports = 9;
                        driver.cpuport = 8;
                }
+               if (robo.is_5365)
+                       snprintf(driver.dev_name, SWITCH_NAME_BUFSZ, "BCM5365");
+               else
+                       snprintf(driver.dev_name, SWITCH_NAME_BUFSZ, "BCM5%s%x", robo.devid & 0xff00 ? "" : "3", robo.devid);
 
                return switch_register_driver(&driver);
        }
@@ -621,6 +877,10 @@ static void __exit robo_exit(void)
        switch_unregister_driver(DRIVER_NAME);
        if (robo.dev)
                dev_put(robo.dev);
+       if (robo.gpio_robo_reset >= 0)
+               gpio_free(robo.gpio_robo_reset);
+       if (robo.gpio_lanports_enable >= 0)
+               gpio_free(robo.gpio_lanports_enable);
        kfree(robo.device);
 }