Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f22d3328 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Johannes Berg
Browse files

iwlwifi: print more info when a queue is stuck 



Print some more info from the SCD's SRAM and dump the TRB
from the FH.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent e4b1681e

drivers/net/wireless/iwlwifi/iwl-fh.h

+2 −0
Original line number Diff line number Diff line
@@ -421,6 +421,8 @@ static inline unsigned int FH_MEM_CBBC_QUEUE(unsigned int chnl) 
		(FH_SRVC_LOWER_BOUND + ((_chnl) - 9) * 0x4)



#define FH_TX_CHICKEN_BITS_REG	(FH_MEM_LOWER_BOUND + 0xE98)

#define FH_TX_TRB_REG(_chan)	(FH_MEM_LOWER_BOUND + 0x958 + (_chan) * 4)



/* Instruct FH to increment the retry count of a packet when

 * it is brought from the memory to TX-FIFO

 */

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

+12 −1
Original line number Diff line number Diff line
@@ -298,6 +298,10 @@ static void iwl_trans_pcie_queue_stuck_timer(unsigned long data) 
	struct iwl_tx_queue *txq = (void *)data;

	struct iwl_trans_pcie *trans_pcie = txq->trans_pcie;

	struct iwl_trans *trans = iwl_trans_pcie_get_trans(trans_pcie);

	u32 scd_sram_addr = trans_pcie->scd_base_addr +

		SCD_TX_STTS_MEM_LOWER_BOUND + (16 * txq->q.id);

	u8 buf[16];

	int i;



	spin_lock(&txq->lock);

	/* check if triggered erroneously */
@@ -307,7 +311,6 @@ static void iwl_trans_pcie_queue_stuck_timer(unsigned long data) 
	}

	spin_unlock(&txq->lock);





	IWL_ERR(trans, "Queue %d stuck for %u ms.\n", txq->q.id,

		jiffies_to_msecs(trans_pcie->wd_timeout));

	IWL_ERR(trans, "Current SW read_ptr %d write_ptr %d\n",
@@ -317,6 +320,14 @@ static void iwl_trans_pcie_queue_stuck_timer(unsigned long data) 
					& (TFD_QUEUE_SIZE_MAX - 1),

		iwl_read_prph(trans, SCD_QUEUE_WRPTR(txq->q.id)));



	iwl_read_targ_mem_bytes(trans, scd_sram_addr, buf, sizeof(buf));



	iwl_print_hex_error(trans, buf, sizeof(buf));



	for (i = 0; i < FH_TCSR_CHNL_NUM; i++)

		IWL_ERR(trans, "FH TRBs(%d) = 0x%08x\n", i,

			iwl_read_direct32(trans, FH_TX_TRB_REG(i)));



	iwl_op_mode_nic_error(trans->op_mode);

}