generic: ar8216: move register inititalization into hw_init
[openwrt.git] / target / linux / generic / files / drivers / net / phy / ar8216.c
index 1183cbc..34322dd 100644 (file)
@@ -137,9 +137,11 @@ ar8216_id_chip(struct ar8216_priv *priv)
        u16 id;
        int i;
 
+       priv->chip = UNKNOWN;
+
        val = ar8216_mii_read(priv, AR8216_REG_CTRL);
        if (val == ~0)
-               return UNKNOWN;
+               return -ENODEV;
 
        id = val & (AR8216_CTRL_REVISION | AR8216_CTRL_VERSION);
        for (i = 0; i < AR8X16_PROBE_RETRIES; i++) {
@@ -147,21 +149,24 @@ ar8216_id_chip(struct ar8216_priv *priv)
 
                val = ar8216_mii_read(priv, AR8216_REG_CTRL);
                if (val == ~0)
-                       return UNKNOWN;
+                       return -ENODEV;
 
                t = val & (AR8216_CTRL_REVISION | AR8216_CTRL_VERSION);
                if (t != id)
-                       return UNKNOWN;
+                       return -ENODEV;
        }
 
        switch (id) {
        case 0x0101:
-               return AR8216;
+               priv->chip = AR8216;
+               break;
        case 0x0301:
-               return AR8236;
+               priv->chip = AR8236;
+               break;
        case 0x1000:
        case 0x1001:
-               return AR8316;
+               priv->chip = AR8316;
+               break;
        default:
                printk(KERN_DEBUG
                        "ar8216: Unknown Atheros device [ver=%d, rev=%d, phy_id=%04x%04x]\n",
@@ -170,7 +175,52 @@ ar8216_id_chip(struct ar8216_priv *priv)
                        mdiobus_read(priv->phy->bus, priv->phy->addr, 2),
                        mdiobus_read(priv->phy->bus, priv->phy->addr, 3));
 
-               return UNKNOWN;
+               return -ENODEV;
+       }
+
+       return 0;
+}
+
+static void
+ar8216_read_port_link(struct ar8216_priv *priv, int port,
+                     struct switch_port_link *link)
+{
+       u32 status;
+       u32 speed;
+
+       memset(link, '\0', sizeof(*link));
+
+       status = priv->read(priv, AR8216_REG_PORT_STATUS(port));
+
+       link->aneg = !!(status & AR8216_PORT_STATUS_LINK_AUTO);
+       if (link->aneg) {
+               link->link = !!(status & AR8216_PORT_STATUS_LINK_UP);
+               if (!link->link)
+                       return;
+       } else {
+               link->link = true;
+       }
+
+       link->duplex = !!(status & AR8216_PORT_STATUS_DUPLEX);
+       link->tx_flow = !!(status & AR8216_PORT_STATUS_TXFLOW);
+       link->rx_flow = !!(status & AR8216_PORT_STATUS_RXFLOW);
+
+       speed = (status & AR8216_PORT_STATUS_SPEED) >>
+                AR8216_PORT_STATUS_SPEED_S;
+
+       switch (speed) {
+       case AR8216_PORT_SPEED_10M:
+               link->speed = SWITCH_PORT_SPEED_10;
+               break;
+       case AR8216_PORT_SPEED_100M:
+               link->speed = SWITCH_PORT_SPEED_100;
+               break;
+       case AR8216_PORT_SPEED_1000M:
+               link->speed = SWITCH_PORT_SPEED_1000;
+               break;
+       default:
+               link->speed = SWITCH_PORT_SPEED_UNKNOWN;
+               break;
        }
 }
 
@@ -233,57 +283,13 @@ ar8216_get_vid(struct switch_dev *dev, const struct switch_attr *attr,
        return 0;
 }
 
