ath11k: removed duplicated functionality
PATCH 1/5 ath11k: removed duplicated functionality
Removed duplicated functionality in ath11k_hal_desc_reo_parse_err() and replaced with function call to ath11k_hal_rx_reo_entl_paddr_get().
--- drivers/net/wireless/ath/ath11k/hal_rx.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/net/wireless/ath/ath11k/hal_rx.c +1 -6
@@ -351,12 +351,7 @@ int ath11k_hal_desc_reo_parse_err(struct ath11k_base *ab, u32 *rx_desc,return -EINVAL ; } - *paddr = (((u64 )FIELD_GET (BUFFER_ADDR_INFO1_ADDR , - desc->buf_addr_info.info1)) <<32 ) | -FIELD_GET (BUFFER_ADDR_INFO0_ADDR , - desc->buf_addr_info.info0); - *desc_bank =FIELD_GET (BUFFER_ADDR_INFO1_SW_COOKIE , - desc->buf_addr_info.info1); +ath11k_hal_rx_reo_ent_paddr_get (ab, rx_desc, paddr, desc_bank);return 0 ; }
Signature · 7 lines
2.7.4 _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH 2/5 ath11k: changed parameter from u8 * to struct sk_buff *
Changed ath11k_hal_rx_parse_mon_status() to take sk_buff pointer instead of opaque u8 pointer. Removed variables that became unused.
--- drivers/net/wireless/ath/ath11k/dp_rx.c | 10 ++-------- drivers/net/wireless/ath/ath11k/hal_rx.c | 6 +++--- drivers/net/wireless/ath/ath11k/hal_rx.h | 2 +- 3 files changed, 6 insertions(+), 12 deletions(-)
drivers/net/wireless/ath/ath11k/dp_rx.c +2 -8
@@ -2406,8 +2406,7 @@ int ath11k_dp_rx_process_mon_status(struct ath11k_base *ab, int mac_id,trace_ath11k_htt_rxdesc (ar, skb->data,DP_RX_BUFFER_SIZE ); } - hal_status =ath11k_hal_rx_parse_mon_status (ab, &ppdu_info, - (u8 *)skb->data); + hal_status =ath11k_hal_rx_parse_mon_status (ab, &ppdu_info, skb);if (ppdu_info.peer_id ==HAL_INVALID_PEERID || hal_status !=HAL_RX_MON_STATUS_PPDU_DONE ) {
@@ -3843,8 +3842,6 @@ static inline void ath11k_dp_rx_mon_status_process_tlv(struct ath11k *ar,struct ath11k_mon_data *pmon = (struct ath11k_mon_data *)&dp->mon_data;struct hal_rx_mon_ppdu_info *ppdu_info;struct sk_buff *status_skb; -u8 *rx_tlv; -u8 *rx_tlv_start;u32 tlv_status =HAL_TLV_STATUS_BUF_DONE ;struct ath11k_pdev_mon_stats *rx_mon_stats;
@@ -3857,11 +3854,8 @@ static inline void ath11k_dp_rx_mon_status_process_tlv(struct ath11k *ar,while (!skb_queue_empty (&pmon->rx_status_q)) { status_skb =skb_dequeue (&pmon->rx_status_q); - rx_tlv = status_skb->data; - rx_tlv_start = rx_tlv; - tlv_status =ath11k_hal_rx_parse_mon_status (ar->ab, ppdu_info, - rx_tlv); + status_skb);if (tlv_status ==HAL_TLV_STATUS_PPDU_DONE ) { rx_mon_stats->status_ppdu_done++; pmon->mon_ppdu_status =DP_PPDU_STATUS_DONE ;
drivers/net/wireless/ath/ath11k/hal_rx.c +3 -3
@@ -1156,13 +1156,13 @@ ath11k_hal_rx_parse_mon_status_tlv(struct ath11k_base *ab,enum hal_rx_mon_status ath11k_hal_rx_parse_mon_status (struct ath11k_base *ab,struct hal_rx_mon_ppdu_info *ppdu_info, -u8 *data) +struct sk_buff *skb) {struct hal_tlv_hdr *tlv;enum hal_rx_mon_status hal_status =HAL_RX_MON_STATUS_BUF_DONE ;u16 tlv_tag;u16 tlv_len; -u8 *ptr = data; +u8 *ptr = skb->data; do { tlv = (struct hal_tlv_hdr *)ptr;
@@ -1183,7 +1183,7 @@ ath11k_hal_rx_parse_mon_status(struct ath11k_base *ab, ptr += tlv_len; ptr =PTR_ALIGN (ptr,HAL_TLV_ALIGN ); -if ((ptr - data) >=DP_RX_BUFFER_SIZE ) +if ((ptr - skb->data) >=DP_RX_BUFFER_SIZE )break ; }while (hal_status ==HAL_RX_MON_STATUS_PPDU_NOT_DONE );
drivers/net/wireless/ath/ath11k/hal_rx.h +1 -1
@@ -336,7 +336,7 @@ void ath11k_hal_rx_reo_ent_buf_paddr_get(void *rx_desc,enum hal_rx_mon_status ath11k_hal_rx_parse_mon_status (struct ath11k_base *ab,struct hal_rx_mon_ppdu_info *ppdu_info, -u8 *data); +struct sk_buff *skb);#define REO_QUEUE_DESC_MAGIC_DEBUG_PATTERN_0 0xDDBEEF#define REO_QUEUE_DESC_MAGIC_DEBUG_PATTERN_1 0xADBEEF#define REO_QUEUE_DESC_MAGIC_DEBUG_PATTERN_2 0xBDBEEF
Signature · 7 lines
2.7.4 _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH 3/5 ath11k: comments added to explain purpose
In reply to Muna SinadaAdded comments for ath11k_hal_tx_desc_sync() and ath11k_hal_tx_status_desc_sync() to explain their purpose.
--- drivers/net/wireless/ath/ath11k/hal_tx.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/ath/ath11k/hal_tx.c +2 -0
@@ -73,12 +73,14 @@ void ath11k_hal_tx_cmd_desc_setup(struct ath11k_base *ab, void *cmd, ti->bss_ast_hash); } +/* Commit the descriptor to hardware */ void ath11k_hal_tx_desc_sync (void *tx_desc_cached,void *hw_desc) {memcpy (hw_desc +sizeof (struct hal_tlv_hdr ), tx_desc_cached,sizeof (struct hal_tcl_data_cmd )); } +/* Get the descriptor status from hardware */ void ath11k_hal_tx_status_desc_sync (void *hw_desc,void *local_desc) {memcpy (local_desc, hw_desc,HAL_TX_STATUS_DESC_LEN );
Signature · 7 lines
2.7.4 _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH 4/5 ath11k: added RMB to return_buffer_manager description
In reply to Muna SinadaAdded "(RBM)" to return_buffer_manager description to clarify what it stands for when utilized.
--- drivers/net/wireless/ath/ath11k/hal_desc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath11k/hal_desc.h +1 -1
@@ -26,7 +26,7 @@ struct ath11k_buffer_addr {* Address (upper 8 bits) of the msdu buffer or msdu extension * descriptor or Link descriptor * -* return_buffer_manager +* return_buffer_manager (RBM) * Consumer: WBM * Producer: SW/FW * Indicates to which buffer manager the buffer or MSDU_EXTENSION
Signature · 7 lines
2.7.4 _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH 5/5 ath11k: add hal dbg mask and utilized for hal stats
In reply to Muna SinadaAdded HAL debug mask. Replaced use of ath11k_info() in ath11k_hal_reo_status_queue_stats() with ath11k_dbg(), which utilizes new HAL debug mask.
--- drivers/net/wireless/ath/ath11k/debug.h | 1 + drivers/net/wireless/ath/ath11k/hal_rx.c | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 12 deletions(-)
drivers/net/wireless/ath/ath11k/debug.h +1 -0
@@ -21,6 +21,7 @@ enum ath11k_debug_mask {ATH11K_DBG_MGMT =0x00000100 ,ATH11K_DBG_REG =0x00000200 ,ATH11K_DBG_TESTMODE =0x00000400 , + ATH11k_DBG_HAL =0x00000800 , ATH11K_DBG_ANY = 0xffffffff, };
drivers/net/wireless/ath/ath11k/hal_rx.c +12 -12
@@ -482,30 +482,30 @@ void ath11k_hal_reo_status_queue_stats(struct ath11k_base *ab, u32 *reo_desc,FIELD_GET (HAL_REO_STATUS_HDR_INFO0_EXEC_STATUS , desc->hdr.info0); -ath11k_info (ab,"Queue stats status:\n" ); -ath11k_info (ab,"header: cmd_num %d status %d\n" , +ath11k_dbg (ab, ATH11k_DBG_HAL,"Queue stats status:\n" ); +ath11k_dbg (ab, ATH11k_DBG_HAL,"header: cmd_num %d status %d\n" , status->uniform_hdr.cmd_num, status->uniform_hdr.cmd_status); -ath11k_info (ab,"ssn %ld cur_idx %ld\n" , +ath11k_dbg (ab, ATH11k_DBG_HAL,"ssn %ld cur_idx %ld\n" ,FIELD_GET (HAL_REO_GET_QUEUE_STATS_STATUS_INFO0_SSN , desc->info0),FIELD_GET (HAL_REO_GET_QUEUE_STATS_STATUS_INFO0_CUR_IDX , desc->info0)); -ath11k_info (ab,"pn = [%08x, %08x, %08x, %08x]\n" , +ath11k_dbg (ab, ATH11k_DBG_HAL,"pn = [%08x, %08x, %08x, %08x]\n" , desc->pn[0 ], desc->pn[1 ], desc->pn[2 ], desc->pn[3 ]); -ath11k_info (ab,"last_rx: enqueue_tstamp %08x dequeue_tstamp %08x\n" , +ath11k_dbg (ab, ATH11k_DBG_HAL,"last_rx: enqueue_tstamp %08x dequeue_tstamp %08x\n" , desc->last_rx_enqueue_timestamp, desc->last_rx_dequeue_timestamp); -ath11k_info (ab,"rx_bitmap [%08x %08x %08x %08x %08x %08x %08x %08x]\n" , +ath11k_dbg (ab, ATH11k_DBG_HAL,"rx_bitmap [%08x %08x %08x %08x %08x %08x %08x %08x]\n" , desc->rx_bitmap[0 ], desc->rx_bitmap[1 ], desc->rx_bitmap[2 ], desc->rx_bitmap[3 ], desc->rx_bitmap[4 ], desc->rx_bitmap[5 ], desc->rx_bitmap[6 ], desc->rx_bitmap[7 ]); -ath11k_info (ab,"count: cur_mpdu %ld cur_msdu %ld\n" , +ath11k_dbg (ab, ATH11k_DBG_HAL,"count: cur_mpdu %ld cur_msdu %ld\n" ,FIELD_GET (HAL_REO_GET_QUEUE_STATS_STATUS_INFO1_MPDU_COUNT , desc->info1),FIELD_GET (HAL_REO_GET_QUEUE_STATS_STATUS_INFO1_MSDU_COUNT , desc->info1)); - ath11k_info(ab, "fwd_timeout %ld fwd_bar %ld dup_count %ld\n", + ath11k_dbg(ab, ATH11k_DBG_HAL, "fwd_timeout %ld fwd_bar %ld dup_count %ld\n", FIELD_GET( HAL_REO_GET_QUEUE_STATS_STATUS_INFO2_TIMEOUT_COUNT, desc->info2),
@@ -514,22 +514,22 @@ void ath11k_hal_reo_status_queue_stats(struct ath11k_base *ab, u32 *reo_desc,FIELD_GET (HAL_REO_GET_QUEUE_STATS_STATUS_INFO2_DUPLICATE_COUNT , desc->info2)); -ath11k_info (ab,"frames_in_order %ld bar_rcvd %ld\n" , +ath11k_dbg (ab, ATH11k_DBG_HAL,"frames_in_order %ld bar_rcvd %ld\n" ,FIELD_GET (HAL_REO_GET_QUEUE_STATS_STATUS_INFO3_FIO_COUNT , desc->info3),FIELD_GET (HAL_REO_GET_QUEUE_STATS_STATUS_INFO3_BAR_RCVD_CNT , desc->info3)); -ath11k_info (ab,"num_mpdus %d num_msdus %d total_bytes %d\n" , +ath11k_dbg (ab, ATH11k_DBG_HAL,"num_mpdus %d num_msdus %d total_bytes %d\n" , desc->num_mpdu_frames, desc->num_msdu_frames, desc->total_bytes); -ath11k_info (ab,"late_rcvd %ld win_jump_2k %ld hole_cnt %ld\n" , +ath11k_dbg (ab, ATH11k_DBG_HAL,"late_rcvd %ld win_jump_2k %ld hole_cnt %ld\n" ,FIELD_GET (HAL_REO_GET_QUEUE_STATS_STATUS_INFO4_LATE_RX_MPDU , desc->info4),FIELD_GET (HAL_REO_GET_QUEUE_STATS_STATUS_INFO4_WINDOW_JMP2K , desc->info4),FIELD_GET (HAL_REO_GET_QUEUE_STATS_STATUS_INFO4_HOLE_COUNT , desc->info4)); -ath11k_info (ab,"looping count %ld\n" , +ath11k_dbg (ab, ATH11k_DBG_HAL,"looping count %ld\n" ,FIELD_GET (HAL_REO_GET_QUEUE_STATS_STATUS_INFO5_LOOPING_CNT , desc->info5)); }
Signature · 7 lines
2.7.4 _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
Quoted 4 lines · Muna Sinada
Removed duplicated functionality in
ath11k_hal_desc_reo_parse_err()and replaced with function call toath11k_hal_rx_reo_entl_paddr_get().Signed-off-by Muna Sinada <[email protected]>
Does not apply and sha1 information is incorrect. Remember to use ath11k-bringup branch as baseline AND no extra patches applied.
Applying: ath11k: removed duplicated functionality
Applying: ath11k: changed parameter from u8 * to struct sk_buff *
fatal: sha1 information is lacking or useless (drivers/net/wireless/ath/ath11k/dp_rx.c).
error: could not build fake ancestor
Patch failed at 0002 ath11k: changed parameter from u8 * to struct sk_buff *
5 patches set to Changes Requested.
11013825 [1/5] ath11k: removed duplicated functionality 11013827 [2/5] ath11k: changed parameter from u8 * to struct sk_buff * 11013829 [3/5] ath11k: comments added to explain purpose 11013831 [4/5] ath11k: added RMB to return_buffer_manager description 11013833 [5/5] ath11k: add hal dbg mask and utilized for hal stats
Signature · 9 lines
https://patchwork.kernel.org/patch/11013825/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k