Commit 9d401222 authored by Mordechay Goodstein's avatar Mordechay Goodstein Committed by Luca Coelho
Browse files

iwlwifi: pcie: add ISR debug info for msix debug 



The debug prints help in case we get timeout on waiting for
hw.

Signed-off-by: default avatarMordechay Goodstein <mordechay.goodstein@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20210411124417.306e2e56d3e8.I72e2977abbb1fddf23b8476bedf6a183fe969ff5@changeid


Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 2b616666

drivers/net/wireless/intel/iwlwifi/pcie/rx.c

+11 −5
Original line number Diff line number Diff line
@@ -1023,6 +1023,9 @@ static int iwl_pcie_napi_poll(struct napi_struct *napi, int budget) 


	ret = iwl_pcie_rx_handle(trans, rxq->id, budget);



	IWL_DEBUG_ISR(trans, "[%d] handled %d, budget %d\n",

		      rxq->id, ret, budget);



	if (ret < budget) {

		spin_lock(&trans_pcie->irq_lock);

		if (test_bit(STATUS_INT_ENABLED, &trans->status))
@@ -1636,10 +1639,13 @@ irqreturn_t iwl_pcie_irq_rx_msix_handler(int irq, void *dev_id) 
	if (WARN_ON(entry->entry >= trans->num_rx_queues))

		return IRQ_NONE;



	if (WARN_ONCE(!rxq, "Got MSI-X interrupt before we have Rx queues"))

	if (WARN_ONCE(!rxq,

		      "[%d] Got MSI-X interrupt before we have Rx queues",

		      entry->entry))

		return IRQ_NONE;



	lock_map_acquire(&trans->sync_cmd_lockdep_map);

	IWL_DEBUG_ISR(trans, "[%d] Got interrupt\n", entry->entry);



	local_bh_disable();

	if (napi_schedule_prep(&rxq->napi))
@@ -2203,8 +2209,8 @@ irqreturn_t iwl_pcie_irq_msix_handler(int irq, void *dev_id) 


	if (iwl_have_debug_level(IWL_DL_ISR)) {

		IWL_DEBUG_ISR(trans,

			      "ISR inta_fh 0x%08x, enabled (sw) 0x%08x (hw) 0x%08x\n",

			      inta_fh, trans_pcie->fh_mask,

			      "ISR[%d] inta_fh 0x%08x, enabled (sw) 0x%08x (hw) 0x%08x\n",

			      entry->entry, inta_fh, trans_pcie->fh_mask,

			      iwl_read32(trans, CSR_MSIX_FH_INT_MASK_AD));

		if (inta_fh & ~trans_pcie->fh_mask)

			IWL_DEBUG_ISR(trans,
@@ -2259,8 +2265,8 @@ irqreturn_t iwl_pcie_irq_msix_handler(int irq, void *dev_id) 
	/* After checking FH register check HW register */

	if (iwl_have_debug_level(IWL_DL_ISR)) {

		IWL_DEBUG_ISR(trans,

			      "ISR inta_hw 0x%08x, enabled (sw) 0x%08x (hw) 0x%08x\n",

			      inta_hw, trans_pcie->hw_mask,

			      "ISR[%d] inta_hw 0x%08x, enabled (sw) 0x%08x (hw) 0x%08x\n",

			      entry->entry, inta_hw, trans_pcie->hw_mask,

			      iwl_read32(trans, CSR_MSIX_HW_INT_MASK_AD));

		if (inta_hw & ~trans_pcie->hw_mask)

			IWL_DEBUG_ISR(trans,

drivers/net/wireless/intel/iwlwifi/pcie/trans.c

+5 −0
Original line number Diff line number Diff line
@@ -1604,6 +1604,11 @@ iwl_pcie_set_interrupt_capa(struct pci_dev *pdev, 
	} else {

		trans_pcie->trans->num_rx_queues = num_irqs - 1;

	}



	IWL_DEBUG_INFO(trans,

		       "MSI-X enabled with rx queues %d, vec mask 0x%x\n",

		       trans_pcie->trans->num_rx_queues, trans_pcie->shared_vec_mask);



	WARN_ON(trans_pcie->trans->num_rx_queues > IWL_MAX_RX_HW_QUEUES);



	trans_pcie->alloc_vecs = num_irqs;