projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
ar8216: fix a MTU related regression
[openwrt.git] / target / linux / generic / files / drivers / net / phy / ar8216.c
diff --git a/target/linux/generic/files/drivers/net/phy/ar8216.c b/target/linux/generic/files/drivers/net/phy/ar8216.c
index ba9bca0..660a11b 100644 (file)
--- a/target/linux/generic/files/drivers/net/phy/ar8216.c
+++ b/target/linux/generic/files/drivers/net/phy/ar8216.c
@@ -29,6 +29,7 @@
 #include <linux/phy.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
+#include <linux/lockdep.h>
 #include "ar8216.h"
 
 /* size of the vlan table */
@@ -86,7 +87,7 @@ ar8216_mii_read(struct ar8216_priv *priv, int reg)
        mutex_lock(&bus->mdio_lock);
 
        bus->write(bus, 0x18, 0, page);
-       msleep(1); /* wait for the page switch to propagate */
+       usleep_range(1000, 2000); /* wait for the page switch to propagate */
        lo = bus->read(bus, 0x10 | r2, r1);
        hi = bus->read(bus, 0x10 | r2, r1 + 1);
 
@@ -110,18 +111,32 @@ ar8216_mii_write(struct ar8216_priv *priv, int reg, u32 val)
        mutex_lock(&bus->mdio_lock);
 
        bus->write(bus, 0x18, 0, r3);
-       msleep(1); /* wait for the page switch to propagate */
+       usleep_range(1000, 2000); /* wait for the page switch to propagate */
        bus->write(bus, 0x10 | r2, r1 + 1, hi);
        bus->write(bus, 0x10 | r2, r1, lo);
 
        mutex_unlock(&bus->mdio_lock);
 }
 
