Commit 7ce1f215 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Kalle Valo
Browse files

iwlwifi: mvm: read the rfkill state and feed it to iwlmei 



Read the rfkill state upon boot, mac start and mac stop.

Reviewed-by: default avatarLuciano Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20211112062814.7502-6-emmanuel.grumbach@intel.com
parent bfcfdb59

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

+4 −0
Original line number Diff line number Diff line
@@ -1148,6 +1148,8 @@ static int iwl_mvm_mac_start(struct ieee80211_hw *hw) 
	ret = __iwl_mvm_mac_start(mvm);

	mutex_unlock(&mvm->mutex);



	iwl_mvm_mei_set_sw_rfkill_state(mvm);



	return ret;

}
@@ -1265,6 +1267,8 @@ static void iwl_mvm_mac_stop(struct ieee80211_hw *hw) 
	 */

	flush_work(&mvm->roc_done_wk);



	iwl_mvm_mei_set_sw_rfkill_state(mvm);



	mutex_lock(&mvm->mutex);

	__iwl_mvm_mac_stop(mvm);

	mutex_unlock(&mvm->mutex);

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

+6 −2
Original line number Diff line number Diff line
@@ -2218,10 +2218,14 @@ static inline void iwl_mvm_mei_device_down(struct iwl_mvm *mvm) 
		iwl_mei_device_down();

}



static inline void iwl_mvm_mei_set_sw_rfkill_state(struct iwl_mvm *mvm, bool sw_rfkill)

static inline void iwl_mvm_mei_set_sw_rfkill_state(struct iwl_mvm *mvm)

{

	bool sw_rfkill =

		mvm->hw_registered ? rfkill_blocked(mvm->hw->wiphy->rfkill) : false;



	if (mvm->mei_registered)

		iwl_mei_set_rfkill_state(iwl_mvm_is_radio_killed(mvm), sw_rfkill);

		iwl_mei_set_rfkill_state(iwl_mvm_is_radio_killed(mvm),

					 sw_rfkill);

}



void iwl_mvm_send_roaming_forbidden_event(struct iwl_mvm *mvm,

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

+3 −0
Original line number Diff line number Diff line
@@ -756,6 +756,9 @@ static int iwl_mvm_start_post_nvm(struct iwl_mvm *mvm) 
	wiphy_rfkill_set_hw_state_reason(mvm->hw->wiphy,

					 mvm->mei_rfkill_blocked,

					 RFKILL_HARD_BLOCK_NOT_OWNER);



	iwl_mvm_mei_set_sw_rfkill_state(mvm);



	return 0;

}