openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

iwlwifi: pcie: no need to save inta in trans_pcie 

This was useful when the handling was not in the same
context as the interrupt cause retrieval: we could have
several hard interrupts until the handler gets called.
Since we retrieve the interrupt cause in the handler itself,
there is no need to OR the interrupt causes.

Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
This commit is contained in:
Emmanuel Grumbach 2013-12-11 09:24:39 +02:00
parent 7117c000c8
commit fe523dc9e9
2 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/wireless/iwlwifi/pcie/internal.h
View File

@ -273,7 +273,6 @@ struct iwl_trans_pcie {
__le32 *ict_tbl; __le32 *ict_tbl;
dma_addr_t ict_tbl_dma; dma_addr_t ict_tbl_dma;
int ict_index; int ict_index;
u32 inta;
bool use_ict; bool use_ict;
struct isr_statistics isr_stats; struct isr_statistics isr_stats;

22
drivers/net/wireless/iwlwifi/pcie/rx.c
View File

@ -838,18 +838,16 @@ static u32 iwl_pcie_int_cause_non_ict(struct iwl_trans *trans)
* the handler can be scheduled because of a previous * the handler can be scheduled because of a previous
* interrupt. * interrupt.
*/ */
if (test_bit(STATUS_INT_ENABLED, &trans->status) && if (test_bit(STATUS_INT_ENABLED, &trans->status) && !inta)
!trans_pcie->inta)
iwl_enable_interrupts(trans); iwl_enable_interrupts(trans);
return trans_pcie->inta; return inta;
} }
if ((inta == 0xFFFFFFFF) || ((inta & 0xFFFFFFF0) == 0xa5a5a5a0)) { if ((inta == 0xFFFFFFFF) || ((inta & 0xFFFFFFF0) == 0xa5a5a5a0)) {
/* Hardware disappeared. It might have already raised /* Hardware disappeared. It might have already raised
* an interrupt */ * an interrupt */
IWL_WARN(trans, "HARDWARE GONE?? INTA == 0x%08x\n", inta); IWL_WARN(trans, "HARDWARE GONE?? INTA == 0x%08x\n", inta);
trans_pcie->inta = 0xFFFFFFFF; return 0xFFFFFFFF;
return trans_pcie->inta;
} }
if (iwl_have_debug_level(IWL_DL_ISR)) if (iwl_have_debug_level(IWL_DL_ISR))
@ -858,9 +856,8 @@ static u32 iwl_pcie_int_cause_non_ict(struct iwl_trans *trans)
inta, trans_pcie->inta_mask, inta, trans_pcie->inta_mask,
iwl_read32(trans, CSR_FH_INT_STATUS)); iwl_read32(trans, CSR_FH_INT_STATUS));
trans_pcie->inta |= inta;
/* the thread will service interrupts and re-enable them */ /* the thread will service interrupts and re-enable them */
return trans_pcie->inta; return inta;
} }
/* a device (PCI-E) page is 4096 bytes long */ /* a device (PCI-E) page is 4096 bytes long */
@ -934,21 +931,19 @@ static u32 iwl_pcie_int_cause_ict(struct iwl_trans *trans)
iwl_read32(trans, CSR_INT_MASK)); iwl_read32(trans, CSR_INT_MASK));
inta &= trans_pcie->inta_mask; inta &= trans_pcie->inta_mask;
trans_pcie->inta |= inta;
/* iwl_pcie_tasklet() will service interrupts and re-enable them */ /* iwl_pcie_tasklet() will service interrupts and re-enable them */
if (likely(inta)) if (likely(inta))
return trans_pcie->inta; return inta;
none: none:
/* re-enable interrupts here since we don't have anything to service. /* re-enable interrupts here since we don't have anything to service.
* only Re-enable if disabled by irq. * only Re-enable if disabled by irq.
*/ */
if (test_bit(STATUS_INT_ENABLED, &trans->status) && if (test_bit(STATUS_INT_ENABLED, &trans->status) && !inta)
!trans_pcie->inta)
iwl_enable_interrupts(trans); iwl_enable_interrupts(trans);
return trans_pcie->inta; return inta;
} }
irqreturn_t iwl_pcie_irq_handler(int irq, void *dev_id) irqreturn_t iwl_pcie_irq_handler(int irq, void *dev_id)
@ -1001,9 +996,6 @@ irqreturn_t iwl_pcie_irq_handler(int irq, void *dev_id)
IWL_DEBUG_ISR(trans, "inta 0x%08x, enabled 0x%08x\n", IWL_DEBUG_ISR(trans, "inta 0x%08x, enabled 0x%08x\n",
inta, iwl_read32(trans, CSR_INT_MASK)); inta, iwl_read32(trans, CSR_INT_MASK));
/* saved interrupt in inta variable now we can reset trans_pcie->inta */
trans_pcie->inta = 0;
spin_unlock_irqrestore(&trans_pcie->irq_lock, flags); spin_unlock_irqrestore(&trans_pcie->irq_lock, flags);
/* Now service all interrupt bits discovered above. */ /* Now service all interrupt bits discovered above. */