Commit ec46ae30 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Luca Coelho

iwlwifi: pcie: fix ALIVE interrupt handling for gen2 devices w/o MSI-X

We added code to restock the buffer upon ALIVE interrupt
when MSI-X is disabled. This was added as part of the context
info code. This code was added only if the ISR debug level
is set which is very unlikely to be related.
Move this code to run even when the ISR debug level is not
set.

Note that gen2 devices work with MSI-X in most cases so that
this path is seldom used.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent c56e00a3
...@@ -1827,25 +1827,23 @@ irqreturn_t iwl_pcie_irq_handler(int irq, void *dev_id) ...@@ -1827,25 +1827,23 @@ irqreturn_t iwl_pcie_irq_handler(int irq, void *dev_id)
goto out; goto out;
} }
if (iwl_have_debug_level(IWL_DL_ISR)) { /* NIC fires this, but we don't use it, redundant with WAKEUP */
/* NIC fires this, but we don't use it, redundant with WAKEUP */ if (inta & CSR_INT_BIT_SCD) {
if (inta & CSR_INT_BIT_SCD) { IWL_DEBUG_ISR(trans,
IWL_DEBUG_ISR(trans, "Scheduler finished to transmit the frame/frames.\n");
"Scheduler finished to transmit the frame/frames.\n"); isr_stats->sch++;
isr_stats->sch++; }
}
/* Alive notification via Rx interrupt will do the real work */ /* Alive notification via Rx interrupt will do the real work */
if (inta & CSR_INT_BIT_ALIVE) { if (inta & CSR_INT_BIT_ALIVE) {
IWL_DEBUG_ISR(trans, "Alive interrupt\n"); IWL_DEBUG_ISR(trans, "Alive interrupt\n");
isr_stats->alive++; isr_stats->alive++;
if (trans->cfg->gen2) { if (trans->cfg->gen2) {
/* /*
* We can restock, since firmware configured * We can restock, since firmware configured
* the RFH * the RFH
*/ */
iwl_pcie_rxmq_restock(trans, trans_pcie->rxq); iwl_pcie_rxmq_restock(trans, trans_pcie->rxq);
}
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment