Commit 16095595 authored Jan 29, 2009 by Steve Glendinning Committed by David S. Miller Jan 29, 2009

smsc9420: fix interrupt signalling test failures



smsc9420 performs an interrupt signalling test when the interface is
brought up.  The current code mistakenly sets its test flag to false
AFTER enabling the software interrupt source, making failure quite
likely.

This patch changes the code to set the test flag BEFORE enabling
interrupts. I've also removed an smp_wmb because the following spinlock
provides an implicit memory barrier.

Signed-off-by: Steve Glendinning <steve.glendinning@smsc.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent b1c4a9dd

drivers/net/smsc9420.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -1378,6 +1378,7 @@ static int smsc9420_open(struct net_device *dev)

		/* test the IRQ connection to the ISR */
		smsc_dbg(IFUP, "Testing ISR using IRQ %d", dev->irq);
		pd->software_irq_signal = false;

		spin_lock_irqsave(&pd->int_lock, flags);
		/* configure interrupt deassertion timer and enable interrupts */
		@@ -1393,8 +1394,6 @@ static int smsc9420_open(struct net_device *dev)
		smsc9420_pci_flush_write(pd);

		timeout = 1000;
		pd->software_irq_signal = false;
		smp_wmb();
		while (timeout--) {
		if (pd->software_irq_signal)
		break;

Admin message