diff options
| author | Guido Barzini <gbarzini@solarflare.com> | 2010-02-03 09:31:24 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-04 03:12:45 (GMT) |
| commit | c91f48d61c5b6fb36a6fc50de923db4db009b0dc (patch) | |
| tree | 204514756abc60e91df45caf10203eba6d2d6f6b | |
| parent | 2e803407400efe592e5294993a5b1e8251f6dd49 (diff) | |
| download | linux-c91f48d61c5b6fb36a6fc50de923db4db009b0dc.tar.xz | |
sfc: Survive ISR0=0 bug in the shared IRQ case
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/sfc/nic.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/net/sfc/nic.c b/drivers/net/sfc/nic.c index db44224..8d9696a3 100644 --- a/drivers/net/sfc/nic.c +++ b/drivers/net/sfc/nic.c @@ -1384,6 +1384,15 @@ static irqreturn_t efx_legacy_interrupt(int irq, void *dev_id) efx->last_irq_cpu = raw_smp_processor_id(); EFX_TRACE(efx, "IRQ %d on CPU %d status " EFX_DWORD_FMT "\n", irq, raw_smp_processor_id(), EFX_DWORD_VAL(reg)); + } else if (EFX_WORKAROUND_15783(efx)) { + /* We can't return IRQ_HANDLED more than once on seeing ISR0=0 + * because this might be a shared interrupt, but we do need to + * check the channel every time and preemptively rearm it if + * it's idle. */ + efx_for_each_channel(channel, efx) { + if (!channel->work_pending) + efx_nic_eventq_read_ack(channel); + } } return result; |