diff mbox

ath10k: correct target assert problem due to CE5 stuck

Message ID 1523535410-29333-1-git-send-email-mpubbise@codeaurora.org (mailing list archive)
State Accepted
Commit 1e8f77502341035f079039c9aa9a647ebc9d881a
Delegated to: Kalle Valo
Headers show

Commit Message

Manikanta Pubbisetty April 12, 2018, 12:16 p.m. UTC 
From: Manikanta Pubbisetty <mpubbise@codeaurora.org>

Correct a minor bug in the commit 0628467f97b5 ("ath10k: fix
copy engine 5 destination ring stuck") which introduced a change to fix
firmware assert that happens when ring indices of copy engine 5 are stuck
for a specific duration, problem with this fix is that it did not use
ring arithmatic. As a result,firmware asserts did not go away entirely
athough the frequency of occurrence has reduced. Using ring arithmatic
to fix the issue.

Tested on QCA9984(fw version-10.4-3.4-00082).

Fixes: 0628467f97b5 ("ath10k: fix copy engine 5 destination ring stuck)
Signed-off-by: Manikanta Pubbisetty <mpubbise@codeaurora.org>
---
 drivers/net/wireless/ath/ath10k/ce.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Kalle Valo April 19, 2018, 3:59 p.m. UTC | #1 
mpubbise@codeaurora.org wrote:

> Correct a minor bug in the commit 0628467f97b5 ("ath10k: fix
> copy engine 5 destination ring stuck") which introduced a change to fix
> firmware assert that happens when ring indices of copy engine 5 are stuck
> for a specific duration, problem with this fix is that it did not use
> ring arithmatic. As a result,firmware asserts did not go away entirely
> athough the frequency of occurrence has reduced. Using ring arithmatic
> to fix the issue.
> 
> Tested on QCA9984(fw version-10.4-3.4-00082).
> 
> Fixes: 0628467f97b5 ("ath10k: fix copy engine 5 destination ring stuck)
> Signed-off-by: Manikanta Pubbisetty <mpubbise@codeaurora.org>
> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

Patch applied to ath-next branch of ath.git, thanks.

1e8f77502341 ath10k: correct target assert problem due to CE5 stuck
diff mbox

Patch

diff --git a/drivers/net/wireless/ath/ath10k/ce.c b/drivers/net/wireless/ath/ath10k/ce.c
index b9def7b..6efa69e 100644
--- a/drivers/net/wireless/ath/ath10k/ce.c
+++ b/drivers/net/wireless/ath/ath10k/ce.c
@@ -615,7 +615,7 @@  void ath10k_ce_rx_update_write_idx(struct ath10k_ce_pipe *pipe, u32 nentries)
 	/* Prevent CE ring stuck issue that will occur when ring is full.
 	 * Make sure that write index is 1 less than read index.
 	 */
-	if ((cur_write_idx + nentries)  == dest_ring->sw_index)
+	if (((cur_write_idx + nentries) & nentries_mask) == dest_ring->sw_index)
 		nentries -= 1;
 
 	write_index = CE_RING_IDX_ADD(nentries_mask, write_index, nentries);