fec: don't enable irqs in hard irq context (81538e74) · Commits · 戴 / test

fec_enet_mii, fec_enet_rx and fec_enet_tx are both only called by fec_enet_interrupt in interrupt context. So they must not use spin_lock_irq/spin_unlock_irq. This fixes: WARNING: at kernel/lockdep.c:2140 trace_hardirqs_on_caller+0x130/0x194() ... Signed-off-by:

Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Cc: Greg Ungerer <gerg@uclinux.org> Cc: Ben Hutchings <ben@decadent.org.uk> Cc: Patrick McHardy <kaber@trash.net> Cc: Sascha Hauer <s.hauer@pengutronix.de> Cc: Matt Waddel <Matt.Waddel@freescale.com> Cc: netdev@vger.kernel.org Cc: Tim Sander <tim01@vlsi.informatik.tu-darmstadt.de> Acked-by:

Greg Ungerer <gerg@uclinux.org> Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/fec.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -427,7 +427,7 @@ fec_enet_tx(struct net_device *dev)
		struct sk_buff *skb;

		fep = netdev_priv(dev);
		spin_lock_irq(&fep->hw_lock);
		spin_lock(&fep->hw_lock);
		bdp = fep->dirty_tx;

		while (((status = bdp->cbd_sc) & BD_ENET_TX_READY) == 0) {
		@@ -486,7 +486,7 @@ fec_enet_tx(struct net_device *dev)
		}
		}
		fep->dirty_tx = bdp;
		spin_unlock_irq(&fep->hw_lock);
		spin_unlock(&fep->hw_lock);
		}


		@@ -509,7 +509,7 @@ fec_enet_rx(struct net_device *dev)
		flush_cache_all();
		#endif

		spin_lock_irq(&fep->hw_lock);
		spin_lock(&fep->hw_lock);

		/* First, grab all of the stats for the incoming packet.
		* These get messed up if we get called due to a busy condition.
		@@ -604,7 +604,7 @@ rx_processing_done:
		}
		fep->cur_rx = bdp;

		spin_unlock_irq(&fep->hw_lock);
		spin_unlock(&fep->hw_lock);
		}

		/* called from interrupt context */
		@@ -615,7 +615,7 @@ fec_enet_mii(struct net_device *dev)
		mii_list_t *mip;

		fep = netdev_priv(dev);
		spin_lock_irq(&fep->mii_lock);
		spin_lock(&fep->mii_lock);

		if ((mip = mii_head) == NULL) {
		printk("MII and no head!\n");
		@@ -633,7 +633,7 @@ fec_enet_mii(struct net_device *dev)
		writel(mip->mii_regval, fep->hwp + FEC_MII_DATA);

		unlock:
		spin_unlock_irq(&fep->mii_lock);
		spin_unlock(&fep->mii_lock);
		}

		static int

Admin message