korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2025-01-06 22:04:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

iwlwifi: pcie: use don't disable interrupt when irq_lock is taken

Browse Source 
Since we don't take this lock in the primary interrupt
handler, there is no pointin disabling the interrupt
in the critical section protected by trans_pcie->irq_lock.

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 10:22:28 +02:00
parent 7ba1faa45f
commit 7b70bd63c6
3 changed files with 26 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -379,13 +379,12 @@ static void iwl_pcie_rxq_free_rbs(struct iwl_trans *trans)
static void iwl_pcie_rx_replenish(struct iwl_trans *trans) static void iwl_pcie_rx_replenish(struct iwl_trans *trans)
{ {
struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans); struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
unsigned long flags;
iwl_pcie_rxq_alloc_rbs(trans, GFP_KERNEL); iwl_pcie_rxq_alloc_rbs(trans, GFP_KERNEL);
spin_lock_irqsave(&trans_pcie->irq_lock, flags); spin_lock(&trans_pcie->irq_lock);
iwl_pcie_rxq_restock(trans); iwl_pcie_rxq_restock(trans);
spin_unlock_irqrestore(&trans_pcie->irq_lock, flags); spin_unlock(&trans_pcie->irq_lock);
} }
static void iwl_pcie_rx_replenish_now(struct iwl_trans *trans) static void iwl_pcie_rx_replenish_now(struct iwl_trans *trans)
@ -541,10 +540,10 @@ int iwl_pcie_rx_init(struct iwl_trans *trans)
iwl_pcie_rx_hw_init(trans, rxq); iwl_pcie_rx_hw_init(trans, rxq);
spin_lock_irqsave(&trans_pcie->irq_lock, flags); spin_lock(&trans_pcie->irq_lock);
rxq->need_update = 1; rxq->need_update = 1;
iwl_pcie_rxq_inc_wr_ptr(trans, rxq); iwl_pcie_rxq_inc_wr_ptr(trans, rxq);
spin_unlock_irqrestore(&trans_pcie->irq_lock, flags); spin_unlock(&trans_pcie->irq_lock);
return 0; return 0;
} }
@ -895,12 +894,11 @@ irqreturn_t iwl_pcie_irq_handler(int irq, void *dev_id)
struct isr_statistics *isr_stats = &trans_pcie->isr_stats; struct isr_statistics *isr_stats = &trans_pcie->isr_stats;
u32 inta = 0; u32 inta = 0;
u32 handled = 0; u32 handled = 0;
unsigned long flags;
u32 i; u32 i;
lock_map_acquire(&trans->sync_cmd_lockdep_map); lock_map_acquire(&trans->sync_cmd_lockdep_map);
spin_lock_irqsave(&trans_pcie->irq_lock, flags); spin_lock(&trans_pcie->irq_lock);
/* dram interrupt table not set yet, /* dram interrupt table not set yet,
* use legacy interrupt. * use legacy interrupt.
@ -937,7 +935,7 @@ irqreturn_t iwl_pcie_irq_handler(int irq, void *dev_id)
*/ */
if (test_bit(STATUS_INT_ENABLED, &trans->status)) if (test_bit(STATUS_INT_ENABLED, &trans->status))
iwl_enable_interrupts(trans); iwl_enable_interrupts(trans);
spin_unlock_irqrestore(&trans_pcie->irq_lock, flags); spin_unlock(&trans_pcie->irq_lock);
lock_map_release(&trans->sync_cmd_lockdep_map); lock_map_release(&trans->sync_cmd_lockdep_map);
return IRQ_NONE; return IRQ_NONE;
} }
@ -948,7 +946,7 @@ irqreturn_t iwl_pcie_irq_handler(int irq, void *dev_id)
* already raised an interrupt. * already raised an interrupt.
*/ */
IWL_WARN(trans, "HARDWARE GONE?? INTA == 0x%08x\n", inta); IWL_WARN(trans, "HARDWARE GONE?? INTA == 0x%08x\n", inta);
spin_unlock_irqrestore(&trans_pcie->irq_lock, flags); spin_unlock(&trans_pcie->irq_lock);
goto out; goto out;
} }
@ -969,7 +967,7 @@ 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));
spin_unlock_irqrestore(&trans_pcie->irq_lock, flags); spin_unlock(&trans_pcie->irq_lock);
/* Now service all interrupt bits discovered above. */ /* Now service all interrupt bits discovered above. */
if (inta & CSR_INT_BIT_HW_ERR) { if (inta & CSR_INT_BIT_HW_ERR) {
@ -1194,12 +1192,11 @@ void iwl_pcie_reset_ict(struct iwl_trans *trans)
{ {
struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans); struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
u32 val; u32 val;
unsigned long flags;
if (!trans_pcie->ict_tbl) if (!trans_pcie->ict_tbl)
return; return;
spin_lock_irqsave(&trans_pcie->irq_lock, flags); spin_lock(&trans_pcie->irq_lock);
iwl_disable_interrupts(trans); iwl_disable_interrupts(trans);
memset(trans_pcie->ict_tbl, 0, ICT_SIZE); memset(trans_pcie->ict_tbl, 0, ICT_SIZE);
@ -1216,18 +1213,17 @@ void iwl_pcie_reset_ict(struct iwl_trans *trans)
trans_pcie->ict_index = 0; trans_pcie->ict_index = 0;
iwl_write32(trans, CSR_INT, trans_pcie->inta_mask); iwl_write32(trans, CSR_INT, trans_pcie->inta_mask);
iwl_enable_interrupts(trans); iwl_enable_interrupts(trans);
spin_unlock_irqrestore(&trans_pcie->irq_lock, flags); spin_unlock(&trans_pcie->irq_lock);
} }
/* Device is going down disable ict interrupt usage */ /* Device is going down disable ict interrupt usage */
void iwl_pcie_disable_ict(struct iwl_trans *trans) void iwl_pcie_disable_ict(struct iwl_trans *trans)
{ {
struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans); struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
unsigned long flags;
spin_lock_irqsave(&trans_pcie->irq_lock, flags); spin_lock(&trans_pcie->irq_lock);
trans_pcie->use_ict = false; trans_pcie->use_ict = false;
spin_unlock_irqrestore(&trans_pcie->irq_lock, flags); spin_unlock(&trans_pcie->irq_lock);
} }
irqreturn_t iwl_pcie_isr(int irq, void *data) irqreturn_t iwl_pcie_isr(int irq, void *data)

