Message ID | 1251882856-23549-2-git-send-email-u.kleine-koenig@pengutronix.de |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
Hi Uwe, Uwe Kleine-König wrote: > 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> Looks good. Acked-by: 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> > --- > drivers/net/fec.c | 12 ++++++------ > 1 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/net/fec.c b/drivers/net/fec.c > index ef82606..9c49d56 100644 > --- a/drivers/net/fec.c > +++ b/drivers/net/fec.c > @@ -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
From: Greg Ungerer <gerg@snapgear.com> Date: Thu, 03 Sep 2009 11:14:24 +1000 > Hi Uwe, > > Uwe Kleine-König wrote: >> 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> > > Looks good. > > Acked-by: Greg Ungerer <gerg@uclinux.org> Applied to net-next-2.6 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/fec.c b/drivers/net/fec.c index ef82606..9c49d56 100644 --- a/drivers/net/fec.c +++ b/drivers/net/fec.c @@ -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
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> --- drivers/net/fec.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)