From patchwork Sat Oct 11 15:05:01 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [stable,2.6.27.y] don't take the mdio_lock in atl1e_probe From: Jay Cliburn X-Patchwork-Id: 4009 Message-Id: <20081011100501.7ff818ce@osprey.hogchain.net> To: stable@kernel.org Cc: Matthew Wilcox , Jeff Garzik , Chris Snook , Jie Yang , netdev@vger.kernel.org, Jay Cliburn , nm127@freemail.hu, Andrew Morton Date: Sat, 11 Oct 2008 10:05:01 -0500 From: Matthew Wilcox Upstream commit: f382a0a8e9403c6d7f8b2cfa21e41fefb5d0c9bd This fixes bug 11736. http://marc.info/?l=linux-netdev&m=122367387219316&w=2 Lockdep warns about the mdio_lock taken with interrupts enabled then later taken from interrupt context. Initially, I considered changing these to spin_lock_irq/spin_unlock_irq, but then I looked at atl1e_phy_init() and saw that it calls msleep(). Sleeping while holding a spinlock is not allowed either. In the probe path, we haven't registered the interrupt handler, so it can't poke at this card yet. It's before we call register_netdev(), so I don't think any other threads can reach this card either. If I'm right, we don't need a spinlock at all. Signed-off-by: Matthew Wilcox Signed-off-by: Jeff Garzik Signed-off-by: David S. Miller --- Resending with correct -stable email address. drivers/net/atl1e/atl1e_main.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) -- 1.5.5.1 -- 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/atl1e/atl1e_main.c b/drivers/net/atl1e/atl1e_main.c index 7685b99..9b60352 100644 --- a/drivers/net/atl1e/atl1e_main.c +++ b/drivers/net/atl1e/atl1e_main.c @@ -2390,9 +2390,7 @@ static int __devinit atl1e_probe(struct pci_dev *pdev, } /* Init GPHY as early as possible due to power saving issue */ - spin_lock(&adapter->mdio_lock); atl1e_phy_init(&adapter->hw); - spin_unlock(&adapter->mdio_lock); /* reset the controller to * put the device in a known good starting state */ err = atl1e_reset_hw(&adapter->hw);