|
@@ -1103,12 +1103,20 @@ static irqreturn_t iwl_pcie_isr(int irq, void *data)
|
|
|
* back-to-back ISRs and sporadic interrupts from our NIC.
|
|
|
* If we have something to service, the tasklet will re-enable ints.
|
|
|
* If we *don't* have something, we'll re-enable before leaving here. */
|
|
|
- inta_mask = iwl_read32(trans, CSR_INT_MASK); /* just for debug */
|
|
|
+ inta_mask = iwl_read32(trans, CSR_INT_MASK);
|
|
|
iwl_write32(trans, CSR_INT_MASK, 0x00000000);
|
|
|
|
|
|
/* Discover which interrupts are active/pending */
|
|
|
inta = iwl_read32(trans, CSR_INT);
|
|
|
|
|
|
+ if (inta & (~inta_mask)) {
|
|
|
+ IWL_DEBUG_ISR(trans,
|
|
|
+ "We got a masked interrupt (0x%08x)...Ack and ignore\n",
|
|
|
+ inta & (~inta_mask));
|
|
|
+ iwl_write32(trans, CSR_INT, inta & (~inta_mask));
|
|
|
+ inta &= inta_mask;
|
|
|
+ }
|
|
|
+
|
|
|
/* Ignore interrupt if there's nothing in NIC to service.
|
|
|
* This may be due to IRQ shared with another device,
|
|
|
* or due to sporadic interrupts thrown from our NIC. */
|
|
@@ -1190,7 +1198,7 @@ irqreturn_t iwl_pcie_isr_ict(int irq, void *data)
|
|
|
* If we have something to service, the tasklet will re-enable ints.
|
|
|
* If we *don't* have something, we'll re-enable before leaving here.
|
|
|
*/
|
|
|
- inta_mask = iwl_read32(trans, CSR_INT_MASK); /* just for debug */
|
|
|
+ inta_mask = iwl_read32(trans, CSR_INT_MASK);
|
|
|
iwl_write32(trans, CSR_INT_MASK, 0x00000000);
|
|
|
|
|
|
/* Ignore interrupt if there's nothing in NIC to service.
|