wifi: ath12k: small cleanup in HAL and WMI
cover wifi: ath12k: small cleanup in HAL and WMI
From: Kalle Valo <[email protected]>
Small cleanup found during review.
Kalle Valo (3):
wifi: ath12k: hal: add ab parameter to macros using it
wifi: ath12k: hal: convert offset macros to functions
wifi: ath12k: wmi: delete PSOC_HOST_MAX_NUM_SS
drivers/net/wireless/ath/ath12k/hal.c | 63 +++++++++++++++++++++++---- drivers/net/wireless/ath/ath12k/hal.h | 24 ---------- drivers/net/wireless/ath/ath12k/wmi.c | 10 ++--- drivers/net/wireless/ath/ath12k/wmi.h | 4 +- 4 files changed, 60 insertions(+), 41 deletions(-)
base-commit: 58e4b9df840cad439a4c878f81bc105cac2197a7
Signature · 1 line
2.30.2
PATCH 1/3 wifi: ath12k: hal: add ab parameter to macros using it
From: Kalle Valo <[email protected]>
It's considered evil if a macro is using a variable but not having the variable as a parameter. So add the ab parameter to macros using that.
No functional changes.
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0-03427-QCAHMTSWPL_V1.0_V2.0_SILICONZ-1.15378.4
--- drivers/net/wireless/ath/ath12k/hal.c | 16 ++++++++-------- drivers/net/wireless/ath/ath12k/hal.h | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-)
drivers/net/wireless/ath/ath12k/hal.c +8 -8
@@ -1217,17 +1217,17 @@ static void ath12k_hal_srng_dst_hw_init(struct ath12k_base *ab,if (srng->flags &HAL_SRNG_FLAGS_MSI_INTR ) {ath12k_hif_write32 (ab, reg_base + -HAL_REO1_RING_MSI1_BASE_LSB_OFFSET , +HAL_REO1_RING_MSI1_BASE_LSB_OFFSET (ab), srng->msi_addr); val =u32_encode_bits (((u64 )srng->msi_addr >>HAL_ADDR_MSB_REG_SHIFT ),HAL_REO1_RING_MSI1_BASE_MSB_ADDR ) |HAL_REO1_RING_MSI1_BASE_MSB_MSI1_ENABLE ;ath12k_hif_write32 (ab, reg_base + -HAL_REO1_RING_MSI1_BASE_MSB_OFFSET , val); +HAL_REO1_RING_MSI1_BASE_MSB_OFFSET (ab), val);ath12k_hif_write32 (ab, - reg_base +HAL_REO1_RING_MSI1_DATA_OFFSET , + reg_base +HAL_REO1_RING_MSI1_DATA_OFFSET (ab), srng->msi_data); }
@@ -1237,7 +1237,7 @@ static void ath12k_hal_srng_dst_hw_init(struct ath12k_base *ab, HAL_REO1_RING_BASE_MSB_RING_BASE_ADDR_MSB) |u32_encode_bits ((srng->entry_size * srng->num_entries),HAL_REO1_RING_BASE_MSB_RING_SIZE ); -ath12k_hif_write32 (ab, reg_base +HAL_REO1_RING_BASE_MSB_OFFSET , val); +ath12k_hif_write32 (ab, reg_base +HAL_REO1_RING_BASE_MSB_OFFSET (ab), val); val =u32_encode_bits (srng->ring_id,HAL_REO1_RING_ID_RING_ID ) |u32_encode_bits (srng->entry_size,HAL_REO1_RING_ID_ENTRY_SIZE );
@@ -1251,15 +1251,15 @@ static void ath12k_hal_srng_dst_hw_init(struct ath12k_base *ab, HAL_REO1_RING_PRDR_INT_SETUP_BATCH_COUNTER_THOLD);ath12k_hif_write32 (ab, - reg_base +HAL_REO1_RING_PRODUCER_INT_SETUP_OFFSET , + reg_base +HAL_REO1_RING_PRODUCER_INT_SETUP_OFFSET (ab), val); hp_addr = hal->rdp.paddr + ((unsigned long )srng->u.dst_ring.hp_addr - (unsigned long )hal->rdp.vaddr); -ath12k_hif_write32 (ab, reg_base +HAL_REO1_RING_HP_ADDR_LSB_OFFSET , +ath12k_hif_write32 (ab, reg_base +HAL_REO1_RING_HP_ADDR_LSB_OFFSET (ab), hp_addr &HAL_ADDR_LSB_REG_MASK ); -ath12k_hif_write32 (ab, reg_base +HAL_REO1_RING_HP_ADDR_MSB_OFFSET , +ath12k_hif_write32 (ab, reg_base +HAL_REO1_RING_HP_ADDR_MSB_OFFSET (ab), hp_addr >>HAL_ADDR_MSB_REG_SHIFT );/* Initialize head and tail pointers to indicate ring is empty */
@@ -1278,7 +1278,7 @@ static void ath12k_hal_srng_dst_hw_init(struct ath12k_base *ab, val |=HAL_REO1_RING_MISC_MSI_SWAP ; val |=HAL_REO1_RING_MISC_SRNG_ENABLE ; -ath12k_hif_write32 (ab, reg_base +HAL_REO1_RING_MISC_OFFSET , val); +ath12k_hif_write32 (ab, reg_base +HAL_REO1_RING_MISC_OFFSET (ab), val); } static void ath12k_hal_srng_src_hw_init(struct ath12k_base *ab,
drivers/net/wireless/ath/ath12k/hal.h +8 -8
@@ -155,13 +155,13 @@ struct ath12k_base;#define HAL_REO1_AGING_THRESH_IX_2 (ab) ((ab)->hw_params->regs->hal_reo1_aging_thres_ix2)#define HAL_REO1_AGING_THRESH_IX_3 (ab) ((ab)->hw_params->regs->hal_reo1_aging_thres_ix3) -#define HAL_REO1_RING_MSI1_BASE_LSB_OFFSET \ +#define HAL_REO1_RING_MSI1_BASE_LSB_OFFSET (ab) \ (HAL_REO1_RING_MSI1_BASE_LSB(ab) - HAL_REO1_RING_BASE_LSB(ab)) -#define HAL_REO1_RING_MSI1_BASE_MSB_OFFSET \ +#define HAL_REO1_RING_MSI1_BASE_MSB_OFFSET (ab) \ (HAL_REO1_RING_MSI1_BASE_MSB(ab) - HAL_REO1_RING_BASE_LSB(ab)) -#define HAL_REO1_RING_MSI1_DATA_OFFSET \ +#define HAL_REO1_RING_MSI1_DATA_OFFSET (ab) \ (HAL_REO1_RING_MSI1_DATA(ab) - HAL_REO1_RING_BASE_LSB(ab)) -#define HAL_REO1_RING_BASE_MSB_OFFSET \ +#define HAL_REO1_RING_BASE_MSB_OFFSET (ab) \ (HAL_REO1_RING_BASE_MSB(ab) - HAL_REO1_RING_BASE_LSB(ab))#define HAL_REO1_RING_ID_OFFSET (ab) \
@@ -170,13 +170,13 @@ struct ath12k_base; (HAL_REO1_RING_ID (_ab) -HAL_REO1_RING_BASE_LSB (_ab)); \ }) -#define HAL_REO1_RING_PRODUCER_INT_SETUP_OFFSET \ +#define HAL_REO1_RING_PRODUCER_INT_SETUP_OFFSET (ab) \ (HAL_REO1_RING_PRODUCER_INT_SETUP(ab) - HAL_REO1_RING_BASE_LSB(ab)) -#define HAL_REO1_RING_HP_ADDR_LSB_OFFSET \ +#define HAL_REO1_RING_HP_ADDR_LSB_OFFSET (ab) \ (HAL_REO1_RING_HP_ADDR_LSB(ab) - HAL_REO1_RING_BASE_LSB(ab)) -#define HAL_REO1_RING_HP_ADDR_MSB_OFFSET \ +#define HAL_REO1_RING_HP_ADDR_MSB_OFFSET (ab) \ (HAL_REO1_RING_HP_ADDR_MSB(ab) - HAL_REO1_RING_BASE_LSB(ab)) -#define HAL_REO1_RING_MISC_OFFSET \ +#define HAL_REO1_RING_MISC_OFFSET (ab) \ (HAL_REO1_RING_MISC(ab) - HAL_REO1_RING_BASE_LSB(ab))/* REO2SW(x) R2 ring pointers (head/tail) address */
Signature · 1 line
2.30.2
Re: [PATCH 1/3] wifi: ath12k: hal: add ab parameter to macros using it
Quoted 8 lines · Kalle Valo
It's considered evil if a macro is using a variable but not having the variable as a parameter. So add the ab parameter to macros using that.
No functional changes.
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0-03427-QCAHMTSWPL_V1.0_V2.0_SILICONZ-1.15378.4
Signed-off-by Kalle Valo <[email protected]>
3 patches applied to ath-next branch of ath.git, thanks.
1a8dc2eb5b4e wifi: ath12k: hal: add ab parameter to macros using it f8209eef730e wifi: ath12k: hal: convert offset macros to functions cfec785c7662 wifi: ath12k: wmi: delete PSOC_HOST_MAX_NUM_SS
Signature · 9 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches -- ath12k mailing list [email protected] https://lists.infradead.org/mailman/listinfo/ath12k
PATCH 2/3 wifi: ath12k: hal: convert offset macros to functions
In reply to Kalle ValoFrom: Kalle Valo <[email protected]>
After previous patch checkpatch was giving warnings:
drivers/net/wireless/ath/ath12k/hal.h:158: Macro argument reuse 'ab' - possible side-effects? drivers/net/wireless/ath/ath12k/hal.h:160: Macro argument reuse 'ab' - possible side-effects? drivers/net/wireless/ath/ath12k/hal.h:162: Macro argument reuse 'ab' - possible side-effects? drivers/net/wireless/ath/ath12k/hal.h:164: Macro argument reuse 'ab' - possible side-effects? drivers/net/wireless/ath/ath12k/hal.h:173: Macro argument reuse 'ab' - possible side-effects? drivers/net/wireless/ath/ath12k/hal.h:175: Macro argument reuse 'ab' - possible side-effects? drivers/net/wireless/ath/ath12k/hal.h:177: Macro argument reuse 'ab' - possible side-effects? drivers/net/wireless/ath/ath12k/hal.h:179: Macro argument reuse 'ab' - possible side-effects?
To fix those convert the macros into functions. As it was difficult to use struct ath12k_base within hal.h, core.h was already including hal.h so including back core.h would not work, move the functions also to hal.c.
No functional changes.
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0-03427-QCAHMTSWPL_V1.0_V2.0_SILICONZ-1.15378.4
--- drivers/net/wireless/ath/ath12k/hal.c | 63 +++++++++++++++++++++++---- drivers/net/wireless/ath/ath12k/hal.h | 24 ---------- 2 files changed, 54 insertions(+), 33 deletions(-)
drivers/net/wireless/ath/ath12k/hal.c +54 -9
@@ -242,6 +242,51 @@ ath12k_hal_wcn7850_tcl_to_wbm_rbm_map[DP_TCL_NUM_RING_MAX] = { }, }; +static unsigned int ath12k_hal_reo1_ring_id_offset (struct ath12k_base *ab) +{ +return HAL_REO1_RING_ID (ab) -HAL_REO1_RING_BASE_LSB (ab); +} + +static unsigned int ath12k_hal_reo1_ring_msi1_base_lsb_offset (struct ath12k_base *ab) +{ +return HAL_REO1_RING_MSI1_BASE_LSB (ab) -HAL_REO1_RING_BASE_LSB (ab); +} + +static unsigned int ath12k_hal_reo1_ring_msi1_base_msb_offset (struct ath12k_base *ab) +{ +return HAL_REO1_RING_MSI1_BASE_MSB (ab) -HAL_REO1_RING_BASE_LSB (ab); +} + +static unsigned int ath12k_hal_reo1_ring_msi1_data_offset (struct ath12k_base *ab) +{ +return HAL_REO1_RING_MSI1_DATA (ab) -HAL_REO1_RING_BASE_LSB (ab); +} + +static unsigned int ath12k_hal_reo1_ring_base_msb_offset (struct ath12k_base *ab) +{ +return HAL_REO1_RING_BASE_MSB (ab) -HAL_REO1_RING_BASE_LSB (ab); +} + +static unsigned int ath12k_hal_reo1_ring_producer_int_setup_offset (struct ath12k_base *ab) +{ +return HAL_REO1_RING_PRODUCER_INT_SETUP (ab) -HAL_REO1_RING_BASE_LSB (ab); +} + +static unsigned int ath12k_hal_reo1_ring_hp_addr_lsb_offset (struct ath12k_base *ab) +{ +return HAL_REO1_RING_HP_ADDR_LSB (ab) -HAL_REO1_RING_BASE_LSB (ab); +} + +static unsigned int ath12k_hal_reo1_ring_hp_addr_msb_offset (struct ath12k_base *ab) +{ +return HAL_REO1_RING_HP_ADDR_MSB (ab) -HAL_REO1_RING_BASE_LSB (ab); +} + +static unsigned int ath12k_hal_reo1_ring_misc_offset (struct ath12k_base *ab) +{ +return HAL_REO1_RING_MISC (ab) -HAL_REO1_RING_BASE_LSB (ab); +} +static bool ath12k_hw_qcn9274_rx_desc_get_first_msdu (struct hal_rx_desc *desc) { return !!le16_get_bits(desc->u.qcn9274.msdu_end.info5,
@@ -1217,17 +1262,17 @@ static void ath12k_hal_srng_dst_hw_init(struct ath12k_base *ab,if (srng->flags &HAL_SRNG_FLAGS_MSI_INTR ) {ath12k_hif_write32 (ab, reg_base + -HAL_REO1_RING_MSI1_BASE_LSB_OFFSET (ab), +ath12k_hal_reo1_ring_msi1_base_lsb_offset (ab), srng->msi_addr); val =u32_encode_bits (((u64 )srng->msi_addr >>HAL_ADDR_MSB_REG_SHIFT ),HAL_REO1_RING_MSI1_BASE_MSB_ADDR ) |HAL_REO1_RING_MSI1_BASE_MSB_MSI1_ENABLE ;ath12k_hif_write32 (ab, reg_base + -HAL_REO1_RING_MSI1_BASE_MSB_OFFSET (ab), val); +ath12k_hal_reo1_ring_msi1_base_msb_offset (ab), val);ath12k_hif_write32 (ab, - reg_base +HAL_REO1_RING_MSI1_DATA_OFFSET (ab), + reg_base +ath12k_hal_reo1_ring_msi1_data_offset (ab), srng->msi_data); }
@@ -1237,11 +1282,11 @@ static void ath12k_hal_srng_dst_hw_init(struct ath12k_base *ab, HAL_REO1_RING_BASE_MSB_RING_BASE_ADDR_MSB) |u32_encode_bits ((srng->entry_size * srng->num_entries),HAL_REO1_RING_BASE_MSB_RING_SIZE ); -ath12k_hif_write32 (ab, reg_base +HAL_REO1_RING_BASE_MSB_OFFSET (ab), val); +ath12k_hif_write32 (ab, reg_base +ath12k_hal_reo1_ring_base_msb_offset (ab), val); val =u32_encode_bits (srng->ring_id,HAL_REO1_RING_ID_RING_ID ) |u32_encode_bits (srng->entry_size,HAL_REO1_RING_ID_ENTRY_SIZE ); -ath12k_hif_write32 (ab, reg_base +HAL_REO1_RING_ID_OFFSET (ab), val); +ath12k_hif_write32 (ab, reg_base +ath12k_hal_reo1_ring_id_offset (ab), val);/* interrupt setup */ val = u32_encode_bits((srng->intr_timer_thres_us >> 3),
@@ -1251,15 +1296,15 @@ static void ath12k_hal_srng_dst_hw_init(struct ath12k_base *ab, HAL_REO1_RING_PRDR_INT_SETUP_BATCH_COUNTER_THOLD);ath12k_hif_write32 (ab, - reg_base +HAL_REO1_RING_PRODUCER_INT_SETUP_OFFSET (ab), + reg_base +ath12k_hal_reo1_ring_producer_int_setup_offset (ab), val); hp_addr = hal->rdp.paddr + ((unsigned long )srng->u.dst_ring.hp_addr - (unsigned long )hal->rdp.vaddr); -ath12k_hif_write32 (ab, reg_base +HAL_REO1_RING_HP_ADDR_LSB_OFFSET (ab), +ath12k_hif_write32 (ab, reg_base +ath12k_hal_reo1_ring_hp_addr_lsb_offset (ab), hp_addr &HAL_ADDR_LSB_REG_MASK ); -ath12k_hif_write32 (ab, reg_base +HAL_REO1_RING_HP_ADDR_MSB_OFFSET (ab), +ath12k_hif_write32 (ab, reg_base +ath12k_hal_reo1_ring_hp_addr_msb_offset (ab), hp_addr >>HAL_ADDR_MSB_REG_SHIFT );/* Initialize head and tail pointers to indicate ring is empty */
@@ -1278,7 +1323,7 @@ static void ath12k_hal_srng_dst_hw_init(struct ath12k_base *ab, val |=HAL_REO1_RING_MISC_MSI_SWAP ; val |=HAL_REO1_RING_MISC_SRNG_ENABLE ; -ath12k_hif_write32 (ab, reg_base +HAL_REO1_RING_MISC_OFFSET (ab), val); +ath12k_hif_write32 (ab, reg_base +ath12k_hal_reo1_ring_misc_offset (ab), val); } static void ath12k_hal_srng_src_hw_init(struct ath12k_base *ab,
drivers/net/wireless/ath/ath12k/hal.h +0 -24
@@ -155,30 +155,6 @@ struct ath12k_base;#define HAL_REO1_AGING_THRESH_IX_2 (ab) ((ab)->hw_params->regs->hal_reo1_aging_thres_ix2)#define HAL_REO1_AGING_THRESH_IX_3 (ab) ((ab)->hw_params->regs->hal_reo1_aging_thres_ix3) -#define HAL_REO1_RING_MSI1_BASE_LSB_OFFSET (ab) \ - (HAL_REO1_RING_MSI1_BASE_LSB(ab) - HAL_REO1_RING_BASE_LSB(ab)) -#define HAL_REO1_RING_MSI1_BASE_MSB_OFFSET (ab) \ - (HAL_REO1_RING_MSI1_BASE_MSB(ab) - HAL_REO1_RING_BASE_LSB(ab)) -#define HAL_REO1_RING_MSI1_DATA_OFFSET (ab) \ - (HAL_REO1_RING_MSI1_DATA(ab) - HAL_REO1_RING_BASE_LSB(ab)) -#define HAL_REO1_RING_BASE_MSB_OFFSET (ab) \ - (HAL_REO1_RING_BASE_MSB(ab) - HAL_REO1_RING_BASE_LSB(ab)) - -#define HAL_REO1_RING_ID_OFFSET (ab) \ - ({ \ - struct ath12k_base *_ab = (ab); \ - (HAL_REO1_RING_ID(_ab) - HAL_REO1_RING_BASE_LSB(_ab)); \ - }) - -#define HAL_REO1_RING_PRODUCER_INT_SETUP_OFFSET (ab) \ - (HAL_REO1_RING_PRODUCER_INT_SETUP(ab) - HAL_REO1_RING_BASE_LSB(ab)) -#define HAL_REO1_RING_HP_ADDR_LSB_OFFSET (ab) \ - (HAL_REO1_RING_HP_ADDR_LSB(ab) - HAL_REO1_RING_BASE_LSB(ab)) -#define HAL_REO1_RING_HP_ADDR_MSB_OFFSET (ab) \ - (HAL_REO1_RING_HP_ADDR_MSB(ab) - HAL_REO1_RING_BASE_LSB(ab)) -#define HAL_REO1_RING_MISC_OFFSET (ab) \ - (HAL_REO1_RING_MISC(ab) - HAL_REO1_RING_BASE_LSB(ab)) -/* REO2SW(x) R2 ring pointers (head/tail) address */ #define HAL_REO1_RING_HP 0x00003048#define HAL_REO1_RING_TP 0x0000304c
Signature · 7 lines
2.30.2 -- ath12k mailing list [email protected] https://lists.infradead.org/mailman/listinfo/ath12k
PATCH 3/3 wifi: ath12k: wmi: delete PSOC_HOST_MAX_NUM_SS
In reply to Kalle ValoFrom: Kalle Valo <[email protected]>
Both PSOC_HOST_MAX_NUM_SS and WMI_MAX_NUM_SS are set to 8. The host assumes that the values are the same but there's no check for that, so things will break if either of the values change. It's simpler and safer to have just one define so delete PSOC_HOST_MAX_NUM_SS and use WMI_MAX_NUM_SS everywhere.
No functional changes.
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0-03427-QCAHMTSWPL_V1.0_V2.0_SILICONZ-1.15378.4
--- drivers/net/wireless/ath/ath12k/wmi.c | 10 +++++----- drivers/net/wireless/ath/ath12k/wmi.h | 4 +--- 2 files changed, 6 insertions(+), 8 deletions(-)
drivers/net/wireless/ath/ath12k/wmi.c +5 -5
@@ -428,7 +428,7 @@ static int ath12k_pull_svc_ready_ext(struct ath12k_wmi_pdev *wmi_handle, arg->ppet.numss_m1 =le32_to_cpu (ev->ppet.numss_m1); arg->ppet.ru_bit_mask =le32_to_cpu (ev->ppet.ru_info); -for (i =0 ; i <PSOC_HOST_MAX_NUM_SS ; i++) +for (i =0 ; i <WMI_MAX_NUM_SS ; i++) arg->ppet.ppet16_ppet8_ru3_ru0[i] =le32_to_cpu (ev->ppet.ppet16_ppet8_ru3_ru0[i]);
@@ -520,7 +520,7 @@ ath12k_pull_mac_phy_cap_svc_ready_ext(struct ath12k_wmi_pdev *wmi_handle, cap_band->he_ppet.numss_m1 =le32_to_cpu (mac_caps->he_ppet2g.numss_m1); cap_band->he_ppet.ru_bit_mask =le32_to_cpu (mac_caps->he_ppet2g.ru_info); -for (i =0 ; i <PSOC_HOST_MAX_NUM_SS ; i++) +for (i =0 ; i <WMI_MAX_NUM_SS ; i++) cap_band->he_ppet.ppet16_ppet8_ru3_ru0[i] =le32_to_cpu (mac_caps->he_ppet2g.ppet16_ppet8_ru3_ru0[i]); }
@@ -541,7 +541,7 @@ ath12k_pull_mac_phy_cap_svc_ready_ext(struct ath12k_wmi_pdev *wmi_handle, cap_band->he_ppet.numss_m1 =le32_to_cpu (mac_caps->he_ppet5g.numss_m1); cap_band->he_ppet.ru_bit_mask =le32_to_cpu (mac_caps->he_ppet5g.ru_info); -for (i =0 ; i <PSOC_HOST_MAX_NUM_SS ; i++) +for (i =0 ; i <WMI_MAX_NUM_SS ; i++) cap_band->he_ppet.ppet16_ppet8_ru3_ru0[i] =le32_to_cpu (mac_caps->he_ppet5g.ppet16_ppet8_ru3_ru0[i]);
@@ -559,7 +559,7 @@ ath12k_pull_mac_phy_cap_svc_ready_ext(struct ath12k_wmi_pdev *wmi_handle, cap_band->he_ppet.numss_m1 =le32_to_cpu (mac_caps->he_ppet5g.numss_m1); cap_band->he_ppet.ru_bit_mask =le32_to_cpu (mac_caps->he_ppet5g.ru_info); -for (i =0 ; i <PSOC_HOST_MAX_NUM_SS ; i++) +for (i =0 ; i <WMI_MAX_NUM_SS ; i++) cap_band->he_ppet.ppet16_ppet8_ru3_ru0[i] =le32_to_cpu (mac_caps->he_ppet5g.ppet16_ppet8_ru3_ru0[i]); }
@@ -1935,7 +1935,7 @@ int ath12k_wmi_send_peer_assoc_cmd(struct ath12k *ar,cpu_to_le32 (arg->peer_he_cap_phyinfo[i]); cmd->peer_ppet.numss_m1 =cpu_to_le32 (arg->peer_ppet.numss_m1); cmd->peer_ppet.ru_info =cpu_to_le32 (arg->peer_ppet.ru_bit_mask); -for (i =0 ; i <PSOC_HOST_MAX_NUM_SS ; i++) +for (i =0 ; i <WMI_MAX_NUM_SS ; i++) cmd->peer_ppet.ppet16_ppet8_ru3_ru0[i] =cpu_to_le32 (arg->peer_ppet.ppet16_ppet8_ru3_ru0[i]);
drivers/net/wireless/ath/ath12k/wmi.h +1 -3
@@ -43,8 +43,6 @@ static inline s32 a_sle32_to_cpu(a_sle32 val)return le32_to_cpu ((__force __le32 )val); } -#define PSOC_HOST_MAX_NUM_SS (8) -/* defines to set Packet extension values which can be 0 us, 8 usec or 16 usec */ #define MAX_HE_NSS 8#define MAX_HE_MODULATION 8
@@ -2233,7 +2231,7 @@ struct ath12k_wmi_pdev_band_arg {struct ath12k_wmi_ppe_threshold_arg {u32 numss_m1;u32 ru_bit_mask; -u32 ppet16_ppet8_ru3_ru0[PSOC_HOST_MAX_NUM_SS ]; +u32 ppet16_ppet8_ru3_ru0[WMI_MAX_NUM_SS ]; };#define PSOC_HOST_MAX_PHY_SIZE (3)
Signature · 1 line
2.30.2