ath11k: change struct name from buffer_addr to ath11k_buffer_addr
PATCH 1/4 ath11k: change struct name from buffer_addr to ath11k_buffer_addr
Changed definition and all mentions of buffer_addr to ath11k_buffer_addr
--- drivers/net/wireless/ath/ath11k/dp.c | 4 ++-- drivers/net/wireless/ath/ath11k/dp_rx.c | 10 +++++----- drivers/net/wireless/ath/ath11k/hal.c | 4 ++-- drivers/net/wireless/ath/ath11k/hal_desc.h | 22 +++++++++++----------- drivers/net/wireless/ath/ath11k/hal_rx.c | 10 +++++----- 5 files changed, 25 insertions(+), 25 deletions(-)
drivers/net/wireless/ath/ath11k/dp.c +2 -2
@@ -372,7 +372,7 @@ static int ath11k_dp_scatter_idle_link_desc_setup(struct ath11k_base *ab, paddr = link_desc_banks[i].paddr;while (n_entries) {ath11k_hal_set_link_desc_addr ( - (struct buffer_addr *)scatter_buf, i, + (struct ath11k_buffer_addr *)scatter_buf, i, paddr); n_entries--; paddr +=HAL_LINK_DESC_SIZE ;
@@ -576,7 +576,7 @@ int ath11k_dp_link_desc_setup(struct ath11k_base *ab,while (n_entries && (desc =ath11k_hal_srng_src_get_next_entry (ab, srng))) {ath11k_hal_set_link_desc_addr ( - (struct buffer_addr *)desc, i, + (struct ath11k_buffer_addr *)desc, i, paddr); n_entries--; paddr +=HAL_LINK_DESC_SIZE ;
drivers/net/wireless/ath/ath11k/dp_rx.c +5 -5
@@ -3292,10 +3292,10 @@ int ath11k_dp_rx_monitor_link_desc_return(struct ath11k *ar, src_srng_desc =ath11k_hal_srng_src_get_next_entry (ar->ab, hal_srng);if (src_srng_desc) { -struct buffer_addr *src_desc = - (struct buffer_addr *)src_srng_desc; +struct ath11k_buffer_addr *src_desc = + (struct ath11k_buffer_addr *)src_srng_desc; - *src_desc = *((struct buffer_addr *)p_last_buf_addr_info); + *src_desc = *((struct ath11k_buffer_addr *)p_last_buf_addr_info); }else {ath11k_dbg (ar->ab,ATH11K_DBG_DATA ,"Monitor Link Desc Ring %d Full" , mac_id);
@@ -3313,10 +3313,10 @@ void ath11k_dp_rx_mon_next_link_desc_get(void *rx_msdu_link_desc, {struct hal_rx_msdu_link *msdu_link = (struct hal_rx_msdu_link *)rx_msdu_link_desc; -struct buffer_addr *buf_addr_info; +struct ath11k_buffer_addr *buf_addr_info;u8 rbm =0 ; - buf_addr_info = (struct buffer_addr *)&msdu_link->buf_addr_info; + buf_addr_info = (struct ath11k_buffer_addr *)&msdu_link->buf_addr_info;ath11k_hal_rx_buf_addr_info_get (buf_addr_info, paddr, sw_cookie, &rbm);
drivers/net/wireless/ath/ath11k/hal.c +2 -2
@@ -691,7 +691,7 @@ u32 ath11k_hal_ce_dst_status_get_length(void *buf)void ath11k_hal_set_link_desc_addr (void *buf,u32 cookie,dma_addr_t paddr) { -struct buffer_addr *desc = (struct buffer_addr *)buf; +struct ath11k_buffer_addr *desc = (struct ath11k_buffer_addr *)buf; desc->info0 =FIELD_PREP (BUFFER_ADDR_INFO0_ADDR , (paddr &HAL_ADDR_LSB_REG_MASK ));
@@ -903,7 +903,7 @@ void ath11k_hal_setup_link_idle_list(struct ath11k_base *ab, u32 nsbufs, u32 tot_link_desc, u32 end_offset) { - struct buffer_addr *link_addr; + struct ath11k_buffer_addr *link_addr;int i;u32 reg_scatter_buf_sz =HAL_WBM_IDLE_SCATTER_BUF_SIZE /64 ;
drivers/net/wireless/ath/ath11k/hal_desc.h +11 -11
@@ -11,12 +11,12 @@#define BUFFER_ADDR_INFO1_RET_BUF_MGR GENMASK(10, 8)#define BUFFER_ADDR_INFO1_SW_COOKIE GENMASK(31, 11) -struct buffer_addr { +struct ath11k_buffer_addr {u32 info0;u32 info1; } __packed; -/* buffer_addr +/* ath11k_buffer_addr * * info0 * Address (lower 32 bits) of the msdu buffer or msdu extension
@@ -684,7 +684,7 @@ enum hal_reo_dest_ring_error_code {#define HAL_REO_DEST_RING_INFO2_LOOPING_COUNT GENMASK(31, 28)struct hal_reo_dest_ring { -struct buffer_addr buf_addr_info; +struct ath11k_buffer_addr buf_addr_info;struct rx_mpdu_desc rx_mpdu_info;struct rx_msdu_desc rx_msdu_info;u32 queue_addr_lo;
@@ -787,7 +787,7 @@ enum hal_reo_entr_rxdma_ecode {#define HAL_REO_ENTR_RING_INFO1_RXDMA_ERROR_CODE GENMASK(6, 2)struct hal_reo_entrance_ring { -struct buffer_addr buf_addr_info; +struct ath11k_buffer_addr buf_addr_info;struct rx_mpdu_desc rx_mpdu_info;u32 queue_addr_lo;u32 info0;/* %HAL_REO_ENTR_RING_INFO0_ */
@@ -999,7 +999,7 @@ enum hal_wbm_htt_tx_comp_status { };struct hal_tcl_data_cmd { -struct buffer_addr buf_addr_info; +struct ath11k_buffer_addr buf_addr_info;u32 info0;u32 info1;u32 info2;
@@ -1540,7 +1540,7 @@ struct hal_tx_rate_stats { } __packed;struct hal_wbm_link_desc { -struct buffer_addr buf_addr_info; +struct ath11k_buffer_addr buf_addr_info; } __packed;/* hal_wbm_link_desc
@@ -1643,7 +1643,7 @@ enum hal_wbm_rel_bm_act {#define HAL_WBM_REL_HTT_TX_COMP_INFO0_EXP_FRAME BIT(17)struct hal_wbm_release_ring { -struct buffer_addr buf_addr_info; +struct ath11k_buffer_addr buf_addr_info;u32 info0;u32 info1;u32 info2;
@@ -1833,7 +1833,7 @@ enum hal_wbm_tqm_rel_reason { };struct hal_wbm_buffer_ring { -struct buffer_addr buf_addr_info; +struct ath11k_buffer_addr buf_addr_info; };enum hal_desc_owner {
@@ -1874,11 +1874,11 @@ struct hal_desc_header { } __packed;struct hal_rx_mpdu_link_ptr { -struct buffer_addr addr_info; +struct ath11k_buffer_addr addr_info; } __packed;struct hal_rx_msdu_details { -struct buffer_addr buf_addr_info; +struct ath11k_buffer_addr buf_addr_info;struct rx_msdu_desc rx_msdu_info; } __packed;
@@ -1887,7 +1887,7 @@ struct hal_rx_msdu_details {struct hal_rx_msdu_link {struct hal_desc_header desc_hdr; -struct buffer_addr buf_addr_info; +struct ath11k_buffer_addr buf_addr_info;u32 info0;u32 pn[4 ];struct hal_rx_msdu_details msdu_link[6 ];
drivers/net/wireless/ath/ath11k/hal_rx.c +5 -5
@@ -269,7 +269,7 @@ int ath11k_hal_reo_cmd_send(struct ath11k_base *ab, struct hal_srng *srng,void ath11k_hal_rx_buf_addr_info_set (void *desc,dma_addr_t paddr,u32 cookie,u8 manager) { -struct buffer_addr *binfo = (struct buffer_addr *)desc; +struct ath11k_buffer_addr *binfo = (struct ath11k_buffer_addr *)desc;u32 paddr_lo, paddr_hi; paddr_lo =lower_32_bits (paddr);
@@ -283,7 +283,7 @@ void ath11k_hal_rx_buf_addr_info_set(void *desc, dma_addr_t paddr,void ath11k_hal_rx_buf_addr_info_get (void *desc,dma_addr_t *paddr,u32 *cookie,u8 *rbm) { -struct buffer_addr *binfo = (struct buffer_addr *)desc; +struct ath11k_buffer_addr *binfo = (struct ath11k_buffer_addr *)desc; *paddr = (((u64)FIELD_GET(BUFFER_ADDR_INFO1_ADDR, binfo->info1)) << 32) |
@@ -453,7 +453,7 @@ int ath11k_hal_wbm_desc_parse_err(struct ath11k_base *ab, void *desc,void ath11k_hal_rx_reo_ent_paddr_get (struct ath11k_base *ab,void *desc,dma_addr_t *paddr,u32 *desc_bank) { -struct buffer_addr *buff_addr = desc; +struct ath11k_buffer_addr *buff_addr = desc; *paddr = ((u64)(FIELD_GET (BUFFER_ADDR_INFO1_ADDR , buff_addr->info1)) <<32 ) |FIELD_GET (BUFFER_ADDR_INFO0_ADDR , buff_addr->info0);
@@ -1200,7 +1200,7 @@ void ath11k_hal_rx_reo_ent_buf_paddr_get(void *rx_desc, dma_addr_t *paddr, {struct hal_reo_entrance_ring *reo_ent_ring = (struct hal_reo_entrance_ring *)rx_desc; -struct buffer_addr *buf_addr_info; +struct ath11k_buffer_addr *buf_addr_info;struct rx_mpdu_desc *rx_mpdu_desc_info_details; rx_mpdu_desc_info_details =
@@ -1209,7 +1209,7 @@ void ath11k_hal_rx_reo_ent_buf_paddr_get(void *rx_desc, dma_addr_t *paddr, *msdu_cnt =FIELD_GET (RX_MPDU_DESC_INFO0_MSDU_COUNT , rx_mpdu_desc_info_details->info0); - buf_addr_info = (struct buffer_addr *)&reo_ent_ring->buf_addr_info; + buf_addr_info = (struct ath11k_buffer_addr *)&reo_ent_ring->buf_addr_info; *paddr = (((u64 )FIELD_GET (BUFFER_ADDR_INFO1_ADDR , buf_addr_info->info1)) << 32) |
Signature · 7 lines
2.7.4 _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH 2/4 ath11k: Use macros for magic arguments
Created macros to provide clarity in the use of the magic parameter
--- drivers/net/wireless/ath/ath11k/hal_rx.c | 12 ++++++++---- drivers/net/wireless/ath/ath11k/hal_rx.h | 4 ++++ 2 files changed, 12 insertions(+), 4 deletions(-)
drivers/net/wireless/ath/ath11k/hal_rx.c +8 -4
@@ -753,7 +753,8 @@ void ath11k_hal_reo_qdesc_setup(void *vaddr, int tid, u32 ba_window_size,memset (qdesc,0 ,sizeof (*qdesc));ath11k_hal_reo_set_desc_hdr (&qdesc->desc_hdr,HAL_DESC_REO_OWNED , -HAL_DESC_REO_QUEUE_DESC ,0xDDBEEF ); +HAL_DESC_REO_QUEUE_DESC , +REO_QUEUE_DESC_MAGIC_DEBUG_PATTERN_0 ); qdesc->rx_queue_num =FIELD_PREP (HAL_RX_REO_QUEUE_RX_QUEUE_NUMBER , tid);
@@ -800,13 +801,16 @@ void ath11k_hal_reo_qdesc_setup(void *vaddr, int tid, u32 ba_window_size,*/ memset (ext_desc,0 ,3 *sizeof (*ext_desc));ath11k_hal_reo_set_desc_hdr (&ext_desc->desc_hdr,HAL_DESC_REO_OWNED , -HAL_DESC_REO_QUEUE_EXT_DESC ,0xADBEEF ); +HAL_DESC_REO_QUEUE_EXT_DESC , +REO_QUEUE_DESC_MAGIC_DEBUG_PATTERN_1 ); ext_desc++;ath11k_hal_reo_set_desc_hdr (&ext_desc->desc_hdr,HAL_DESC_REO_OWNED , -HAL_DESC_REO_QUEUE_EXT_DESC ,0xBDBEEF ); +HAL_DESC_REO_QUEUE_EXT_DESC , +REO_QUEUE_DESC_MAGIC_DEBUG_PATTERN_2 ); ext_desc++;ath11k_hal_reo_set_desc_hdr (&ext_desc->desc_hdr,HAL_DESC_REO_OWNED , -HAL_DESC_REO_QUEUE_EXT_DESC ,0xCDBEEF ); +HAL_DESC_REO_QUEUE_EXT_DESC , +REO_QUEUE_DESC_MAGIC_DEBUG_PATTERN_3 ); } void ath11k_hal_reo_init_cmd_ring(struct ath11k_base *ab,
drivers/net/wireless/ath/ath11k/hal_rx.h +4 -0
@@ -337,4 +337,8 @@ 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); +#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 +#define REO_QUEUE_DESC_MAGIC_DEBUG_PATTERN_3 0xCDBEEF#endif
Signature · 7 lines
2.7.4 _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH 3/4 ath11k: cast reo_desc directly to struct hal_tlv_hdr
In reply to Muna SinadaTo avoid opaque pointers, reo_desc directly casted to 'struct hal_tlv_hdr *' in ath11k_hal_reo_cmd_send(). Due to this, removed unnecessary typecasting in functions that received reo_desc as an argument.
--- drivers/net/wireless/ath/ath11k/hal_rx.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
drivers/net/wireless/ath/ath11k/hal_rx.c +5 -8
@@ -20,10 +20,9 @@ static void ath11k_hal_reo_set_desc_hdr(struct hal_desc_header *hdr, hdr->info0 |=FIELD_PREP (HAL_DESC_HDR_INFO0_DBG_RESERVED , magic); } -static int ath11k_hal_reo_cmd_queue_stats (u32 *reo_desc, +static int ath11k_hal_reo_cmd_queue_stats (struct hal_tlv_hdr *tlv,struct ath11k_hal_reo_cmd *cmd) { -struct hal_tlv_hdr *tlv = (struct hal_tlv_hdr *)reo_desc;struct hal_reo_get_queue_stats *desc; tlv->tl = FIELD_PREP(HAL_TLV_HDR_TAG, HAL_REO_GET_QUEUE_STATS) |
@@ -46,10 +45,9 @@ static int ath11k_hal_reo_cmd_queue_stats(u32 *reo_desc,return FIELD_GET (HAL_REO_CMD_HDR_INFO0_CMD_NUMBER , desc->cmd.info0); } -static int ath11k_hal_reo_cmd_flush_cache (struct ath11k_hal *hal,u32 *reo_desc, +static int ath11k_hal_reo_cmd_flush_cache (struct ath11k_hal *hal,struct hal_tlv_hdr *tlv,struct ath11k_hal_reo_cmd *cmd) { -struct hal_tlv_hdr *tlv = (struct hal_tlv_hdr *)reo_desc;struct hal_reo_flush_cache *desc;u8 avail_slot =ffz (hal->avail_blk_resource);
@@ -94,10 +92,9 @@ static int ath11k_hal_reo_cmd_flush_cache(struct ath11k_hal *hal, u32 *reo_desc,return FIELD_GET (HAL_REO_CMD_HDR_INFO0_CMD_NUMBER , desc->cmd.info0); } -static int ath11k_hal_reo_cmd_update_rx_queue (u32 *reo_desc, +static int ath11k_hal_reo_cmd_update_rx_queue (struct hal_tlv_hdr *tlv,struct ath11k_hal_reo_cmd *cmd) { -struct hal_tlv_hdr *tlv = (struct hal_tlv_hdr *)reo_desc;struct hal_reo_update_rx_queue *desc; tlv->tl = FIELD_PREP(HAL_TLV_HDR_TAG, HAL_REO_UPDATE_RX_REO_QUEUE) |
@@ -225,13 +222,13 @@ int ath11k_hal_reo_cmd_send(struct ath11k_base *ab, struct hal_srng *srng,enum hal_reo_cmd_type type, struct ath11k_hal_reo_cmd *cmd) { - u32 *reo_desc; + struct hal_tlv_hdr *reo_desc;int ret;spin_lock_bh (&srng->lock);ath11k_hal_srng_access_begin (ab, srng); - reo_desc =ath11k_hal_srng_src_get_next_entry (ab, srng); + reo_desc = (struct hal_tlv_hdr *)ath11k_hal_srng_src_get_next_entry (ab, srng);if (!reo_desc) { ret = -ENOBUFS ; goto out;
Signature · 7 lines
2.7.4 _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH 4/4 ath11k: removing unnecessary parentheses
In reply to Muna SinadaRemoved unnecessary parentheses because of operator precedence
--- drivers/net/wireless/ath/ath11k/hal_rx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath11k/hal_rx.c +2 -2
@@ -338,8 +338,8 @@ int ath11k_hal_desc_reo_parse_err(struct ath11k_base *ab, u32 *rx_desc, desc->info0); ab->soc_stats.reo_error[err_code]++; -if ((push_reason !=HAL_REO_DEST_RING_PUSH_REASON_ERR_DETECTED ) && - (push_reason !=HAL_REO_DEST_RING_PUSH_REASON_ROUTING_INSTRUCTION )) { +if (push_reason !=HAL_REO_DEST_RING_PUSH_REASON_ERR_DETECTED && + push_reason !=HAL_REO_DEST_RING_PUSH_REASON_ROUTING_INSTRUCTION ) {ath11k_warn (ab,"expected error push reason code, received %d\n" , push_reason);return -EINVAL ;
Signature · 7 lines
2.7.4 _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
Quoted 4 lines · Muna Sinada
Changed definition and all mentions of
buffer_addrtoath11k_buffer_addrSigned-off-by Muna Sinada <[email protected]>Signed-off-by Kalle Valo <[email protected]>
4 patches applied to ath11k-bringup branch of ath.git, thanks.
53e969e57e82 ath11k: change struct name from buffer_addr to ath11k_buffer_addr 5fdeafcdf59d ath11k: Use macros for magic arguments1ebe3fd25d83 ath11k: cast reo_desc directly to struct hal_tlv_hdr ea713329999f ath11k: removing unnecessary parentheses
Signature · 9 lines
https://patchwork.kernel.org/patch/11007805/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k