Patch "iwlwifi: pcie: fix the set of DMA memory mask" has been added to the 4.9-stable tree

Patch "iwlwifi: pcie: fix the set of DMA memory mask" has been added to the 4.9-stable tree

[gregkh]

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

    iwlwifi: pcie: fix the set of DMA memory mask

to the 4.9-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-pcie-fix-the-set-of-dma-memory-mask.patch
and it can be found in the queue-4.9 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 2c6262b754f3c3338cb40b23880a3ac1f4693b25 Mon Sep 17 00:00:00 2001
From: Sara Sharon <sara.sharon@intel.com>
Date: Wed, 7 Dec 2016 12:22:11 +0200
Subject: iwlwifi: pcie: fix the set of DMA memory mask

From: Sara Sharon <sara.sharon@intel.com>

commit 2c6262b754f3c3338cb40b23880a3ac1f4693b25 upstream.

Our 9000 device supports 64 bit DMA address for RX only, and
not for TX.
Setting DMA mask to 64 for the whole device is erroneous - we
can do it only for a000 devices where device is capable of
both RX & TX DMA with 64 bit address space.

Fixes: 96a6497bc3ed ("iwlwifi: pcie: add 9000 series multi queue rx DMA support")
Signed-off-by: Sara Sharon <sara.sharon@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/net/wireless/intel/iwlwifi/pcie/trans.c |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
@@ -2929,16 +2929,12 @@ struct iwl_trans *iwl_trans_pcie_alloc(s
 				       PCIE_LINK_STATE_CLKPM);
 	}
 
-	if (cfg->mq_rx_supported)
-		addr_size = 64;
-	else
-		addr_size = 36;
-
 	if (cfg->use_tfh) {
+		addr_size = 64;
 		trans_pcie->max_tbs = IWL_TFH_NUM_TBS;
 		trans_pcie->tfd_size = sizeof(struct iwl_tfh_tfd);
-
 	} else {
+		addr_size = 36;
 		trans_pcie->max_tbs = IWL_NUM_OF_TBS;
 		trans_pcie->tfd_size = sizeof(struct iwl_tfd);
 	}


Patches currently in stable-queue which might be from sara.sharon@intel.com are

queue-4.9/iwlwifi-mvm-synchronize-firmware-dma-paging-memory.patch
queue-4.9/iwlwifi-mvm-fix-reorder-timer-re-arming.patch
queue-4.9/iwlwifi-pcie-fix-the-set-of-dma-memory-mask.patch
queue-4.9/iwlwifi-mvm-fix-pending-frame-counter-calculation.patch
queue-4.9/iwlwifi-pcie-trans-remove-unused-shift_param.patch
queue-4.9/iwlwifi-mvm-fix-references-to-first_agg_queue-in-dqa-mode.patch