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

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

iwlwifi: mvm: add iccm data to 8000 b-step data dump 



In 8000 HW family B-step only, the ICCM is separate
from the SRAM. This adds the ICCM to the dump data
collected for FW debug.

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 fe92e32a

drivers/net/wireless/iwlwifi/mvm/mac80211.c

+24 −0
Original line number Diff line number Diff line
@@ -1007,6 +1007,9 @@ void iwl_mvm_free_fw_dump_desc(struct iwl_mvm *mvm) 
	mvm->fw_dump_desc = NULL;

}



#define IWL8260_ICCM_OFFSET		0x44000 /* Only for B-step */

#define IWL8260_ICCM_LEN		0xC000 /* Only for B-step */



void iwl_mvm_fw_error_dump(struct iwl_mvm *mvm)

{

	struct iwl_fw_error_dump_file *dump_file;
@@ -1083,6 +1086,14 @@ void iwl_mvm_fw_error_dump(struct iwl_mvm *mvm) 
		   fifo_data_len +

		   sizeof(*dump_info);



	/*

	 * In 8000 HW family B-step include the ICCM (which resides separately)

	 */

	if (mvm->cfg->device_family == IWL_DEVICE_FAMILY_8000 &&

	    CSR_HW_REV_STEP(mvm->trans->hw_rev) == SILICON_B_STEP)

		file_len += sizeof(*dump_data) + sizeof(*dump_mem) +

			    IWL8260_ICCM_LEN;



	if (mvm->fw_dump_desc)

		file_len += sizeof(*dump_data) + sizeof(*dump_trig) +

			    mvm->fw_dump_desc->len;
@@ -1170,6 +1181,19 @@ void iwl_mvm_fw_error_dump(struct iwl_mvm *mvm) 
					 dump_mem->data, sram2_len);

	}



	if (mvm->cfg->device_family == IWL_DEVICE_FAMILY_8000 &&

	    CSR_HW_REV_STEP(mvm->trans->hw_rev) == SILICON_B_STEP) {

		dump_data = iwl_fw_error_next_data(dump_data);

		dump_data->type = cpu_to_le32(IWL_FW_ERROR_DUMP_MEM);

		dump_data->len = cpu_to_le32(IWL8260_ICCM_LEN +

					     sizeof(*dump_mem));

		dump_mem = (void *)dump_data->data;

		dump_mem->type = cpu_to_le32(IWL_FW_ERROR_DUMP_MEM_SRAM);

		dump_mem->offset = cpu_to_le32(IWL8260_ICCM_OFFSET);

		iwl_trans_read_mem_bytes(mvm->trans, IWL8260_ICCM_OFFSET,

					 dump_mem->data, IWL8260_ICCM_LEN);

	}



	fw_error_dump->trans_ptr = iwl_trans_dump_data(mvm->trans);

	fw_error_dump->op_mode_len = file_len;

	if (fw_error_dump->trans_ptr)