Skip to contentSkip to conversation

Patch "iwlwifi: mvm: write the correct internal TXF index" has been added to the 4.7-stable tree

PATCH [email protected] 1 participant 1 message Oct 4, 2016

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

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

iwlwifi: mvm: write the correct internal TXF index

to the 4.7-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-write-the-correct-internal-txf-index.patch
and it can be found in the queue-4.7 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From e7c9bd1cc632e924a69bf704385484386bb10933 Mon Sep 17 00:00:00 2001

From: Golan Ben-Ami <[email protected]>
Date: Wed, 15 Jun 2016 09:16:24 +0300
Subject: iwlwifi: mvm: write the correct internal TXF index

From: Golan Ben-Ami <[email protected]>

commit e7c9bd1cc632e924a69bf704385484386bb10933 upstream.

The TX fifos are arranged consecutively in the SMEM, beginning with the regular fifos, and tailed by the internal fifos. In the current code, while trying to read the internal fifos, we read the fifos beginning with the index zero.
By doing this we actually re-read the regular fifos.

In order to read the internal fifos, start the reading index from the number of regular fifos configured by the fw.

Fixes 39654cb3a6a2 ("iwlwifi: don't access a nonexistent register upon assert")
---
 drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c +2 -1
@@ -288,7 +288,8 @@ static void iwl_mvm_dump_fifos(struct iw
 			fifo_hdr->fifo_num = cpu_to_le32(i);
 
 			/* Mark the number of TXF we're pulling now */
-			iwl_trans_write_prph(mvm->trans, TXF_CPU2_NUM, i);
+			iwl_trans_write_prph(mvm->trans, TXF_CPU2_NUM, i +
+				ARRAY_SIZE(mvm->shared_mem_cfg.txfifo_size));
 
 			fifo_hdr->available_bytes =
 				cpu_to_le32(iwl_trans_read_prph(mvm->trans,

Patches currently in stable-queue which might be from [email protected] are

queue-4.7/iwlwifi-mvm-write-the-correct-internal-txf-index.patch