-static const char *ar8216_speed_str(unsigned speed)
-{
-       switch (speed) {
-       case AR8216_PORT_SPEED_10M:
-               return "10baseT";
-       case AR8216_PORT_SPEED_100M:
-               return "100baseT";
-       case AR8216_PORT_SPEED_1000M:
-               return "1000baseT";
-       }
-
-       return "unknown";
-}
-
-static int ar8216_port_get_link(struct switch_dev *dev,
-                               const struct switch_attr *attr,
-                               struct switch_val *val)
+static int
+ar8216_get_port_link(struct switch_dev *dev, int port,
+                    struct switch_port_link *link)
 {
        struct ar8216_priv *priv = to_ar8216(dev);
-       u32 len;
-       u32 status;
-       int port;
-
-       port = val->port_vlan;
-
-       memset(priv->buf, '\0', sizeof(priv->buf));
-       status = priv->read(priv, AR8216_REG_PORT_STATUS(port));
-
-       if (status & AR8216_PORT_STATUS_LINK_UP) {
-               len = snprintf(priv->buf, sizeof(priv->buf),
-                               "port:%d link:up speed:%s %s-duplex %s%s%s",
-                               port,
-                               ar8216_speed_str((status &
-                                                 AR8216_PORT_STATUS_SPEED) >>
-                                                AR8216_PORT_STATUS_SPEED_S),
-                               (status & AR8216_PORT_STATUS_DUPLEX) ?
-                                       "full" : "half",
-                               (status & AR8216_PORT_STATUS_TXFLOW) ?
-                                       "txflow ": "",
-                               (status & AR8216_PORT_STATUS_RXFLOW) ?
-                                       "rxflow " : "",
-                               (status & AR8216_PORT_STATUS_LINK_AUTO) ?
-                                       "auto ": "");
-       } else {
-               len = snprintf(priv->buf, sizeof(priv->buf), "port:%d link:down",
-                               port);
-       }
-
-       val->value.s = priv->buf;
-       val->len = len;
 
+       ar8216_read_port_link(priv, port, link);
        return 0;
 }
 
@@ -396,14 +402,6 @@ static struct switch_attr ar8216_globals[] = {
 };
 
 static struct switch_attr ar8216_port[] = {
-       {
-               .type = SWITCH_TYPE_STRING,
-               .name = "link",
-               .description = "Get port link information",
-               .max = 1,
-               .set = NULL,
-               .get = ar8216_port_get_link,
-       },
 };
 
 static struct switch_attr ar8216_vlan[] = {
@@ -477,14 +475,22 @@ static int
 ar8216_wait_bit(struct ar8216_priv *priv, int reg, u32 mask, u32 val)
 {
        int timeout = 20;
+       u32 t = 0;
 
-       while ((priv->read(priv, reg) & mask) != val) {
-               if (timeout-- <= 0) {
-                       printk(KERN_ERR "ar8216: timeout waiting for operation to complete\n");
-                       return 1;
-               }
+       while (1) {
+               t = priv->read(priv, reg);
+               if ((t & mask) == val)
+                       return 0;
+
+               if (timeout-- <= 0)
+                       break;
+
+               udelay(10);
        }
-       return 0;
+
+       pr_err("ar8216: timeout on reg %08x: %08x & %08x != %08x\n",
+              (unsigned int) reg, t, mask, val);
+       return -ETIMEDOUT;
 }
 
 static void
@@ -632,6 +638,17 @@ 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) {
        static int initialized;
        int i;
@@ -650,6 +667,10 @@ 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);
+
        initialized = true;
        return 0;
 }
