ath10k: Fix shadow register implementation for WCN3990
PATCH 1/1 ath10k: Fix shadow register implementation for WCN3990
WCN3990 supports shadow registers write operation support for copy engine for regular operation in powersave mode.
Since WCN3990 is a 64-bit target, the shadow register implementation needs to be done in the copy engine handlers for 64-bit target. Currently the shadow register implementation is present in the 32-bit target handlers of copy engine.
Fix the shadow register copy engine write operation implementation for 64-bit target(WCN3990).
Tested HW: WCN3990
Tested FW: WLAN.HL.2.0-01188-QCAHLSWMTPLZ-1
--- drivers/net/wireless/ath/ath10k/ce.c | 26 +++++++++++++------------- drivers/net/wireless/ath/ath10k/ce.h | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-)
drivers/net/wireless/ath/ath10k/ce.c +13 -13
@@ -500,14 +500,8 @@ static int _ath10k_ce_send_nolock(struct ath10k_ce_pipe *ce_state, write_index =CE_RING_IDX_INCR (nentries_mask, write_index);/* WORKAROUND */ -if (!(flags &CE_SEND_FLAG_GATHER )) { -if (ar->hw_params.shadow_reg_support) -ath10k_ce_shadow_src_ring_write_index_set (ar, ce_state, - write_index); -else -ath10k_ce_src_ring_write_index_set (ar, ctrl_addr, - write_index); - } +if (!(flags &CE_SEND_FLAG_GATHER )) +ath10k_ce_src_ring_write_index_set (ar, ctrl_addr, write_index); src_ring->write_index = write_index; exit:
@@ -581,8 +575,14 @@ static int _ath10k_ce_send_nolock_64(struct ath10k_ce_pipe *ce_state,/* Update Source Ring Write Index */ write_index =CE_RING_IDX_INCR (nentries_mask, write_index); -if (!(flags &CE_SEND_FLAG_GATHER )) -ath10k_ce_src_ring_write_index_set (ar, ctrl_addr, write_index); +if (!(flags &CE_SEND_FLAG_GATHER )) { +if (ar->hw_params.shadow_reg_support) +ath10k_ce_shadow_src_ring_write_index_set (ar, ce_state, + write_index); +else +ath10k_ce_src_ring_write_index_set (ar, ctrl_addr, + write_index); + } src_ring->write_index = write_index; exit:
@@ -1404,12 +1404,12 @@ static int ath10k_ce_alloc_shadow_base(struct ath10k *ar, u32 nentries) { src_ring->shadow_base_unaligned =kcalloc (nentries, -sizeof (struct ce_desc ), +sizeof (struct ce_desc_64 ),GFP_KERNEL );if (!src_ring->shadow_base_unaligned)return -ENOMEM ; - src_ring->shadow_base = (struct ce_desc *) + src_ring->shadow_base = (struct ce_desc_64 *)PTR_ALIGN (src_ring->shadow_base_unaligned,CE_DESC_RING_ALIGN );return 0 ;
@@ -1461,7 +1461,7 @@ ath10k_ce_alloc_src_ring(struct ath10k *ar, unsigned int ce_id, ret =ath10k_ce_alloc_shadow_base (ar, src_ring, nentries);if (ret) {dma_free_coherent (ar->dev, - (nentries *sizeof (struct ce_desc ) + + (nentries *sizeof (struct ce_desc_64 ) +CE_DESC_RING_ALIGN ), src_ring->base_addr_owner_space_unaligned, base_addr);
drivers/net/wireless/ath/ath10k/ce.h +1 -1
@@ -118,7 +118,7 @@ struct ath10k_ce_ring {u32 base_addr_ce_space;char *shadow_base_unaligned; -struct ce_desc *shadow_base; +struct ce_desc_64 *shadow_base;/* keep last */ void *per_transfer_context[0 ];
Signature · 7 lines
2.7.4 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Quoted 11 lines · Rakesh Pillai
WCN3990 supports shadow registers write operation support for copy engine for regular operation in powersave mode.
Since WCN3990 is a 64-bit target, the shadow register implementation needs to be done in the copy engine handlers for 64-bit target. Currently the shadow register implementation is present in the 32-bit target handlers of copy engine.
Fix the shadow register copy engine write operation implementation for 64-bit target(WCN3990).
Quoted 6 lines
Tested HW: WCN3990
Tested FW: WLAN.HL.2.0-01188-QCAHLSWMTPLZ-1Fixes b7ba83f7c414 ("ath10k: add support for shadow register for WNC3990")Signed-off-by Rakesh Pillai <[email protected]>Signed-off-by Kalle Valo <[email protected]>
I was able to apply with 3-way merge but please double check the results:
Applying: ath10k: Fix shadow register implementation for WCN3990 Using index info to reconstruct a base tree...
M drivers/net/wireless/ath/ath10k/ce.c
M drivers/net/wireless/ath/ath10k/ce.h
Falling back to patching base and 3-way merge... Auto-merging drivers/net/wireless/ath/ath10k/ce.h Auto-merging drivers/net/wireless/ath/ath10k/ce.c
Signature · 9 lines
https://patchwork.kernel.org/patch/10785903/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Quoted 11 lines · Rakesh Pillai
WCN3990 supports shadow registers write operation support for copy engine for regular operation in powersave mode.
Since WCN3990 is a 64-bit target, the shadow register implementation needs to be done in the copy engine handlers for 64-bit target. Currently the shadow register implementation is present in the 32-bit target handlers of copy engine.
Fix the shadow register copy engine write operation implementation for 64-bit target(WCN3990).
Quoted 6 lines
Tested HW: WCN3990
Tested FW: WLAN.HL.2.0-01188-QCAHLSWMTPLZ-1Fixes b7ba83f7c414 ("ath10k: add support for shadow register for WNC3990")Signed-off-by Rakesh Pillai <[email protected]>Signed-off-by Kalle Valo <[email protected]>
I was able to apply with 3-way merge but please double check the results:
Applying: ath10k: Fix shadow register implementation for WCN3990 Using index info to reconstruct a base tree...
M drivers/net/wireless/ath/ath10k/ce.c
M drivers/net/wireless/ath/ath10k/ce.h
Falling back to patching base and 3-way merge... Auto-merging drivers/net/wireless/ath/ath10k/ce.h Auto-merging drivers/net/wireless/ath/ath10k/ce.c
Signature · 3 lines
https://patchwork.kernel.org/patch/10785903/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
A message that is not in the archive (sent off-list or not yet received): [email protected]
Hi Kalle,
I have checked the patch, and it is fine.
Thanks,
Rakesh Pillai.
Quoted 31 lines · Kalle Valo
Quoted 11 lines · Rakesh Pillai
WCN3990 supports shadow registers write operation support for copy engine for regular operation in powersave mode.
Since WCN3990 is a 64-bit target, the shadow register implementation needs to be done in the copy engine handlers for 64-bit target. Currently the shadow register implementation is present in the 32-bit target handlers of copy engine.
Fix the shadow register copy engine write operation implementation for 64-bit target(WCN3990).
Quoted 6 lines
Tested HW: WCN3990
Tested FW: WLAN.HL.2.0-01188-QCAHLSWMTPLZ-1Fixes b7ba83f7c414 ("ath10k: add support for shadow register for WNC3990")Signed-off-by Rakesh Pillai <[email protected]>Signed-off-by Kalle Valo <[email protected]>I was able to apply with 3-way merge but please double check the results:
Applying: ath10k: Fix shadow register implementation for WCN3990 Using index info to reconstruct a base tree...
Mdrivers/net/wireless/ath/ath10k/ce.c
Mdrivers/net/wireless/ath/ath10k/ce.h
Falling back to patching base and 3-way merge... Auto-mergingdrivers/net/wireless/ath/ath10k/ce.hAuto-mergingdrivers/net/wireless/ath/ath10k/ce.c
Quoted 11 lines · Rakesh Pillai
WCN3990 supports shadow registers write operation support for copy engine for regular operation in powersave mode.
Since WCN3990 is a 64-bit target, the shadow register implementation needs to be done in the copy engine handlers for 64-bit target. Currently the shadow register implementation is present in the 32-bit target handlers of copy engine.
Fix the shadow register copy engine write operation implementation for 64-bit target(WCN3990).
Quoted 6 lines
Tested HW: WCN3990
Tested FW: WLAN.HL.2.0-01188-QCAHLSWMTPLZ-1Fixes b7ba83f7c414 ("ath10k: add support for shadow register for WNC3990")Signed-off-by Rakesh Pillai <[email protected]>Signed-off-by Kalle Valo <[email protected]>
Patch applied to ath-next branch of ath.git, thanks.
1863008369ae ath10k: fix shadow register implementation for WCN3990
Signature · 9 lines
https://patchwork.kernel.org/patch/10785903/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Quoted 11 lines · Rakesh Pillai
WCN3990 supports shadow registers write operation support for copy engine for regular operation in powersave mode.
Since WCN3990 is a 64-bit target, the shadow register implementation needs to be done in the copy engine handlers for 64-bit target. Currently the shadow register implementation is present in the 32-bit target handlers of copy engine.
Fix the shadow register copy engine write operation implementation for 64-bit target(WCN3990).
Quoted 6 lines
Tested HW: WCN3990
Tested FW: WLAN.HL.2.0-01188-QCAHLSWMTPLZ-1Fixes b7ba83f7c414 ("ath10k: add support for shadow register for WNC3990")Signed-off-by Rakesh Pillai <[email protected]>Signed-off-by Kalle Valo <[email protected]>
Patch applied to ath-next branch of ath.git, thanks.
1863008369ae ath10k: fix shadow register implementation for WCN3990
Signature · 3 lines
https://patchwork.kernel.org/patch/10785903/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches