diff options
| author | Ron Mercer <ron.mercer@qlogic.com> | 2009-10-05 11:46:48 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-06 17:33:36 -0700 |
| commit | 5ee22a5aa9cd85527b93b24402db9ae2567d5aa6 (patch) | |
| tree | 3aab2dc6c3507a3e0b5cd0d13c15d3523dab8f2c /drivers/net/qlge | |
| parent | d799bbfbe2dc94b95ad5735c99769892675c3ada (diff) | |
| download | kernel_goldelico_gta04-5ee22a5aa9cd85527b93b24402db9ae2567d5aa6.zip kernel_goldelico_gta04-5ee22a5aa9cd85527b93b24402db9ae2567d5aa6.tar.gz kernel_goldelico_gta04-5ee22a5aa9cd85527b93b24402db9ae2567d5aa6.tar.bz2 | |
qlge: Fix queueing of firmware handler in ISR.
Check that we are not already polling firmware events before we queue the
firmware event worker, then disable firmware interrupts.
Otherwise we can queue the same event multiple times.
Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/qlge')
| -rw-r--r-- | drivers/net/qlge/qlge_main.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c index 3d0efea..c21eda0 100644 --- a/drivers/net/qlge/qlge_main.c +++ b/drivers/net/qlge/qlge_main.c @@ -2001,15 +2001,17 @@ static irqreturn_t qlge_isr(int irq, void *dev_id) /* * Check MPI processor activity. */ - if (var & STS_PI) { + if ((var & STS_PI) && + (ql_read32(qdev, INTR_MASK) & INTR_MASK_PI)) { /* * We've got an async event or mailbox completion. * Handle it and clear the source of the interrupt. */ QPRINTK(qdev, INTR, ERR, "Got MPI processor interrupt.\n"); ql_disable_completion_interrupt(qdev, intr_context->intr); - queue_delayed_work_on(smp_processor_id(), qdev->workqueue, - &qdev->mpi_work, 0); + ql_write32(qdev, INTR_MASK, (INTR_MASK_PI << 16)); + queue_delayed_work_on(smp_processor_id(), + qdev->workqueue, &qdev->mpi_work, 0); work_done++; } |