23
drivers/net/wireless/iwlwifi/pcie/trans.c
View File

@ -271,13 +271,12 @@ static void iwl_pcie_apm_stop(struct iwl_trans *trans)
static int iwl_pcie_nic_init(struct iwl_trans *trans) static int iwl_pcie_nic_init(struct iwl_trans *trans)
{ {
struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans); struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
unsigned long flags;
/* nic_init */ /* nic_init */
spin_lock_irqsave(&trans_pcie->irq_lock, flags); spin_lock(&trans_pcie->irq_lock);
iwl_pcie_apm_init(trans); iwl_pcie_apm_init(trans);
spin_unlock_irqrestore(&trans_pcie->irq_lock, flags); spin_unlock(&trans_pcie->irq_lock);
iwl_pcie_set_pwr(trans, false); iwl_pcie_set_pwr(trans, false);
@ -635,13 +634,12 @@ static void iwl_trans_pcie_fw_alive(struct iwl_trans *trans, u32 scd_addr)
static void iwl_trans_pcie_stop_device(struct iwl_trans *trans) static void iwl_trans_pcie_stop_device(struct iwl_trans *trans)
{ {
struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans); struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
unsigned long flags;
bool hw_rfkill; bool hw_rfkill;
/* tell the device to stop sending interrupts */ /* tell the device to stop sending interrupts */
spin_lock_irqsave(&trans_pcie->irq_lock, flags); spin_lock(&trans_pcie->irq_lock);
iwl_disable_interrupts(trans); iwl_disable_interrupts(trans);
spin_unlock_irqrestore(&trans_pcie->irq_lock, flags); spin_unlock(&trans_pcie->irq_lock);
/* device going down, Stop using ICT table */ /* device going down, Stop using ICT table */
iwl_pcie_disable_ict(trans); iwl_pcie_disable_ict(trans);
@ -673,9 +671,9 @@ static void iwl_trans_pcie_stop_device(struct iwl_trans *trans)
/* Upon stop, the APM issues an interrupt if HW RF kill is set. /* Upon stop, the APM issues an interrupt if HW RF kill is set.
* Clean again the interrupt here * Clean again the interrupt here
*/ */
spin_lock_irqsave(&trans_pcie->irq_lock, flags); spin_lock(&trans_pcie->irq_lock);
iwl_disable_interrupts(trans); iwl_disable_interrupts(trans);
spin_unlock_irqrestore(&trans_pcie->irq_lock, flags); spin_unlock(&trans_pcie->irq_lock);
/* stop and reset the on-board processor */ /* stop and reset the on-board processor */
iwl_write32(trans, CSR_RESET, CSR_RESET_REG_FLAG_NEVO_RESET); iwl_write32(trans, CSR_RESET, CSR_RESET_REG_FLAG_NEVO_RESET);
@ -821,18 +819,17 @@ static int iwl_trans_pcie_start_hw(struct iwl_trans *trans)
static void iwl_trans_pcie_op_mode_leave(struct iwl_trans *trans) static void iwl_trans_pcie_op_mode_leave(struct iwl_trans *trans)
{ {
struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans); struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
unsigned long flags;
/* disable interrupts - don't enable HW RF kill interrupt */ /* disable interrupts - don't enable HW RF kill interrupt */
spin_lock_irqsave(&trans_pcie->irq_lock, flags); spin_lock(&trans_pcie->irq_lock);
iwl_disable_interrupts(trans); iwl_disable_interrupts(trans);
spin_unlock_irqrestore(&trans_pcie->irq_lock, flags); spin_unlock(&trans_pcie->irq_lock);
iwl_pcie_apm_stop(trans); iwl_pcie_apm_stop(trans);
spin_lock_irqsave(&trans_pcie->irq_lock, flags); spin_lock(&trans_pcie->irq_lock);
iwl_disable_interrupts(trans); iwl_disable_interrupts(trans);
spin_unlock_irqrestore(&trans_pcie->irq_lock, flags); spin_unlock(&trans_pcie->irq_lock);
iwl_pcie_disable_ict(trans); iwl_pcie_disable_ict(trans);
} }

10
drivers/net/wireless/iwlwifi/pcie/tx.c
View File

@ -737,10 +737,9 @@ int iwl_pcie_tx_stop(struct iwl_trans *trans)
{ {
struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans); struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
int ch, txq_id, ret; int ch, txq_id, ret;
unsigned long flags;
/* Turn off all Tx DMA fifos */ /* Turn off all Tx DMA fifos */
spin_lock_irqsave(&trans_pcie->irq_lock, flags); spin_lock(&trans_pcie->irq_lock);
iwl_pcie_txq_set_sched(trans, 0); iwl_pcie_txq_set_sched(trans, 0);
@ -757,7 +756,7 @@ int iwl_pcie_tx_stop(struct iwl_trans *trans)
iwl_read_direct32(trans, iwl_read_direct32(trans,
FH_TSSR_TX_STATUS_REG)); FH_TSSR_TX_STATUS_REG));
} }
spin_unlock_irqrestore(&trans_pcie->irq_lock, flags); spin_unlock(&trans_pcie->irq_lock);
if (!trans_pcie->txq) { if (!trans_pcie->txq) {
IWL_WARN(trans, IWL_WARN(trans,
@ -865,7 +864,6 @@ int iwl_pcie_tx_init(struct iwl_trans *trans)
struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans); struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
int ret; int ret;
int txq_id, slots_num; int txq_id, slots_num;
unsigned long flags;
bool alloc = false; bool alloc = false;
if (!trans_pcie->txq) { if (!trans_pcie->txq) {
@ -875,7 +873,7 @@ int iwl_pcie_tx_init(struct iwl_trans *trans)
alloc = true; alloc = true;
} }
spin_lock_irqsave(&trans_pcie->irq_lock, flags); spin_lock(&trans_pcie->irq_lock);
/* Turn off all Tx DMA fifos */ /* Turn off all Tx DMA fifos */
iwl_write_prph(trans, SCD_TXFACT, 0); iwl_write_prph(trans, SCD_TXFACT, 0);
@ -884,7 +882,7 @@ int iwl_pcie_tx_init(struct iwl_trans *trans)
iwl_write_direct32(trans, FH_KW_MEM_ADDR_REG, iwl_write_direct32(trans, FH_KW_MEM_ADDR_REG,
trans_pcie->kw.dma >> 4); trans_pcie->kw.dma >> 4);
spin_unlock_irqrestore(&trans_pcie->irq_lock, flags); spin_unlock(&trans_pcie->irq_lock);
/* Alloc and init all Tx queues, including the command queue (#4/#9) */ /* Alloc and init all Tx queues, including the command queue (#4/#9) */
for (txq_id = 0; txq_id < trans->cfg->base_params->num_of_queues; for (txq_id = 0; txq_id < trans->cfg->base_params->num_of_queues;