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

Commit 473ad712 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach
Browse files

iwlwifi: dump CSRs to fw-error-dump 



Add the Control Status Registers to the firmware error dump
infrastructure.

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

drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h

+2 −2
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ 
/**

 * enum iwl_fw_error_dump_type - types of data in the dump file

 * @IWL_FW_ERROR_DUMP_SRAM:

 * @IWL_FW_ERROR_DUMP_REG:

 * @IWL_FW_ERROR_DUMP_CSR: Control Status Registers - from offset 0

 * @IWL_FW_ERROR_DUMP_RXF:

 * @IWL_FW_ERROR_DUMP_TXCMD: last TX command data, structured as

 *	&struct iwl_fw_error_dump_txcmd packets
@@ -82,7 +82,7 @@ 
 */

enum iwl_fw_error_dump_type {

	IWL_FW_ERROR_DUMP_SRAM = 0,

	IWL_FW_ERROR_DUMP_REG = 1,

	IWL_FW_ERROR_DUMP_CSR = 1,

	IWL_FW_ERROR_DUMP_RXF = 2,

	IWL_FW_ERROR_DUMP_TXCMD = 3,

	IWL_FW_ERROR_DUMP_DEV_FW_INFO = 4,

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

+32 −1
Original line number Diff line number Diff line
@@ -1912,6 +1912,27 @@ static u32 iwl_trans_pcie_dump_prph(struct iwl_trans *trans, 
	return prph_len;

}



#define IWL_CSR_TO_DUMP (0x250)



static u32 iwl_trans_pcie_dump_csr(struct iwl_trans *trans,

				   struct iwl_fw_error_dump_data **data)

{

	u32 csr_len = sizeof(**data) + IWL_CSR_TO_DUMP;

	__le32 *val;

	int i;



	(*data)->type = cpu_to_le32(IWL_FW_ERROR_DUMP_CSR);

	(*data)->len = cpu_to_le32(IWL_CSR_TO_DUMP);

	val = (void *)(*data)->data;



	for (i = 0; i < IWL_CSR_TO_DUMP; i += 4)

		*val++ = cpu_to_le32(iwl_trans_pcie_read32(trans, i));



	*data = iwl_fw_error_next_data(*data);



	return csr_len;

}



static

struct iwl_trans_dump_data *iwl_trans_pcie_dump_data(struct iwl_trans *trans)

{
@@ -1923,9 +1944,17 @@ struct iwl_trans_dump_data *iwl_trans_pcie_dump_data(struct iwl_trans *trans) 
	u32 len;

	int i, ptr;



	len = sizeof(*dump_data) + sizeof(*data) +

	/* transport dump header */

	len = sizeof(*dump_data);



	/* host commands */

	len += sizeof(*data) +

		cmdq->q.n_window * (sizeof(*txcmd) + TFD_MAX_PAYLOAD_SIZE);



	/* CSR registers */

	len += sizeof(*data) + IWL_CSR_TO_DUMP;



	/* PRPH registers */

	for (i = 0; i < ARRAY_SIZE(iwl_prph_dump_addr); i++) {

		/* The range includes both boundaries */

		int num_bytes_in_chunk = iwl_prph_dump_addr[i].end -
@@ -1935,6 +1964,7 @@ struct iwl_trans_dump_data *iwl_trans_pcie_dump_data(struct iwl_trans *trans) 
			num_bytes_in_chunk;

	}



	/* FW monitor */

	if (trans_pcie->fw_mon_page)

		len += sizeof(*data) + sizeof(struct iwl_fw_error_dump_fw_mon) +

			trans_pcie->fw_mon_size;
@@ -1973,6 +2003,7 @@ struct iwl_trans_dump_data *iwl_trans_pcie_dump_data(struct iwl_trans *trans) 
	data = iwl_fw_error_next_data(data);



	len += iwl_trans_pcie_dump_prph(trans, &data);

	len += iwl_trans_pcie_dump_csr(trans, &data);

	/* data is already pointing to the next section */



	if (trans_pcie->fw_mon_page) {