From a870c6181a5f579c9cdb252252814bb341a94e6d Mon Sep 17 00:00:00 2001 From: Akshay Kosigi Date: Mon, 8 Jul 2019 23:10:30 +0530 Subject: [PATCH] qcacmn: Change to clean up of void pointers Add code to cleanup usages of void pointer usages in DP code. Change-Id: I0736bcc0a547d858ed02f1ee59084a44e5fe4bec CRs-Fixed: 2487249 --- dp/wifi3.0/dp_htt.c | 4 +-- dp/wifi3.0/dp_htt.h | 4 +-- dp/wifi3.0/dp_internal.h | 17 +++++++-- dp/wifi3.0/dp_main.c | 66 +++++++++++++++++++++-------------- dp/wifi3.0/dp_peer.c | 6 ++-- dp/wifi3.0/dp_rx.c | 6 ++-- dp/wifi3.0/dp_rx_defrag.c | 3 +- dp/wifi3.0/dp_rx_err.c | 10 +++--- dp/wifi3.0/dp_rx_mon_dest.c | 4 +-- dp/wifi3.0/dp_rx_mon_status.c | 2 +- hal/wifi3.0/hal_api.h | 4 +-- hal/wifi3.0/hal_api_mon.h | 6 ++-- hal/wifi3.0/hal_rx.h | 8 +++-- 13 files changed, 84 insertions(+), 56 deletions(-) diff --git a/dp/wifi3.0/dp_htt.c b/dp/wifi3.0/dp_htt.c index 105b66d004..c2bad7d5c7 100644 --- a/dp/wifi3.0/dp_htt.c +++ b/dp/wifi3.0/dp_htt.c @@ -3584,14 +3584,14 @@ void * htt_soc_initialize(struct htt_soc *htt_soc, struct cdp_ctrl_objmgr_psoc *ctrl_psoc, HTC_HANDLE htc_soc, - void *hal_soc, qdf_device_t osdev) + hal_soc_handle_t hal_soc_hdl, qdf_device_t osdev) { struct htt_soc *soc = (struct htt_soc *)htt_soc; soc->osdev = osdev; soc->ctrl_psoc = ctrl_psoc; soc->htc_soc = htc_soc; - soc->hal_soc = hal_soc; + soc->hal_soc = hal_soc_hdl; if (htt_htc_soc_attach(soc)) goto fail2; diff --git a/dp/wifi3.0/dp_htt.h b/dp/wifi3.0/dp_htt.h index c804090d99..aed9233103 100644 --- a/dp/wifi3.0/dp_htt.h +++ b/dp/wifi3.0/dp_htt.h @@ -116,7 +116,7 @@ struct dp_htt_htc_pkt_union { struct htt_soc { struct cdp_ctrl_objmgr_psoc *ctrl_psoc; struct dp_soc *dp_soc; - void *hal_soc; + hal_soc_handle_t hal_soc; /* htt_logger handle */ struct htt_logger *htt_logger_handle; HTC_HANDLE htc_soc; @@ -221,7 +221,7 @@ void * htt_soc_initialize(struct htt_soc *htt_soc, struct cdp_ctrl_objmgr_psoc *ctrl_psoc, HTC_HANDLE htc_soc, - void *hal_soc, qdf_device_t osdev); + hal_soc_handle_t hal_soc_hdl, qdf_device_t osdev); /* * htt_soc_attach() - attach DP and HTT SOC diff --git a/dp/wifi3.0/dp_internal.h b/dp/wifi3.0/dp_internal.h index 7d9288df31..dfea615a13 100644 --- a/dp/wifi3.0/dp_internal.h +++ b/dp/wifi3.0/dp_internal.h @@ -1238,7 +1238,7 @@ static inline int dp_srng_access_start(struct dp_intr *int_ctx, struct dp_soc *dp_soc, hal_ring_handle_t hal_ring_hdl) { - void *hal_soc = dp_soc->hal_soc; + hal_soc_handle_t hal_soc = dp_soc->hal_soc; return hal_srng_access_start(hal_soc, hal_ring_hdl); } @@ -1247,7 +1247,7 @@ static inline void dp_srng_access_end(struct dp_intr *int_ctx, struct dp_soc *dp_soc, hal_ring_handle_t hal_ring_hdl) { - void *hal_soc = dp_soc->hal_soc; + hal_soc_handle_t hal_soc = dp_soc->hal_soc; return hal_srng_access_end(hal_soc, hal_ring_hdl); } @@ -1358,4 +1358,17 @@ struct cdp_soc *dp_soc_to_cdp_soc(struct dp_soc *psoc) { return (struct cdp_soc *)psoc; } + +/** + * dp_soc_to_cdp_soc_t() - typecast dp psoc to + * ol txrx soc handle + * @psoc: DP psoc handle + * + * Return: struct cdp_soc_t pointer + */ +static inline +struct cdp_soc_t *dp_soc_to_cdp_soc_t(struct dp_soc *psoc) +{ + return (struct cdp_soc_t *)psoc; +} #endif /* #ifndef _DP_INTERNAL_H_ */ diff --git a/dp/wifi3.0/dp_main.c b/dp/wifi3.0/dp_main.c index cad67da004..0ecd427ef5 100644 --- a/dp/wifi3.0/dp_main.c +++ b/dp/wifi3.0/dp_main.c @@ -131,7 +131,8 @@ dp_config_enh_tx_capture(struct cdp_pdev *pdev_handle, int val) } #endif -void *dp_soc_init(void *dpsoc, HTC_HANDLE htc_handle, void *hif_handle); +void *dp_soc_init(void *dpsoc, HTC_HANDLE htc_handle, + struct hif_opaque_softc *hif_handle); static void dp_pdev_detach(struct cdp_pdev *txrx_pdev, int force); static struct dp_soc * dp_soc_attach(struct cdp_ctrl_objmgr_psoc *ctrl_psoc, HTC_HANDLE htc_handle, @@ -423,7 +424,7 @@ static int dp_get_num_rx_contexts(struct cdp_soc_t *soc_hdl) */ static void dp_pktlogmod_exit(struct dp_pdev *handle) { - void *scn = (void *)handle->soc->hif_handle; + struct hif_opaque_softc *scn = (void *)handle->soc->hif_handle; if (!scn) { QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, @@ -770,7 +771,7 @@ static QDF_STATUS dp_peer_ast_entry_del_by_soc(struct cdp_soc_t *soc_handle, qdf_spin_unlock_bh(&soc->ast_lock); if (cb) { cb(soc->ctrl_psoc, - soc, + dp_soc_to_cdp_soc(soc), arg, CDP_TXRX_AST_DELETE_IN_PROGRESS); } @@ -832,7 +833,7 @@ static QDF_STATUS dp_peer_ast_entry_del_by_pdev(struct cdp_soc_t *soc_handle, if (cb) { cb(soc->ctrl_psoc, - soc, + dp_soc_to_cdp_soc(soc), arg, CDP_TXRX_AST_DELETE_IN_PROGRESS); } @@ -1269,7 +1270,7 @@ static int dp_srng_setup(struct dp_soc *soc, struct dp_srng *srng, int ring_type, int ring_num, int mac_id, uint32_t num_entries, bool cached) { - void *hal_soc = soc->hal_soc; + hal_soc_handle_t hal_soc = soc->hal_soc; uint32_t entry_size = hal_srng_get_entrysize(hal_soc, ring_type); /* TODO: See if we should get align size from hal */ uint32_t ring_base_align = 8; @@ -1413,13 +1414,13 @@ static void dp_srng_cleanup(struct dp_soc *soc, struct dp_srng *srng, } /* TODO: Need this interface from HIF */ -void *hif_get_hal_handle(void *hif_handle); +void *hif_get_hal_handle(struct hif_opaque_softc *hif_handle); #ifdef WLAN_FEATURE_DP_EVENT_HISTORY int dp_srng_access_start(struct dp_intr *int_ctx, struct dp_soc *dp_soc, hal_ring_handle_t hal_ring_hdl) { - void *hal_soc = dp_soc->hal_soc; + hal_soc_handle_t hal_soc = dp_soc->hal_soc; uint32_t hp, tp; uint8_t ring_id; @@ -1435,7 +1436,7 @@ int dp_srng_access_start(struct dp_intr *int_ctx, struct dp_soc *dp_soc, void dp_srng_access_end(struct dp_intr *int_ctx, struct dp_soc *dp_soc, hal_ring_handle_t hal_ring_hdl) { - void *hal_soc = dp_soc->hal_soc; + hal_soc_handle_t hal_soc = dp_soc->hal_soc; uint32_t hp, tp; uint8_t ring_id; @@ -2095,6 +2096,9 @@ static int dp_hw_link_desc_pool_setup(struct dp_soc *soc) soc->link_desc_banks[i].size, "link_desc_bank"); } + qdf_minidump_log((soc->link_desc_banks[i].base_vaddr), + soc->link_desc_banks[i].size, + "link_desc_bank"); } if (last_bank_size) { @@ -2130,6 +2134,9 @@ static int dp_hw_link_desc_pool_setup(struct dp_soc *soc) soc->link_desc_banks[i].size, "link_desc_bank"); } + qdf_minidump_log((soc->link_desc_banks[i].base_vaddr), + soc->link_desc_banks[i].size, + "link_desc_bank"); } @@ -3067,13 +3074,13 @@ static QDF_STATUS dp_lro_hash_setup(struct dp_soc *soc, struct dp_pdev *pdev) dp_info("toeplitz_hash_ipv4:"); qdf_trace_hex_dump(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO, - (void *)lro_hash.toeplitz_hash_ipv4, + lro_hash.toeplitz_hash_ipv4, (sizeof(lro_hash.toeplitz_hash_ipv4[0]) * LRO_IPV4_SEED_ARR_SZ)); dp_info("toeplitz_hash_ipv6:"); qdf_trace_hex_dump(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO, - (void *)lro_hash.toeplitz_hash_ipv6, + lro_hash.toeplitz_hash_ipv6, (sizeof(lro_hash.toeplitz_hash_ipv6[0]) * LRO_IPV6_SEED_ARR_SZ)); @@ -5220,7 +5227,8 @@ static void *dp_peer_create_wifi3(struct cdp_vdev *vdev_handle, pdev->next_peer_cookie--; qdf_err("Failed to initialize peer rate stats"); } else { - peer->wlanstats_ctx = (void *)peer_cookie.ctx; + peer->wlanstats_ctx = (struct cdp_peer_rate_stats_ctx *) + peer_cookie.ctx; } } return (void *)peer; @@ -5430,7 +5438,7 @@ static void dp_cp_peer_del_resp_handler(struct cdp_soc_t *soc_hdl, if (cb) { cb(soc->ctrl_psoc, - soc, + dp_soc_to_cdp_soc(soc), cookie, CDP_TXRX_AST_DELETED); } @@ -5812,7 +5820,8 @@ void dp_peer_unref_delete(struct dp_peer *peer) qdf_mem_copy(peer_cookie.mac_addr, peer->mac_addr.raw, QDF_MAC_ADDR_SIZE); peer_cookie.ctx = NULL; - peer_cookie.ctx = (void *)peer->wlanstats_ctx; + peer_cookie.ctx = (struct cdp_stats_cookie *) + peer->wlanstats_ctx; #if defined(FEATURE_PERPKT_INFO) && WDI_EVENT_ENABLE dp_wdi_event_handler(WDI_EVENT_PEER_DESTROY, pdev->soc, @@ -9133,7 +9142,7 @@ static QDF_STATUS dp_runtime_resume(struct cdp_pdev *opaque_pdev) { struct dp_pdev *pdev = (struct dp_pdev *)opaque_pdev; struct dp_soc *soc = pdev->soc; - void *hal_srng; + hal_ring_handle_t hal_srng; int i; if (soc->intr_mode == DP_INTR_POLL) @@ -9428,10 +9437,11 @@ void dp_soc_set_txrx_ring_map(struct dp_soc *soc) * * Return: DP SOC handle on success, NULL on failure */ -void *dp_soc_attach_wifi3(struct cdp_ctrl_objmgr_psoc *ctrl_psoc, - void *hif_handle, - HTC_HANDLE htc_handle, qdf_device_t qdf_osdev, - struct ol_if_ops *ol_ops, uint16_t device_id) +struct cdp_soc_t * +dp_soc_attach_wifi3(struct cdp_ctrl_objmgr_psoc *ctrl_psoc, + struct hif_opaque_softc *hif_handle, + HTC_HANDLE htc_handle, qdf_device_t qdf_osdev, + struct ol_if_ops *ol_ops, uint16_t device_id) { struct dp_soc *dp_soc = NULL; @@ -9443,7 +9453,7 @@ void *dp_soc_attach_wifi3(struct cdp_ctrl_objmgr_psoc *ctrl_psoc, if (!dp_soc_init(dp_soc, htc_handle, hif_handle)) return NULL; - return (void *)dp_soc; + return dp_soc_to_cdp_soc_t(dp_soc); } #else @@ -9458,16 +9468,17 @@ void *dp_soc_attach_wifi3(struct cdp_ctrl_objmgr_psoc *ctrl_psoc, * * Return: DP SOC handle on success, NULL on failure */ -void *dp_soc_attach_wifi3(struct cdp_ctrl_objmgr_psoc *ctrl_psoc, - void *hif_handle, - HTC_HANDLE htc_handle, qdf_device_t qdf_osdev, - struct ol_if_ops *ol_ops, uint16_t device_id) +struct cdp_soc_t * +dp_soc_attach_wifi3(struct cdp_ctrl_objmgr_psoc *ctrl_psoc, + struct hif_opaque_softc *hif_handle, + HTC_HANDLE htc_handle, qdf_device_t qdf_osdev, + struct ol_if_ops *ol_ops, uint16_t device_id) { struct dp_soc *dp_soc = NULL; dp_soc = dp_soc_attach(ctrl_psoc, htc_handle, qdf_osdev, ol_ops, device_id); - return (void *)dp_soc; + return dp_soc_to_cdp_soc_t(dp_soc); } #endif @@ -9523,7 +9534,7 @@ dp_soc_attach(struct cdp_ctrl_objmgr_psoc *ctrl_psoc, HTC_HANDLE htc_handle, if (htt_soc_htc_prealloc(htt_soc) != QDF_STATUS_SUCCESS) goto fail2; - return (void *)soc; + return soc; fail2: htt_soc_detach(htt_soc); fail1: @@ -9540,7 +9551,8 @@ fail0: * * Return: DP SOC handle on success, NULL on failure */ -void *dp_soc_init(void *dpsoc, HTC_HANDLE htc_handle, void *hif_handle) +void *dp_soc_init(void *dpsoc, HTC_HANDLE htc_handle, + struct hif_opaque_softc *hif_handle) { int target_type; struct dp_soc *soc = (struct dp_soc *)dpsoc; @@ -9652,7 +9664,7 @@ void *dp_soc_init(void *dpsoc, HTC_HANDLE htc_handle, void *hif_handle) * Return: DP SOC handle on success, NULL on failure */ void *dp_soc_init_wifi3(void *dpsoc, struct cdp_ctrl_objmgr_psoc *ctrl_psoc, - void *hif_handle, + struct hif_opaque_softc *hif_handle, HTC_HANDLE htc_handle, qdf_device_t qdf_osdev, struct ol_if_ops *ol_ops, uint16_t device_id) { diff --git a/dp/wifi3.0/dp_peer.c b/dp/wifi3.0/dp_peer.c index f38623f655..12c5839251 100644 --- a/dp/wifi3.0/dp_peer.c +++ b/dp/wifi3.0/dp_peer.c @@ -269,7 +269,7 @@ static inline void dp_peer_ast_cleanup(struct dp_soc *soc, ast->callback = NULL; ast->cookie = NULL; cb(soc->ctrl_psoc, - dp_psoc_to_cdp_psoc(soc), + dp_soc_to_cdp_soc(soc), cookie, CDP_TXRX_AST_DELETE_IN_PROGRESS); } @@ -716,7 +716,7 @@ int dp_peer_add_ast(struct dp_soc *soc, /* Call the saved callback*/ if (cb) { cb(soc->ctrl_psoc, - dp_psoc_to_cdp_psoc(soc), + dp_soc_to_cdp_soc(soc), cookie, CDP_TXRX_AST_DELETE_IN_PROGRESS); } @@ -1142,7 +1142,7 @@ static int dp_peer_ast_free_entry_by_mac(struct dp_soc *soc, if (cb) { cb(soc->ctrl_psoc, - dp_psoc_to_cdp_psoc(soc), + dp_soc_to_cdp_soc(soc), cookie, CDP_TXRX_AST_DELETED); } diff --git a/dp/wifi3.0/dp_rx.c b/dp/wifi3.0/dp_rx.c index a91deadef3..e67e7d3891 100644 --- a/dp/wifi3.0/dp_rx.c +++ b/dp/wifi3.0/dp_rx.c @@ -60,7 +60,7 @@ void dp_rx_dump_info_and_assert(struct dp_soc *soc, hal_ring_desc_t ring_desc, struct dp_rx_desc *rx_desc) { - void *hal_soc = soc->hal_soc; + hal_soc_handle_t hal_soc = soc->hal_soc; dp_rx_desc_dump(rx_desc); hal_srng_dump_ring_desc(hal_soc, hal_ring_hdl, ring_desc); @@ -1622,8 +1622,8 @@ void dp_rx_deliver_to_stack_no_peer(struct dp_soc *soc, qdf_nbuf_t nbuf) uint32_t dp_rx_process(struct dp_intr *int_ctx, hal_ring_handle_t hal_ring_hdl, uint8_t reo_ring_num, uint32_t quota) { - void *hal_soc; hal_ring_desc_t ring_desc; + hal_soc_handle_t hal_soc; struct dp_rx_desc *rx_desc = NULL; qdf_nbuf_t nbuf, next; union dp_rx_desc_list_elem_t *head[MAX_PDEV_CNT]; @@ -2224,7 +2224,7 @@ dp_pdev_rx_buffers_attach(struct dp_soc *dp_soc, uint32_t mac_id, uint32_t num_req_buffers) { struct dp_pdev *dp_pdev = dp_get_pdev_for_mac_id(dp_soc, mac_id); - void *rxdma_srng = dp_rxdma_srng->hal_srng; + hal_ring_handle_t rxdma_srng = dp_rxdma_srng->hal_srng; union dp_rx_desc_list_elem_t *next; void *rxdma_ring_entry; qdf_dma_addr_t paddr; diff --git a/dp/wifi3.0/dp_rx_defrag.c b/dp/wifi3.0/dp_rx_defrag.c index f0509d9730..3e57a31e2c 100644 --- a/dp/wifi3.0/dp_rx_defrag.c +++ b/dp/wifi3.0/dp_rx_defrag.c @@ -1014,10 +1014,9 @@ dp_rx_defrag_nwifi_to_8023(qdf_nbuf_t nbuf, uint16_t hdrsize) uint32_t nbuf_len, seq_no, dst_ind; uint32_t *mpdu_wrd; uint32_t ret, cookie; - hal_ring_desc_t dst_ring_desc = peer->rx_tid[tid].dst_ring_desc; - void *hal_srng = soc->reo_reinject_ring.hal_srng; + hal_ring_handle_t hal_srng = soc->reo_reinject_ring.hal_srng; ent_ring_desc = hal_srng_src_get_next(soc->hal_soc, hal_srng); if (!ent_ring_desc) { diff --git a/dp/wifi3.0/dp_rx_err.c b/dp/wifi3.0/dp_rx_err.c index f8753added..c46be3a295 100644 --- a/dp/wifi3.0/dp_rx_err.c +++ b/dp/wifi3.0/dp_rx_err.c @@ -166,8 +166,8 @@ dp_rx_link_desc_return_by_addr(struct dp_soc *soc, uint8_t bm_action) { struct dp_srng *wbm_desc_rel_ring = &soc->wbm_desc_rel_ring; - void *wbm_rel_srng = wbm_desc_rel_ring->hal_srng; - void *hal_soc = soc->hal_soc; + hal_ring_handle_t wbm_rel_srng = wbm_desc_rel_ring->hal_srng; + hal_soc_handle_t hal_soc = soc->hal_soc; QDF_STATUS status = QDF_STATUS_E_FAILURE; void *src_srng_desc; @@ -1091,8 +1091,8 @@ uint32_t dp_rx_err_process(struct dp_intr *int_ctx, struct dp_soc *soc, hal_ring_handle_t hal_ring_hdl, uint32_t quota) { - void *hal_soc; hal_ring_desc_t ring_desc; + hal_soc_handle_t hal_soc; uint32_t count = 0; uint32_t rx_bufs_used = 0; uint32_t rx_bufs_reaped[MAX_PDEV_CNT] = { 0 }; @@ -1279,8 +1279,8 @@ uint32_t dp_rx_wbm_err_process(struct dp_intr *int_ctx, struct dp_soc *soc, hal_ring_handle_t hal_ring_hdl, uint32_t quota) { - void *hal_soc; hal_ring_desc_t ring_desc; + hal_soc_handle_t hal_soc; struct dp_rx_desc *rx_desc; union dp_rx_desc_list_elem_t *head[MAX_PDEV_CNT] = { NULL }; union dp_rx_desc_list_elem_t *tail[MAX_PDEV_CNT] = { NULL }; @@ -1720,8 +1720,8 @@ dp_rxdma_err_process(struct dp_intr *int_ctx, struct dp_soc *soc, { struct dp_pdev *pdev = dp_get_pdev_for_mac_id(soc, mac_id); int mac_for_pdev = dp_get_mac_id_for_mac(soc, mac_id); - void *hal_soc; hal_ring_desc_t rxdma_dst_ring_desc; + hal_soc_handle_t hal_soc; void *err_dst_srng; union dp_rx_desc_list_elem_t *head = NULL; union dp_rx_desc_list_elem_t *tail = NULL; diff --git a/dp/wifi3.0/dp_rx_mon_dest.c b/dp/wifi3.0/dp_rx_mon_dest.c index 9344de69ce..b32be7bd71 100644 --- a/dp/wifi3.0/dp_rx_mon_dest.c +++ b/dp/wifi3.0/dp_rx_mon_dest.c @@ -59,7 +59,7 @@ dp_rx_mon_link_desc_return(struct dp_pdev *dp_pdev, { struct dp_srng *dp_srng; hal_ring_handle_t hal_ring_hdl; - void *hal_soc; + hal_soc_handle_t hal_soc; QDF_STATUS status = QDF_STATUS_E_FAILURE; void *src_srng_desc; int mac_for_pdev = dp_get_mac_id_for_mac(dp_pdev->soc, mac_id); @@ -1076,8 +1076,8 @@ void dp_rx_mon_dest_process(struct dp_soc *soc, uint32_t mac_id, uint32_t quota) { struct dp_pdev *pdev = dp_get_pdev_for_mac_id(soc, mac_id); uint8_t pdev_id; - void *hal_soc; hal_ring_desc_t rxdma_dst_ring_desc; + hal_soc_handle_t hal_soc; void *mon_dst_srng; union dp_rx_desc_list_elem_t *head = NULL; union dp_rx_desc_list_elem_t *tail = NULL; diff --git a/dp/wifi3.0/dp_rx_mon_status.c b/dp/wifi3.0/dp_rx_mon_status.c index 9852a1e995..b201c52a14 100644 --- a/dp/wifi3.0/dp_rx_mon_status.c +++ b/dp/wifi3.0/dp_rx_mon_status.c @@ -826,7 +826,7 @@ dp_rx_mon_status_srng_process(struct dp_soc *soc, uint32_t mac_id, uint32_t quota) { struct dp_pdev *pdev = dp_get_pdev_for_mac_id(soc, mac_id); - void *hal_soc; + hal_soc_handle_t hal_soc; void *mon_status_srng; void *rxdma_mon_status_ring_entry; QDF_STATUS status; diff --git a/hal/wifi3.0/hal_api.h b/hal/wifi3.0/hal_api.h index 4e94b26661..162da6b7be 100644 --- a/hal/wifi3.0/hal_api.h +++ b/hal/wifi3.0/hal_api.h @@ -1496,7 +1496,7 @@ static inline void hal_setup_link_idle_list(void *halsoc, * @hal_ring_hdl: Source ring pointer * @ring_desc: Opaque ring descriptor handle */ -static inline void hal_srng_dump_ring_desc(struct hal_soc *hal, +static inline void hal_srng_dump_ring_desc(hal_soc_handle_t hal_soc_hdl, hal_ring_handle_t hal_ring_hdl, hal_ring_desc_t ring_desc) { @@ -1512,7 +1512,7 @@ static inline void hal_srng_dump_ring_desc(struct hal_soc *hal, * @hal_soc: Opaque HAL SOC handle * @hal_ring_hdl: Source ring pointer */ -static inline void hal_srng_dump_ring(struct hal_soc *hal, +static inline void hal_srng_dump_ring(hal_soc_handle_t hal_soc_hdl, hal_ring_handle_t hal_ring_hdl) { struct hal_srng *srng = (struct hal_srng *)hal_ring_hdl; diff --git a/hal/wifi3.0/hal_api_mon.h b/hal/wifi3.0/hal_api_mon.h index 47e189ea86..2c76bc780c 100644 --- a/hal/wifi3.0/hal_api_mon.h +++ b/hal/wifi3.0/hal_api_mon.h @@ -345,8 +345,10 @@ void hal_rx_mon_next_link_desc_get(void *rx_msdu_link_desc, * Return: void */ -static inline void hal_rx_mon_msdu_link_desc_set(struct hal_soc *soc, - void *src_srng_desc, void *buf_addr_info) +static inline +void hal_rx_mon_msdu_link_desc_set(hal_soc_handle_t hal_soc_hdl, + void *src_srng_desc, + void *buf_addr_info) { struct buffer_addr_info *wbm_srng_buffer_addr_info = (struct buffer_addr_info *)src_srng_desc; diff --git a/hal/wifi3.0/hal_rx.h b/hal/wifi3.0/hal_rx.h index b6834bd43f..5403e0abff 100644 --- a/hal/wifi3.0/hal_rx.h +++ b/hal/wifi3.0/hal_rx.h @@ -2381,7 +2381,7 @@ static inline bool hal_rx_reo_is_2k_jump(hal_ring_desc_t rx_desc) /** * hal_rx_msdu_link_desc_set: Retrieves MSDU Link Descriptor to WBM * - * @ soc : HAL version of the SOC pointer + * @ hal_soc_hdl : HAL version of the SOC pointer * @ src_srng_desc : void pointer to the WBM Release Ring descriptor * @ buf_addr_info : void pointer to the buffer_addr_info * @ bm_action : put in IDLE list or release to MSDU_LIST @@ -2390,7 +2390,7 @@ static inline bool hal_rx_reo_is_2k_jump(hal_ring_desc_t rx_desc) */ /* look at implementation at dp_hw_link_desc_pool_setup()*/ static inline -void hal_rx_msdu_link_desc_set(struct hal_soc *soc, +void hal_rx_msdu_link_desc_set(hal_soc_handle_t hal_soc_hdl, void *src_srng_desc, hal_ring_desc_t buf_addr_info, uint8_t bm_action) @@ -3194,8 +3194,10 @@ uint8_t hal_rx_reo_ent_rxdma_error_code_get(hal_ring_desc_t reo_ent_desc) */ static inline void hal_rx_wbm_err_info_get(void *wbm_desc, struct hal_wbm_err_desc_info *wbm_er_info, - struct hal_soc *hal_soc) + hal_soc_handle_t hal_soc_hdl) { + struct hal_soc *hal_soc = (struct hal_soc *)hal_soc_hdl; + hal_soc->ops->hal_rx_wbm_err_info_get(wbm_desc, (void *)wbm_er_info); }