+static void
+ar8216_phy_dbg_write(struct ar8216_priv *priv, int phy_addr,
+                    u16 dbg_addr, u16 dbg_data)
+{
+       struct mii_bus *bus = priv->phy->bus;
+
+       mutex_lock(&bus->mdio_lock);
+       bus->write(bus, phy_addr, MII_ATH_DBG_ADDR, dbg_addr);
+       bus->write(bus, phy_addr, MII_ATH_DBG_DATA, dbg_data);
+       mutex_unlock(&bus->mdio_lock);
+}
+
 static u32
 ar8216_rmw(struct ar8216_priv *priv, int reg, u32 mask, u32 val)
 {
        u32 v;
 
+       lockdep_assert_held(&priv->reg_mutex);
+
        v = priv->read(priv, reg);
        v &= ~mask;
        v |= val;
@@ -226,7 +241,7 @@ ar8216_read_port_link(struct ar8216_priv *priv, int port,
 
 static int
 ar8216_set_vlan(struct switch_dev *dev, const struct switch_attr *attr,
-                struct switch_val *val)
+               struct switch_val *val)
 {
        struct ar8216_priv *priv = to_ar8216(dev);
        priv->vlan = !!val->value.i;
@@ -235,7 +250,7 @@ ar8216_set_vlan(struct switch_dev *dev, const struct switch_attr *attr,
 
 static int
 ar8216_get_vlan(struct switch_dev *dev, const struct switch_attr *attr,
-                struct switch_val *val)
+               struct switch_val *val)
 {
        struct ar8216_priv *priv = to_ar8216(dev);
        val->value.i = priv->vlan;
@@ -267,7 +282,7 @@ ar8216_get_pvid(struct switch_dev *dev, int port, int *vlan)
 
 static int
 ar8216_set_vid(struct switch_dev *dev, const struct switch_attr *attr,
-                struct switch_val *val)
+              struct switch_val *val)
 {
        struct ar8216_priv *priv = to_ar8216(dev);
        priv->vlan_id[val->port_vlan] = val->value.i;
@@ -276,7 +291,7 @@ ar8216_set_vid(struct switch_dev *dev, const struct switch_attr *attr,
 
 static int
 ar8216_get_vid(struct switch_dev *dev, const struct switch_attr *attr,
-                struct switch_val *val)
+              struct switch_val *val)
 {
        struct ar8216_priv *priv = to_ar8216(dev);
        val->value.i = priv->vlan_id[val->port_vlan];
@@ -299,8 +314,8 @@ ar8216_mangle_tx(struct sk_buff *skb, struct net_device *dev)
        struct ar8216_priv *priv = dev->phy_ptr;
        unsigned char *buf;
 
-    if (unlikely(!priv))
-        goto error;
+       if (unlikely(!priv))
+               goto error;
 
        if (!priv->vlan)
                goto send;
@@ -451,9 +466,9 @@ ar8216_set_ports(struct switch_dev *dev, struct switch_val *val)
        for (i = 0; i < val->len; i++) {
                struct switch_port *p = &val->value.ports[i];
 
-               if (p->flags & (1 << SWITCH_PORT_FLAG_TAGGED))
+               if (p->flags & (1 << SWITCH_PORT_FLAG_TAGGED)) {
                        priv->vlan_tagged |= (1 << p->id);
-               else {
+               } else {
                        priv->vlan_tagged &= ~(1 << p->id);
                        priv->pvid[p->id] = val->port_vlan;
 
@@ -608,21 +623,14 @@ ar8216_hw_apply(struct switch_dev *dev)
 
                if (priv->vlan) {
                        pvid = priv->vlan_id[priv->pvid[i]];
-               } else {
-                       pvid = i;
-               }
-
-               if (priv->vlan) {
                        if (priv->vlan_tagged & (1 << i))
                                egress = AR8216_OUT_ADD_VLAN;
                        else
                                egress = AR8216_OUT_STRIP_VLAN;
-               } else {
-                       egress = AR8216_OUT_KEEP;
-               }
-               if (priv->vlan) {
                        ingress = AR8216_IN_SECURE;
                } else {
+                       pvid = i;
+                       egress = AR8216_OUT_KEEP;
                        ingress = AR8216_IN_PORT_ONLY;
                }
 
@@ -640,16 +648,12 @@ ar8216_hw_apply(struct switch_dev *dev)
 static int
 ar8216_hw_init(struct ar8216_priv *priv)
 {
-       /* XXX: undocumented magic from atheros, required! */
-       priv->write(priv, 0x38, 0xc000050e);
-
-       ar8216_rmw(priv, AR8216_REG_GLOBAL_CTRL,
-                  AR8216_GCTRL_MTU, 1518 + 8 + 2);
        return 0;
 }
 
 static int
-ar8236_hw_init(struct ar8216_priv *priv) {
+ar8236_hw_init(struct ar8216_priv *priv)
+{
        int i;
        struct mii_bus *bus;
 
@@ -666,16 +670,13 @@ ar8236_hw_init(struct ar8216_priv *priv) {
        }
        msleep(1000);
 
-       /* enable jumbo frames */
-       ar8216_rmw(priv, AR8216_REG_GLOBAL_CTRL,
-                  AR8316_GCTRL_MTU, 9018 + 8 + 2);
-
        priv->initialized = true;
        return 0;
 }
 
 static int
-ar8316_hw_init(struct ar8216_priv *priv) {
+ar8316_hw_init(struct ar8216_priv *priv)
+{
        int i;
        u32 val, newval;
        struct mii_bus *bus;
@@ -706,23 +707,17 @@ ar8316_hw_init(struct ar8216_priv *priv) {
 
        priv->write(priv, 0x8, newval);
 
-       /* standard atheros magic */
-       priv->write(priv, 0x38, 0xc000050e);
-
        /* Initialize the ports */
        bus = priv->phy->bus;
        for (i = 0; i < 5; i++) {
                if ((i == 4) && priv->port4_phy &&
                    priv->phy->interface == PHY_INTERFACE_MODE_RGMII) {
                        /* work around for phy4 rgmii mode */
-                       mdiobus_write(bus, i, MII_ATH_DBG_ADDR, 0x12);
-                       mdiobus_write(bus, i, MII_ATH_DBG_DATA, 0x480c);
+                       ar8216_phy_dbg_write(priv, i, 0x12, 0x480c);
                        /* rx delay */
-                       mdiobus_write(bus, i, MII_ATH_DBG_ADDR, 0x0);
-                       mdiobus_write(bus, i, MII_ATH_DBG_DATA, 0x824e);
+                       ar8216_phy_dbg_write(priv, i, 0x0, 0x824e);
                        /* tx delay */
-                       mdiobus_write(bus, i, MII_ATH_DBG_ADDR, 0x5);
-                       mdiobus_write(bus, i, MII_ATH_DBG_DATA, 0x3d47);
+                       ar8216_phy_dbg_write(priv, i, 0x5, 0x3d47);
                        msleep(1000);
                }
 
@@ -734,18 +729,38 @@ ar8316_hw_init(struct ar8216_priv *priv) {
                msleep(1000);
        }
 
-       /* enable jumbo frames */
-       ar8216_rmw(priv, AR8216_REG_GLOBAL_CTRL,
-                  AR8316_GCTRL_MTU, 9018 + 8 + 2);
-
-       /* enable cpu port to receive multicast and broadcast frames */
-       priv->write(priv, AR8216_REG_FLOOD_MASK, 0x003f003f);
-
 out:
        priv->initialized = true;
        return 0;
 }
 
+static void
+ar8216_init_globals(struct ar8216_priv *priv)
+{
+       switch (priv->chip) {
+       case AR8216:
+               /* standard atheros magic */
+               priv->write(priv, 0x38, 0xc000050e);
+
+               ar8216_rmw(priv, AR8216_REG_GLOBAL_CTRL,
+                          AR8216_GCTRL_MTU, 1518 + 8 + 2);
+               break;
+       case AR8316:
+               /* standard atheros magic */
+               priv->write(priv, 0x38, 0xc000050e);
+
+               /* enable cpu port to receive multicast and broadcast frames */
+               priv->write(priv, AR8216_REG_FLOOD_MASK, 0x003f003f);
+
+               /* fall through */
+       case AR8236:
+               /* enable jumbo frames */
+               ar8216_rmw(priv, AR8216_REG_GLOBAL_CTRL,
+                          AR8316_GCTRL_MTU, 9018 + 8 + 2);
+               break;
+       }
+}
+
 static void
 ar8216_init_port(struct ar8216_priv *priv, int port)
 {
@@ -781,15 +796,17 @@ ar8216_reset_switch(struct switch_dev *dev)
        mutex_lock(&priv->reg_mutex);
        memset(&priv->vlan, 0, sizeof(struct ar8216_priv) -
                offsetof(struct ar8216_priv, vlan));
-       for (i = 0; i < AR8X16_MAX_VLANS; i++) {
+
+       for (i = 0; i < AR8X16_MAX_VLANS; i++)
                priv->vlan_id[i] = i;
-       }
 
        /* Configure all ports */
        for (i = 0; i < AR8216_NUM_PORTS; i++)
                ar8216_init_port(priv, i);
 
+       ar8216_init_globals(priv);
        mutex_unlock(&priv->reg_mutex);
+
        return ar8216_hw_apply(dev);
 }
 
@@ -954,9 +971,9 @@ ar8216_read_status(struct phy_device *phydev)
        struct ar8216_priv *priv = phydev->priv;
        struct switch_port_link link;
        int ret;
-       if (phydev->addr != 0) {
+
+       if (phydev->addr != 0)
                return genphy_read_status(phydev);
-       }
 
        ar8216_read_port_link(priv, phydev->addr, &link);
        phydev->link = !!link.link;
@@ -965,13 +982,13 @@ ar8216_read_status(struct phy_device *phydev)
 
        switch (link.speed) {
        case SWITCH_PORT_SPEED_10:
-               phydev->speed = SPEED_10;
+               phydev->speed = SPEED_10;
                break;
        case SWITCH_PORT_SPEED_100:
-               phydev->speed = SPEED_100;
+               phydev->speed = SPEED_100;
                break;
        case SWITCH_PORT_SPEED_1000:
-               phydev->speed = SPEED_1000;
+               phydev->speed = SPEED_1000;
                break;
        default:
                phydev->speed = 0;
Personal OpenWRT clone
This page took 0.031406 seconds and 4 git commands to generate.