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

Commit 06d51e0d authored by Liad Kaufman's avatar Liad Kaufman Committed by Emmanuel Grumbach
Browse files

iwlwifi: pcie: add fh registers to dump data 



Adds all FH registers between FH_MEM_UPPER_BOUND and
FH_MEM_LOWER_BOUND (which should be readable to the driver)
to the dump data when it is collected.

Signed-off-by: default avatarLiad Kaufman <liad.kaufman@intel.com>
Reviewed-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent dcab8ecd

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

+3 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ 
 * @IWL_FW_ERROR_DUMP_FW_MONITOR: firmware monitor

 * @IWL_FW_ERROR_DUMP_PRPH: range of periphery registers - there can be several

 *	sections like this in a single file.

 * @IWL_FW_ERROR_DUMP_FH_REGS: range of FH registers

 */

enum iwl_fw_error_dump_type {

	IWL_FW_ERROR_DUMP_SRAM = 0,
@@ -90,6 +91,8 @@ enum iwl_fw_error_dump_type { 
	IWL_FW_ERROR_DUMP_DEV_FW_INFO = 4,

	IWL_FW_ERROR_DUMP_FW_MONITOR = 5,

	IWL_FW_ERROR_DUMP_PRPH = 6,

	IWL_FW_ERROR_DUMP_TXF = 7,

	IWL_FW_ERROR_DUMP_FH_REGS = 8,



	IWL_FW_ERROR_DUMP_MAX,

};

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

+30 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ 
#include "iwl-agn-hw.h"

#include "iwl-fw-error-dump.h"

#include "internal.h"

#include "iwl-fh.h"



/* extended range in FW SRAM */

#define IWL_FW_MEM_EXTENDED_START	0x40000
@@ -1970,6 +1971,31 @@ static u32 iwl_trans_pcie_dump_csr(struct iwl_trans *trans, 
	return csr_len;

}



static u32 iwl_trans_pcie_fh_regs_dump(struct iwl_trans *trans,

				       struct iwl_fw_error_dump_data **data)

{

	u32 fh_regs_len = FH_MEM_UPPER_BOUND - FH_MEM_LOWER_BOUND;

	unsigned long flags;

	__le32 *val;

	int i;



	if (!iwl_trans_grab_nic_access(trans, false, &flags))

		return 0;



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

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

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



	for (i = FH_MEM_LOWER_BOUND; i < FH_MEM_UPPER_BOUND; i += sizeof(u32))

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



	iwl_trans_release_nic_access(trans, &flags);



	*data = iwl_fw_error_next_data(*data);



	return sizeof(**data) + fh_regs_len;

}



static

struct iwl_trans_dump_data *iwl_trans_pcie_dump_data(struct iwl_trans *trans)

{
@@ -2001,6 +2027,9 @@ struct iwl_trans_dump_data *iwl_trans_pcie_dump_data(struct iwl_trans *trans) 
			num_bytes_in_chunk;

	}



	/* FH registers */

	len += sizeof(*data) + (FH_MEM_UPPER_BOUND - FH_MEM_LOWER_BOUND);



	/* FW monitor */

	if (trans_pcie->fw_mon_page)

		len += sizeof(*data) + sizeof(struct iwl_fw_error_dump_fw_mon) +
@@ -2041,6 +2070,7 @@ struct iwl_trans_dump_data *iwl_trans_pcie_dump_data(struct iwl_trans *trans) 


	len += iwl_trans_pcie_dump_prph(trans, &data);

	len += iwl_trans_pcie_dump_csr(trans, &data);

	len += iwl_trans_pcie_fh_regs_dump(trans, &data);

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



	if (trans_pcie->fw_mon_page) {