ar8216: enable cpu port to receive arp and broadcast frames for ar8236
[openwrt/staging/chunkeey.git] / target / linux / generic / files / drivers / net / phy / ar8216.c
index 884b3199c125fda78655e6a37c09a26661fac622..91e090af813c448c0e7fc6c3752b31710cb9b8c1 100644 (file)
@@ -34,6 +34,9 @@
 #include <linux/ar8216_platform.h>
 #include <linux/workqueue.h>
 #include <linux/of_device.h>
+#include <linux/leds.h>
+#include <linux/gpio.h>
+#include <linux/version.h>
 
 #include "ar8216.h"
 
@@ -49,6 +52,11 @@ struct ar8xxx_priv;
 #define AR8XXX_CAP_GIGE                        BIT(0)
 #define AR8XXX_CAP_MIB_COUNTERS                BIT(1)
 
+#define AR8XXX_NUM_PHYS        5
+
+static void ar8216_set_mirror_regs(struct ar8xxx_priv *priv);
+static void ar8327_set_mirror_regs(struct ar8xxx_priv *priv);
+
 enum {
        AR8XXX_VER_AR8216 = 0x01,
        AR8XXX_VER_AR8236 = 0x03,
@@ -65,24 +73,65 @@ struct ar8xxx_mib_desc {
 
 struct ar8xxx_chip {
        unsigned long caps;
+       bool config_at_probe;
+       bool mii_lo_first;
+
+       /* parameters to calculate REG_PORT_STATS_BASE */
+       unsigned reg_port_stats_start;
+       unsigned reg_port_stats_length;
 
        int (*hw_init)(struct ar8xxx_priv *priv);
+       void (*cleanup)(struct ar8xxx_priv *priv);
+
        void (*init_globals)(struct ar8xxx_priv *priv);
        void (*init_port)(struct ar8xxx_priv *priv, int port);
-       void (*setup_port)(struct ar8xxx_priv *priv, int port, u32 egress,
-                          u32 ingress, u32 members, u32 pvid);
+       void (*setup_port)(struct ar8xxx_priv *priv, int port, u32 members);
        u32 (*read_port_status)(struct ar8xxx_priv *priv, int port);
        int (*atu_flush)(struct ar8xxx_priv *priv);
        void (*vtu_flush)(struct ar8xxx_priv *priv);
        void (*vtu_load_vlan)(struct ar8xxx_priv *priv, u32 vid, u32 port_mask);
+       void (*phy_fixup)(struct ar8xxx_priv *priv, int phy);
+       void (*set_mirror_regs)(struct ar8xxx_priv *priv);
 
        const struct ar8xxx_mib_desc *mib_decs;
        unsigned num_mibs;
+       unsigned mib_func;
+};
+
+enum ar8327_led_pattern {
+       AR8327_LED_PATTERN_OFF = 0,
+       AR8327_LED_PATTERN_BLINK,
+       AR8327_LED_PATTERN_ON,
+       AR8327_LED_PATTERN_RULE,
+};
+
+struct ar8327_led_entry {
+       unsigned reg;
+       unsigned shift;
+};
+
+struct ar8327_led {
+       struct led_classdev cdev;
+       struct ar8xxx_priv *sw_priv;
+
+       char *name;
+       bool active_low;
+       u8 led_num;
+       enum ar8327_led_mode mode;
+
+       struct mutex mutex;
+       spinlock_t lock;
+       struct work_struct led_work;
+       bool enable_hw_mode;
+       enum ar8327_led_pattern pattern;
 };
 
 struct ar8327_data {
        u32 port0_status;
        u32 port6_status;
+
+       struct ar8327_led **leds;
+       unsigned int num_leds;
 };
 
 struct ar8xxx_priv {
@@ -102,15 +151,12 @@ struct ar8xxx_priv {
        u8 chip_ver;
        u8 chip_rev;
        const struct ar8xxx_chip *chip;
-       union {
-               struct ar8327_data ar8327;
-       } chip_data;
+       void *chip_data;
        bool initialized;
        bool port4_phy;
        char buf[2048];
 
        bool init;
-       bool mii_lo_first;
 
        struct mutex mib_lock;
        struct delayed_work mib_work;
@@ -280,6 +326,76 @@ split_addr(u32 regaddr, u16 *r1, u16 *r2, u16 *page)
        *page = regaddr & 0x1ff;
 }
 
+/* inspired by phy_poll_reset in drivers/net/phy/phy_device.c */
+static int
+ar8xxx_phy_poll_reset(struct mii_bus *bus)
+{
+        unsigned int sleep_msecs = 20;
+        int ret, elapsed, i;
+
+        for (elapsed = sleep_msecs; elapsed <= 600;
+            elapsed += sleep_msecs) {
+                msleep(sleep_msecs);
+                for (i = 0; i < AR8XXX_NUM_PHYS; i++) {
+                        ret = mdiobus_read(bus, i, MII_BMCR);
+                        if (ret < 0)
+                               return ret;
+                        if (ret & BMCR_RESET)
+                               break;
+                        if (i == AR8XXX_NUM_PHYS - 1) {
+                                usleep_range(1000, 2000);
+                                return 0;
+                        }
+                }
+        }
+        return -ETIMEDOUT;
+}
+
+static int
+ar8xxx_phy_check_aneg(struct phy_device *phydev)
+{
+       int ret;
+
+       if (phydev->autoneg != AUTONEG_ENABLE)
+               return 0;
+       /*
+        * BMCR_ANENABLE might have been cleared
+        * by phy_init_hw in certain kernel versions
+        * therefore check for it
+        */
+       ret = phy_read(phydev, MII_BMCR);
+       if (ret < 0)
+               return ret;
+       if (ret & BMCR_ANENABLE)
+               return 0;
+
+       dev_info(&phydev->dev, "ANEG disabled, re-enabling ...\n");
+       ret |= BMCR_ANENABLE | BMCR_ANRESTART;
+       return phy_write(phydev, MII_BMCR, ret);
+}
+
+static void
+ar8xxx_phy_init(struct ar8xxx_priv *priv)
+{
+       int i;
+       struct mii_bus *bus;
+
+       bus = priv->mii_bus;
+       for (i = 0; i < AR8XXX_NUM_PHYS; i++) {
+               if (priv->chip->phy_fixup)
+                       priv->chip->phy_fixup(priv, i);
+
+               /* initialize the port itself */
+               mdiobus_write(bus, i, MII_ADVERTISE,
+                       ADVERTISE_ALL | ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM);
+               if (ar8xxx_has_gige(priv))
+                       mdiobus_write(bus, i, MII_CTRL1000, ADVERTISE_1000FULL);
+               mdiobus_write(bus, i, MII_BMCR, BMCR_RESET | BMCR_ANENABLE);
+       }
+
+       ar8xxx_phy_poll_reset(bus);
+}
+
 static u32
 ar8xxx_mii_read(struct ar8xxx_priv *priv, int reg)
 {
@@ -316,7 +432,7 @@ ar8xxx_mii_write(struct ar8xxx_priv *priv, int reg, u32 val)
 
        bus->write(bus, 0x18, 0, r3);
        usleep_range(1000, 2000); /* wait for the page switch to propagate */
-       if (priv->mii_lo_first) {
+       if (priv->chip->mii_lo_first) {
                bus->write(bus, 0x10 | r2, r1, lo);
                bus->write(bus, 0x10 | r2, r1 + 1, hi);
        } else {
@@ -352,7 +468,7 @@ ar8xxx_mii_rmw(struct ar8xxx_priv *priv, int reg, u32 mask, u32 val)
        lo = ret & 0xffff;
        hi = (u16) (ret >> 16);
 
-       if (priv->mii_lo_first) {
+       if (priv->chip->mii_lo_first) {
                bus->write(bus, 0x10 | r2, r1, lo);
                bus->write(bus, 0x10 | r2, r1 + 1, hi);
        } else {
@@ -423,16 +539,11 @@ ar8xxx_reg_wait(struct ar8xxx_priv *priv, u32 reg, u32 mask, u32 val,
 static int
 ar8xxx_mib_op(struct ar8xxx_priv *priv, u32 op)
 {
-       unsigned mib_func;
+       unsigned mib_func = priv->chip->mib_func;
        int ret;
 
        lockdep_assert_held(&priv->mib_lock);
 
-       if (chip_is_ar8327(priv) || chip_is_ar8337(priv))
-               mib_func = AR8327_REG_MIB_FUNC;
-       else
-               mib_func = AR8216_REG_MIB_FUNC;
-
        /* Capture the hardware statistics for all ports */
        ar8xxx_rmw(priv, mib_func, AR8216_MIB_FUNC, (op << AR8216_MIB_FUNC_S));
 
@@ -470,13 +581,8 @@ ar8xxx_mib_fetch_port_stat(struct ar8xxx_priv *priv, int port, bool flush)
 
        lockdep_assert_held(&priv->mib_lock);
 
-       if (chip_is_ar8327(priv) || chip_is_ar8337(priv))
-               base = AR8327_REG_PORT_STATS_BASE(port);
-       else if (chip_is_ar8236(priv) ||
-                chip_is_ar8316(priv))
-               base = AR8236_REG_PORT_STATS_BASE(port);
-       else
-               base = AR8216_REG_PORT_STATS_BASE(port);
+       base = priv->chip->reg_port_stats_start +
+              priv->chip->reg_port_stats_length * port;
 
        mib_stats = &priv->mib_stats[port * priv->chip->num_mibs];
        for (i = 0; i < priv->chip->num_mibs; i++) {
@@ -687,10 +793,24 @@ ar8216_read_port_status(struct ar8xxx_priv *priv, int port)
 }
 
 static void
-ar8216_setup_port(struct ar8xxx_priv *priv, int port, u32 egress, u32 ingress,
-                 u32 members, u32 pvid)
+ar8216_setup_port(struct ar8xxx_priv *priv, int port, u32 members)
 {
        u32 header;
+       u32 egress, ingress;
+       u32 pvid;
+
+       if (priv->vlan) {
+               pvid = priv->vlan_id[priv->pvid[port]];
+               if (priv->vlan_tagged & (1 << port))
+                       egress = AR8216_OUT_ADD_VLAN;
+               else
+                       egress = AR8216_OUT_STRIP_VLAN;
+               ingress = AR8216_IN_SECURE;
+       } else {
+               pvid = port;
+               egress = AR8216_OUT_KEEP;
+               ingress = AR8216_IN_PORT_ONLY;
+       }
 
        if (chip_is_ar8216(priv) && priv->vlan && port == AR8216_PORT_CPU)
                header = AR8216_PORT_CTRL_HEADER;
@@ -716,6 +836,12 @@ ar8216_setup_port(struct ar8xxx_priv *priv, int port, u32 egress, u32 ingress,
 static int
 ar8216_hw_init(struct ar8xxx_priv *priv)
 {
+       if (priv->initialized)
+               return 0;
+
+       ar8xxx_phy_init(priv);
+
+       priv->initialized = true;
        return 0;
 }
 
@@ -758,6 +884,9 @@ ar8216_init_port(struct ar8xxx_priv *priv, int port)
 static const struct ar8xxx_chip ar8216_chip = {
        .caps = AR8XXX_CAP_MIB_COUNTERS,
 
+       .reg_port_stats_start = 0x19000,
+       .reg_port_stats_length = 0xa0,
+
        .hw_init = ar8216_hw_init,
        .init_globals = ar8216_init_globals,
        .init_port = ar8216_init_port,
@@ -766,15 +895,32 @@ static const struct ar8xxx_chip ar8216_chip = {
        .atu_flush = ar8216_atu_flush,
        .vtu_flush = ar8216_vtu_flush,
        .vtu_load_vlan = ar8216_vtu_load_vlan,
+       .set_mirror_regs = ar8216_set_mirror_regs,
 
        .num_mibs = ARRAY_SIZE(ar8216_mibs),
        .mib_decs = ar8216_mibs,
+       .mib_func = AR8216_REG_MIB_FUNC
 };
 
 static void
-ar8236_setup_port(struct ar8xxx_priv *priv, int port, u32 egress, u32 ingress,
-                 u32 members, u32 pvid)
+ar8236_setup_port(struct ar8xxx_priv *priv, int port, u32 members)
 {
+       u32 egress, ingress;
+       u32 pvid;
+
+       if (priv->vlan) {
+               pvid = priv->vlan_id[priv->pvid[port]];
+               if (priv->vlan_tagged & (1 << port))
+                       egress = AR8216_OUT_ADD_VLAN;
+               else
+                       egress = AR8216_OUT_STRIP_VLAN;
+               ingress = AR8216_IN_SECURE;
+       } else {
+               pvid = port;
+               egress = AR8216_OUT_KEEP;
+               ingress = AR8216_IN_PORT_ONLY;
+       }
+
        ar8xxx_rmw(priv, AR8216_REG_PORT_CTRL(port),
                   AR8216_PORT_CTRL_LEARN | AR8216_PORT_CTRL_VLAN_MODE |
                   AR8216_PORT_CTRL_SINGLE_VLAN | AR8216_PORT_CTRL_STATE |
@@ -794,29 +940,6 @@ ar8236_setup_port(struct ar8xxx_priv *priv, int port, u32 egress, u32 ingress,
                   (members << AR8236_PORT_VLAN2_MEMBER_S));
 }
 
-static int
-ar8236_hw_init(struct ar8xxx_priv *priv)
-{
-       int i;
-       struct mii_bus *bus;
-
-       if (priv->initialized)
-               return 0;
-
-       /* Initialize the PHYs */
-       bus = priv->mii_bus;
-       for (i = 0; i < 5; i++) {
-               mdiobus_write(bus, i, MII_ADVERTISE,
-                             ADVERTISE_ALL | ADVERTISE_PAUSE_CAP |
-                             ADVERTISE_PAUSE_ASYM);
-               mdiobus_write(bus, i, MII_BMCR, BMCR_RESET | BMCR_ANENABLE);
-       }
-       msleep(1000);
-
-       priv->initialized = true;
-       return 0;
-}
-
 static void
 ar8236_init_globals(struct ar8xxx_priv *priv)
 {
@@ -824,6 +947,15 @@ ar8236_init_globals(struct ar8xxx_priv *priv)
        ar8xxx_rmw(priv, AR8216_REG_GLOBAL_CTRL,
                   AR8316_GCTRL_MTU, 9018 + 8 + 2);
 
+       /* enable cpu port to receive arp frames */
+       ar8xxx_rmw(priv, AR8216_REG_ATU_CTRL,
+                  AR8236_ATU_CTRL_RES, AR8236_ATU_CTRL_RES);
+
+       /* enable cpu port to receive multicast and broadcast frames */
+       ar8xxx_rmw(priv, AR8216_REG_FLOOD_MASK,
+                  AR8236_FM_CPU_BROADCAST_EN | AR8236_FM_CPU_BCAST_FWD_EN,
+                  AR8236_FM_CPU_BROADCAST_EN | AR8236_FM_CPU_BCAST_FWD_EN);
+
        /* Enable MIB counters */
        ar8xxx_rmw(priv, AR8216_REG_MIB_FUNC, AR8216_MIB_FUNC | AR8236_MIB_EN,
                   (AR8216_MIB_FUNC_NO_OP << AR8216_MIB_FUNC_S) |
@@ -832,7 +964,11 @@ ar8236_init_globals(struct ar8xxx_priv *priv)
 
 static const struct ar8xxx_chip ar8236_chip = {
        .caps = AR8XXX_CAP_MIB_COUNTERS,
-       .hw_init = ar8236_hw_init,
+
+       .reg_port_stats_start = 0x20000,
+       .reg_port_stats_length = 0x100,
+
+       .hw_init = ar8216_hw_init,
        .init_globals = ar8236_init_globals,
        .init_port = ar8216_init_port,
        .setup_port = ar8236_setup_port,
@@ -840,17 +976,17 @@ static const struct ar8xxx_chip ar8236_chip = {
        .atu_flush = ar8216_atu_flush,
        .vtu_flush = ar8216_vtu_flush,
        .vtu_load_vlan = ar8216_vtu_load_vlan,
+       .set_mirror_regs = ar8216_set_mirror_regs,
 
        .num_mibs = ARRAY_SIZE(ar8236_mibs),
        .mib_decs = ar8236_mibs,
+       .mib_func = AR8216_REG_MIB_FUNC
 };
 
 static int
 ar8316_hw_init(struct ar8xxx_priv *priv)
 {
-       int i;
        u32 val, newval;
-       struct mii_bus *bus;
 
        val = priv->read(priv, AR8316_REG_POSTRIP);
 
@@ -889,17 +1025,7 @@ ar8316_hw_init(struct ar8xxx_priv *priv)
                msleep(1000);
        }
 
-       /* Initialize the ports */
-       bus = priv->mii_bus;
-       for (i = 0; i < 5; i++) {
-               /* initialize the port itself */
-               mdiobus_write(bus, i, MII_ADVERTISE,
-                       ADVERTISE_ALL | ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM);
-               mdiobus_write(bus, i, MII_CTRL1000, ADVERTISE_1000FULL);
-               mdiobus_write(bus, i, MII_BMCR, BMCR_RESET | BMCR_ANENABLE);
-       }
-
-       msleep(1000);
+       ar8xxx_phy_init(priv);
 
 out:
        priv->initialized = true;
@@ -927,6 +1053,10 @@ ar8316_init_globals(struct ar8xxx_priv *priv)
 
 static const struct ar8xxx_chip ar8316_chip = {
        .caps = AR8XXX_CAP_GIGE | AR8XXX_CAP_MIB_COUNTERS,
+
+       .reg_port_stats_start = 0x20000,
+       .reg_port_stats_length = 0x100,
+
        .hw_init = ar8316_hw_init,
        .init_globals = ar8316_init_globals,
        .init_port = ar8216_init_port,
@@ -935,9 +1065,11 @@ static const struct ar8xxx_chip ar8316_chip = {
        .atu_flush = ar8216_atu_flush,
        .vtu_flush = ar8216_vtu_flush,
        .vtu_load_vlan = ar8216_vtu_load_vlan,
+       .set_mirror_regs = ar8216_set_mirror_regs,
 
        .num_mibs = ARRAY_SIZE(ar8236_mibs),
        .mib_decs = ar8236_mibs,
+       .mib_func = AR8216_REG_MIB_FUNC
 };
 
 static u32
@@ -1088,12 +1220,321 @@ ar8327_get_port_init_status(struct ar8327_port_cfg *cfg)
        return t;
 }
 
+#define AR8327_LED_ENTRY(_num, _reg, _shift) \
+       [_num] = { .reg = (_reg), .shift = (_shift) }
+
+static const struct ar8327_led_entry
+ar8327_led_map[AR8327_NUM_LEDS] = {
+       AR8327_LED_ENTRY(AR8327_LED_PHY0_0, 0, 14),
+       AR8327_LED_ENTRY(AR8327_LED_PHY0_1, 1, 14),
+       AR8327_LED_ENTRY(AR8327_LED_PHY0_2, 2, 14),
+
+       AR8327_LED_ENTRY(AR8327_LED_PHY1_0, 3, 8),
+       AR8327_LED_ENTRY(AR8327_LED_PHY1_1, 3, 10),
+       AR8327_LED_ENTRY(AR8327_LED_PHY1_2, 3, 12),
+
+       AR8327_LED_ENTRY(AR8327_LED_PHY2_0, 3, 14),
+       AR8327_LED_ENTRY(AR8327_LED_PHY2_1, 3, 16),
+       AR8327_LED_ENTRY(AR8327_LED_PHY2_2, 3, 18),
+
+       AR8327_LED_ENTRY(AR8327_LED_PHY3_0, 3, 20),
+       AR8327_LED_ENTRY(AR8327_LED_PHY3_1, 3, 22),
+       AR8327_LED_ENTRY(AR8327_LED_PHY3_2, 3, 24),
+
+       AR8327_LED_ENTRY(AR8327_LED_PHY4_0, 0, 30),
+       AR8327_LED_ENTRY(AR8327_LED_PHY4_1, 1, 30),
+       AR8327_LED_ENTRY(AR8327_LED_PHY4_2, 2, 30),
+};
+
+static void
+ar8327_set_led_pattern(struct ar8xxx_priv *priv, unsigned int led_num,
+                      enum ar8327_led_pattern pattern)
+{
+       const struct ar8327_led_entry *entry;
+
+       entry = &ar8327_led_map[led_num];
+       ar8xxx_rmw(priv, AR8327_REG_LED_CTRL(entry->reg),
+                  (3 << entry->shift), pattern << entry->shift);
+}
+
+static void
+ar8327_led_work_func(struct work_struct *work)
+{
+       struct ar8327_led *aled;
+       u8 pattern;
+
+       aled = container_of(work, struct ar8327_led, led_work);
+
+       spin_lock(&aled->lock);
+       pattern = aled->pattern;
+       spin_unlock(&aled->lock);
+
+       ar8327_set_led_pattern(aled->sw_priv, aled->led_num,
+                              pattern);
+}
+
+static void
+ar8327_led_schedule_change(struct ar8327_led *aled, u8 pattern)
+{
+       if (aled->pattern == pattern)
+               return;
+
+       aled->pattern = pattern;
+       schedule_work(&aled->led_work);
+}
+
+static inline struct ar8327_led *
+led_cdev_to_ar8327_led(struct led_classdev *led_cdev)
+{
+       return container_of(led_cdev, struct ar8327_led, cdev);
+}
+
+static int
+ar8327_led_blink_set(struct led_classdev *led_cdev,
+                    unsigned long *delay_on,
+                    unsigned long *delay_off)
+{
+       struct ar8327_led *aled = led_cdev_to_ar8327_led(led_cdev);
+
+       if (*delay_on == 0 && *delay_off == 0) {
+               *delay_on = 125;
+               *delay_off = 125;
+       }
+
+       if (*delay_on != 125 || *delay_off != 125) {
+               /*
+                * The hardware only supports blinking at 4Hz. Fall back
+                * to software implementation in other cases.
+                */
+               return -EINVAL;
+       }
+
+       spin_lock(&aled->lock);
+
+       aled->enable_hw_mode = false;
+       ar8327_led_schedule_change(aled, AR8327_LED_PATTERN_BLINK);
+
+       spin_unlock(&aled->lock);
+
+       return 0;
+}
+
+static void
+ar8327_led_set_brightness(struct led_classdev *led_cdev,
+                         enum led_brightness brightness)
+{
+       struct ar8327_led *aled = led_cdev_to_ar8327_led(led_cdev);
+       u8 pattern;
+       bool active;
+
+       active = (brightness != LED_OFF);
+       active ^= aled->active_low;
+
+       pattern = (active) ? AR8327_LED_PATTERN_ON :
+                            AR8327_LED_PATTERN_OFF;
+
+       spin_lock(&aled->lock);
+
+       aled->enable_hw_mode = false;
+       ar8327_led_schedule_change(aled, pattern);
+
+       spin_unlock(&aled->lock);
+}
+
+static ssize_t
+ar8327_led_enable_hw_mode_show(struct device *dev,
+                              struct device_attribute *attr,
+                              char *buf)
+{
+       struct led_classdev *led_cdev = dev_get_drvdata(dev);
+       struct ar8327_led *aled = led_cdev_to_ar8327_led(led_cdev);
+       ssize_t ret = 0;
+
+       spin_lock(&aled->lock);
+       ret += sprintf(buf, "%d\n", aled->enable_hw_mode);
+       spin_unlock(&aled->lock);
+
+       return ret;
+}
+
+static ssize_t
+ar8327_led_enable_hw_mode_store(struct device *dev,
+                               struct device_attribute *attr,
+                               const char *buf,
+                               size_t size)
+{
+        struct led_classdev *led_cdev = dev_get_drvdata(dev);
+       struct ar8327_led *aled = led_cdev_to_ar8327_led(led_cdev);
+       u8 pattern;
+       u8 value;
+       int ret;
+
+       ret = kstrtou8(buf, 10, &value);
+       if (ret < 0)
+               return -EINVAL;
+
+       spin_lock(&aled->lock);
+
+       aled->enable_hw_mode = !!value;
+       if (aled->enable_hw_mode)
+               pattern = AR8327_LED_PATTERN_RULE;
+       else
+               pattern = AR8327_LED_PATTERN_OFF;
+
+       ar8327_led_schedule_change(aled, pattern);
+
+       spin_unlock(&aled->lock);
+
+       return size;
+}
+
+static DEVICE_ATTR(enable_hw_mode,  S_IRUGO | S_IWUSR,
+                  ar8327_led_enable_hw_mode_show,
+                  ar8327_led_enable_hw_mode_store);
+
+static int
+ar8327_led_register(struct ar8xxx_priv *priv, struct ar8327_led *aled)
+{
+       int ret;
+
+       ret = led_classdev_register(NULL, &aled->cdev);
+       if (ret < 0)
+               return ret;
+
+       if (aled->mode == AR8327_LED_MODE_HW) {
+               ret = device_create_file(aled->cdev.dev,
+                                        &dev_attr_enable_hw_mode);
+               if (ret)
+                       goto err_unregister;
+       }
+
+       return 0;
+
+err_unregister:
+       led_classdev_unregister(&aled->cdev);
+       return ret;
+}
+
+static void
+ar8327_led_unregister(struct ar8327_led *aled)
+{
+       if (aled->mode == AR8327_LED_MODE_HW)
+               device_remove_file(aled->cdev.dev, &dev_attr_enable_hw_mode);
+
+       led_classdev_unregister(&aled->cdev);
+       cancel_work_sync(&aled->led_work);
+}
+
+static int
+ar8327_led_create(struct ar8xxx_priv *priv,
+                 const struct ar8327_led_info *led_info)
+{
+       struct ar8327_data *data = priv->chip_data;
+       struct ar8327_led *aled;
+       int ret;
+
+       if (!IS_ENABLED(CONFIG_AR8216_PHY_LEDS))
+               return 0;
+
+       if (!led_info->name)
+               return -EINVAL;
+
+       if (led_info->led_num >= AR8327_NUM_LEDS)
+               return -EINVAL;
+
+       aled = kzalloc(sizeof(*aled) + strlen(led_info->name) + 1,
+                      GFP_KERNEL);
+       if (!aled)
+               return -ENOMEM;
+
+       aled->sw_priv = priv;
+       aled->led_num = led_info->led_num;
+       aled->active_low = led_info->active_low;
+       aled->mode = led_info->mode;
+
+       if (aled->mode == AR8327_LED_MODE_HW)
+               aled->enable_hw_mode = true;
+
+       aled->name = (char *)(aled + 1);
+       strcpy(aled->name, led_info->name);
+
+       aled->cdev.name = aled->name;
+       aled->cdev.brightness_set = ar8327_led_set_brightness;
+       aled->cdev.blink_set = ar8327_led_blink_set;
+       aled->cdev.default_trigger = led_info->default_trigger;
+
+       spin_lock_init(&aled->lock);
+       mutex_init(&aled->mutex);
+       INIT_WORK(&aled->led_work, ar8327_led_work_func);
+
+       ret = ar8327_led_register(priv, aled);
+       if (ret)
+               goto err_free;
+
+       data->leds[data->num_leds++] = aled;
+
+       return 0;
+
+err_free:
+       kfree(aled);
+       return ret;
+}
+
+static void
+ar8327_led_destroy(struct ar8327_led *aled)
+{
+       ar8327_led_unregister(aled);
+       kfree(aled);
+}
+
+static void
+ar8327_leds_init(struct ar8xxx_priv *priv)
+{
+       struct ar8327_data *data = priv->chip_data;
+       unsigned i;
+
+       if (!IS_ENABLED(CONFIG_AR8216_PHY_LEDS))
+               return;
+
+       for (i = 0; i < data->num_leds; i++) {
+               struct ar8327_led *aled;
+
+               aled = data->leds[i];
+
+               if (aled->enable_hw_mode)
+                       aled->pattern = AR8327_LED_PATTERN_RULE;
+               else
+                       aled->pattern = AR8327_LED_PATTERN_OFF;
+
+               ar8327_set_led_pattern(priv, aled->led_num, aled->pattern);
+       }
+}
+
+static void
+ar8327_leds_cleanup(struct ar8xxx_priv *priv)
+{
+       struct ar8327_data *data = priv->chip_data;
+       unsigned i;
+
+       if (!IS_ENABLED(CONFIG_AR8216_PHY_LEDS))
+               return;
+
+       for (i = 0; i < data->num_leds; i++) {
+               struct ar8327_led *aled;
+
+               aled = data->leds[i];
+               ar8327_led_destroy(aled);
+       }
+
+       kfree(data->leds);
+}
+
 static int
 ar8327_hw_config_pdata(struct ar8xxx_priv *priv,
                       struct ar8327_platform_data *pdata)
 {
        struct ar8327_led_cfg *led_cfg;
-       struct ar8327_data *data;
+       struct ar8327_data *data = priv->chip_data;
        u32 pos, new_pos;
        u32 t;
 
@@ -1102,8 +1543,6 @@ ar8327_hw_config_pdata(struct ar8xxx_priv *priv,
 
        priv->get_port_link = pdata->get_port_link;
 
-       data = &priv->chip_data.ar8327;
-
        data->port0_status = ar8327_get_port_init_status(&pdata->port0_cfg);
        data->port6_status = ar8327_get_port_init_status(&pdata->port6_cfg);
 
@@ -1157,6 +1596,18 @@ ar8327_hw_config_pdata(struct ar8xxx_priv *priv,
 
        priv->write(priv, AR8327_REG_POWER_ON_STRIP, new_pos);
 
+       if (pdata->leds && pdata->num_leds) {
+               int i;
+
+               data->leds = kzalloc(pdata->num_leds * sizeof(void *),
+                                    GFP_KERNEL);
+               if (!data->leds)
+                       return -ENOMEM;
+
+               for (i = 0; i < pdata->num_leds; i++)
+                       ar8327_led_create(priv, &pdata->leds[i]);
+       }
+
        return 0;
 }
 
@@ -1164,6 +1615,7 @@ ar8327_hw_config_pdata(struct ar8xxx_priv *priv,
 static int
 ar8327_hw_config_of(struct ar8xxx_priv *priv, struct device_node *np)
 {
+       struct ar8327_data *data = priv->chip_data;
        const __be32 *paddr;
        int len;
        int i;
@@ -1183,10 +1635,10 @@ ar8327_hw_config_of(struct ar8xxx_priv *priv, struct device_node *np)
 
                switch (reg) {
                case AR8327_REG_PORT_STATUS(0):
-                       priv->chip_data.ar8327.port0_status = val;
+                       data->port0_status = val;
                        break;
                case AR8327_REG_PORT_STATUS(6):
-                       priv->chip_data.ar8327.port6_status = val;
+                       data->port6_status = val;
                        break;
                default:
                        priv->write(priv, reg, val);
@@ -1207,9 +1659,11 @@ ar8327_hw_config_of(struct ar8xxx_priv *priv, struct device_node *np)
 static int
 ar8327_hw_init(struct ar8xxx_priv *priv)
 {
-       struct mii_bus *bus;
        int ret;
-       int i;
+
+       priv->chip_data = kzalloc(sizeof(struct ar8327_data), GFP_KERNEL);
+       if (!priv->chip_data)
+               return -ENOMEM;
 
        if (priv->phy->dev.of_node)
                ret = ar8327_hw_config_of(priv, priv->phy->dev.of_node);
@@ -1220,23 +1674,19 @@ ar8327_hw_init(struct ar8xxx_priv *priv)
        if (ret)
                return ret;
 
-       bus = priv->mii_bus;
-       for (i = 0; i < AR8327_NUM_PHYS; i++) {
-               ar8327_phy_fixup(priv, i);
-
-               /* start aneg on the PHY */
-               mdiobus_write(bus, i, MII_ADVERTISE, ADVERTISE_ALL |
-                                                    ADVERTISE_PAUSE_CAP |
-                                                    ADVERTISE_PAUSE_ASYM);
-               mdiobus_write(bus, i, MII_CTRL1000, ADVERTISE_1000FULL);
-               mdiobus_write(bus, i, MII_BMCR, BMCR_RESET | BMCR_ANENABLE);
-       }
+       ar8327_leds_init(priv);
 
-       msleep(1000);
+       ar8xxx_phy_init(priv);
 
        return 0;
 }
 
+static void
+ar8327_cleanup(struct ar8xxx_priv *priv)
+{
+       ar8327_leds_cleanup(priv);
+}
+
 static void
 ar8327_init_globals(struct ar8xxx_priv *priv)
 {
@@ -1260,17 +1710,27 @@ ar8327_init_globals(struct ar8xxx_priv *priv)
        /* Enable MIB counters */
        ar8xxx_reg_set(priv, AR8327_REG_MODULE_EN,
                       AR8327_MODULE_EN_MIB);
+
+       /* Disable EEE on all ports due to stability issues */
+       t = priv->read(priv, AR8327_REG_EEE_CTRL);
+       t |= AR8327_EEE_CTRL_DISABLE_PHY(0) |
+            AR8327_EEE_CTRL_DISABLE_PHY(1) |
+            AR8327_EEE_CTRL_DISABLE_PHY(2) |
+            AR8327_EEE_CTRL_DISABLE_PHY(3) |
+            AR8327_EEE_CTRL_DISABLE_PHY(4);
+       priv->write(priv, AR8327_REG_EEE_CTRL, t);
 }
 
 static void
 ar8327_init_port(struct ar8xxx_priv *priv, int port)
 {
+       struct ar8327_data *data = priv->chip_data;
        u32 t;
 
        if (port == AR8216_PORT_CPU)
-               t = priv->chip_data.ar8327.port0_status;
+               t = data->port0_status;
        else if (port == 6)
-               t = priv->chip_data.ar8327.port6_status;
+               t = data->port6_status;
        else
                t = AR8216_PORT_STATUS_LINK_AUTO;
 
@@ -1345,7 +1805,7 @@ ar8327_vtu_load_vlan(struct ar8xxx_priv *priv, u32 vid, u32 port_mask)
                        mode = AR8327_VTU_FUNC0_EG_MODE_NOT;
                else if (priv->vlan == 0)
                        mode = AR8327_VTU_FUNC0_EG_MODE_KEEP;
-               else if (priv->vlan_tagged & BIT(i))
+               else if ((priv->vlan_tagged & BIT(i)) || (priv->vlan_id[priv->pvid[i]] != vid))
                        mode = AR8327_VTU_FUNC0_EG_MODE_TAG;
                else
                        mode = AR8327_VTU_FUNC0_EG_MODE_UNTAG;
@@ -1356,31 +1816,26 @@ ar8327_vtu_load_vlan(struct ar8xxx_priv *priv, u32 vid, u32 port_mask)
 }
 
 static void
-ar8327_setup_port(struct ar8xxx_priv *priv, int port, u32 egress, u32 ingress,
-                 u32 members, u32 pvid)
+ar8327_setup_port(struct ar8xxx_priv *priv, int port, u32 members)
 {
        u32 t;
-       u32 mode;
+       u32 egress, ingress;
+       u32 pvid = priv->vlan_id[priv->pvid[port]];
+
+       if (priv->vlan) {
+               egress = AR8327_PORT_VLAN1_OUT_MODE_UNMOD;
+               ingress = AR8216_IN_SECURE;
+       } else {
+               egress = AR8327_PORT_VLAN1_OUT_MODE_UNTOUCH;
+               ingress = AR8216_IN_PORT_ONLY;
+       }
 
        t = pvid << AR8327_PORT_VLAN0_DEF_SVID_S;
        t |= pvid << AR8327_PORT_VLAN0_DEF_CVID_S;
        priv->write(priv, AR8327_REG_PORT_VLAN0(port), t);
 
-       mode = AR8327_PORT_VLAN1_OUT_MODE_UNMOD;
-       switch (egress) {
-       case AR8216_OUT_KEEP:
-               mode = AR8327_PORT_VLAN1_OUT_MODE_UNTOUCH;
-               break;
-       case AR8216_OUT_STRIP_VLAN:
-               mode = AR8327_PORT_VLAN1_OUT_MODE_UNTAG;
-               break;
-       case AR8216_OUT_ADD_VLAN:
-               mode = AR8327_PORT_VLAN1_OUT_MODE_TAG;
-               break;
-       }
-
        t = AR8327_PORT_VLAN1_PORT_VLAN_PROP;
-       t |= mode << AR8327_PORT_VLAN1_OUT_MODE_S;
+       t |= egress << AR8327_PORT_VLAN1_OUT_MODE_S;
        priv->write(priv, AR8327_REG_PORT_VLAN1(port), t);
 
        t = members;
@@ -1392,7 +1847,14 @@ ar8327_setup_port(struct ar8xxx_priv *priv, int port, u32 egress, u32 ingress,
 
 static const struct ar8xxx_chip ar8327_chip = {
        .caps = AR8XXX_CAP_GIGE | AR8XXX_CAP_MIB_COUNTERS,
+       .config_at_probe = true,
+       .mii_lo_first = true,
+
+       .reg_port_stats_start = 0x1000,
+       .reg_port_stats_length = 0x100,
+
        .hw_init = ar8327_hw_init,
+       .cleanup = ar8327_cleanup,
        .init_globals = ar8327_init_globals,
        .init_port = ar8327_init_port,
        .setup_port = ar8327_setup_port,
@@ -1400,9 +1862,12 @@ static const struct ar8xxx_chip ar8327_chip = {
        .atu_flush = ar8327_atu_flush,
        .vtu_flush = ar8327_vtu_flush,
        .vtu_load_vlan = ar8327_vtu_load_vlan,
+       .phy_fixup = ar8327_phy_fixup,
+       .set_mirror_regs = ar8327_set_mirror_regs,
 
        .num_mibs = ARRAY_SIZE(ar8236_mibs),
        .mib_decs = ar8236_mibs,
+       .mib_func = AR8327_REG_MIB_FUNC
 };
 
 static int
@@ -1498,6 +1963,30 @@ ar8xxx_sw_get_ports(struct switch_dev *dev, struct switch_val *val)
        return 0;
 }
 
+static int
+ar8327_sw_get_ports(struct switch_dev *dev, struct switch_val *val)
+{
+       struct ar8xxx_priv *priv = swdev_to_ar8xxx(dev);
+       u8 ports = priv->vlan_table[val->port_vlan];
+       int i;
+
+       val->len = 0;
+       for (i = 0; i < dev->ports; i++) {
+               struct switch_port *p;
+
+               if (!(ports & (1 << i)))
+                       continue;
+
+               p = &val->value.ports[val->len++];
+               p->id = i;
+               if ((priv->vlan_tagged & (1 << i)) || (priv->pvid[i] != val->port_vlan))
+                       p->flags = (1 << SWITCH_PORT_FLAG_TAGGED);
+               else
+                       p->flags = 0;
+       }
+       return 0;
+}
+
 static int
 ar8xxx_sw_set_ports(struct switch_dev *dev, struct switch_val *val)
 {
@@ -1529,6 +2018,31 @@ ar8xxx_sw_set_ports(struct switch_dev *dev, struct switch_val *val)
        return 0;
 }
 
+static int
+ar8327_sw_set_ports(struct switch_dev *dev, struct switch_val *val)
+{
+       struct ar8xxx_priv *priv = swdev_to_ar8xxx(dev);
+       u8 *vt = &priv->vlan_table[val->port_vlan];
+       int i;
+
+       *vt = 0;
+       for (i = 0; i < val->len; i++) {
+               struct switch_port *p = &val->value.ports[i];
+
+               if (p->flags & (1 << SWITCH_PORT_FLAG_TAGGED)) {
+                       if (val->port_vlan == priv->pvid[p->id]) {
+                               priv->vlan_tagged |= (1 << p->id);
+                       }
+               } else {
+                       priv->vlan_tagged &= ~(1 << p->id);
+                       priv->pvid[p->id] = val->port_vlan;
+               }
+
+               *vt |= 1 << p->id;
+       }
+       return 0;
+}
+
 static void
 ar8327_set_mirror_regs(struct ar8xxx_priv *priv)
 {
@@ -1611,16 +2125,6 @@ ar8216_set_mirror_regs(struct ar8xxx_priv *priv)
                           AR8216_PORT_CTRL_MIRROR_TX);
 }
 
-static void
-ar8xxx_set_mirror_regs(struct ar8xxx_priv *priv)
-{
-       if (chip_is_ar8327(priv) || chip_is_ar8337(priv)) {
-               ar8327_set_mirror_regs(priv);
-       } else {
-               ar8216_set_mirror_regs(priv);
-       }
-}
-
 static int
 ar8xxx_sw_hw_apply(struct switch_dev *dev)
 {
@@ -1665,27 +2169,10 @@ ar8xxx_sw_hw_apply(struct switch_dev *dev)
 
        /* update the port destination mask registers and tag settings */
        for (i = 0; i < dev->ports; i++) {
-               int egress, ingress;
-               int pvid;
-
-               if (priv->vlan) {
-                       pvid = priv->vlan_id[priv->pvid[i]];
-                       if (priv->vlan_tagged & (1 << i))
-                               egress = AR8216_OUT_ADD_VLAN;
-                       else
-                               egress = AR8216_OUT_STRIP_VLAN;
-                       ingress = AR8216_IN_SECURE;
-               } else {
-                       pvid = i;
-                       egress = AR8216_OUT_KEEP;
-                       ingress = AR8216_IN_PORT_ONLY;
-               }
-
-               priv->chip->setup_port(priv, i, egress, ingress, portmask[i],
-                                      pvid);
+               priv->chip->setup_port(priv, i, portmask[i]);
        }
 
-       ar8xxx_set_mirror_regs(priv);
+       priv->chip->set_mirror_regs(priv);
 
        mutex_unlock(&priv->reg_mutex);
        return 0;
@@ -1757,7 +2244,7 @@ ar8xxx_sw_set_mirror_rx_enable(struct switch_dev *dev,
 
        mutex_lock(&priv->reg_mutex);
        priv->mirror_rx = !!val->value.i;
-       ar8xxx_set_mirror_regs(priv);
+       priv->chip->set_mirror_regs(priv);
        mutex_unlock(&priv->reg_mutex);
 
        return 0;
@@ -1782,7 +2269,7 @@ ar8xxx_sw_set_mirror_tx_enable(struct switch_dev *dev,
 
        mutex_lock(&priv->reg_mutex);
        priv->mirror_tx = !!val->value.i;
-       ar8xxx_set_mirror_regs(priv);
+       priv->chip->set_mirror_regs(priv);
        mutex_unlock(&priv->reg_mutex);
 
        return 0;
@@ -1807,7 +2294,7 @@ ar8xxx_sw_set_mirror_monitor_port(struct switch_dev *dev,
 
        mutex_lock(&priv->reg_mutex);
        priv->monitor_port = val->value.i;
-       ar8xxx_set_mirror_regs(priv);
+       priv->chip->set_mirror_regs(priv);
        mutex_unlock(&priv->reg_mutex);
 
        return 0;
@@ -1832,7 +2319,7 @@ ar8xxx_sw_set_mirror_source_port(struct switch_dev *dev,
 
        mutex_lock(&priv->reg_mutex);
        priv->source_port = val->value.i;
-       ar8xxx_set_mirror_regs(priv);
+       priv->chip->set_mirror_regs(priv);
        mutex_unlock(&priv->reg_mutex);
 
        return 0;
@@ -2088,8 +2575,8 @@ static const struct switch_dev_ops ar8327_sw_ops = {
        },
        .get_port_pvid = ar8xxx_sw_get_pvid,
        .set_port_pvid = ar8xxx_sw_set_pvid,
-       .get_vlan_ports = ar8xxx_sw_get_ports,
-       .set_vlan_ports = ar8xxx_sw_set_ports,
+       .get_vlan_ports = ar8327_sw_get_ports,
+       .set_vlan_ports = ar8327_sw_set_ports,
        .apply_config = ar8xxx_sw_hw_apply,
        .reset_switch = ar8xxx_sw_reset_switch,
        .get_port_link = ar8xxx_sw_get_port_link,
@@ -2133,11 +2620,9 @@ ar8xxx_id_chip(struct ar8xxx_priv *priv)
                priv->chip = &ar8316_chip;
                break;
        case AR8XXX_VER_AR8327:
-               priv->mii_lo_first = true;
                priv->chip = &ar8327_chip;
                break;
        case AR8XXX_VER_AR8337:
-               priv->mii_lo_first = true;
                priv->chip = &ar8327_chip;
                break;
        default:
@@ -2234,6 +2719,10 @@ ar8xxx_create(void)
 static void
 ar8xxx_free(struct ar8xxx_priv *priv)
 {
+       if (priv->chip && priv->chip->cleanup)
+               priv->chip->cleanup(priv);
+
+       kfree(priv->chip_data);
        kfree(priv->mib_stats);
        kfree(priv);
 }
@@ -2331,8 +2820,8 @@ ar8xxx_phy_config_init(struct phy_device *phydev)
        if (WARN_ON(!priv))
                return -ENODEV;
 
-       if (chip_is_ar8327(priv) || chip_is_ar8337(priv))
-               return 0;
+       if (priv->chip->config_at_probe)
+               return ar8xxx_phy_check_aneg(phydev);
 
        priv->phy = phydev;
 
@@ -2421,6 +2910,7 @@ static const u32 ar8xxx_phy_ids[] = {
        0x004dd036, /* AR8337 */
        0x004dd041,
        0x004dd042,
+       0x004dd043, /* AR8236 */
 };
 
 static bool
@@ -2506,7 +2996,7 @@ found:
                        phydev->advertising = ADVERTISED_100baseT_Full;
                }
 
-               if (chip_is_ar8327(priv) || chip_is_ar8337(priv)) {
+               if (priv->chip->config_at_probe) {
                        priv->phy = phydev;
 
                        ret = ar8xxx_start(priv);
@@ -2576,6 +3066,15 @@ ar8xxx_phy_remove(struct phy_device *phydev)
        ar8xxx_free(priv);
 }
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)
+static int
+ar8xxx_phy_soft_reset(struct phy_device *phydev)
+{
+       /* we don't need an extra reset */
+       return 0;
+}
+#endif
+
 static struct phy_driver ar8xxx_phy_driver = {
        .phy_id         = 0x004d0000,
        .name           = "Atheros AR8216/AR8236/AR8316",
@@ -2587,6 +3086,9 @@ static struct phy_driver ar8xxx_phy_driver = {
        .config_init    = ar8xxx_phy_config_init,
        .config_aneg    = ar8xxx_phy_config_aneg,
        .read_status    = ar8xxx_phy_read_status,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)
+       .soft_reset     = ar8xxx_phy_soft_reset,
+#endif
        .driver         = { .owner = THIS_MODULE },
 };