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

Commit 1a3fe0b2 authored Sep 30, 2015 by Arik Nemtsov Committed by Luca Coelho Oct 05, 2015

iwlwifi: mvm: init card correctly on ctkill exit check



During the CT-kill exit flow, the card is powered up and partially
initialized to check if the temperature is already low enough.
Unfortunately the init bails early because the CT-kill flag is set.
Make the code bail early only for HW RF-kill, as was intended by the
author. CT-kill is self-imposed and is not really RF-kill.

Fixes: 31b8b343 ("iwlwifi: fix RFkill while calibrating")
Cc: <stable@vger.kernel.org> [3.18+]
Signed-off-by: Arik Nemtsov <arikx.nemtsov@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

parent f08f6258

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -703,7 +703,7 @@ int iwl_run_init_mvm_ucode(struct iwl_mvm *mvm, bool read_nvm)
		* abort after reading the nvm in case RF Kill is on, we will complete
		* the init seq later when RF kill will switch to off
		*/
		if (iwl_mvm_is_radio_killed(mvm)) {
		if (iwl_mvm_is_radio_hw_killed(mvm)) {
		IWL_DEBUG_RF_KILL(mvm,
		"jump over all phy activities due to RF kill\n");
		iwl_remove_notification(&mvm->notif_wait, &calib_wait);
		@@ -736,7 +736,7 @@ int iwl_run_init_mvm_ucode(struct iwl_mvm *mvm, bool read_nvm)
		ret = iwl_wait_notification(&mvm->notif_wait, &calib_wait,
		MVM_UCODE_CALIB_TIMEOUT);

		if (ret && iwl_mvm_is_radio_killed(mvm)) {
		if (ret && iwl_mvm_is_radio_hw_killed(mvm)) {
		IWL_DEBUG_RF_KILL(mvm, "RFKILL while calibrating.\n");
		ret = 1;
		}

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -860,6 +860,11 @@ static inline bool iwl_mvm_is_radio_killed(struct iwl_mvm *mvm)
		test_bit(IWL_MVM_STATUS_HW_CTKILL, &mvm->status);
		}

		static inline bool iwl_mvm_is_radio_hw_killed(struct iwl_mvm *mvm)
		{
		return test_bit(IWL_MVM_STATUS_HW_RFKILL, &mvm->status);
		}

		/* Must be called with rcu_read_lock() held and it can only be
		* released when mvmsta is not needed anymore.
		*/