Patchwork ns83820: spin_lock_irq() => spin_lock()

login
register
mail settings
Submitter Dan Carpenter
Date Oct. 13, 2010, 7:18 p.m.
Message ID <20101013191852.GD6060@bicker>
Download mbox | patch
Permalink /patch/67725/
State Accepted
Delegated to: David Miller
Headers show

Comments

Dan Carpenter - Oct. 13, 2010, 7:18 p.m.
This is essentially cosmetic.  At this point the IRQs are already
disabled because we called spin_lock_irq(&dev->rx_info.lock).

The real bug here was fixed back in 2006 in 3a10ccebe: "[PATCH] lock
validator: fix ns83820.c irq-flags bug".  Prior to that patch, it was
a "spin_lock_irq is not nestable" type bug.  The 2006 patch changes the
unlock to not re-enable IRQs, which eliminates the potential deadlock.

But this bit was missed.  We should change the lock function as well so
it balances nicely.

Signed-off-by: Dan Carpenter <error27@gmail.com>

--
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
David Miller - Oct. 18, 2010, 8:53 a.m.
From: Dan Carpenter <error27@gmail.com>
Date: Wed, 13 Oct 2010 21:18:53 +0200

> This is essentially cosmetic.  At this point the IRQs are already
> disabled because we called spin_lock_irq(&dev->rx_info.lock).
> 
> The real bug here was fixed back in 2006 in 3a10ccebe: "[PATCH] lock
> validator: fix ns83820.c irq-flags bug".  Prior to that patch, it was
> a "spin_lock_irq is not nestable" type bug.  The 2006 patch changes the
> unlock to not re-enable IRQs, which eliminates the potential deadlock.
> 
> But this bit was missed.  We should change the lock function as well so
> it balances nicely.
> 
> Signed-off-by: Dan Carpenter <error27@gmail.com>

Applied.
--
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

Patch

diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c
index 3bbd0aa..84134c7 100644
--- a/drivers/net/ns83820.c
+++ b/drivers/net/ns83820.c
@@ -772,7 +772,7 @@  static int ns83820_setup_rx(struct net_device *ndev)
 		phy_intr(ndev);
 
 		/* Okay, let it rip */
-		spin_lock_irq(&dev->misc_lock);
+		spin_lock(&dev->misc_lock);
 		dev->IMR_cache |= ISR_PHY;
 		dev->IMR_cache |= ISR_RXRCMP;
 		//dev->IMR_cache |= ISR_RXERR;