Commit 635a4d10 authored by Johannes Berg's avatar Johannes Berg Committed by Zhang Changzhong
Browse files

iwlwifi: mvm: move iwl_mvm_stop_device() out of line 

mainline inclusion
from mainline-v5.11-rc1
commit cf5b4627
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAVU87
CVE: CVE-2024-47673

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=cf5b462768474c783cf40f6408a038540917088a



--------------------------------

This function has grown quite a bit over time, move it
out of line before we grow it even further.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20201209231352.1a0211e66906.I572eb69dc3738319310c9cbe03a36d942f4f68f7@changeid


Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parent ffc5791c

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

+1 −10
Original line number Diff line number Diff line
@@ -1948,16 +1948,7 @@ static inline u32 iwl_mvm_flushable_queues(struct iwl_mvm *mvm) 
		~BIT(IWL_MVM_DQA_CMD_QUEUE));

}



static inline void iwl_mvm_stop_device(struct iwl_mvm *mvm)

{

	lockdep_assert_held(&mvm->mutex);

	iwl_fw_cancel_timestamp(&mvm->fwrt);

	clear_bit(IWL_MVM_STATUS_FIRMWARE_RUNNING, &mvm->status);

	iwl_fw_dbg_stop_sync(&mvm->fwrt);

	iwl_trans_stop_device(mvm->trans);

	iwl_free_fw_paging(&mvm->fwrt);

	iwl_fw_dump_conf_clear(&mvm->fwrt);

}

void iwl_mvm_stop_device(struct iwl_mvm *mvm);



/* Re-configure the SCD for a queue that has already been configured */

int iwl_mvm_reconfig_scd(struct iwl_mvm *mvm, int queue, int fifo, int sta_id,

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

+14 −0
Original line number Diff line number Diff line
@@ -902,6 +902,20 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg, 
	return NULL;

}



void iwl_mvm_stop_device(struct iwl_mvm *mvm)

{

	lockdep_assert_held(&mvm->mutex);



	iwl_fw_cancel_timestamp(&mvm->fwrt);



	clear_bit(IWL_MVM_STATUS_FIRMWARE_RUNNING, &mvm->status);



	iwl_fw_dbg_stop_sync(&mvm->fwrt);

	iwl_trans_stop_device(mvm->trans);

	iwl_free_fw_paging(&mvm->fwrt);

	iwl_fw_dump_conf_clear(&mvm->fwrt);

}



static void iwl_op_mode_mvm_stop(struct iwl_op_mode *op_mode)

{

	struct iwl_mvm *mvm = IWL_OP_MODE_GET_MVM(op_mode);