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

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

iwlwifi: mvm: make sure state isn't in d0i3 when collecting fw dbg 



This makes sure that we're not trying to read/write any of
the FW debug data collected during d0i3.

Signed-off-by: default avatarLiad Kaufman <liad.kaufman@intel.com>
Reviewed-by: default avatarEliad Peller <eliad@wizery.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent bd999318

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -1390,6 +1390,7 @@ static ssize_t iwl_dbgfs_d0i3_refs_read(struct file *file, 
	PRINT_MVM_REF(IWL_MVM_REF_TM_CMD);

	PRINT_MVM_REF(IWL_MVM_REF_TM_CMD);

	PRINT_MVM_REF(IWL_MVM_REF_EXIT_WORK);

	PRINT_MVM_REF(IWL_MVM_REF_EXIT_WORK);

	PRINT_MVM_REF(IWL_MVM_REF_PROTECT_CSA);

	PRINT_MVM_REF(IWL_MVM_REF_PROTECT_CSA);

	PRINT_MVM_REF(IWL_MVM_REF_FW_DBG_COLLECT);





	return simple_read_from_buffer(user_buf, count, ppos, buf, pos);

	return simple_read_from_buffer(user_buf, count, ppos, buf, pos);

}

}

drivers/net/wireless/iwlwifi/mvm/mvm.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -276,6 +276,7 @@ enum iwl_mvm_ref_type { 
	IWL_MVM_REF_TM_CMD,

	IWL_MVM_REF_TM_CMD,

	IWL_MVM_REF_EXIT_WORK,

	IWL_MVM_REF_EXIT_WORK,

	IWL_MVM_REF_PROTECT_CSA,

	IWL_MVM_REF_PROTECT_CSA,

	IWL_MVM_REF_FW_DBG_COLLECT,





	/* update debugfs.c when changing this */

	/* update debugfs.c when changing this */

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

+5 −0
Original line number Original line Diff line number Diff line
@@ -818,9 +818,14 @@ static void iwl_mvm_fw_error_dump_wk(struct work_struct *work) 
	struct iwl_mvm *mvm =

	struct iwl_mvm *mvm =

		container_of(work, struct iwl_mvm, fw_error_dump_wk);

		container_of(work, struct iwl_mvm, fw_error_dump_wk);





	if (iwl_mvm_ref_sync(mvm, IWL_MVM_REF_FW_DBG_COLLECT))

		return;



	mutex_lock(&mvm->mutex);

	mutex_lock(&mvm->mutex);

	iwl_mvm_fw_error_dump(mvm);

	iwl_mvm_fw_error_dump(mvm);

	mutex_unlock(&mvm->mutex);

	mutex_unlock(&mvm->mutex);



	iwl_mvm_unref(mvm, IWL_MVM_REF_FW_DBG_COLLECT);

}

}





void iwl_mvm_nic_restart(struct iwl_mvm *mvm, bool fw_error)

void iwl_mvm_nic_restart(struct iwl_mvm *mvm, bool fw_error)