generic: ar8216: use bus->mdio_lock directly in ar8216_mii_{read,write}

[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 cdbf166..fe329d8 100644 (file)
--- a/target/linux/generic/files/drivers/net/phy/ar8216.c
+++ b/target/linux/generic/files/drivers/net/phy/ar8216.c
@@ -48,6 +48,8 @@ struct ar8216_priv {
        bool port4_phy;
        char buf[80];
 
+       bool init;
+
        /* all fields below are cleared on reset */
        bool vlan;
        u16 vlan_id[AR8X16_MAX_VLANS];
@@ -75,14 +77,20 @@ static u32
 ar8216_mii_read(struct ar8216_priv *priv, int reg)
 {
        struct phy_device *phy = priv->phy;
+       struct mii_bus *bus = phy->bus;
        u16 r1, r2, page;
        u16 lo, hi;
 
        split_addr((u32) reg, &r1, &r2, &page);
-       mdiobus_write(phy->bus, 0x18, 0, page);
+
+       mutex_lock(&bus->mdio_lock);
+
+       bus->write(bus, 0x18, 0, page);
        msleep(1); /* wait for the page switch to propagate */
-       lo = mdiobus_read(phy->bus, 0x10 | r2, r1);
-       hi = mdiobus_read(phy->bus, 0x10 | r2, r1 + 1);
+       lo = bus->read(bus, 0x10 | r2, r1);
+       hi = bus->read(bus, 0x10 | r2, r1 + 1);
+
+       mutex_unlock(&bus->mdio_lock);
 
        return (hi << 16) | lo;
 }
@@ -91,17 +99,22 @@ static void
 ar8216_mii_write(struct ar8216_priv *priv, int reg, u32 val)
 {
        struct phy_device *phy = priv->phy;
+       struct mii_bus *bus = phy->bus;
        u16 r1, r2, r3;
        u16 lo, hi;
 
        split_addr((u32) reg, &r1, &r2, &r3);
-       mdiobus_write(phy->bus, 0x18, 0, r3);
-       msleep(1); /* wait for the page switch to propagate */
-
        lo = val & 0xffff;
        hi = (u16) (val >> 16);
-       mdiobus_write(phy->bus, 0x10 | r2, r1 + 1, hi);
-       mdiobus_write(phy->bus, 0x10 | r2, r1, lo);
+
+       mutex_lock(&bus->mdio_lock);
+
+       bus->write(bus, 0x18, 0, r3);
+       msleep(1); /* 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 u32
@@ -144,6 +157,8 @@ ar8216_id_chip(struct ar8216_priv *priv)
        switch (id) {
        case 0x0101:
                return AR8216;
+       case 0x0301:
+               return AR8236;
        case 0x1000:
        case 0x1001:
                return AR8316;
@@ -513,6 +528,29 @@ ar8216_setup_port(struct ar8216_priv *priv, int port, u32 egress, u32 ingress,
                   (pvid << AR8216_PORT_VLAN_DEFAULT_ID_S));
 }
 
+static void
+ar8236_setup_port(struct ar8216_priv *priv, int port, u32 egress, u32 ingress,
+                 u32 members, u32 pvid)
+{
+       ar8216_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 |
+                  AR8216_PORT_CTRL_HEADER | AR8216_PORT_CTRL_LEARN_LOCK,
+                  AR8216_PORT_CTRL_LEARN |
+                  (egress << AR8216_PORT_CTRL_VLAN_MODE_S) |
+                  (AR8216_PORT_STATE_FORWARD << AR8216_PORT_CTRL_STATE_S));
+
+       ar8216_rmw(priv, AR8236_REG_PORT_VLAN(port),
+                  AR8236_PORT_VLAN_DEFAULT_ID,
+                  (pvid << AR8236_PORT_VLAN_DEFAULT_ID_S));
+
+       ar8216_rmw(priv, AR8236_REG_PORT_VLAN2(port),
+                  AR8236_PORT_VLAN2_VLAN_MODE |
+                  AR8236_PORT_VLAN2_MEMBER,
+                  (ingress << AR8236_PORT_VLAN2_VLAN_MODE_S) |
+                  (members << AR8236_PORT_VLAN2_MEMBER_S));
+}
+
 static int
 ar8216_hw_apply(struct switch_dev *dev)
 {
@@ -525,7 +563,7 @@ ar8216_hw_apply(struct switch_dev *dev)
        ar8216_vtu_op(priv, AR8216_VTU_OP_FLUSH, 0);
 
        memset(portmask, 0, sizeof(portmask));
-       if (priv->vlan) {
+       if (!priv->init) {
                /* calculate the port destination masks and load vlans
                 * into the vlan translation unit */
                for (j = 0; j < AR8X16_MAX_VLANS; j++) {
@@ -568,10 +606,13 @@ ar8216_hw_apply(struct switch_dev *dev)
                        pvid = i;
                }
 
-               if (priv->vlan && (priv->vlan_tagged & (1 << i))) {
-                       egress = AR8216_OUT_ADD_VLAN;
+               if (priv->vlan) {
+                       if (priv->vlan_tagged & (1 << i))
+                               egress = AR8216_OUT_ADD_VLAN;
+                       else
+                               egress = AR8216_OUT_STRIP_VLAN;
                } else {
-                       egress = AR8216_OUT_STRIP_VLAN;
+                       egress = AR8216_OUT_KEEP;
                }
                if (priv->vlan) {
                        ingress = AR8216_IN_SECURE;
@@ -579,12 +620,40 @@ ar8216_hw_apply(struct switch_dev *dev)
                        ingress = AR8216_IN_PORT_ONLY;
                }
 
-               ar8216_setup_port(priv, i, egress, ingress, portmask[i], pvid);
+               if (priv->chip == AR8236)
+                       ar8236_setup_port(priv, i, egress, ingress, portmask[i],
+                                         pvid);
+               else
+                       ar8216_setup_port(priv, i, egress, ingress, portmask[i],
+                                         pvid);
        }
        mutex_unlock(&priv->reg_mutex);
        return 0;
 }
 
+static int
+ar8236_hw_init(struct ar8216_priv *priv) {
+       static int initialized;
+       int i;
+       struct mii_bus *bus;
+
+       if (initialized)
+               return 0;
+
+       /* Initialize the PHYs */
+       bus = priv->phy->bus;
+       for (i = 0; i < 5; i++) {
+               bus->write(bus, i, MII_ADVERTISE,
+                          ADVERTISE_ALL | ADVERTISE_PAUSE_CAP |
+                          ADVERTISE_PAUSE_ASYM);
+               bus->write(bus, i, MII_BMCR, BMCR_RESET | BMCR_ANENABLE);
+       }
+       msleep(1000);
+
+       initialized = true;
+       return 0;
+}
+
 static int
 ar8316_hw_init(struct ar8216_priv *priv) {
        int i;
@@ -692,7 +761,8 @@ ar8216_reset_switch(struct switch_dev *dev)
        if (priv->chip == AR8216) {
                ar8216_rmw(priv, AR8216_REG_GLOBAL_CTRL,
                        AR8216_GCTRL_MTU, 1518 + 8 + 2);
-       } else if (priv->chip == AR8316) {
+       } else if (priv->chip == AR8316 ||
+                  priv->chip == AR8236) {
                /* enable jumbo frames */
                ar8216_rmw(priv, AR8216_REG_GLOBAL_CTRL,
                        AR8316_GCTRL_MTU, 9018 + 8 + 2);
@@ -806,6 +876,10 @@ ar8216_config_init(struct phy_device *pdev)
                        /* port 5 connected to the other mac, therefore unusable */
                        swdev->ports = (AR8216_NUM_PORTS - 1);
                }
+       } else if (priv->chip == AR8236) {
+               swdev->name = "Atheros AR8236";
+               swdev->vlans = AR8216_NUM_VLANS;
+               swdev->ports = AR8216_NUM_PORTS;
        } else {
                swdev->name = "Atheros AR8216";
                swdev->vlans = AR8216_NUM_VLANS;
@@ -816,6 +890,8 @@ ar8216_config_init(struct phy_device *pdev)
                goto done;
        }
 
+       priv->init = true;
+
        if (priv->chip == AR8316) {
                ret = ar8316_hw_init(priv);
                if (ret) {
@@ -824,6 +900,14 @@ ar8216_config_init(struct phy_device *pdev)
                }
        }
 
+       if (priv->chip == AR8236) {
+               ret = ar8236_hw_init(priv);
+               if (ret) {
+                       kfree(priv);
+                       goto done;
+               }
+       }
+
        ret = ar8216_reset_switch(&priv->dev);
        if (ret) {
                kfree(priv);
@@ -843,6 +927,8 @@ ar8216_config_init(struct phy_device *pdev)
                dev->netdev_ops = &priv->ndo;
        }
 
+       priv->init = false;
+
 done:
        return ret;
 }
@@ -918,7 +1004,7 @@ ar8216_remove(struct phy_device *pdev)
 
 static struct phy_driver ar8216_driver = {
        .phy_id         = 0x004d0000,
-       .name           = "Atheros AR8216/AR8316",
+       .name           = "Atheros AR8216/AR8236/AR8316",
        .phy_id_mask    = 0xffff0000,
        .features       = PHY_BASIC_FEATURES,
        .probe          = ar8216_probe,