ar71xx: only reinit the ethernet MAC at .open() on ar724x for now, until we've figure...
[openwrt.git] / target / linux / ar71xx / files / drivers / net / ag71xx / ag71xx_phy.c
index 0db0a4b..9c76544 100644 (file)
@@ -1,7 +1,7 @@
 /*
  *  Atheros AR71xx built-in ethernet mac driver
  *
- *  Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
  *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
  *
  *  Based on Atheros' AG7100 driver
 
 #include "ag71xx.h"
 
-static unsigned char *ag71xx_speed_str(struct ag71xx *ag)
-{
-       switch (ag->speed) {
-       case SPEED_1000:
-               return "1000";
-       case SPEED_100:
-               return "100";
-       case SPEED_10:
-               return "10";
-       }
-
-       return "?";
-}
-
-static void ag71xx_phy_link_update(struct ag71xx *ag)
-{
-       struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
-       u32 cfg2;
-       u32 ifctl;
-       u32 fifo5;
-       u32 mii_speed;
-
-       if (!ag->link) {
-               netif_carrier_off(ag->dev);
-               if (netif_msg_link(ag))
-                       printk(KERN_INFO "%s: link down\n", ag->dev->name);
-               return;
-       }
-
-       cfg2 = ag71xx_rr(ag, AG71XX_REG_MAC_CFG2);
-       cfg2 &= ~(MAC_CFG2_IF_1000 | MAC_CFG2_IF_10_100 | MAC_CFG2_FDX);
-       cfg2 |= (ag->duplex) ? MAC_CFG2_FDX : 0;
-
-       ifctl = ag71xx_rr(ag, AG71XX_REG_MAC_IFCTL);
-       ifctl &= ~(MAC_IFCTL_SPEED);
-
-       fifo5 = ag71xx_rr(ag, AG71XX_REG_FIFO_CFG5);
-       fifo5 &= ~FIFO_CFG5_BM;
-
-       switch (ag->speed) {
-       case SPEED_1000:
-               mii_speed =  MII_CTRL_SPEED_1000;
-               cfg2 |= MAC_CFG2_IF_1000;
-               fifo5 |= FIFO_CFG5_BM;
-               break;
-       case SPEED_100:
-               mii_speed = MII_CTRL_SPEED_100;
-               cfg2 |= MAC_CFG2_IF_10_100;
-               ifctl |= MAC_IFCTL_SPEED;
-               break;
-       case SPEED_10:
-               mii_speed = MII_CTRL_SPEED_10;
-               cfg2 |= MAC_CFG2_IF_10_100;
-               break;
-       default:
-               BUG();
-               return;
-       }
-
-       if (pdata->is_ar91xx)
-               ag71xx_wr(ag, AG71XX_REG_FIFO_CFG3, 0x00780fff);
-       else if (pdata->is_ar724x)
-               ag71xx_wr(ag, AG71XX_REG_FIFO_CFG3, pdata->fifo_cfg3);
-       else
-               ag71xx_wr(ag, AG71XX_REG_FIFO_CFG3, 0x008001ff);
-
-       if (pdata->set_pll)
-               pdata->set_pll(ag->speed);
-
-       ag71xx_mii_ctrl_set_speed(ag, mii_speed);
-
-       ag71xx_wr(ag, AG71XX_REG_MAC_CFG2, cfg2);
-       ag71xx_wr(ag, AG71XX_REG_FIFO_CFG5, fifo5);
-       ag71xx_wr(ag, AG71XX_REG_MAC_IFCTL, ifctl);
-
-       netif_carrier_on(ag->dev);
-       if (netif_msg_link(ag))
-               printk(KERN_INFO "%s: link up (%sMbps/%s duplex)\n",
-                       ag->dev->name,
-                       ag71xx_speed_str(ag),
-                       (DUPLEX_FULL == ag->duplex) ? "Full" : "Half");
-
-       DBG("%s: fifo_cfg0=%#x, fifo_cfg1=%#x, fifo_cfg2=%#x\n",
-               ag->dev->name,
-               ag71xx_rr(ag, AG71XX_REG_FIFO_CFG0),
-               ag71xx_rr(ag, AG71XX_REG_FIFO_CFG1),
-               ag71xx_rr(ag, AG71XX_REG_FIFO_CFG2));
-
-       DBG("%s: fifo_cfg3=%#x, fifo_cfg4=%#x, fifo_cfg5=%#x\n",
-               ag->dev->name,
-               ag71xx_rr(ag, AG71XX_REG_FIFO_CFG3),
-               ag71xx_rr(ag, AG71XX_REG_FIFO_CFG4),
-               ag71xx_rr(ag, AG71XX_REG_FIFO_CFG5));
-
-       DBG("%s: mac_cfg2=%#x, mac_ifctl=%#x, mii_ctrl=%#x\n",
-               ag->dev->name,
-               ag71xx_rr(ag, AG71XX_REG_MAC_CFG2),
-               ag71xx_rr(ag, AG71XX_REG_MAC_IFCTL),
-               ag71xx_mii_ctrl_rr(ag));
-}
-
 static void ag71xx_phy_link_adjust(struct net_device *dev)
 {
        struct ag71xx *ag = netdev_priv(dev);
@@ -138,7 +37,7 @@ static void ag71xx_phy_link_adjust(struct net_device *dev)
        ag->speed = phydev->speed;
 
        if (status_change)
-               ag71xx_phy_link_update(ag);
+               ag71xx_link_adjust(ag);
 
        spin_unlock_irqrestore(&ag->lock, flags);
 }
@@ -148,12 +47,8 @@ void ag71xx_phy_start(struct ag71xx *ag)
        if (ag->phy_dev) {
                phy_start(ag->phy_dev);
        } else {
-               struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
-
-               ag->duplex = pdata->duplex;
-               ag->speed = pdata->speed;
                ag->link = 1;
-               ag71xx_phy_link_update(ag);
+               ag71xx_link_adjust(ag);
        }
 }
 
@@ -162,10 +57,8 @@ void ag71xx_phy_stop(struct ag71xx *ag)
        if (ag->phy_dev) {
                phy_stop(ag->phy_dev);
        } else {
-               ag->duplex = -1;
                ag->link = 0;
-               ag->speed = 0;
-               ag71xx_phy_link_update(ag);
+               ag71xx_link_adjust(ag);
        }
 }
 
@@ -182,12 +75,16 @@ static int ag71xx_phy_connect_fixed(struct ag71xx *ag)
        case SPEED_1000:
                break;
        default:
-               printk(KERN_ERR "%s: invalid speed specified\n",
-                       dev->name);
+               printk(KERN_ERR "%s: invalid speed specified\n", dev->name);
                ret = -EINVAL;
                break;
        }
 
+       printk(KERN_DEBUG "%s: using fixed link parameters\n", dev->name);
+
+       ag->duplex = pdata->duplex;
+       ag->speed = pdata->speed;
+
        return ret;
 }
 
@@ -196,7 +93,6 @@ static int ag71xx_phy_connect_multi(struct ag71xx *ag)
        struct net_device *dev = ag->dev;
        struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
        struct phy_device *phydev = NULL;
-       int phy_count = 0;
        int phy_addr;
        int ret = 0;
 
@@ -214,50 +110,39 @@ static int ag71xx_phy_connect_multi(struct ag71xx *ag)
 
                if (phydev == NULL)
                        phydev = ag->mii_bus->phy_map[phy_addr];
-
-               phy_count++;
        }
 
-       switch (phy_count) {
-       case 0:
+       if (!phydev) {
                printk(KERN_ERR "%s: no PHY found with phy_mask=%08x\n",
                        dev->name, pdata->phy_mask);
-               ret = -ENODEV;
-               break;
-       case 1:
-               ag->phy_dev = phy_connect(dev, dev_name(&phydev->dev),
-                       &ag71xx_phy_link_adjust, 0, pdata->phy_if_mode);
-
-               if (IS_ERR(ag->phy_dev)) {
-                       printk(KERN_ERR "%s: could not connect to PHY at %s\n",
-                               dev->name, dev_name(&phydev->dev));
-                       return PTR_ERR(ag->phy_dev);
-               }
+               return -ENODEV;
+       }
 
-               /* mask with MAC supported features */
-               if (pdata->has_gbit)
-                       phydev->supported &= PHY_GBIT_FEATURES;
-               else
-                       phydev->supported &= PHY_BASIC_FEATURES;
+       ag->phy_dev = phy_connect(dev, dev_name(&phydev->dev),
+                                 &ag71xx_phy_link_adjust, 0,
+                                 pdata->phy_if_mode);
 