@@ -714,11 +735,44 @@ 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_port(struct ar8216_priv *priv, int port)
+{
+       /* Enable port learning and tx */
+       priv->write(priv, AR8216_REG_PORT_CTRL(port),
+               AR8216_PORT_CTRL_LEARN |
+               (4 << AR8216_PORT_CTRL_STATE_S));
+
+       priv->write(priv, AR8216_REG_PORT_VLAN(port), 0);
+
+       if (port == AR8216_PORT_CPU) {
+               priv->write(priv, AR8216_REG_PORT_STATUS(port),
+                       AR8216_PORT_STATUS_LINK_UP |
+                       ((priv->chip == AR8316) ?
+                               AR8216_PORT_SPEED_1000M : AR8216_PORT_SPEED_100M) |
+                       AR8216_PORT_STATUS_TXMAC |
+                       AR8216_PORT_STATUS_RXMAC |
+                       ((priv->chip == AR8316) ? AR8216_PORT_STATUS_RXFLOW : 0) |
+                       ((priv->chip == AR8316) ? AR8216_PORT_STATUS_TXFLOW : 0) |
+                       AR8216_PORT_STATUS_DUPLEX);
+       } else {
+               priv->write(priv, AR8216_REG_PORT_STATUS(port),
+                       AR8216_PORT_STATUS_LINK_AUTO);
+       }
+}
+
 static int
 ar8216_reset_switch(struct switch_dev *dev)
 {
@@ -731,47 +785,11 @@ ar8216_reset_switch(struct switch_dev *dev)
        for (i = 0; i < AR8X16_MAX_VLANS; i++) {
                priv->vlan_id[i] = i;
        }
-       for (i = 0; i < AR8216_NUM_PORTS; i++) {
-               /* Enable port learning and tx */
-               priv->write(priv, AR8216_REG_PORT_CTRL(i),
-                       AR8216_PORT_CTRL_LEARN |
-                       (4 << AR8216_PORT_CTRL_STATE_S));
-
-               priv->write(priv, AR8216_REG_PORT_VLAN(i), 0);
-
-               /* Configure all PHYs */
-               if (i == AR8216_PORT_CPU) {
-                       priv->write(priv, AR8216_REG_PORT_STATUS(i),
-                               AR8216_PORT_STATUS_LINK_UP |
-                               ((priv->chip == AR8316) ?
-                                       AR8216_PORT_SPEED_1000M : AR8216_PORT_SPEED_100M) |
-                               AR8216_PORT_STATUS_TXMAC |
-                               AR8216_PORT_STATUS_RXMAC |
-                               ((priv->chip == AR8316) ? AR8216_PORT_STATUS_RXFLOW : 0) |
-                               ((priv->chip == AR8316) ? AR8216_PORT_STATUS_TXFLOW : 0) |
-                               AR8216_PORT_STATUS_DUPLEX);
-               } else {
-                       priv->write(priv, AR8216_REG_PORT_STATUS(i),
-                               AR8216_PORT_STATUS_LINK_AUTO);
-               }
-       }
-       /* XXX: undocumented magic from atheros, required! */
-       priv->write(priv, 0x38, 0xc000050e);
 
-       if (priv->chip == AR8216) {
-               ar8216_rmw(priv, AR8216_REG_GLOBAL_CTRL,
-                       AR8216_GCTRL_MTU, 1518 + 8 + 2);
-       } else if (priv->chip == AR8316 ||
-                  priv->chip == AR8236) {
-               /* enable jumbo frames */
-               ar8216_rmw(priv, AR8216_REG_GLOBAL_CTRL,
-                       AR8316_GCTRL_MTU, 9018 + 8 + 2);
-       }
+       /* Configure all ports */
+       for (i = 0; i < AR8216_NUM_PORTS; i++)
+               ar8216_init_port(priv, i);
 
-       if (priv->chip == AR8316) {
-               /* enable cpu port to receive multicast and broadcast frames */
-               priv->write(priv, AR8216_REG_FLOOD_MASK, 0x003f003f);
-       }
        mutex_unlock(&priv->reg_mutex);
        return ar8216_hw_apply(dev);
 }
@@ -796,6 +814,7 @@ static const struct switch_dev_ops ar8216_ops = {
        .set_vlan_ports = ar8216_set_ports,
        .apply_config = ar8216_hw_apply,
        .reset_switch = ar8216_reset_switch,
+       .get_port_link = ar8216_get_port_link,
 };
 
 static int
@@ -814,7 +833,9 @@ ar8216_config_init(struct phy_device *pdev)
 
        priv->phy = pdev;
 
