Skip to content

Commit

Permalink
Fix PHY Lib support for gianfar and ucc_geth
Browse files Browse the repository at this point in the history
The PHY Lib now uses mutexes instead of spin_locks.  ucc_geth
and gianfar both grab the locks in their mdio_reset functions,
so they need to use mutex_(un)lock instead.  This was not caught
until someone tested it on an SMP system.

Signed-off-by: Andy Fleming <afleming@freescale.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
  • Loading branch information
Andy Fleming authored and Jeff Garzik committed Feb 6, 2008
1 parent 4e84f9b commit 15cf6dd
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions drivers/net/gianfar_mii.c
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ int gfar_mdio_reset(struct mii_bus *bus)
struct gfar_mii __iomem *regs = (void __iomem *)bus->priv;
unsigned int timeout = PHY_INIT_TIMEOUT;

spin_lock_bh(&bus->mdio_lock);
mutex_lock(&bus->mdio_lock);

/* Reset the management interface */
gfar_write(&regs->miimcfg, MIIMCFG_RESET);
Expand All @@ -140,7 +140,7 @@ int gfar_mdio_reset(struct mii_bus *bus)
timeout--)
cpu_relax();

spin_unlock_bh(&bus->mdio_lock);
mutex_unlock(&bus->mdio_lock);

if(timeout <= 0) {
printk(KERN_ERR "%s: The MII Bus is stuck!\n",
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/ucc_geth_mii.c
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ int uec_mdio_reset(struct mii_bus *bus)
struct ucc_mii_mng __iomem *regs = (void __iomem *)bus->priv;
unsigned int timeout = PHY_INIT_TIMEOUT;

spin_lock_bh(&bus->mdio_lock);
mutex_lock(&bus->mdio_lock);

/* Reset the management interface */
out_be32(&regs->miimcfg, MIIMCFG_RESET_MANAGEMENT);
Expand All @@ -121,7 +121,7 @@ int uec_mdio_reset(struct mii_bus *bus)
while ((in_be32(&regs->miimind) & MIIMIND_BUSY) && timeout--)
cpu_relax();

spin_unlock_bh(&bus->mdio_lock);
mutex_unlock(&bus->mdio_lock);

if (timeout <= 0) {
printk(KERN_ERR "%s: The MII Bus is stuck!\n", bus->name);
Expand Down

0 comments on commit 15cf6dd

Please sign in to comment.