mirror of
https://github.com/torvalds/linux.git
synced 2026-05-28 17:13:52 +02:00
wifi: ath12k: Rename hal_ops to ops
Rename the hal_ops member in the HAL context to ops. The prefix is dropped to avoid redundancy, as the structure already resides within the HAL context. Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1 Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3 Signed-off-by: Ripan Deuri <quic_rdeuri@quicinc.com> Reviewed-by: Baochen Qiang <baochen.qiang@oss.qualcomm.com> Reviewed-by: Vasanthakumar Thiagarajan <vasanthakumar.thiagarajan@oss.qualcomm.com> Link: https://patch.msgid.link/20251009111045.1763001-18-quic_rdeuri@quicinc.com Signed-off-by: Jeff Johnson <jeff.johnson@oss.qualcomm.com>
This commit is contained in:
parent
6250af6073
commit
49ba5debad
|
|
@ -2052,7 +2052,7 @@ ath12k_dp_mon_rx_merg_msdus(struct ath12k_pdev_dp *dp_pdev,
|
|||
|
||||
rx_desc = (struct hal_rx_desc *)head_msdu->data;
|
||||
hdr_desc =
|
||||
ab->hal.hal_ops->rx_desc_get_msdu_payload(rx_desc);
|
||||
ab->hal.ops->rx_desc_get_msdu_payload(rx_desc);
|
||||
|
||||
/* Base size */
|
||||
wh = (struct ieee80211_hdr_3addr *)hdr_desc;
|
||||
|
|
|
|||
|
|
@ -108,27 +108,27 @@ static inline u16 ath12k_dp_rx_h_frag_no(struct ath12k_base *ab,
|
|||
static inline u8 ath12k_dp_rx_h_l3pad(struct ath12k_base *ab,
|
||||
struct hal_rx_desc *desc)
|
||||
{
|
||||
return ab->hal.hal_ops->rx_desc_get_l3_pad_bytes(desc);
|
||||
return ab->hal.ops->rx_desc_get_l3_pad_bytes(desc);
|
||||
}
|
||||
|
||||
static inline void ath12k_dp_rx_desc_end_tlv_copy(struct ath12k_base *ab,
|
||||
struct hal_rx_desc *fdesc,
|
||||
struct hal_rx_desc *ldesc)
|
||||
{
|
||||
ab->hal.hal_ops->rx_desc_copy_end_tlv(fdesc, ldesc);
|
||||
ab->hal.ops->rx_desc_copy_end_tlv(fdesc, ldesc);
|
||||
}
|
||||
|
||||
static inline void ath12k_dp_rxdesc_set_msdu_len(struct ath12k_base *ab,
|
||||
struct hal_rx_desc *desc,
|
||||
u16 len)
|
||||
{
|
||||
ab->hal.hal_ops->rx_desc_set_msdu_len(desc, len);
|
||||
ab->hal.ops->rx_desc_set_msdu_len(desc, len);
|
||||
}
|
||||
|
||||
static inline u32 ath12k_dp_rxdesc_get_ppduid(struct ath12k_base *ab,
|
||||
struct hal_rx_desc *rx_desc)
|
||||
{
|
||||
return ab->hal.hal_ops->rx_desc_get_mpdu_ppdu_id(rx_desc);
|
||||
return ab->hal.ops->rx_desc_get_mpdu_ppdu_id(rx_desc);
|
||||
}
|
||||
|
||||
static inline bool ath12k_dp_rxdesc_mpdu_valid(struct ath12k_base *ab,
|
||||
|
|
@ -136,7 +136,7 @@ static inline bool ath12k_dp_rxdesc_mpdu_valid(struct ath12k_base *ab,
|
|||
{
|
||||
u32 tlv_tag;
|
||||
|
||||
tlv_tag = ab->hal.hal_ops->rx_desc_get_mpdu_start_tag(rx_desc);
|
||||
tlv_tag = ab->hal.ops->rx_desc_get_mpdu_start_tag(rx_desc);
|
||||
|
||||
return tlv_tag == HAL_RX_MPDU_START;
|
||||
}
|
||||
|
|
@ -145,7 +145,7 @@ static inline void ath12k_dp_rx_desc_get_dot11_hdr(struct ath12k_base *ab,
|
|||
struct hal_rx_desc *desc,
|
||||
struct ieee80211_hdr *hdr)
|
||||
{
|
||||
ab->hal.hal_ops->rx_desc_get_dot11_hdr(desc, hdr);
|
||||
ab->hal.ops->rx_desc_get_dot11_hdr(desc, hdr);
|
||||
}
|
||||
|
||||
static inline void ath12k_dp_rx_desc_get_crypto_header(struct ath12k_base *ab,
|
||||
|
|
@ -153,13 +153,13 @@ static inline void ath12k_dp_rx_desc_get_crypto_header(struct ath12k_base *ab,
|
|||
u8 *crypto_hdr,
|
||||
enum hal_encrypt_type enctype)
|
||||
{
|
||||
ab->hal.hal_ops->rx_desc_get_crypto_header(desc, crypto_hdr, enctype);
|
||||
ab->hal.ops->rx_desc_get_crypto_header(desc, crypto_hdr, enctype);
|
||||
}
|
||||
|
||||
static inline u8 ath12k_dp_rx_get_msdu_src_link(struct ath12k_base *ab,
|
||||
struct hal_rx_desc *desc)
|
||||
{
|
||||
return ab->hal.hal_ops->rx_desc_get_msdu_src_link_id(desc);
|
||||
return ab->hal.ops->rx_desc_get_msdu_src_link_id(desc);
|
||||
}
|
||||
|
||||
static inline void ath12k_dp_clean_up_skb_list(struct sk_buff_head *skb_list)
|
||||
|
|
|
|||
|
|
@ -10,76 +10,76 @@
|
|||
static void ath12k_hal_ce_dst_setup(struct ath12k_base *ab,
|
||||
struct hal_srng *srng, int ring_num)
|
||||
{
|
||||
ab->hal.hal_ops->ce_dst_setup(ab, srng, ring_num);
|
||||
ab->hal.ops->ce_dst_setup(ab, srng, ring_num);
|
||||
}
|
||||
|
||||
static void ath12k_hal_srng_src_hw_init(struct ath12k_base *ab,
|
||||
struct hal_srng *srng)
|
||||
{
|
||||
ab->hal.hal_ops->srng_src_hw_init(ab, srng);
|
||||
ab->hal.ops->srng_src_hw_init(ab, srng);
|
||||
}
|
||||
|
||||
static void ath12k_hal_srng_dst_hw_init(struct ath12k_base *ab,
|
||||
struct hal_srng *srng)
|
||||
{
|
||||
ab->hal.hal_ops->srng_dst_hw_init(ab, srng);
|
||||
ab->hal.ops->srng_dst_hw_init(ab, srng);
|
||||
}
|
||||
|
||||
static void ath12k_hal_set_umac_srng_ptr_addr(struct ath12k_base *ab,
|
||||
struct hal_srng *srng)
|
||||
{
|
||||
ab->hal.hal_ops->set_umac_srng_ptr_addr(ab, srng);
|
||||
ab->hal.ops->set_umac_srng_ptr_addr(ab, srng);
|
||||
}
|
||||
|
||||
static int ath12k_hal_srng_get_ring_id(struct ath12k_hal *hal,
|
||||
enum hal_ring_type type,
|
||||
int ring_num, int mac_id)
|
||||
{
|
||||
return hal->hal_ops->srng_get_ring_id(hal, type, ring_num, mac_id);
|
||||
return hal->ops->srng_get_ring_id(hal, type, ring_num, mac_id);
|
||||
}
|
||||
|
||||
int ath12k_hal_srng_update_shadow_config(struct ath12k_base *ab,
|
||||
enum hal_ring_type ring_type,
|
||||
int ring_num)
|
||||
{
|
||||
return ab->hal.hal_ops->srng_update_shadow_config(ab, ring_type,
|
||||
return ab->hal.ops->srng_update_shadow_config(ab, ring_type,
|
||||
ring_num);
|
||||
}
|
||||
|
||||
u32 ath12k_hal_ce_get_desc_size(struct ath12k_hal *hal, enum hal_ce_desc type)
|
||||
{
|
||||
return hal->hal_ops->ce_get_desc_size(type);
|
||||
return hal->ops->ce_get_desc_size(type);
|
||||
}
|
||||
|
||||
void ath12k_hal_tx_set_dscp_tid_map(struct ath12k_base *ab, int id)
|
||||
{
|
||||
ab->hal.hal_ops->tx_set_dscp_tid_map(ab, id);
|
||||
ab->hal.ops->tx_set_dscp_tid_map(ab, id);
|
||||
}
|
||||
|
||||
void ath12k_hal_tx_configure_bank_register(struct ath12k_base *ab,
|
||||
u32 bank_config, u8 bank_id)
|
||||
{
|
||||
ab->hal.hal_ops->tx_configure_bank_register(ab, bank_config, bank_id);
|
||||
ab->hal.ops->tx_configure_bank_register(ab, bank_config, bank_id);
|
||||
}
|
||||
|
||||
void ath12k_hal_reoq_lut_addr_read_enable(struct ath12k_base *ab)
|
||||
{
|
||||
ab->hal.hal_ops->reoq_lut_addr_read_enable(ab);
|
||||
ab->hal.ops->reoq_lut_addr_read_enable(ab);
|
||||
}
|
||||
|
||||
void ath12k_hal_reoq_lut_set_max_peerid(struct ath12k_base *ab)
|
||||
{
|
||||
ab->hal.hal_ops->reoq_lut_set_max_peerid(ab);
|
||||
ab->hal.ops->reoq_lut_set_max_peerid(ab);
|
||||
}
|
||||
|
||||
void ath12k_hal_write_ml_reoq_lut_addr(struct ath12k_base *ab, dma_addr_t paddr)
|
||||
{
|
||||
ab->hal.hal_ops->write_ml_reoq_lut_addr(ab, paddr);
|
||||
ab->hal.ops->write_ml_reoq_lut_addr(ab, paddr);
|
||||
}
|
||||
|
||||
void ath12k_hal_write_reoq_lut_addr(struct ath12k_base *ab, dma_addr_t paddr)
|
||||
{
|
||||
ab->hal.hal_ops->write_reoq_lut_addr(ab, paddr);
|
||||
ab->hal.ops->write_reoq_lut_addr(ab, paddr);
|
||||
}
|
||||
|
||||
void ath12k_hal_setup_link_idle_list(struct ath12k_base *ab,
|
||||
|
|
@ -87,25 +87,25 @@ void ath12k_hal_setup_link_idle_list(struct ath12k_base *ab,
|
|||
u32 nsbufs, u32 tot_link_desc,
|
||||
u32 end_offset)
|
||||
{
|
||||
ab->hal.hal_ops->setup_link_idle_list(ab, sbuf, nsbufs, tot_link_desc,
|
||||
ab->hal.ops->setup_link_idle_list(ab, sbuf, nsbufs, tot_link_desc,
|
||||
end_offset);
|
||||
}
|
||||
|
||||
void ath12k_hal_reo_hw_setup(struct ath12k_base *ab, u32 ring_hash_map)
|
||||
{
|
||||
ab->hal.hal_ops->reo_hw_setup(ab, ring_hash_map);
|
||||
ab->hal.ops->reo_hw_setup(ab, ring_hash_map);
|
||||
}
|
||||
|
||||
void ath12k_hal_reo_init_cmd_ring(struct ath12k_base *ab, struct hal_srng *srng)
|
||||
{
|
||||
ab->hal.hal_ops->reo_init_cmd_ring(ab, srng);
|
||||
ab->hal.ops->reo_init_cmd_ring(ab, srng);
|
||||
}
|
||||
|
||||
void ath12k_hal_rx_buf_addr_info_set(struct ath12k_hal *hal,
|
||||
struct ath12k_buffer_addr *binfo,
|
||||
dma_addr_t paddr, u32 cookie, u8 manager)
|
||||
{
|
||||
hal->hal_ops->rx_buf_addr_info_set(binfo, paddr, cookie, manager);
|
||||
hal->ops->rx_buf_addr_info_set(binfo, paddr, cookie, manager);
|
||||
}
|
||||
|
||||
void ath12k_hal_rx_buf_addr_info_get(struct ath12k_hal *hal,
|
||||
|
|
@ -113,18 +113,18 @@ void ath12k_hal_rx_buf_addr_info_get(struct ath12k_hal *hal,
|
|||
dma_addr_t *paddr, u32 *msdu_cookies,
|
||||
u8 *rbm)
|
||||
{
|
||||
hal->hal_ops->rx_buf_addr_info_get(binfo, paddr, msdu_cookies, rbm);
|
||||
hal->ops->rx_buf_addr_info_get(binfo, paddr, msdu_cookies, rbm);
|
||||
}
|
||||
|
||||
void ath12k_hal_cc_config(struct ath12k_base *ab)
|
||||
{
|
||||
ab->hal.hal_ops->cc_config(ab);
|
||||
ab->hal.ops->cc_config(ab);
|
||||
}
|
||||
|
||||
enum hal_rx_buf_return_buf_manager
|
||||
ath12k_hal_get_idle_link_rbm(struct ath12k_hal *hal, u8 device_id)
|
||||
{
|
||||
return hal->hal_ops->get_idle_link_rbm(hal, device_id);
|
||||
return hal->ops->get_idle_link_rbm(hal, device_id);
|
||||
}
|
||||
|
||||
static int ath12k_hal_alloc_cont_rdp(struct ath12k_hal *hal)
|
||||
|
|
@ -266,27 +266,27 @@ void ath12k_hal_ce_src_set_desc(struct ath12k_hal *hal,
|
|||
dma_addr_t paddr, u32 len, u32 id,
|
||||
u8 byte_swap_data)
|
||||
{
|
||||
hal->hal_ops->ce_src_set_desc(desc, paddr, len, id, byte_swap_data);
|
||||
hal->ops->ce_src_set_desc(desc, paddr, len, id, byte_swap_data);
|
||||
}
|
||||
|
||||
void ath12k_hal_ce_dst_set_desc(struct ath12k_hal *hal,
|
||||
struct hal_ce_srng_dest_desc *desc,
|
||||
dma_addr_t paddr)
|
||||
{
|
||||
hal->hal_ops->ce_dst_set_desc(desc, paddr);
|
||||
hal->ops->ce_dst_set_desc(desc, paddr);
|
||||
}
|
||||
|
||||
u32 ath12k_hal_ce_dst_status_get_length(struct ath12k_hal *hal,
|
||||
struct hal_ce_srng_dst_status_desc *desc)
|
||||
{
|
||||
return hal->hal_ops->ce_dst_status_get_length(desc);
|
||||
return hal->ops->ce_dst_status_get_length(desc);
|
||||
}
|
||||
|
||||
void ath12k_hal_set_link_desc_addr(struct ath12k_hal *hal,
|
||||
struct hal_wbm_link_desc *desc, u32 cookie,
|
||||
dma_addr_t paddr, int rbm)
|
||||
{
|
||||
hal->hal_ops->set_link_desc_addr(desc, cookie, paddr, rbm);
|
||||
hal->ops->set_link_desc_addr(desc, cookie, paddr, rbm);
|
||||
}
|
||||
|
||||
void *ath12k_hal_srng_dst_peek(struct ath12k_base *ab, struct hal_srng *srng)
|
||||
|
|
@ -702,7 +702,7 @@ int ath12k_hal_srng_init(struct ath12k_base *ab)
|
|||
struct ath12k_hal *hal = &ab->hal;
|
||||
int ret;
|
||||
|
||||
ret = hal->hal_ops->create_srng_config(hal);
|
||||
ret = hal->ops->create_srng_config(hal);
|
||||
if (ret)
|
||||
goto err_hal;
|
||||
|
||||
|
|
|
|||
|
|
@ -1135,7 +1135,7 @@ struct ath12k_hal {
|
|||
} wrp;
|
||||
|
||||
struct device *dev;
|
||||
const struct hal_ops *hal_ops;
|
||||
const struct hal_ops *ops;
|
||||
const struct ath12k_hw_regs *regs;
|
||||
const struct ath12k_hw_hal_params *hal_params;
|
||||
/* Available REO blocking resources bitmap */
|
||||
|
|
|
|||
|
|
@ -53,6 +53,6 @@ void ath12k_wifi7_dp_extract_rx_desc_data(struct ath12k_base *ab,
|
|||
struct hal_rx_desc *rx_desc,
|
||||
struct hal_rx_desc *ldesc)
|
||||
{
|
||||
ab->hal.hal_ops->extract_rx_desc_data(rx_info, rx_desc, ldesc);
|
||||
ab->hal.ops->extract_rx_desc_data(rx_info, rx_desc, ldesc);
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ int ath12k_wifi7_hal_init(struct ath12k_base *ab)
|
|||
|
||||
memset(hal, 0, sizeof(*hal));
|
||||
|
||||
hal->hal_ops = ath12k_wifi7_hw_ver_map[ab->hw_rev].hal_ops;
|
||||
hal->ops = ath12k_wifi7_hw_ver_map[ab->hw_rev].hal_ops;
|
||||
hal->hal_desc_sz = ath12k_wifi7_hw_ver_map[ab->hw_rev].hal_desc_sz;
|
||||
hal->tcl_to_wbm_rbm_map = ath12k_wifi7_hw_ver_map[ab->hw_rev].tcl_to_wbm_rbm_map;
|
||||
hal->regs = ath12k_wifi7_hw_ver_map[ab->hw_rev].hw_regs;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user