| From f382a0a8e9403c6d7f8b2cfa21e41fefb5d0c9bd Mon Sep 17 00:00:00 2001 |
| From: Matthew Wilcox <matthew@wil.cx> |
| Date: Tue, 12 Aug 2008 07:13:14 -0600 |
| Subject: netdrvr: atl1e: Don't take the mdio_lock in atl1e_probe |
| |
| From: Matthew Wilcox <matthew@wil.cx> |
| |
| commit f382a0a8e9403c6d7f8b2cfa21e41fefb5d0c9bd upstream |
| |
| 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 <willy@linux.intel.com> |
| Cc: Jay Cliburn <jacliburn@bellsouth.net> |
| Signed-off-by: Jeff Garzik <jgarzik@redhat.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/net/atl1e/atl1e_main.c | 2 -- |
| 1 file changed, 2 deletions(-) |
| |
| --- a/drivers/net/atl1e/atl1e_main.c |
| +++ b/drivers/net/atl1e/atl1e_main.c |
| @@ -2390,9 +2390,7 @@ static int __devinit atl1e_probe(struct |
| } |
| |
| /* 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); |
