target/linux/atheros/patches-3.10/220-enet_micrel_workaround.patch

   1 --- a/drivers/net/ethernet/ar231x/ar231x.c
   2 +++ b/drivers/net/ethernet/ar231x/ar231x.c
   3 @@ -150,6 +150,7 @@ static int ar231x_mdiobus_write(struct m
   4  static int ar231x_mdiobus_reset(struct mii_bus *bus);
   5  static int ar231x_mdiobus_probe (struct net_device *dev);
   6  static void ar231x_adjust_link(struct net_device *dev);
   7 +static bool no_phy;
   8
   9  #ifndef ERR
  10  #define ERR(fmt, args...) printk("%s: " fmt, __func__, ##args)
  11 @@ -182,6 +183,32 @@ static const struct net_device_ops ar231
  12  #endif
  13  };
  14
  15 +static int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id)
  16 +{
  17 +       int phy_reg;
  18 +
  19 +       /**
  20 +        * Grab the bits from PHYIR1, and put them
  21 +        * in the upper half.
  22 +        */
  23 +       phy_reg = mdiobus_read(bus, addr, MII_PHYSID1);
  24 +
  25 +       if (phy_reg < 0)
  26 +               return -EIO;
  27 +
  28 +       *phy_id = (phy_reg & 0xffff) << 16;
  29 +
  30 +       /* Grab the bits from PHYIR2, and put them in the lower half */
  31 +       phy_reg = mdiobus_read(bus, addr, MII_PHYSID2);
  32 +
  33 +       if (phy_reg < 0)
  34 +               return -EIO;
  35 +
  36 +       *phy_id |= (phy_reg & 0xffff);
  37 +
  38 +       return 0;
  39 +}
  40 +
  41  int ar231x_probe(struct platform_device *pdev)
  42  {
  43         struct net_device *dev;
  44 @@ -297,6 +324,23 @@ int ar231x_probe(struct platform_device
  45
  46         mdiobus_register(sp->mii_bus);
  47
  48 +       /**
  49 +        * Workaround for Micrel switch, which is only available on
  50 +        * one PHY and cannot be configured through MDIO.
  51 +        */
  52 +       if (!no_phy) {
  53 +               u32 phy_id = 0;
  54 +               get_phy_id(sp->mii_bus, 1, &phy_id);
  55 +               if (phy_id == 0x00221450)
  56 +                       no_phy = true;
  57 +       }
  58 +       if (no_phy) {
  59 +               sp->link = 1;
  60 +               netif_carrier_on(dev);
  61 +               return 0;
  62 +       }
  63 +       no_phy = true;
  64 +
  65         if (ar231x_mdiobus_probe(dev) != 0) {
  66                 printk(KERN_ERR "%s: mdiobus_probe failed\n", dev->name);
  67                 rx_tasklet_cleanup(dev);
  68 @@ -353,8 +397,10 @@ static int ar231x_remove(struct platform
  69         rx_tasklet_cleanup(dev);
  70         ar231x_init_cleanup(dev);
  71         unregister_netdev(dev);
  72 -       mdiobus_unregister(sp->mii_bus);
  73 -       mdiobus_free(sp->mii_bus);
  74 +       if (sp->mii_bus) {
  75 +               mdiobus_unregister(sp->mii_bus);
  76 +               mdiobus_free(sp->mii_bus);
  77 +       }
  78         kfree(dev);
  79         return 0;
  80  }
  81 @@ -1120,6 +1166,9 @@ static int ar231x_ioctl(struct net_devic
  82         struct ar231x_private *sp = netdev_priv(dev);
  83         int ret;
  84
  85 +       if (!sp->phy_dev)
  86 +               return -ENODEV;
  87 +
  88         switch (cmd) {
  89
  90         case SIOCETHTOOL: