The following commit has been merged in the linux branch: commit 37ccd92f55c6c6c23f2b4a7c8830b313b70da0ed Author: John Bonesio bones@secretlab.ca Date: Wed Oct 14 15:10:19 2009 -0700
net/fec_mpc52xx: Fix kernel panic on FEC error
The MDIO bus cannot be accessed at interrupt context, but on an FEC error, the fec_mpc52xx driver reset function also tries to reset the PHY. Since the error is detected at IRQ context, and the PHY functions try to sleep, the kernel ends up panicking.
Resetting the PHY on an FEC error isn't even necessary. This patch solves the problem by removing the PHY reset entirely.
Signed-off-by: John Bonesio bones@secretlab.ca Signed-off-by: Grant Likely grant.likely@secretlab.ca Signed-off-by: David S. Miller davem@davemloft.net
diff --git a/drivers/net/fec_mpc52xx.c b/drivers/net/fec_mpc52xx.c index c40113f..66dace6 100644 --- a/drivers/net/fec_mpc52xx.c +++ b/drivers/net/fec_mpc52xx.c @@ -759,12 +759,6 @@ static void mpc52xx_fec_reset(struct net_device *dev)
mpc52xx_fec_hw_init(dev);
- if (priv->phydev) { - phy_stop(priv->phydev); - phy_write(priv->phydev, MII_BMCR, BMCR_RESET); - phy_start(priv->phydev); - } - bcom_fec_rx_reset(priv->rx_dmatsk); bcom_fec_tx_reset(priv->tx_dmatsk);