-       priv->chip = ar8216_id_chip(priv);
+       ret = ar8216_id_chip(priv);
+       if (ret)
+               goto err_free_priv;
 
        if (pdev->addr != 0) {
                if (priv->chip == AR8316) {
@@ -885,34 +906,26 @@ ar8216_config_init(struct phy_device *pdev)
                swdev->vlans = AR8216_NUM_VLANS;
        }
 
-       if ((ret = register_switch(&priv->dev, pdev->attached_dev)) < 0) {
-               kfree(priv);
-               goto done;
-       }
+       ret = register_switch(&priv->dev, pdev->attached_dev);
+       if (ret)
+               goto err_free_priv;
 
        priv->init = true;
 
-       if (priv->chip == AR8316) {
+       ret = 0;
+       if (priv->chip == AR8216)
+               ret = ar8216_hw_init(priv);
+       else if (priv->chip == AR8236)
+               ret = ar8236_hw_init(priv);
+       else if (priv->chip == AR8316)
                ret = ar8316_hw_init(priv);
-               if (ret) {
-                       kfree(priv);
-                       goto done;
-               }
-       }
 
-       if (priv->chip == AR8236) {
-               ret = ar8236_hw_init(priv);
-               if (ret) {
-                       kfree(priv);
-                       goto done;
-               }
-       }
+       if (ret)
+               goto err_free_priv;
 
        ret = ar8216_reset_switch(&priv->dev);
-       if (ret) {
-               kfree(priv);
-               goto done;
-       }
+       if (ret)
+               goto err_free_priv;
 
        dev->phy_ptr = priv;
 
@@ -929,7 +942,10 @@ ar8216_config_init(struct phy_device *pdev)
 
        priv->init = false;
 
-done:
+       return 0;
+
+err_free_priv:
+       kfree(priv);
        return ret;
 }
 
@@ -937,23 +953,37 @@ static int
 ar8216_read_status(struct phy_device *phydev)
 {
        struct ar8216_priv *priv = phydev->priv;
+       struct switch_port_link link;
        int ret;
        if (phydev->addr != 0) {
                return genphy_read_status(phydev);
        }
 
-       phydev->speed = priv->chip == AR8316 ? SPEED_1000 : SPEED_100;
-       phydev->duplex = DUPLEX_FULL;
-       phydev->link = 1;
+       ar8216_read_port_link(priv, phydev->addr, &link);
+       phydev->link = !!link.link;
+       if (!phydev->link)
+               return 0;
+
+       switch (link.speed) {
+       case SWITCH_PORT_SPEED_10:
+               phydev->speed = SPEED_10;
+               break;
+       case SWITCH_PORT_SPEED_100:
+               phydev->speed = SPEED_100;
+               break;
+       case SWITCH_PORT_SPEED_1000:
+               phydev->speed = SPEED_1000;
+               break;
+       default:
+               phydev->speed = 0;
+       }
+       phydev->duplex = link.duplex ? DUPLEX_FULL : DUPLEX_HALF;
 
        /* flush the address translation unit */
        mutex_lock(&priv->reg_mutex);
        ret = ar8216_wait_bit(priv, AR8216_REG_ATU, AR8216_ATU_ACTIVE, 0);
-
        if (!ret)
                priv->write(priv, AR8216_REG_ATU, AR8216_ATU_OP_FLUSH);
-       else
-               ret = -ETIMEDOUT;
        mutex_unlock(&priv->reg_mutex);
 
        phydev->state = PHY_RUNNING;
@@ -976,14 +1006,9 @@ static int
 ar8216_probe(struct phy_device *pdev)
 {
        struct ar8216_priv priv;
-       u16 chip;
 
        priv.phy = pdev;
-       chip = ar8216_id_chip(&priv);
-       if (chip == UNKNOWN)
-               return -ENODEV;
-
-       return 0;
+       return ar8216_id_chip(&priv);
 }
 
 static void