Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15cf6dde authored by Andy Fleming's avatar Andy Fleming Committed by Jeff Garzik
Browse files

Fix PHY Lib support for gianfar and ucc_geth 



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: default avatarAndy Fleming <afleming@freescale.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 4e84f9b1

drivers/net/gianfar_mii.c

+2 −2
Original line number Diff line number Diff line
@@ -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);
@@ -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",

drivers/net/ucc_geth_mii.c

+2 −2
Original line number Diff line number Diff line
@@ -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);
@@ -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);