All of lore.kernel.org
 help / color / mirror / Atom feed
From: <gregkh@linuxfoundation.org>
To: sara.sharon@intel.com, gregkh@linuxfoundation.org,
	luciano.coelho@intel.com
Cc: <stable@vger.kernel.org>, <stable-commits@vger.kernel.org>
Subject: Patch "iwlwifi: pcie: fix the set of DMA memory mask" has been added to the 4.10-stable tree
Date: Tue, 09 May 2017 11:19:49 +0200	[thread overview]
Message-ID: <149432158964@kroah.com> (raw)


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.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-pcie-fix-the-set-of-dma-memory-mask.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 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
@@ -2956,16 +2956,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.10/iwlwifi-mvm-synchronize-firmware-dma-paging-memory.patch
queue-4.10/iwlwifi-mvm-fix-reorder-timer-re-arming.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-pcie-trans-remove-unused-shift_param.patch
queue-4.10/iwlwifi-mvm-fix-accessing-fw_id_to_mac_id.patch
queue-4.10/iwlwifi-mvm-fix-references-to-first_agg_queue-in-dqa-mode.patch

                 reply	other threads:[~2017-05-09  9:21 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=149432158964@kroah.com \
    --to=gregkh@linuxfoundation.org \
    --cc=luciano.coelho@intel.com \
    --cc=sara.sharon@intel.com \
    --cc=stable-commits@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.