Commit 58d3bef4 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Luca Coelho
Browse files

iwlwifi: remove all the d0i3 references 



As part of the d0i3 removal.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 2b7f4753

drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
 * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH

 * Copyright(c) 2015        Intel Deutschland GmbH

 * Copyright(c) 2018 Intel Corporation

 * Copyright(c) 2018 - 2019 Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -31,7 +31,7 @@ 
 * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH

 * Copyright(c) 2015        Intel Deutschland GmbH

 * Copyright(c) 2018 Intel Corporation

 * Copyright(c) 2018 - 2019 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

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

+0 −9
Original line number Diff line number Diff line
@@ -1106,7 +1106,6 @@ static int __iwl_mvm_suspend(struct ieee80211_hw *hw, 
		iwl_mvm_free_nd(mvm);



		if (!unified_image) {

			iwl_mvm_ref(mvm, IWL_MVM_REF_UCODE_DOWN);

			if (mvm->fw_restart > 0) {

				mvm->fw_restart--;

				ieee80211_restart_hw(mvm->hw);
@@ -2115,14 +2114,6 @@ out: 
	 * 2. We are using a unified image but had an error while exiting D3

	 */

	set_bit(IWL_MVM_STATUS_HW_RESTART_REQUESTED, &mvm->status);

	/*

	 * When switching images we return 1, which causes mac80211

	 * to do a reconfig with IEEE80211_RECONFIG_TYPE_RESTART.

	 * This type of reconfig calls iwl_mvm_restart_complete(),

	 * where we unref the IWL_MVM_REF_UCODE_DOWN, so we need

	 * to take the reference here.

	 */

	iwl_mvm_ref(mvm, IWL_MVM_REF_UCODE_DOWN);



	return 1;

}

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

+0 −111
Original line number Diff line number Diff line
@@ -1056,19 +1056,11 @@ static ssize_t iwl_dbgfs_fw_restart_write(struct iwl_mvm *mvm, char *buf, 
static ssize_t iwl_dbgfs_fw_nmi_write(struct iwl_mvm *mvm, char *buf,

				      size_t count, loff_t *ppos)

{

	int ret;



	if (!iwl_mvm_firmware_running(mvm))

		return -EIO;



	ret = iwl_mvm_ref_sync(mvm, IWL_MVM_REF_NMI);

	if (ret)

		return ret;



	iwl_force_nmi(mvm->trans);



	iwl_mvm_unref(mvm, IWL_MVM_REF_NMI);



	return count;

}
@@ -1380,19 +1372,12 @@ static ssize_t iwl_dbgfs_fw_dbg_collect_write(struct iwl_mvm *mvm, 
					      char *buf, size_t count,

					      loff_t *ppos)

{

	int ret;



	ret = iwl_mvm_ref_sync(mvm, IWL_MVM_REF_PRPH_WRITE);

	if (ret)

		return ret;

	if (count == 0)

		return 0;



	iwl_fw_dbg_collect(&mvm->fwrt, FW_DBG_TRIGGER_USER, buf,

			   (count - 1), NULL);



	iwl_mvm_unref(mvm, IWL_MVM_REF_PRPH_WRITE);



	return count;

}
@@ -1579,87 +1564,6 @@ static ssize_t iwl_dbgfs_bcast_filters_macs_write(struct iwl_mvm *mvm, 
}

#endif



#define PRINT_MVM_REF(ref) do {						\

	if (mvm->refs[ref])						\

		pos += scnprintf(buf + pos, bufsz - pos,		\

				 "\t(0x%lx): %d %s\n",			\

				 BIT(ref), mvm->refs[ref], #ref);	\

} while (0)



static ssize_t iwl_dbgfs_d0i3_refs_read(struct file *file,

					char __user *user_buf,

					size_t count, loff_t *ppos)

{

	struct iwl_mvm *mvm = file->private_data;

	int i, pos = 0;

	char buf[256];

	const size_t bufsz = sizeof(buf);

	u32 refs = 0;



	for (i = 0; i < IWL_MVM_REF_COUNT; i++)

		if (mvm->refs[i])

			refs |= BIT(i);



	pos += scnprintf(buf + pos, bufsz - pos, "taken mvm refs: 0x%x\n",

			 refs);



	PRINT_MVM_REF(IWL_MVM_REF_UCODE_DOWN);

	PRINT_MVM_REF(IWL_MVM_REF_SCAN);

	PRINT_MVM_REF(IWL_MVM_REF_ROC);

	PRINT_MVM_REF(IWL_MVM_REF_ROC_AUX);

	PRINT_MVM_REF(IWL_MVM_REF_P2P_CLIENT);

	PRINT_MVM_REF(IWL_MVM_REF_AP_IBSS);

	PRINT_MVM_REF(IWL_MVM_REF_USER);

	PRINT_MVM_REF(IWL_MVM_REF_TX);

	PRINT_MVM_REF(IWL_MVM_REF_TX_AGG);

	PRINT_MVM_REF(IWL_MVM_REF_ADD_IF);

	PRINT_MVM_REF(IWL_MVM_REF_START_AP);

	PRINT_MVM_REF(IWL_MVM_REF_BSS_CHANGED);

	PRINT_MVM_REF(IWL_MVM_REF_PREPARE_TX);

	PRINT_MVM_REF(IWL_MVM_REF_PROTECT_TDLS);

	PRINT_MVM_REF(IWL_MVM_REF_CHECK_CTKILL);

	PRINT_MVM_REF(IWL_MVM_REF_PRPH_READ);

	PRINT_MVM_REF(IWL_MVM_REF_PRPH_WRITE);

	PRINT_MVM_REF(IWL_MVM_REF_NMI);

	PRINT_MVM_REF(IWL_MVM_REF_TM_CMD);

	PRINT_MVM_REF(IWL_MVM_REF_EXIT_WORK);

	PRINT_MVM_REF(IWL_MVM_REF_PROTECT_CSA);

	PRINT_MVM_REF(IWL_MVM_REF_FW_DBG_COLLECT);

	PRINT_MVM_REF(IWL_MVM_REF_INIT_UCODE);

	PRINT_MVM_REF(IWL_MVM_REF_SENDING_CMD);

	PRINT_MVM_REF(IWL_MVM_REF_RX);



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

}



static ssize_t iwl_dbgfs_d0i3_refs_write(struct iwl_mvm *mvm, char *buf,

					 size_t count, loff_t *ppos)

{

	unsigned long value;

	int ret;

	bool taken;



	ret = kstrtoul(buf, 10, &value);

	if (ret < 0)

		return ret;



	mutex_lock(&mvm->mutex);



	taken = mvm->refs[IWL_MVM_REF_USER];

	if (value == 1 && !taken)

		iwl_mvm_ref(mvm, IWL_MVM_REF_USER);

	else if (value == 0 && taken)

		iwl_mvm_unref(mvm, IWL_MVM_REF_USER);

	else

		ret = -EINVAL;



	mutex_unlock(&mvm->mutex);



	if (ret < 0)

		return ret;

	return count;

}



#define MVM_DEBUGFS_WRITE_FILE_OPS(name, bufsz) \

	_MVM_DEBUGFS_WRITE_FILE_OPS(name, bufsz, struct iwl_mvm)

#define MVM_DEBUGFS_READ_WRITE_FILE_OPS(name, bufsz) \
@@ -1692,21 +1596,14 @@ iwl_dbgfs_prph_reg_read(struct file *file, 
	int pos = 0;

	char buf[32];

	const size_t bufsz = sizeof(buf);

	int ret;



	if (!mvm->dbgfs_prph_reg_addr)

		return -EINVAL;



	ret = iwl_mvm_ref_sync(mvm, IWL_MVM_REF_PRPH_READ);

	if (ret)

		return ret;



	pos += scnprintf(buf + pos, bufsz - pos, "Reg 0x%x: (0x%x)\n",

		mvm->dbgfs_prph_reg_addr,

		iwl_read_prph(mvm->trans, mvm->dbgfs_prph_reg_addr));



	iwl_mvm_unref(mvm, IWL_MVM_REF_PRPH_READ);



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

}
@@ -1716,7 +1613,6 @@ iwl_dbgfs_prph_reg_write(struct iwl_mvm *mvm, char *buf, 
{

	u8 args;

	u32 value;

	int ret;



	args = sscanf(buf, "%i %i", &mvm->dbgfs_prph_reg_addr, &value);

	/* if we only want to set the reg address - nothing more to do */
@@ -1727,13 +1623,8 @@ iwl_dbgfs_prph_reg_write(struct iwl_mvm *mvm, char *buf, 
	if (args != 2)

		return -EINVAL;



	ret = iwl_mvm_ref_sync(mvm, IWL_MVM_REF_PRPH_WRITE);

	if (ret)

		return ret;



	iwl_write_prph(mvm->trans, mvm->dbgfs_prph_reg_addr, value);



	iwl_mvm_unref(mvm, IWL_MVM_REF_PRPH_WRITE);

out:

	return count;

}
@@ -1892,7 +1783,6 @@ MVM_DEBUGFS_WRITE_FILE_OPS(fw_nmi, 10); 
MVM_DEBUGFS_WRITE_FILE_OPS(bt_tx_prio, 10);

MVM_DEBUGFS_WRITE_FILE_OPS(bt_force_ant, 10);

MVM_DEBUGFS_READ_WRITE_FILE_OPS(scan_ant_rxchain, 8);

MVM_DEBUGFS_READ_WRITE_FILE_OPS(d0i3_refs, 8);

MVM_DEBUGFS_READ_WRITE_FILE_OPS(fw_dbg_conf, 8);

MVM_DEBUGFS_WRITE_FILE_OPS(fw_dbg_collect, 64);

MVM_DEBUGFS_WRITE_FILE_OPS(indirection_tbl,
@@ -2091,7 +1981,6 @@ void iwl_mvm_dbgfs_register(struct iwl_mvm *mvm, struct dentry *dbgfs_dir) 
	MVM_DEBUGFS_ADD_FILE(bt_force_ant, mvm->debugfs_dir, 0200);

	MVM_DEBUGFS_ADD_FILE(scan_ant_rxchain, mvm->debugfs_dir, 0600);

	MVM_DEBUGFS_ADD_FILE(prph_reg, mvm->debugfs_dir, 0600);

	MVM_DEBUGFS_ADD_FILE(d0i3_refs, mvm->debugfs_dir, 0600);

	MVM_DEBUGFS_ADD_FILE(fw_dbg_conf, mvm->debugfs_dir, 0600);

	MVM_DEBUGFS_ADD_FILE(fw_dbg_collect, mvm->debugfs_dir, 0200);

	MVM_DEBUGFS_ADD_FILE(send_echo_cmd, mvm->debugfs_dir, 0200);

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

+0 −4
Original line number Diff line number Diff line
@@ -1326,10 +1326,6 @@ int iwl_mvm_up(struct iwl_mvm *mvm) 
			goto error;

	}



	/* allow FW/transport low power modes if not during restart */

	if (!test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status))

		iwl_mvm_unref(mvm, IWL_MVM_REF_UCODE_DOWN);



	if (test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status))

		iwl_mvm_send_recovery_cmd(mvm, ERROR_RECOVERY_UPDATE_DB);

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

+0 −195
Original line number Diff line number Diff line
@@ -213,91 +213,6 @@ static int __iwl_mvm_mac_set_key(struct ieee80211_hw *hw, 
				 struct ieee80211_sta *sta,

				 struct ieee80211_key_conf *key);



void iwl_mvm_ref(struct iwl_mvm *mvm, enum iwl_mvm_ref_type ref_type)

{

	if (!iwl_mvm_is_d0i3_supported(mvm))

		return;



	IWL_DEBUG_RPM(mvm, "Take mvm reference - type %d\n", ref_type);

	spin_lock_bh(&mvm->refs_lock);

	mvm->refs[ref_type]++;

	spin_unlock_bh(&mvm->refs_lock);

	iwl_trans_ref(mvm->trans);

}



void iwl_mvm_unref(struct iwl_mvm *mvm, enum iwl_mvm_ref_type ref_type)

{

	if (!iwl_mvm_is_d0i3_supported(mvm))

		return;



	IWL_DEBUG_RPM(mvm, "Leave mvm reference - type %d\n", ref_type);

	spin_lock_bh(&mvm->refs_lock);

	if (WARN_ON(!mvm->refs[ref_type])) {

		spin_unlock_bh(&mvm->refs_lock);

		return;

	}

	mvm->refs[ref_type]--;

	spin_unlock_bh(&mvm->refs_lock);

	iwl_trans_unref(mvm->trans);

}



static void iwl_mvm_unref_all_except(struct iwl_mvm *mvm,

				     enum iwl_mvm_ref_type except_ref)

{

	int i, j;



	if (!iwl_mvm_is_d0i3_supported(mvm))

		return;



	spin_lock_bh(&mvm->refs_lock);

	for (i = 0; i < IWL_MVM_REF_COUNT; i++) {

		if (except_ref == i || !mvm->refs[i])

			continue;



		IWL_DEBUG_RPM(mvm, "Cleanup: remove mvm ref type %d (%d)\n",

			      i, mvm->refs[i]);

		for (j = 0; j < mvm->refs[i]; j++)

			iwl_trans_unref(mvm->trans);

		mvm->refs[i] = 0;

	}

	spin_unlock_bh(&mvm->refs_lock);

}



bool iwl_mvm_ref_taken(struct iwl_mvm *mvm)

{

	int i;

	bool taken = false;



	if (!iwl_mvm_is_d0i3_supported(mvm))

		return true;



	spin_lock_bh(&mvm->refs_lock);

	for (i = 0; i < IWL_MVM_REF_COUNT; i++) {

		if (mvm->refs[i]) {

			taken = true;

			break;

		}

	}

	spin_unlock_bh(&mvm->refs_lock);



	return taken;

}



int iwl_mvm_ref_sync(struct iwl_mvm *mvm, enum iwl_mvm_ref_type ref_type)

{

	iwl_mvm_ref(mvm, ref_type);



	if (!wait_event_timeout(mvm->d0i3_exit_waitq,

				!test_bit(IWL_MVM_STATUS_IN_D0I3, &mvm->status),

				HZ)) {

		WARN_ON_ONCE(1);

		iwl_mvm_unref(mvm, ref_type);

		return -EIO;

	}



	return 0;

}



static void iwl_mvm_reset_phy_ctxts(struct iwl_mvm *mvm)

{

	int i;
@@ -857,10 +772,6 @@ static bool iwl_mvm_defer_tx(struct iwl_mvm *mvm, 


	__skb_queue_tail(&mvm->d0i3_tx, skb);



	/* trigger wakeup */

	iwl_mvm_ref(mvm, IWL_MVM_REF_TX);

	iwl_mvm_unref(mvm, IWL_MVM_REF_TX);



	defer = true;

out:

	spin_unlock(&mvm->d0i3_tx_lock);
@@ -1080,7 +991,6 @@ static int iwl_mvm_mac_ampdu_action(struct ieee80211_hw *hw, 
{

	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);

	int ret;

	bool tx_agg_ref = false;

	struct ieee80211_sta *sta = params->sta;

	enum ieee80211_ampdu_mlme_action action = params->action;

	u16 tid = params->tid;
@@ -1095,31 +1005,6 @@ static int iwl_mvm_mac_ampdu_action(struct ieee80211_hw *hw, 
	if (!(mvm->nvm_data->sku_cap_11n_enable))

		return -EACCES;



	/* return from D0i3 before starting a new Tx aggregation */

	switch (action) {

	case IEEE80211_AMPDU_TX_START:

	case IEEE80211_AMPDU_TX_STOP_CONT:

	case IEEE80211_AMPDU_TX_STOP_FLUSH:

	case IEEE80211_AMPDU_TX_STOP_FLUSH_CONT:

	case IEEE80211_AMPDU_TX_OPERATIONAL:

		/*

		 * for tx start, wait synchronously until D0i3 exit to

		 * get the correct sequence number for the tid.

		 * additionally, some other ampdu actions use direct

		 * target access, which is not handled automatically

		 * by the trans layer (unlike commands), so wait for

		 * d0i3 exit in these cases as well.

		 */

		ret = iwl_mvm_ref_sync(mvm, IWL_MVM_REF_TX_AGG);

		if (ret)

			return ret;



		tx_agg_ref = true;

		break;

	default:

		break;

	}



	mutex_lock(&mvm->mutex);



	switch (action) {
@@ -1180,13 +1065,6 @@ static int iwl_mvm_mac_ampdu_action(struct ieee80211_hw *hw, 
	}

	mutex_unlock(&mvm->mutex);



	/*

	 * If the tid is marked as started, we won't use it for offloaded

	 * traffic on the next D0i3 entry. It's safe to unref.

	 */

	if (tx_agg_ref)

		iwl_mvm_unref(mvm, IWL_MVM_REF_TX_AGG);



	return ret;

}
@@ -1210,11 +1088,6 @@ static void iwl_mvm_cleanup_iterator(void *data, u8 *mac, 


static void iwl_mvm_restart_cleanup(struct iwl_mvm *mvm)

{

	/* cleanup all stale references (scan, roc), but keep the

	 * ucode_down ref until reconfig is complete

	 */

	iwl_mvm_unref_all_except(mvm, IWL_MVM_REF_UCODE_DOWN);



	iwl_mvm_stop_device(mvm);



	mvm->cur_aid = 0;
@@ -1272,14 +1145,6 @@ int __iwl_mvm_mac_start(struct iwl_mvm *mvm) 
		clear_bit(IWL_MVM_STATUS_HW_RESTART_REQUESTED, &mvm->status);

		/* Clean up some internal and mac80211 state on restart */

		iwl_mvm_restart_cleanup(mvm);

	} else {

		/* Hold the reference to prevent runtime suspend while

		 * the start procedure runs.  It's a bit confusing

		 * that the UCODE_DOWN reference is taken, but it just

		 * means "UCODE is not UP yet". ( TODO: rename this

		 * reference).

		 */

		iwl_mvm_ref(mvm, IWL_MVM_REF_UCODE_DOWN);

	}

	ret = iwl_mvm_up(mvm);
@@ -1339,9 +1204,6 @@ static void iwl_mvm_restart_complete(struct iwl_mvm *mvm) 
		IWL_ERR(mvm, "Failed to update quotas after restart (%d)\n",

			ret);



	/* allow transport/FW low power modes */

	iwl_mvm_unref(mvm, IWL_MVM_REF_UCODE_DOWN);



	iwl_mvm_send_recovery_cmd(mvm, ERROR_RECOVERY_END_OF_RECOVERY);



	/*
@@ -1593,15 +1455,6 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw, 
	mvmvif->mvm = mvm;

	RCU_INIT_POINTER(mvmvif->probe_resp_data, NULL);



	/*

	 * make sure D0i3 exit is completed, otherwise a target access

	 * during tx queue configuration could be done when still in

	 * D0i3 state.

	 */

	ret = iwl_mvm_ref_sync(mvm, IWL_MVM_REF_ADD_IF);

	if (ret)

		return ret;



	/*

	 * Not much to do here. The stack will not allow interface

	 * types or combinations that we didn't advertise, so we
@@ -1737,8 +1590,6 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw, 
 out_unlock:

	mutex_unlock(&mvm->mutex);



	iwl_mvm_unref(mvm, IWL_MVM_REF_ADD_IF);



	return ret;

}
@@ -2506,7 +2357,6 @@ static void iwl_mvm_bss_info_changed_station(struct iwl_mvm *mvm, 
			iwl_mvm_sf_update(mvm, vif, false);

			iwl_mvm_power_vif_assoc(mvm, vif);

			if (vif->p2p) {

				iwl_mvm_ref(mvm, IWL_MVM_REF_P2P_CLIENT);

				iwl_mvm_update_smps(mvm, vif,

						    IWL_MVM_SMPS_REQ_PROT,

						    IEEE80211_SMPS_DYNAMIC);
@@ -2553,9 +2403,6 @@ static void iwl_mvm_bss_info_changed_station(struct iwl_mvm *mvm, 
			if (ret)

				IWL_ERR(mvm, "failed to update quotas\n");



			if (vif->p2p)

				iwl_mvm_unref(mvm, IWL_MVM_REF_P2P_CLIENT);



			/* this will take the cleared BSSID from bss_conf */

			ret = iwl_mvm_mac_ctxt_changed(mvm, vif, false, NULL);

			if (ret)
@@ -2643,14 +2490,6 @@ static int iwl_mvm_start_ap_ibss(struct ieee80211_hw *hw, 
	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);

	int ret, i;



	/*

	 * iwl_mvm_mac_ctxt_add() might read directly from the device

	 * (the system time), so make sure it is available.

	 */

	ret = iwl_mvm_ref_sync(mvm, IWL_MVM_REF_START_AP);

	if (ret)

		return ret;



	mutex_lock(&mvm->mutex);



	/* Send the beacon template */
@@ -2746,8 +2585,6 @@ static int iwl_mvm_start_ap_ibss(struct ieee80211_hw *hw, 
	if (vif->p2p && mvm->p2p_device_vif)

		iwl_mvm_mac_ctxt_changed(mvm, mvm->p2p_device_vif, false, NULL);



	iwl_mvm_ref(mvm, IWL_MVM_REF_AP_IBSS);



	iwl_mvm_bt_coex_vif_change(mvm);



	/* we don't support TDLS during DCM */
@@ -2769,7 +2606,6 @@ out_remove: 
	iwl_mvm_mac_ctxt_remove(mvm, vif);

out_unlock:

	mutex_unlock(&mvm->mutex);

	iwl_mvm_unref(mvm, IWL_MVM_REF_START_AP);

	return ret;

}
@@ -2807,8 +2643,6 @@ static void iwl_mvm_stop_ap_ibss(struct ieee80211_hw *hw, 


	iwl_mvm_bt_coex_vif_change(mvm);



	iwl_mvm_unref(mvm, IWL_MVM_REF_AP_IBSS);



	/* Need to update the P2P Device MAC (only GO, IBSS is single vif) */

	if (vif->p2p && mvm->p2p_device_vif)

		iwl_mvm_mac_ctxt_changed(mvm, mvm->p2p_device_vif, false, NULL);
@@ -2882,14 +2716,6 @@ static void iwl_mvm_bss_info_changed(struct ieee80211_hw *hw, 
{

	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);



	/*

	 * iwl_mvm_bss_info_changed_station() might call

	 * iwl_mvm_protect_session(), which reads directly from

	 * the device (the system time), so make sure it is available.

	 */

	if (iwl_mvm_ref_sync(mvm, IWL_MVM_REF_BSS_CHANGED))

		return;



	mutex_lock(&mvm->mutex);



	if (changes & BSS_CHANGED_IDLE && !bss_conf->idle)
@@ -2913,7 +2739,6 @@ static void iwl_mvm_bss_info_changed(struct ieee80211_hw *hw, 
	}



	mutex_unlock(&mvm->mutex);

	iwl_mvm_unref(mvm, IWL_MVM_REF_BSS_CHANGED);

}



static int iwl_mvm_mac_hw_scan(struct ieee80211_hw *hw,
@@ -3483,13 +3308,6 @@ static void iwl_mvm_mac_mgd_prepare_tx(struct ieee80211_hw *hw, 
	u32 duration = IWL_MVM_TE_SESSION_PROTECTION_MAX_TIME_MS;

	u32 min_duration = IWL_MVM_TE_SESSION_PROTECTION_MIN_TIME_MS;



	/*

	 * iwl_mvm_protect_session() reads directly from the device

	 * (the system time), so make sure it is available.

	 */

	if (iwl_mvm_ref_sync(mvm, IWL_MVM_REF_PREPARE_TX))

		return;



	if (req_duration > duration)

		duration = req_duration;
@@ -3497,8 +3315,6 @@ static void iwl_mvm_mac_mgd_prepare_tx(struct ieee80211_hw *hw, 
	/* Try really hard to protect the session and hear a beacon */

	iwl_mvm_protect_session(mvm, vif, duration, min_duration, 500, false);

	mutex_unlock(&mvm->mutex);



	iwl_mvm_unref(mvm, IWL_MVM_REF_PREPARE_TX);

}



static int iwl_mvm_mac_sched_scan_start(struct ieee80211_hw *hw,
@@ -4314,23 +4130,12 @@ static int __iwl_mvm_assign_vif_chanctx(struct iwl_mvm *mvm, 
				 IWL_UCODE_TLV_CAPA_CHANNEL_SWITCH_CMD)) {

			u32 duration = 3 * vif->bss_conf.beacon_int;





			/* iwl_mvm_protect_session() reads directly from the

			 * device (the system time), so make sure it is

			 * available.

			 */

			ret = iwl_mvm_ref_sync(mvm, IWL_MVM_REF_PROTECT_CSA);

			if (ret)

				goto out_remove_binding;



			/* Protect the session to make sure we hear the first

			 * beacon on the new channel.

			 */

			iwl_mvm_protect_session(mvm, vif, duration, duration,

						vif->bss_conf.beacon_int / 2,

						true);



			iwl_mvm_unref(mvm, IWL_MVM_REF_PROTECT_CSA);

		}



		iwl_mvm_update_quotas(mvm, false, NULL);

CRA Git | Maintained and supported by SUSTech CRA and CCSE