Patch "iwlwifi: mvm: don't restart HW if suspend fails with unified image" has been added to the 4.10-stable tree

[<gregkh@linuxfoundation.org>]

This is a note to let you know that I've just added the patch titled

    iwlwifi: mvm: don't restart HW if suspend fails with unified image

to the 4.10-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     iwlwifi-mvm-don-t-restart-hw-if-suspend-fails-with-unified-image.patch
and it can be found in the queue-4.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From bac453ab3745eaa64137ea6e77e009b45954f0ae Mon Sep 17 00:00:00 2001
From: Luca Coelho <luciano.coelho@intel.com>
Date: Fri, 7 Oct 2016 15:16:26 +0300
Subject: iwlwifi: mvm: don't restart HW if suspend fails with unified image

From: Luca Coelho <luciano.coelho@intel.com>

commit bac453ab3745eaa64137ea6e77e009b45954f0ae upstream.

For unified images, we shouldn't restart the HW if suspend fails.  The
only reason for restarting the HW with non-unified images is to go
back to the D0 image.

Fixes: 23ae61282b88 ("iwlwifi: mvm: Do not switch to D3 image on suspend")
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/net/wireless/intel/iwlwifi/mvm/d3.c |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

--- a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c
@@ -1262,12 +1262,15 @@ static int __iwl_mvm_suspend(struct ieee
 	iwl_trans_d3_suspend(mvm->trans, test, !unified_image);
  out:
 	if (ret < 0) {
-		iwl_mvm_ref(mvm, IWL_MVM_REF_UCODE_DOWN);
-		if (mvm->restart_fw > 0) {
-			mvm->restart_fw--;
-			ieee80211_restart_hw(mvm->hw);
-		}
 		iwl_mvm_free_nd(mvm);
+
+		if (!unified_image) {
+			iwl_mvm_ref(mvm, IWL_MVM_REF_UCODE_DOWN);
+			if (mvm->restart_fw > 0) {
+				mvm->restart_fw--;
+				ieee80211_restart_hw(mvm->hw);
+			}
+		}
 	}
  out_noreset:
 	mutex_unlock(&mvm->mutex);


Patches currently in stable-queue which might be from luciano.coelho@intel.com are

queue-4.10/iwlwifi-mvm-properly-check-for-transport-data-in-dump.patch
queue-4.10/iwlwifi-mvm-synchronize-firmware-dma-paging-memory.patch
queue-4.10/iwlwifi-mvm-overwrite-skb-info-later.patch
queue-4.10/iwlwifi-mvm-fix-reorder-timer-re-arming.patch
queue-4.10/iwlwifi-mvm-pcie-adjust-a-msdu-tx_cmd-length-in-pcie.patch
queue-4.10/iwlwifi-pcie-fix-the-set-of-dma-memory-mask.patch
queue-4.10/iwlwifi-mvm-fix-pending-frame-counter-calculation.patch
queue-4.10/iwlwifi-mvm-writing-zero-bytes-to-debugfs-causes-a-crash.patch
queue-4.10/iwlwifi-pcie-trans-remove-unused-shift_param.patch
queue-4.10/iwlwifi-mvm-don-t-restart-hw-if-suspend-fails-with-unified-image.patch
queue-4.10/iwlwifi-fix-module_firmware-for-6030.patch
queue-4.10/iwlwifi-mvm-fix-accessing-fw_id_to_mac_id.patch
queue-4.10/iwlwifi-mvm-use-aux-queue-for-offchannel-frames-in-dqa.patch
queue-4.10/iwlwifi-pcie-don-t-increment-decrement-a-bool.patch
queue-4.10/iwlwifi-mvm-fix-references-to-first_agg_queue-in-dqa-mode.patch