|
@@ -1198,7 +1198,7 @@ irqreturn_t iwl_pcie_isr_ict(int irq, void *data)
|
|
|
{
|
|
|
struct iwl_trans *trans = data;
|
|
|
struct iwl_trans_pcie *trans_pcie;
|
|
|
- u32 inta, inta_mask;
|
|
|
+ u32 inta;
|
|
|
u32 val = 0;
|
|
|
u32 read;
|
|
|
unsigned long flags;
|
|
@@ -1226,7 +1226,6 @@ 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);
|
|
|
iwl_write32(trans, CSR_INT_MASK, 0x00000000);
|
|
|
|
|
|
/* Ignore interrupt if there's nothing in NIC to service.
|
|
@@ -1271,8 +1270,13 @@ irqreturn_t iwl_pcie_isr_ict(int irq, void *data)
|
|
|
val |= 0x8000;
|
|
|
|
|
|
inta = (0xff & val) | ((0xff00 & val) << 16);
|
|
|
- IWL_DEBUG_ISR(trans, "ISR inta 0x%08x, enabled 0x%08x ict 0x%08x\n",
|
|
|
- inta, inta_mask, val);
|
|
|
+ IWL_DEBUG_ISR(trans, "ISR inta 0x%08x, enabled(sw) 0x%08x ict 0x%08x\n",
|
|
|
+ inta, trans_pcie->inta_mask, val);
|
|
|
+#ifdef CONFIG_IWLWIFI_DEBUG
|
|
|
+ if (iwl_have_debug_level(IWL_DL_ISR))
|
|
|
+ IWL_DEBUG_ISR(trans, "enabled(hw) 0x%08x\n",
|
|
|
+ iwl_read32(trans, CSR_INT_MASK));
|
|
|
+#endif
|
|
|
|
|
|
inta &= trans_pcie->inta_mask;
|
|
|
trans_pcie->inta |= inta;
|