releases/4.9.28/iwlwifi-pcie-fix-the-set-of-dma-memory-mask.patch

   1 From 2c6262b754f3c3338cb40b23880a3ac1f4693b25 Mon Sep 17 00:00:00 2001
   2 From: Sara Sharon <sara.sharon@intel.com>
   3 Date: Wed, 7 Dec 2016 12:22:11 +0200
   4 Subject: iwlwifi: pcie: fix the set of DMA memory mask
   5
   6 From: Sara Sharon <sara.sharon@intel.com>
   7
   8 commit 2c6262b754f3c3338cb40b23880a3ac1f4693b25 upstream.
   9
  10 Our 9000 device supports 64 bit DMA address for RX only, and
  11 not for TX.
  12 Setting DMA mask to 64 for the whole device is erroneous - we
  13 can do it only for a000 devices where device is capable of
  14 both RX & TX DMA with 64 bit address space.
  15
  16 Fixes: 96a6497bc3ed ("iwlwifi: pcie: add 9000 series multi queue rx DMA support")
  17 Signed-off-by: Sara Sharon <sara.sharon@intel.com>
  18 Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
  19 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  20
  21 ---
  22  drivers/net/wireless/intel/iwlwifi/pcie/trans.c |    8 ++------
  23  1 file changed, 2 insertions(+), 6 deletions(-)
  24
  25 --- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
  26 +++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
  27 @@ -2929,16 +2929,12 @@ struct iwl_trans *iwl_trans_pcie_alloc(s
  28                                        PCIE_LINK_STATE_CLKPM);
  29         }
  30
  31 -       if (cfg->mq_rx_supported)
  32 -               addr_size = 64;
  33 -       else
  34 -               addr_size = 36;
  35 -
  36         if (cfg->use_tfh) {
  37 +               addr_size = 64;
  38                 trans_pcie->max_tbs = IWL_TFH_NUM_TBS;
  39                 trans_pcie->tfd_size = sizeof(struct iwl_tfh_tfd);
  40 -
  41         } else {
  42 +               addr_size = 36;
  43                 trans_pcie->max_tbs = IWL_NUM_OF_TBS;
  44                 trans_pcie->tfd_size = sizeof(struct iwl_tfd);
  45         }