From 6ad0435991482107664f65b7ae3fd588f10149d4 Mon Sep 17 00:00:00 2001

From: Johannes Berg <johannes.berg@intel.com>

Date: Tue, 25 Apr 2017 10:21:18 +0200

Subject: [PATCH] iwlwifi: mvm: don't warn in queue sync on RF-kill

Git-commit: 6ad0435991482107664f65b7ae3fd588f10149d4

Patch-mainline: 4.13-rc1

References: bsc#1051510

If we happen to be in or get into the queue sync when RF-kill

is asserted, we return from there and warn since there are

still queue sync notifications outstanding. These can't ever

come though, because we're in RF-kill, so don't WARN then.

While at it, also move the warning to the appropriate place,

if the request is not synchronous then we shouldn't warn, but

currently always will.

To make it fast, also trigger the waitq when on rfkill assert.

Fixes: 0636b938214c ("iwlwifi: mvm: implement driver RX queues sync command")

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c |    8 +++++---

 drivers/net/wireless/intel/iwlwifi/mvm/ops.c      |    4 ++--

 2 files changed, 7 insertions(+), 5 deletions(-)

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

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

@@ -4268,11 +4268,13 @@ void iwl_mvm_sync_rx_queues_internal(str

 		goto out;

 	}

-	if (notif->sync)

+	if (notif->sync) {

 		ret = wait_event_timeout(mvm->rx_sync_waitq,

-					 atomic_read(&mvm->queue_sync_counter) == 0,

+					 atomic_read(&mvm->queue_sync_counter) == 0 ||

+					 iwl_mvm_is_radio_killed(mvm),

 					 HZ);

-	WARN_ON_ONCE(!ret);

+		WARN_ON_ONCE(!ret && !iwl_mvm_is_radio_killed(mvm));

+	}

 out:

 	atomic_set(&mvm->queue_sync_counter, 0);

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

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

@@ -1112,7 +1112,7 @@ void iwl_mvm_set_hw_ctkill_state(struct

 	else

 		clear_bit(IWL_MVM_STATUS_HW_CTKILL, &mvm->status);

-	wiphy_rfkill_set_hw_state(mvm->hw->wiphy, iwl_mvm_is_radio_killed(mvm));

+	iwl_mvm_set_rfkill_state(mvm);

 }

 static bool iwl_mvm_set_hw_rfkill_state(struct iwl_op_mode *op_mode, bool state)

@@ -1125,7 +1125,7 @@ static bool iwl_mvm_set_hw_rfkill_state(

 	else

 		clear_bit(IWL_MVM_STATUS_HW_RFKILL, &mvm->status);

-	wiphy_rfkill_set_hw_state(mvm->hw->wiphy, iwl_mvm_is_radio_killed(mvm));

+	iwl_mvm_set_rfkill_state(mvm);

 	/* iwl_run_init_mvm_ucode is waiting for results, abort it */

 	if (calibrating)