-               phydev->advertising = phydev->supported;
+       if (IS_ERR(ag->phy_dev)) {
+               printk(KERN_ERR "%s: could not connect to PHY at %s\n",
+                       dev->name, dev_name(&phydev->dev));
+               return PTR_ERR(ag->phy_dev);
+       }
 
-               printk(KERN_DEBUG "%s: connected to PHY at %s "
-                       "[uid=%08x, driver=%s]\n",
-                       dev->name, dev_name(&phydev->dev),
-                       phydev->phy_id, phydev->drv->name);
+       /* mask with MAC supported features */
+       if (pdata->has_gbit)
+               phydev->supported &= PHY_GBIT_FEATURES;
+       else
+               phydev->supported &= PHY_BASIC_FEATURES;
 
-               ag->link = 0;
-               ag->speed = 0;
-               ag->duplex = -1;
-               break;
+       phydev->advertising = phydev->supported;
 
-       default:
-               printk(KERN_DEBUG "%s: connected to %d PHYs\n",
-                       dev->name, phy_count);
-               ret = ag71xx_phy_connect_fixed(ag);
-               break;
-       }
+       printk(KERN_DEBUG "%s: connected to PHY at %s [uid=%08x, driver=%s]\n",
+               dev->name, dev_name(&phydev->dev),
+               phydev->phy_id, phydev->drv->name);
+
+       ag->link = 0;
+       ag->speed = 0;
+       ag->duplex = -1;
 
        return ret;
 }
@@ -308,6 +193,13 @@ int ag71xx_phy_connect(struct ag71xx *ag)
                return -ENODEV;
        }
 
+       /* Reset the mdio bus explicitly */
+       if (ag->mii_bus->reset) {
+               mutex_lock(&ag->mii_bus->mdio_lock);
+               ag->mii_bus->reset(ag->mii_bus);
+               mutex_unlock(&ag->mii_bus->mdio_lock);
+       }
+
        if (pdata->phy_mask)
                return ag71xx_phy_connect_multi(ag);
 
This page took 0.031918 seconds and 4 git commands to generate.