ath11k: CE and HAL support for QCA6390
v2 cover ath11k: CE and HAL support for QCA6390
Here we are adding QCA6390 support to CE and HAL as well as some changes to WMI.
For QCA6390 support there will be one more patchset after this. Please review.
This patchset depends on the patchset:
ath11k: firmware and board file support for PCI devices
Kalle
v2:
* resend because it seems linux-wireless lost v1
Carl Huang (9):
ath11k: hal: create register values dynamically
ath11k: ce: support different CE configurations
ath11k: hal: assign msi_addr and msi_data to srng
ath11k: ce: get msi_addr and msi_data before srng setup
ath11k: disable CE interrupt before hif start
ath11k: force single pdev only for QCA6390
ath11k: initialize wmi config based on hw_params
ath11k: wmi: put hardware to DBS mode
ath11k: dp: redefine peer_map and peer_unmap
Kalle Valo (3):
ath11k: hal: cleanup dynamic register macros
ath11k: ce: remove host_ce_config_wlan macro
ath11k: ce: remove CE_COUNT() macro
drivers/net/wireless/ath/ath11k/ahb.c | 24 ++-- drivers/net/wireless/ath/ath11k/ce.c | 114 ++++++++++++++--- drivers/net/wireless/ath/ath11k/ce.h | 10 +- drivers/net/wireless/ath/ath11k/core.c | 10 ++ drivers/net/wireless/ath/ath11k/core.h | 1 + drivers/net/wireless/ath/ath11k/dp.h | 6 +- drivers/net/wireless/ath/ath11k/dp_rx.c | 2 + drivers/net/wireless/ath/ath11k/hal.c | 72 +++++------ drivers/net/wireless/ath/ath11k/hal.h | 171 ++++++++++++++------------ drivers/net/wireless/ath/ath11k/hal_rx.c | 8 +- drivers/net/wireless/ath/ath11k/htc.c | 2 +- drivers/net/wireless/ath/ath11k/hw.c | 204 +++++++++++++++++++++++++++++++ drivers/net/wireless/ath/ath11k/hw.h | 63 ++++++++++ drivers/net/wireless/ath/ath11k/mac.c | 33 +++++ drivers/net/wireless/ath/ath11k/pci.c | 25 ++-- drivers/net/wireless/ath/ath11k/wmi.c | 94 +++++++++----- 16 files changed, 648 insertions(+), 191 deletions(-)
Signature · 7 lines
2.7.4 -- ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH v2 1/12 ath11k: hal: create register values dynamically
From: Carl Huang <[email protected]>
QCA6390 has different register offset compared to IPQ8074, so need to attach the register offset dynamically based on hw_params.
Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.1.0.1-01238-QCAHKSWPL_SILICONZ-2
--- drivers/net/wireless/ath/ath11k/core.c | 2 + drivers/net/wireless/ath/ath11k/hal.h | 72 +++++++++++----------- drivers/net/wireless/ath/ath11k/hw.c | 105 +++++++++++++++++++++++++++++++++ drivers/net/wireless/ath/ath11k/hw.h | 49 +++++++++++++++ 4 files changed, 192 insertions(+), 36 deletions(-)
drivers/net/wireless/ath/ath11k/core.c +2 -0
@@ -32,6 +32,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { .hw_ops = &ipq8074_ops, .ring_mask = &ath11k_hw_ring_mask_ipq8074, .internal_sleep_clock = false, + .regs = &ipq8074_regs, }, { .name = "qca6390 hw2.0",
@@ -46,6 +47,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { .hw_ops = &qca6390_ops, .ring_mask = &ath11k_hw_ring_mask_ipq8074, .internal_sleep_clock = true, + .regs = &qca6390_regs, }, };
drivers/net/wireless/ath/ath11k/hal.h +36 -36
108 lines not on this page · raw message
drivers/net/wireless/ath/ath11k/hw.c +105 -0
114 lines not on this page · raw message
drivers/net/wireless/ath/ath11k/hw.h +49 -0
59 lines not on this page · raw message
Signature · 7 lines
2.7.4 -- ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
Re: [PATCH v2 01/12] ath11k: hal: create register values dynamically
Quoted 8 lines · Kalle Valo
QCA6390 has different register offset compared to IPQ8074, so need to attach the register offset dynamically based on
hw_params.Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.1.0.1-01238-QCAHKSWPL_SILICONZ-2Signed-off-by Carl Huang <[email protected]>Signed-off-by Kalle Valo <[email protected]>
12 patches applied to ath-next branch of ath.git, thanks.
6976433c4778 ath11k: hal: create register values dynamically 2b5e665bedf7 ath11k: hal: cleanup dynamic register macros e3396b8bddd2 ath11k: ce: support different CE configurations 6e5e9f59dc5b ath11k: ce: remove host_ce_config_wlan macro d9d4b5f35488 ath11k: ce: remove CE_COUNT() macro 7cea7c5b0e7b ath11k: hal: assign msi_addr and msi_data to srng 1a05ed37c513 ath11k: ce: get msi_addr and msi_data before srng setup e5c860e121c2 ath11k: disable CE interrupt before hif start 5f859bc02c7b ath11k: force single pdev only for QCA6390 2d4bcbed5b7d ath11k: initialize wmi config based on hw_params ed0192f7942e ath11k: wmi: put hardware to DBS mode 13ecd81fbad6 ath11k: dp: redefine peer_map and peer_unmap
Signature · 9 lines
https://patchwork.kernel.org/patch/11716083/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches -- ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
Re: [PATCH v2 01/12] ath11k: hal: create register values dynamically
In reply to Kalle ValoQuoted 8 lines · Kalle Valo
QCA6390 has different register offset compared to IPQ8074, so need to attach the register offset dynamically based on
hw_params.Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.1.0.1-01238-QCAHKSWPL_SILICONZ-2Signed-off-by Carl Huang <[email protected]>Signed-off-by Kalle Valo <[email protected]>
12 patches applied to ath-next branch of ath.git, thanks.
6976433c4778 ath11k: hal: create register values dynamically 2b5e665bedf7 ath11k: hal: cleanup dynamic register macros e3396b8bddd2 ath11k: ce: support different CE configurations 6e5e9f59dc5b ath11k: ce: remove host_ce_config_wlan macro d9d4b5f35488 ath11k: ce: remove CE_COUNT() macro 7cea7c5b0e7b ath11k: hal: assign msi_addr and msi_data to srng 1a05ed37c513 ath11k: ce: get msi_addr and msi_data before srng setup e5c860e121c2 ath11k: disable CE interrupt before hif start 5f859bc02c7b ath11k: force single pdev only for QCA6390 2d4bcbed5b7d ath11k: initialize wmi config based on hw_params ed0192f7942e ath11k: wmi: put hardware to DBS mode 13ecd81fbad6 ath11k: dp: redefine peer_map and peer_unmap
Signature · 3 lines
https://patchwork.kernel.org/patch/11716083/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
PATCH v2 2/12 ath11k: hal: cleanup dynamic register macros
In reply to Kalle ValoNow some of the HAL register macros access ab variable in a hidden way, make ab variable visible in the macro by adding it as an argument.
This is done in a separate patch to keep the patches simple. No functional changes.
Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.1.0.1-01238-QCAHKSWPL_SILICONZ-2
--- drivers/net/wireless/ath/ath11k/hal.c | 66 ++++++------ drivers/net/wireless/ath/ath11k/hal.h | 171 +++++++++++++++++-------------- drivers/net/wireless/ath/ath11k/hal_rx.c | 8 +- 3 files changed, 133 insertions(+), 112 deletions(-)
drivers/net/wireless/ath/ath11k/hal.c +33 -33
@@ -329,7 +329,7 @@ static void ath11k_hal_srng_dst_hw_init(struct ath11k_base *ab,if (srng->flags &HAL_SRNG_FLAGS_MSI_INTR ) {ath11k_hif_write32 (ab, reg_base + -HAL_REO1_RING_MSI1_BASE_LSB_OFFSET , +HAL_REO1_RING_MSI1_BASE_LSB_OFFSET (ab), (u32 )srng->msi_addr); val = FIELD_PREP(HAL_REO1_RING_MSI1_BASE_MSB_ADDR,
@@ -337,10 +337,10 @@ static void ath11k_hal_srng_dst_hw_init(struct ath11k_base *ab, HAL_ADDR_MSB_REG_SHIFT)) |HAL_REO1_RING_MSI1_BASE_MSB_MSI1_ENABLE ;ath11k_hif_write32 (ab, reg_base + -HAL_REO1_RING_MSI1_BASE_MSB_OFFSET , val); +HAL_REO1_RING_MSI1_BASE_MSB_OFFSET (ab), val);ath11k_hif_write32 (ab, - reg_base +HAL_REO1_RING_MSI1_DATA_OFFSET , + reg_base +HAL_REO1_RING_MSI1_DATA_OFFSET (ab), srng->msi_data); }
@@ -351,11 +351,11 @@ static void ath11k_hal_srng_dst_hw_init(struct ath11k_base *ab, HAL_ADDR_MSB_REG_SHIFT)) |FIELD_PREP (HAL_REO1_RING_BASE_MSB_RING_SIZE , (srng->entry_size * srng->num_entries)); -ath11k_hif_write32 (ab, reg_base +HAL_REO1_RING_BASE_MSB_OFFSET , val); +ath11k_hif_write32 (ab, reg_base +HAL_REO1_RING_BASE_MSB_OFFSET (ab), val); val =FIELD_PREP (HAL_REO1_RING_ID_RING_ID , srng->ring_id) |FIELD_PREP (HAL_REO1_RING_ID_ENTRY_SIZE , srng->entry_size); -ath11k_hif_write32 (ab, reg_base +HAL_REO1_RING_ID_OFFSET , val); +ath11k_hif_write32 (ab, reg_base +HAL_REO1_RING_ID_OFFSET (ab), val);/* interrupt setup */ val = FIELD_PREP(HAL_REO1_RING_PRDR_INT_SETUP_INTR_TMR_THOLD,
@@ -366,21 +366,21 @@ static void ath11k_hal_srng_dst_hw_init(struct ath11k_base *ab, srng->entry_size));ath11k_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); -ath11k_hif_write32 (ab, reg_base +HAL_REO1_RING_HP_ADDR_LSB_OFFSET , +ath11k_hif_write32 (ab, reg_base +HAL_REO1_RING_HP_ADDR_LSB_OFFSET (ab), hp_addr &HAL_ADDR_LSB_REG_MASK ); -ath11k_hif_write32 (ab, reg_base +HAL_REO1_RING_HP_ADDR_MSB_OFFSET , +ath11k_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 */ reg_base = srng->hwreg_base[HAL_SRNG_REG_GRP_R2 ];ath11k_hif_write32 (ab, reg_base,0 ); -ath11k_hif_write32 (ab, reg_base +HAL_REO1_RING_TP_OFFSET ,0 ); +ath11k_hif_write32 (ab, reg_base +HAL_REO1_RING_TP_OFFSET (ab),0 ); *srng->u.dst_ring.hp_addr =0 ; reg_base = srng->hwreg_base[HAL_SRNG_REG_GRP_R0 ];
@@ -393,7 +393,7 @@ static void ath11k_hal_srng_dst_hw_init(struct ath11k_base *ab, val |=HAL_REO1_RING_MISC_MSI_SWAP ; val |=HAL_REO1_RING_MISC_SRNG_ENABLE ; -ath11k_hif_write32 (ab, reg_base +HAL_REO1_RING_MISC_OFFSET , val); +ath11k_hif_write32 (ab, reg_base +HAL_REO1_RING_MISC_OFFSET (ab), val); } static void ath11k_hal_srng_src_hw_init(struct ath11k_base *ab,
@@ -408,7 +408,7 @@ static void ath11k_hal_srng_src_hw_init(struct ath11k_base *ab,if (srng->flags &HAL_SRNG_FLAGS_MSI_INTR ) {ath11k_hif_write32 (ab, reg_base + -HAL_TCL1_RING_MSI1_BASE_LSB_OFFSET , +HAL_TCL1_RING_MSI1_BASE_LSB_OFFSET (ab), (u32 )srng->msi_addr); val = FIELD_PREP(HAL_TCL1_RING_MSI1_BASE_MSB_ADDR,
@@ -416,11 +416,11 @@ static void ath11k_hal_srng_src_hw_init(struct ath11k_base *ab, HAL_ADDR_MSB_REG_SHIFT)) |HAL_TCL1_RING_MSI1_BASE_MSB_MSI1_ENABLE ;ath11k_hif_write32 (ab, reg_base + -HAL_TCL1_RING_MSI1_BASE_MSB_OFFSET , +HAL_TCL1_RING_MSI1_BASE_MSB_OFFSET (ab), val);ath11k_hif_write32 (ab, reg_base + -HAL_TCL1_RING_MSI1_DATA_OFFSET , +HAL_TCL1_RING_MSI1_DATA_OFFSET (ab), srng->msi_data); }
@@ -431,10 +431,10 @@ static void ath11k_hal_srng_src_hw_init(struct ath11k_base *ab, HAL_ADDR_MSB_REG_SHIFT)) |FIELD_PREP (HAL_TCL1_RING_BASE_MSB_RING_SIZE , (srng->entry_size * srng->num_entries)); -ath11k_hif_write32 (ab, reg_base +HAL_TCL1_RING_BASE_MSB_OFFSET , val); +ath11k_hif_write32 (ab, reg_base +HAL_TCL1_RING_BASE_MSB_OFFSET (ab), val); val =FIELD_PREP (HAL_REO1_RING_ID_ENTRY_SIZE , srng->entry_size); -ath11k_hif_write32 (ab, reg_base +HAL_TCL1_RING_ID_OFFSET , val); +ath11k_hif_write32 (ab, reg_base +HAL_TCL1_RING_ID_OFFSET (ab), val);/* interrupt setup */ /* NOTE: IPQ8074 v2 requires the interrupt timer threshold in the
@@ -448,7 +448,7 @@ static void ath11k_hal_srng_src_hw_init(struct ath11k_base *ab, srng->entry_size));ath11k_hif_write32 (ab, - reg_base +HAL_TCL1_RING_CONSR_INT_SETUP_IX0_OFFSET , + reg_base +HAL_TCL1_RING_CONSR_INT_SETUP_IX0_OFFSET (ab), val); val =0 ;
@@ -457,7 +457,7 @@ static void ath11k_hal_srng_src_hw_init(struct ath11k_base *ab, srng->u.src_ring.low_threshold); }ath11k_hif_write32 (ab, - reg_base +HAL_TCL1_RING_CONSR_INT_SETUP_IX1_OFFSET , + reg_base +HAL_TCL1_RING_CONSR_INT_SETUP_IX1_OFFSET (ab), val);if (srng->ring_id !=HAL_SRNG_RING_ID_WBM_IDLE_LINK ) {
@@ -465,10 +465,10 @@ static void ath11k_hal_srng_src_hw_init(struct ath11k_base *ab, ((unsigned long )srng->u.src_ring.tp_addr - (unsigned long )hal->rdp.vaddr);ath11k_hif_write32 (ab, - reg_base +HAL_TCL1_RING_TP_ADDR_LSB_OFFSET , + reg_base +HAL_TCL1_RING_TP_ADDR_LSB_OFFSET (ab), tp_addr &HAL_ADDR_LSB_REG_MASK );ath11k_hif_write32 (ab, - reg_base +HAL_TCL1_RING_TP_ADDR_MSB_OFFSET , + reg_base +HAL_TCL1_RING_TP_ADDR_MSB_OFFSET (ab), tp_addr >>HAL_ADDR_MSB_REG_SHIFT ); }
@@ -492,7 +492,7 @@ static void ath11k_hal_srng_src_hw_init(struct ath11k_base *ab, val |=HAL_TCL1_RING_MISC_SRNG_ENABLE ; -ath11k_hif_write32 (ab, reg_base +HAL_TCL1_RING_MISC_OFFSET , val); +ath11k_hif_write32 (ab, reg_base +HAL_TCL1_RING_MISC_OFFSET (ab), val); } static void ath11k_hal_srng_hw_init(struct ath11k_base *ab,
@@ -1043,7 +1043,7 @@ int ath11k_hal_srng_setup(struct ath11k_base *ab, enum hal_ring_type type, }else { srng->u.dst_ring.tp_addr = (u32 *)((unsigned long )ab->mem + reg_base + - (HAL_REO1_RING_TP -HAL_REO1_RING_HP )); + (HAL_REO1_RING_TP (ab) -HAL_REO1_RING_HP (ab))); } }
@@ -1072,14 +1072,14 @@ static int ath11k_hal_srng_create_config(struct ath11k_base *ab)return -ENOMEM ; s = &hal->srng_config[HAL_REO_DST ]; - s->reg_start[0 ] =HAL_SEQ_WCSS_UMAC_REO_REG +HAL_REO1_RING_BASE_LSB ; - s->reg_start[1 ] =HAL_SEQ_WCSS_UMAC_REO_REG +HAL_REO1_RING_HP ; - s->reg_size[0 ] =HAL_REO2_RING_BASE_LSB -HAL_REO1_RING_BASE_LSB ; - s->reg_size[1 ] =HAL_REO2_RING_HP -HAL_REO1_RING_HP ; + s->reg_start[0 ] =HAL_SEQ_WCSS_UMAC_REO_REG +HAL_REO1_RING_BASE_LSB (ab); + s->reg_start[1 ] =HAL_SEQ_WCSS_UMAC_REO_REG +HAL_REO1_RING_HP (ab); + s->reg_size[0 ] =HAL_REO2_RING_BASE_LSB (ab) -HAL_REO1_RING_BASE_LSB (ab); + s->reg_size[1 ] =HAL_REO2_RING_HP (ab) -HAL_REO1_RING_HP (ab); s = &hal->srng_config[HAL_REO_EXCEPTION ]; - s->reg_start[0 ] =HAL_SEQ_WCSS_UMAC_REO_REG +HAL_REO_TCL_RING_BASE_LSB ; - s->reg_start[1 ] =HAL_SEQ_WCSS_UMAC_REO_REG +HAL_REO_TCL_RING_HP ; + s->reg_start[0 ] =HAL_SEQ_WCSS_UMAC_REO_REG +HAL_REO_TCL_RING_BASE_LSB (ab); + s->reg_start[1 ] =HAL_SEQ_WCSS_UMAC_REO_REG +HAL_REO_TCL_RING_HP (ab); s = &hal->srng_config[HAL_REO_REINJECT ]; s->reg_start[0 ] =HAL_SEQ_WCSS_UMAC_REO_REG +HAL_SW2REO_RING_BASE_LSB ;
@@ -1090,21 +1090,21 @@ static int ath11k_hal_srng_create_config(struct ath11k_base *ab) s->reg_start[1 ] =HAL_SEQ_WCSS_UMAC_REO_REG +HAL_REO_CMD_HP ; s = &hal->srng_config[HAL_REO_STATUS ]; - s->reg_start[0 ] =HAL_SEQ_WCSS_UMAC_REO_REG +HAL_REO_STATUS_RING_BASE_LSB ; - s->reg_start[1 ] =HAL_SEQ_WCSS_UMAC_REO_REG +HAL_REO_STATUS_HP ; + s->reg_start[0 ] =HAL_SEQ_WCSS_UMAC_REO_REG +HAL_REO_STATUS_RING_BASE_LSB (ab); + s->reg_start[1 ] =HAL_SEQ_WCSS_UMAC_REO_REG +HAL_REO_STATUS_HP (ab); s = &hal->srng_config[HAL_TCL_DATA ]; - s->reg_start[0 ] =HAL_SEQ_WCSS_UMAC_TCL_REG +HAL_TCL1_RING_BASE_LSB ; + s->reg_start[0 ] =HAL_SEQ_WCSS_UMAC_TCL_REG +HAL_TCL1_RING_BASE_LSB (ab); s->reg_start[1 ] =HAL_SEQ_WCSS_UMAC_TCL_REG +HAL_TCL1_RING_HP ; - s->reg_size[0 ] =HAL_TCL2_RING_BASE_LSB -HAL_TCL1_RING_BASE_LSB ; + s->reg_size[0 ] =HAL_TCL2_RING_BASE_LSB (ab) -HAL_TCL1_RING_BASE_LSB (ab); s->reg_size[1 ] =HAL_TCL2_RING_HP -HAL_TCL1_RING_HP ; s = &hal->srng_config[HAL_TCL_CMD ]; - s->reg_start[0 ] =HAL_SEQ_WCSS_UMAC_TCL_REG +HAL_TCL_RING_BASE_LSB ; + s->reg_start[0 ] =HAL_SEQ_WCSS_UMAC_TCL_REG +HAL_TCL_RING_BASE_LSB (ab); s->reg_start[1 ] =HAL_SEQ_WCSS_UMAC_TCL_REG +HAL_TCL_RING_HP ; s = &hal->srng_config[HAL_TCL_STATUS ]; - s->reg_start[0 ] =HAL_SEQ_WCSS_UMAC_TCL_REG +HAL_TCL_STATUS_RING_BASE_LSB ; + s->reg_start[0 ] =HAL_SEQ_WCSS_UMAC_TCL_REG +HAL_TCL_STATUS_RING_BASE_LSB (ab); s->reg_start[1 ] =HAL_SEQ_WCSS_UMAC_TCL_REG +HAL_TCL_STATUS_RING_HP ;return 0 ;
drivers/net/wireless/ath/ath11k/hal.h +96 -75
202 lines not on this page · raw message
drivers/net/wireless/ath/ath11k/hal_rx.c +4 -4
@@ -813,13 +813,13 @@ void ath11k_hal_reo_hw_setup(struct ath11k_base *ab, u32 ring_hash_map)FIELD_PREP (HAL_REO1_GEN_ENABLE_AGING_FLUSH_ENABLE ,1 );ath11k_hif_write32 (ab, reo_base +HAL_REO1_GEN_ENABLE , val); -ath11k_hif_write32 (ab, reo_base +HAL_REO1_AGING_THRESH_IX_0 , +ath11k_hif_write32 (ab, reo_base +HAL_REO1_AGING_THRESH_IX_0 (ab),HAL_DEFAULT_REO_TIMEOUT_USEC ); -ath11k_hif_write32 (ab, reo_base +HAL_REO1_AGING_THRESH_IX_1 , +ath11k_hif_write32 (ab, reo_base +HAL_REO1_AGING_THRESH_IX_1 (ab),HAL_DEFAULT_REO_TIMEOUT_USEC ); -ath11k_hif_write32 (ab, reo_base +HAL_REO1_AGING_THRESH_IX_2 , +ath11k_hif_write32 (ab, reo_base +HAL_REO1_AGING_THRESH_IX_2 (ab),HAL_DEFAULT_REO_TIMEOUT_USEC ); -ath11k_hif_write32 (ab, reo_base +HAL_REO1_AGING_THRESH_IX_3 , +ath11k_hif_write32 (ab, reo_base +HAL_REO1_AGING_THRESH_IX_3 (ab),HAL_DEFAULT_REO_TIMEOUT_USEC ); ath11k_hif_write32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_0,
Signature · 7 lines
2.7.4 -- ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH v2 3/12 ath11k: ce: support different CE configurations
In reply to Kalle ValoFrom: Carl Huang <[email protected]>
QCA6390 uses only 9 Copy Engines while IPQ8074 may use 12, make it possible to change CE configuration dynamically via hw_params.
The defines for host_ce_config_wlan and CE_COUNT are temporary solutions, they will be removed in the following patches to keep things simple.
Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.1.0.1-01238-QCAHKSWPL_SILICONZ-2
--- drivers/net/wireless/ath/ath11k/ahb.c | 12 ++--- drivers/net/wireless/ath/ath11k/ce.c | 84 +++++++++++++++++++++++++++++++++- drivers/net/wireless/ath/ath11k/ce.h | 11 +++-- drivers/net/wireless/ath/ath11k/core.c | 4 ++ drivers/net/wireless/ath/ath11k/hal.c | 2 +- drivers/net/wireless/ath/ath11k/hw.c | 1 + drivers/net/wireless/ath/ath11k/hw.h | 2 + drivers/net/wireless/ath/ath11k/pci.c | 12 ++--- 8 files changed, 110 insertions(+), 18 deletions(-)
drivers/net/wireless/ath/ath11k/ahb.c +6 -6
@@ -387,7 +387,7 @@ static void ath11k_ahb_kill_tasklets(struct ath11k_base *ab)for (i =0 ; i <CE_COUNT ; i++) {struct ath11k_ce_pipe *ce_pipe = &ab->ce.ce_pipe[i]; -if (ath11k_ce_get_attr_flags (i) &CE_ATTR_DIS_INTR ) +if (ath11k_ce_get_attr_flags (ab, i) &CE_ATTR_DIS_INTR )continue ;tasklet_kill (&ce_pipe->intr_tq);
@@ -476,7 +476,7 @@ static void ath11k_ahb_sync_ce_irqs(struct ath11k_base *ab)int irq_idx;for (i =0 ; i <CE_COUNT ; i++) { -if (ath11k_ce_get_attr_flags (i) &CE_ATTR_DIS_INTR ) +if (ath11k_ce_get_attr_flags (ab, i) &CE_ATTR_DIS_INTR )continue ; irq_idx =ATH11K_IRQ_CE0_OFFSET + i;
@@ -504,7 +504,7 @@ static void ath11k_ahb_ce_irqs_enable(struct ath11k_base *ab)int i;for (i =0 ; i <CE_COUNT ; i++) { -if (ath11k_ce_get_attr_flags (i) &CE_ATTR_DIS_INTR ) +if (ath11k_ce_get_attr_flags (ab, i) &CE_ATTR_DIS_INTR )continue ;ath11k_ahb_ce_irq_enable (ab, i); }
@@ -515,7 +515,7 @@ static void ath11k_ahb_ce_irqs_disable(struct ath11k_base *ab)int i;for (i =0 ; i <CE_COUNT ; i++) { -if (ath11k_ce_get_attr_flags (i) &CE_ATTR_DIS_INTR ) +if (ath11k_ce_get_attr_flags (ab, i) &CE_ATTR_DIS_INTR )continue ;ath11k_ahb_ce_irq_disable (ab, i); }
@@ -602,7 +602,7 @@ static void ath11k_ahb_free_irq(struct ath11k_base *ab)int i;for (i =0 ; i <CE_COUNT ; i++) { -if (ath11k_ce_get_attr_flags (i) &CE_ATTR_DIS_INTR ) +if (ath11k_ce_get_attr_flags (ab, i) &CE_ATTR_DIS_INTR )continue ; irq_idx =ATH11K_IRQ_CE0_OFFSET + i;free_irq (ab->irq_num[irq_idx], &ab->ce.ce_pipe[i]);
@@ -759,7 +759,7 @@ static int ath11k_ahb_config_irq(struct ath11k_base *ab)for (i =0 ; i <CE_COUNT ; i++) {struct ath11k_ce_pipe *ce_pipe = &ab->ce.ce_pipe[i]; -if (ath11k_ce_get_attr_flags (i) &CE_ATTR_DIS_INTR ) +if (ath11k_ce_get_attr_flags (ab, i) &CE_ATTR_DIS_INTR )continue ; irq_idx =ATH11K_IRQ_CE0_OFFSET + i;
drivers/net/wireless/ath/ath11k/ce.c +82 -2
102 lines not on this page · raw message
drivers/net/wireless/ath/ath11k/ce.h +8 -3
@@ -6,7 +6,8 @@#ifndef ATH11K_CE_H #define ATH11K_CE_H -#define CE_COUNT 12 +#define CE_COUNT (ab->hw_params.ce_count) +#define CE_COUNT_MAX 12/* Byte swap data words */ #define CE_ATTR_BYTE_SWAP_DATA 2
@@ -165,11 +166,14 @@ struct ath11k_ce_pipe { };struct ath11k_ce { -struct ath11k_ce_pipe ce_pipe[CE_COUNT ]; +struct ath11k_ce_pipe ce_pipe[CE_COUNT_MAX ];/* Protects rings of all ce pipes */ spinlock_t ce_lock; }; +extern const struct ce_attr ath11k_host_ce_config_ipq8074[]; +extern const struct ce_attr ath11k_host_ce_config_qca6390[]; +void ath11k_ce_cleanup_pipes (struct ath11k_base *ab);void ath11k_ce_rx_replenish_retry (struct timer_list *t);void ath11k_ce_per_engine_service (struct ath11k_base *ab,u16 ce_id);
@@ -179,8 +183,9 @@ void ath11k_ce_rx_post_buf(struct ath11k_base *ab);int ath11k_ce_init_pipes (struct ath11k_base *ab);int ath11k_ce_alloc_pipes (struct ath11k_base *ab);void ath11k_ce_free_pipes (struct ath11k_base *ab); -int ath11k_ce_get_attr_flags (int ce_id); +int ath11k_ce_get_attr_flags (struct ath11k_base *ab,int ce_id);void ath11k_ce_poll_send_completed (struct ath11k_base *ab,u8 pipe_id);int ath11k_ce_map_service_to_pipe (struct ath11k_base *ab,u16 service_id,u8 *ul_pipe,u8 *dl_pipe); +int ath11k_ce_attr_attach (struct ath11k_base *ab);#endif
drivers/net/wireless/ath/ath11k/core.c +4 -0
@@ -33,6 +33,8 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { .ring_mask = &ath11k_hw_ring_mask_ipq8074, .internal_sleep_clock = false, .regs = &ipq8074_regs, + .host_ce_config = ath11k_host_ce_config_ipq8074, + .ce_count = 12, }, { .name = "qca6390 hw2.0",
@@ -48,6 +50,8 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { .ring_mask = &ath11k_hw_ring_mask_ipq8074, .internal_sleep_clock = true, .regs = &qca6390_regs, + .host_ce_config = ath11k_host_ce_config_qca6390, + .ce_count = 9, }, };
drivers/net/wireless/ath/ath11k/hal.c +1 -1
@@ -1160,7 +1160,7 @@ void ath11k_hal_dump_srng_stats(struct ath11k_base *ab)for (i =0 ; i <CE_COUNT ; i++) { ce_pipe = &ab->ce.ce_pipe[i]; -if (ath11k_ce_get_attr_flags (i) &CE_ATTR_DIS_INTR ) +if (ath11k_ce_get_attr_flags (ab, i) &CE_ATTR_DIS_INTR )continue ; ath11k_err(ab, "CE_id %d pipe_num %d %ums before\n",
drivers/net/wireless/ath/ath11k/hw.c +1 -0
@@ -9,6 +9,7 @@#include "hw.h" #include "core.h" +#include "ce.h" /* Map from pdev index to hw mac index */ static u8 ath11k_hw_ipq8074_mac_from_pdev_id (int pdev_idx)
drivers/net/wireless/ath/ath11k/hw.h +2 -0
@@ -137,6 +137,8 @@ struct ath11k_hw_params {bool internal_sleep_clock;const struct ath11k_hw_regs *regs; +const struct ce_attr *host_ce_config; +u32 ce_count; };extern const struct ath11k_hw_ops ipq8074_ops;
drivers/net/wireless/ath/ath11k/pci.c +6 -6
@@ -394,7 +394,7 @@ static void ath11k_pci_free_irq(struct ath11k_base *ab)int i, irq_idx;for (i =0 ; i <CE_COUNT ; i++) { -if (ath11k_ce_get_attr_flags (i) &CE_ATTR_DIS_INTR ) +if (ath11k_ce_get_attr_flags (ab, i) &CE_ATTR_DIS_INTR )continue ; irq_idx =ATH11K_PCI_IRQ_CE0_OFFSET + i;free_irq (ab->irq_num[irq_idx], &ab->ce.ce_pipe[i]);
@@ -422,7 +422,7 @@ static void ath11k_pci_ce_irqs_disable(struct ath11k_base *ab)int i;for (i =0 ; i <CE_COUNT ; i++) { -if (ath11k_ce_get_attr_flags (i) &CE_ATTR_DIS_INTR ) +if (ath11k_ce_get_attr_flags (ab, i) &CE_ATTR_DIS_INTR )continue ;ath11k_pci_ce_irq_disable (ab, i); }
@@ -434,7 +434,7 @@ static void ath11k_pci_sync_ce_irqs(struct ath11k_base *ab)int irq_idx;for (i =0 ; i <CE_COUNT ; i++) { -if (ath11k_ce_get_attr_flags (i) &CE_ATTR_DIS_INTR ) +if (ath11k_ce_get_attr_flags (ab, i) &CE_ATTR_DIS_INTR )continue ; irq_idx =ATH11K_PCI_IRQ_CE0_OFFSET + i;
@@ -482,7 +482,7 @@ static int ath11k_pci_config_irq(struct ath11k_base *ab) irq =ath11k_pci_get_msi_irq (ab->dev, msi_data); ce_pipe = &ab->ce.ce_pipe[i]; -if (ath11k_ce_get_attr_flags (i) &CE_ATTR_DIS_INTR ) +if (ath11k_ce_get_attr_flags (ab, i) &CE_ATTR_DIS_INTR )continue ; irq_idx =ATH11K_PCI_IRQ_CE0_OFFSET + i;
@@ -522,7 +522,7 @@ static void ath11k_pci_ce_irqs_enable(struct ath11k_base *ab)int i;for (i =0 ; i <CE_COUNT ; i++) { -if (ath11k_ce_get_attr_flags (i) &CE_ATTR_DIS_INTR ) +if (ath11k_ce_get_attr_flags (ab, i) &CE_ATTR_DIS_INTR )continue ;ath11k_pci_ce_irq_enable (ab, i); }
@@ -683,7 +683,7 @@ static void ath11k_pci_kill_tasklets(struct ath11k_base *ab)for (i =0 ; i <CE_COUNT ; i++) {struct ath11k_ce_pipe *ce_pipe = &ab->ce.ce_pipe[i]; -if (ath11k_ce_get_attr_flags (i) &CE_ATTR_DIS_INTR ) +if (ath11k_ce_get_attr_flags (ab, i) &CE_ATTR_DIS_INTR )continue ;tasklet_kill (&ce_pipe->intr_tq);
Signature · 7 lines
2.7.4 -- ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH v2 4/12 ath11k: ce: remove host_ce_config_wlan macro
In reply to Kalle ValoThis macro is evil as it's accesses ab variable in a hidden way. It's better for readibility to access ab->hw_params.host_ce_config directly.
This is done in a separate patch to keep the patches simple. No functional changes.
Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.1.0.1-01238-QCAHKSWPL_SILICONZ-2
--- drivers/net/wireless/ath/ath11k/ce.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)
drivers/net/wireless/ath/ath11k/ce.c +8 -10
@@ -7,8 +7,6 @@#include "debug.h" #include "hif.h" -#define host_ce_config_wlan ab->hw_params.host_ce_config -const struct ce_attr ath11k_host_ce_config_ipq8074[] = {/* CE0: host->target HTC control and raw streams */ {
@@ -471,19 +469,19 @@ static int ath11k_ce_init_ring(struct ath11k_base *ab,switch (type) {case HAL_CE_SRC : -if (!(CE_ATTR_DIS_INTR & host_ce_config_wlan[ce_id].flags)) +if (!(CE_ATTR_DIS_INTR & ab->hw_params.host_ce_config[ce_id].flags)) params.intr_batch_cntr_thres_entries =1 ;break ;case HAL_CE_DST : - params.max_buffer_len = host_ce_config_wlan[ce_id].src_sz_max; -if (!(host_ce_config_wlan[ce_id].flags &CE_ATTR_DIS_INTR )) { + params.max_buffer_len = ab->hw_params.host_ce_config[ce_id].src_sz_max; +if (!(ab->hw_params.host_ce_config[ce_id].flags &CE_ATTR_DIS_INTR )) { params.intr_timer_thres_us =1024 ; params.flags |=HAL_SRNG_FLAGS_LOW_THRESH_INTR_EN ; params.low_threshold = ce_ring->nentries -3 ; }break ;case HAL_CE_DST_STATUS : -if (!(host_ce_config_wlan[ce_id].flags &CE_ATTR_DIS_INTR )) { +if (!(ab->hw_params.host_ce_config[ce_id].flags &CE_ATTR_DIS_INTR )) { params.intr_batch_cntr_thres_entries =1 ; params.intr_timer_thres_us =0x1000 ; }
@@ -502,7 +500,7 @@ static int ath11k_ce_init_ring(struct ath11k_base *ab,return ret; } -if (!(CE_ATTR_DIS_INTR & host_ce_config_wlan[ce_id].flags)) +if (!(CE_ATTR_DIS_INTR & ab->hw_params.host_ce_config[ce_id].flags))ath11k_ce_srng_msi_ring_params_setup (ab, ce_id, ¶ms); ce_ring->hal_ring_id = ret;
@@ -550,7 +548,7 @@ ath11k_ce_alloc_ring(struct ath11k_base *ab, int nentries, int desc_sz)static int ath11k_ce_alloc_pipe (struct ath11k_base *ab,int ce_id) {struct ath11k_ce_pipe *pipe = &ab->ce.ce_pipe[ce_id]; -const struct ce_attr *attr = &host_ce_config_wlan[ce_id]; +const struct ce_attr *attr = &ab->hw_params.host_ce_config[ce_id];struct ath11k_ce_ring *ring;int nentries;int desc_sz;
@@ -877,7 +875,7 @@ int ath11k_ce_alloc_pipes(struct ath11k_base *ab)spin_lock_init (&ab->ce.ce_lock);for (i =0 ; i <CE_COUNT ; i++) { - attr = &host_ce_config_wlan[i]; + attr = &ab->hw_params.host_ce_config[i]; pipe = &ab->ce.ce_pipe[i]; pipe->pipe_num = i; pipe->ab = ab;
@@ -919,6 +917,6 @@ int ath11k_ce_get_attr_flags(struct ath11k_base *ab, int ce_id)if (ce_id >=CE_COUNT )return -EINVAL ; -return host_ce_config_wlan[ce_id].flags; +return ab->hw_params.host_ce_config[ce_id].flags; }EXPORT_SYMBOL (ath11k_ce_get_attr_flags);
Signature · 7 lines
2.7.4 -- ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH v2 5/12 ath11k: ce: remove CE_COUNT() macro
In reply to Kalle ValoThis macro is evil as it's accesses ab variable in a hidden way. It's better for readibility to access ab->hw_params.ce_count directly.
This is done in a separate patch to keep the patches simple. No functional changes.
Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.1.0.1-01238-QCAHKSWPL_SILICONZ-2
--- drivers/net/wireless/ath/ath11k/ahb.c | 12 ++++++------ drivers/net/wireless/ath/ath11k/ce.c | 12 ++++++------ drivers/net/wireless/ath/ath11k/ce.h | 1 - drivers/net/wireless/ath/ath11k/hal.c | 2 +- drivers/net/wireless/ath/ath11k/htc.c | 2 +- drivers/net/wireless/ath/ath11k/pci.c | 12 ++++++------ 6 files changed, 20 insertions(+), 21 deletions(-)
drivers/net/wireless/ath/ath11k/ahb.c +6 -6
@@ -384,7 +384,7 @@ static void ath11k_ahb_kill_tasklets(struct ath11k_base *ab) {int i; -for (i =0 ; i <CE_COUNT ; i++) { +for (i =0 ; i < ab->hw_params.ce_count; i++) {struct ath11k_ce_pipe *ce_pipe = &ab->ce.ce_pipe[i];if (ath11k_ce_get_attr_flags (ab, i) &CE_ATTR_DIS_INTR )
@@ -475,7 +475,7 @@ static void ath11k_ahb_sync_ce_irqs(struct ath11k_base *ab)int i;int irq_idx; -for (i =0 ; i <CE_COUNT ; i++) { +for (i =0 ; i < ab->hw_params.ce_count; i++) {if (ath11k_ce_get_attr_flags (ab, i) &CE_ATTR_DIS_INTR )continue ;
@@ -503,7 +503,7 @@ static void ath11k_ahb_ce_irqs_enable(struct ath11k_base *ab) {int i; -for (i =0 ; i <CE_COUNT ; i++) { +for (i =0 ; i < ab->hw_params.ce_count; i++) {if (ath11k_ce_get_attr_flags (ab, i) &CE_ATTR_DIS_INTR )continue ;ath11k_ahb_ce_irq_enable (ab, i);
@@ -514,7 +514,7 @@ static void ath11k_ahb_ce_irqs_disable(struct ath11k_base *ab) {int i; -for (i =0 ; i <CE_COUNT ; i++) { +for (i =0 ; i < ab->hw_params.ce_count; i++) {if (ath11k_ce_get_attr_flags (ab, i) &CE_ATTR_DIS_INTR )continue ;ath11k_ahb_ce_irq_disable (ab, i);
@@ -601,7 +601,7 @@ static void ath11k_ahb_free_irq(struct ath11k_base *ab)int irq_idx;int i; -for (i =0 ; i <CE_COUNT ; i++) { +for (i =0 ; i < ab->hw_params.ce_count; i++) {if (ath11k_ce_get_attr_flags (ab, i) &CE_ATTR_DIS_INTR )continue ; irq_idx =ATH11K_IRQ_CE0_OFFSET + i;
@@ -756,7 +756,7 @@ static int ath11k_ahb_config_irq(struct ath11k_base *ab)int ret;/* Configure CE irqs */ -for (i =0 ; i <CE_COUNT ; i++) { +for (i =0 ; i < ab->hw_params.ce_count; i++) {struct ath11k_ce_pipe *ce_pipe = &ab->ce.ce_pipe[i];if (ath11k_ce_get_attr_flags (ab, i) &CE_ATTR_DIS_INTR )
drivers/net/wireless/ath/ath11k/ce.c +6 -6
@@ -718,7 +718,7 @@ void ath11k_ce_cleanup_pipes(struct ath11k_base *ab)struct ath11k_ce_pipe *pipe;int pipe_num; -for (pipe_num =0 ; pipe_num <CE_COUNT ; pipe_num++) { +for (pipe_num =0 ; pipe_num < ab->hw_params.ce_count; pipe_num++) { pipe = &ab->ce.ce_pipe[pipe_num];ath11k_ce_rx_pipe_cleanup (pipe);
@@ -736,7 +736,7 @@ void ath11k_ce_rx_post_buf(struct ath11k_base *ab)int i;int ret; -for (i =0 ; i <CE_COUNT ; i++) { +for (i =0 ; i < ab->hw_params.ce_count; i++) { pipe = &ab->ce.ce_pipe[i]; ret =ath11k_ce_rx_post_pipe (pipe);if (ret) {
@@ -767,7 +767,7 @@ int ath11k_ce_init_pipes(struct ath11k_base *ab)int i;int ret; -for (i =0 ; i <CE_COUNT ; i++) { +for (i =0 ; i < ab->hw_params.ce_count; i++) { pipe = &ab->ce.ce_pipe[i];if (pipe->src_ring) {
@@ -825,7 +825,7 @@ void ath11k_ce_free_pipes(struct ath11k_base *ab)int desc_sz;int i; -for (i =0 ; i <CE_COUNT ; i++) { +for (i =0 ; i < ab->hw_params.ce_count; i++) { pipe = &ab->ce.ce_pipe[i];if (pipe->src_ring) {
@@ -874,7 +874,7 @@ int ath11k_ce_alloc_pipes(struct ath11k_base *ab)spin_lock_init (&ab->ce.ce_lock); -for (i =0 ; i <CE_COUNT ; i++) { +for (i =0 ; i < ab->hw_params.ce_count; i++) { attr = &ab->hw_params.host_ce_config[i]; pipe = &ab->ce.ce_pipe[i]; pipe->pipe_num = i;
@@ -914,7 +914,7 @@ void ath11k_ce_byte_swap(void *mem, u32 len)int ath11k_ce_get_attr_flags (struct ath11k_base *ab,int ce_id) { -if (ce_id >=CE_COUNT ) +if (ce_id >= ab->hw_params.ce_count)return -EINVAL ;return ab->hw_params.host_ce_config[ce_id].flags;
drivers/net/wireless/ath/ath11k/ce.h +0 -1
@@ -6,7 +6,6 @@#ifndef ATH11K_CE_H #define ATH11K_CE_H -#define CE_COUNT (ab->hw_params.ce_count)#define CE_COUNT_MAX 12/* Byte swap data words */
drivers/net/wireless/ath/ath11k/hal.c +1 -1
@@ -1157,7 +1157,7 @@ void ath11k_hal_dump_srng_stats(struct ath11k_base *ab)int i;ath11k_err (ab,"Last interrupt received for each CE:\n" ); -for (i =0 ; i <CE_COUNT ; i++) { +for (i =0 ; i < ab->hw_params.ce_count; i++) { ce_pipe = &ab->ce.ce_pipe[i];if (ath11k_ce_get_attr_flags (ab, i) &CE_ATTR_DIS_INTR )
drivers/net/wireless/ath/ath11k/htc.c +1 -1
@@ -478,7 +478,7 @@ int ath11k_htc_wait_target(struct ath11k_htc *htc)if (!time_left) {ath11k_warn (ab,"failed to receive control response completion, polling..\n" ); -for (i =0 ; i <CE_COUNT ; i++) +for (i =0 ; i < ab->hw_params.ce_count; i++)ath11k_ce_per_engine_service (htc->ab, i); time_left =
drivers/net/wireless/ath/ath11k/pci.c +6 -6
@@ -393,7 +393,7 @@ static void ath11k_pci_free_irq(struct ath11k_base *ab) {int i, irq_idx; -for (i =0 ; i <CE_COUNT ; i++) { +for (i =0 ; i < ab->hw_params.ce_count; i++) {if (ath11k_ce_get_attr_flags (ab, i) &CE_ATTR_DIS_INTR )continue ; irq_idx =ATH11K_PCI_IRQ_CE0_OFFSET + i;
@@ -421,7 +421,7 @@ static void ath11k_pci_ce_irqs_disable(struct ath11k_base *ab) {int i; -for (i =0 ; i <CE_COUNT ; i++) { +for (i =0 ; i < ab->hw_params.ce_count; i++) {if (ath11k_ce_get_attr_flags (ab, i) &CE_ATTR_DIS_INTR )continue ;ath11k_pci_ce_irq_disable (ab, i);
@@ -433,7 +433,7 @@ static void ath11k_pci_sync_ce_irqs(struct ath11k_base *ab)int i;int irq_idx; -for (i =0 ; i <CE_COUNT ; i++) { +for (i =0 ; i < ab->hw_params.ce_count; i++) {if (ath11k_ce_get_attr_flags (ab, i) &CE_ATTR_DIS_INTR )continue ;
@@ -477,7 +477,7 @@ static int ath11k_pci_config_irq(struct ath11k_base *ab)return ret;/* Configure CE irqs */ -for (i =0 ; i <CE_COUNT ; i++) { +for (i =0 ; i < ab->hw_params.ce_count; i++) { msi_data = (i % msi_data_count) + msi_irq_start; irq =ath11k_pci_get_msi_irq (ab->dev, msi_data); ce_pipe = &ab->ce.ce_pipe[i];
@@ -521,7 +521,7 @@ static void ath11k_pci_ce_irqs_enable(struct ath11k_base *ab) {int i; -for (i =0 ; i <CE_COUNT ; i++) { +for (i =0 ; i < ab->hw_params.ce_count; i++) {if (ath11k_ce_get_attr_flags (ab, i) &CE_ATTR_DIS_INTR )continue ;ath11k_pci_ce_irq_enable (ab, i);
@@ -680,7 +680,7 @@ static void ath11k_pci_kill_tasklets(struct ath11k_base *ab) {int i; -for (i =0 ; i <CE_COUNT ; i++) { +for (i =0 ; i < ab->hw_params.ce_count; i++) {struct ath11k_ce_pipe *ce_pipe = &ab->ce.ce_pipe[i];if (ath11k_ce_get_attr_flags (ab, i) &CE_ATTR_DIS_INTR )
Signature · 7 lines
2.7.4 -- ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH v2 6/12 ath11k: hal: assign msi_addr and msi_data to srng
In reply to Kalle ValoFrom: Carl Huang <[email protected]>
QCA6390 uses MSI interrupt so it needs msi_addr and msi_data to generate interrupt.
Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.1.0.1-01238-QCAHKSWPL_SILICONZ-2
--- drivers/net/wireless/ath/ath11k/hal.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/ath/ath11k/hal.c +2 -0
@@ -985,6 +985,8 @@ int ath11k_hal_srng_setup(struct ath11k_base *ab, enum hal_ring_type type, params->intr_batch_cntr_thres_entries; srng->intr_timer_thres_us = params->intr_timer_thres_us; srng->flags = params->flags; + srng->msi_addr = params->msi_addr; + srng->msi_data = params->msi_data; srng->initialized =1 ;spin_lock_init (&srng->lock);
Signature · 7 lines
2.7.4 -- ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH v2 7/12 ath11k: ce: get msi_addr and msi_data before srng setup
In reply to Kalle ValoFrom: Carl Huang <[email protected]>
Move function to get msi_addr and msi_data before srng setup, otherwise srng is setup with no MSI configuration.
Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.1.0.1-01238-QCAHKSWPL_SILICONZ-2
--- drivers/net/wireless/ath/ath11k/ce.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath11k/ce.c +3 -3
@@ -467,6 +467,9 @@ static int ath11k_ce_init_ring(struct ath11k_base *ab, params.ring_base_vaddr = ce_ring->base_addr_owner_space; params.num_entries = ce_ring->nentries; +if (!(CE_ATTR_DIS_INTR & ab->hw_params.host_ce_config[ce_id].flags)) +ath11k_ce_srng_msi_ring_params_setup (ab, ce_id, ¶ms); +switch (type) {case HAL_CE_SRC :if (!(CE_ATTR_DIS_INTR & ab->hw_params.host_ce_config[ce_id].flags))
@@ -500,9 +503,6 @@ static int ath11k_ce_init_ring(struct ath11k_base *ab,return ret; } -if (!(CE_ATTR_DIS_INTR & ab->hw_params.host_ce_config[ce_id].flags)) -ath11k_ce_srng_msi_ring_params_setup (ab, ce_id, ¶ms); - ce_ring->hal_ring_id = ret;return 0 ;
Signature · 7 lines
2.7.4 -- ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH v2 8/12 ath11k: disable CE interrupt before hif start
In reply to Kalle ValoFrom: Carl Huang <[email protected]>
Disable CE interrupt otherwise interrupt may come before host initialized related context. This also fixes unbalanced interrupt enablement.
Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.1.0.1-01238-QCAHKSWPL_SILICONZ-2
--- drivers/net/wireless/ath/ath11k/pci.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/ath/ath11k/pci.c +1 -0
@@ -500,6 +500,7 @@ static int ath11k_pci_config_irq(struct ath11k_base *ab) } ab->irq_num[irq_idx] = irq; +ath11k_pci_ce_irq_disable (ab, i); }return 0 ;
Signature · 7 lines
2.7.4 -- ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH v2 9/12 ath11k: force single pdev only for QCA6390
In reply to Kalle ValoFrom: Carl Huang <[email protected]>
For QCA6390, only one pdev is created and only one HW is registered to mac80211. This one pdev manages both 2G radio and 5G radio.
Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.1.0.1-01238-QCAHKSWPL_SILICONZ-2
--- drivers/net/wireless/ath/ath11k/core.c | 2 + drivers/net/wireless/ath/ath11k/core.h | 1 + drivers/net/wireless/ath/ath11k/hw.h | 2 + drivers/net/wireless/ath/ath11k/mac.c | 33 +++++++++++++ drivers/net/wireless/ath/ath11k/wmi.c | 86 ++++++++++++++++++++++++---------- 5 files changed, 98 insertions(+), 26 deletions(-)
drivers/net/wireless/ath/ath11k/core.c +2 -0
@@ -35,6 +35,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { .regs = &ipq8074_regs, .host_ce_config = ath11k_host_ce_config_ipq8074, .ce_count = 12, + .single_pdev_only = false, }, { .name = "qca6390 hw2.0",
@@ -52,6 +53,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { .regs = &qca6390_regs, .host_ce_config = ath11k_host_ce_config_qca6390, .ce_count = 9, + .single_pdev_only = true, }, };
drivers/net/wireless/ath/ath11k/core.h +1 -0
@@ -545,6 +545,7 @@ struct ath11k { };struct ath11k_band_cap { +u32 phy_id;u32 max_bw_supported;u32 ht_cap_info;u32 he_cap_info[2 ];
drivers/net/wireless/ath/ath11k/hw.h +2 -0
@@ -139,6 +139,8 @@ struct ath11k_hw_params {const struct ath11k_hw_regs *regs;const struct ce_attr *host_ce_config;u32 ce_count; + +bool single_pdev_only; };extern const struct ath11k_hw_ops ipq8074_ops;
drivers/net/wireless/ath/ath11k/mac.c +33 -0
@@ -521,6 +521,11 @@ struct ath11k *ath11k_mac_get_ar_by_pdev_id(struct ath11k_base *ab, u32 pdev_id)int i;struct ath11k_pdev *pdev; +if (ab->hw_params.single_pdev_only) { + pdev =rcu_dereference (ab->pdevs_active[0 ]); +return pdev ? pdev->ar :NULL ; + } +if (WARN_ON (pdev_id > ab->num_radios))return NULL ;
@@ -5821,12 +5826,29 @@ static void ath11k_mac_update_ch_list(struct ath11k *ar, } } +static u32 ath11k_get_phy_id (struct ath11k *ar,u32 band) +{ +struct ath11k_pdev *pdev = ar->pdev; +struct ath11k_pdev_cap *pdev_cap = &pdev->cap; + +if (band ==WMI_HOST_WLAN_2G_CAP ) +return pdev_cap->band[NL80211_BAND_2GHZ ].phy_id; + +if (band ==WMI_HOST_WLAN_5G_CAP ) +return pdev_cap->band[NL80211_BAND_5GHZ ].phy_id; + +ath11k_warn (ar->ab,"unsupported phy cap:%d\n" , band); + +return 0 ; +} +static int ath11k_mac_setup_channels_rates (struct ath11k *ar,u32 supported_bands) {struct ieee80211_supported_band *band;struct ath11k_hal_reg_capabilities_ext *reg_cap;void *channels; +u32 phy_id; BUILD_BUG_ON((ARRAY_SIZE(ath11k_2ghz_channels) + ARRAY_SIZE(ath11k_5ghz_channels) +
@@ -5849,6 +5871,11 @@ static int ath11k_mac_setup_channels_rates(struct ath11k *ar, band->n_bitrates = ath11k_g_rates_size; band->bitrates = ath11k_g_rates; ar->hw->wiphy->bands[NL80211_BAND_2GHZ ] = band; + +if (ar->ab->hw_params.single_pdev_only) { + phy_id =ath11k_get_phy_id (ar,WMI_HOST_WLAN_2G_CAP ); + reg_cap = &ar->ab->hal_reg_cap[phy_id]; + }ath11k_mac_update_ch_list (ar, band, reg_cap->low_2ghz_chan, reg_cap->high_2ghz_chan);
@@ -5893,6 +5920,12 @@ static int ath11k_mac_setup_channels_rates(struct ath11k *ar, band->n_bitrates = ath11k_a_rates_size; band->bitrates = ath11k_a_rates; ar->hw->wiphy->bands[NL80211_BAND_5GHZ ] = band; + +if (ar->ab->hw_params.single_pdev_only) { + phy_id =ath11k_get_phy_id (ar,WMI_HOST_WLAN_5G_CAP ); + reg_cap = &ar->ab->hal_reg_cap[phy_id]; + } +ath11k_mac_update_ch_list (ar, band, reg_cap->low_5ghz_chan, reg_cap->high_5ghz_chan);
drivers/net/wireless/ath/ath11k/wmi.c +60 -26
143 lines not on this page · raw message
Signature · 7 lines
2.7.4 -- ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH v2 10/12 ath11k: initialize wmi config based on hw_params
In reply to Kalle ValoFrom: Carl Huang <[email protected]>
QCA6390 has very different wmi config parameters compared to IPQ8074, so use different function to initialize wmi init config parameters.
Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.1.0.1-01238-QCAHKSWPL_SILICONZ-2
--- drivers/net/wireless/ath/ath11k/hw.c | 98 +++++++++++++++++++++++++++++++++++ drivers/net/wireless/ath/ath11k/hw.h | 4 ++ drivers/net/wireless/ath/ath11k/wmi.c | 4 +- 3 files changed, 105 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath11k/hw.c +98 -0
@@ -31,12 +31,110 @@ static u8 ath11k_hw_ipq6018_mac_from_pdev_id(int pdev_idx)return pdev_idx; } +static void ath11k_init_wmi_config_qca6390 (struct ath11k_base *ab, +struct target_resource_config *config) +{ + config->num_vdevs =4 ; + config->num_peers =16 ; + config->num_tids =32 ; + + config->num_offload_peers =3 ; + config->num_offload_reorder_buffs =3 ; + config->num_peer_keys =TARGET_NUM_PEER_KEYS ; + config->ast_skid_limit =TARGET_AST_SKID_LIMIT ; + config->tx_chain_mask = (1 << ab->target_caps.num_rf_chains) -1 ; + config->rx_chain_mask = (1 << ab->target_caps.num_rf_chains) -1 ; + config->rx_timeout_pri[0 ] =TARGET_RX_TIMEOUT_LO_PRI ; + config->rx_timeout_pri[1 ] =TARGET_RX_TIMEOUT_LO_PRI ; + config->rx_timeout_pri[2 ] =TARGET_RX_TIMEOUT_LO_PRI ; + config->rx_timeout_pri[3 ] =TARGET_RX_TIMEOUT_HI_PRI ; + config->rx_decap_mode =TARGET_DECAP_MODE_NATIVE_WIFI ; + config->scan_max_pending_req =TARGET_SCAN_MAX_PENDING_REQS ; + config->bmiss_offload_max_vdev =TARGET_BMISS_OFFLOAD_MAX_VDEV ; + config->roam_offload_max_vdev =TARGET_ROAM_OFFLOAD_MAX_VDEV ; + config->roam_offload_max_ap_profiles =TARGET_ROAM_OFFLOAD_MAX_AP_PROFILES ; + config->num_mcast_groups =0 ; + config->num_mcast_table_elems =0 ; + config->mcast2ucast_mode =0 ; + config->tx_dbg_log_size =TARGET_TX_DBG_LOG_SIZE ; + config->num_wds_entries =0 ; + config->dma_burst_size =0 ; + config->rx_skip_defrag_timeout_dup_detection_check =0 ; + config->vow_config =TARGET_VOW_CONFIG ; + config->gtk_offload_max_vdev =2 ; + config->num_msdu_desc =0x400 ; + config->beacon_tx_offload_max_vdev =2 ; + config->rx_batchmode =TARGET_RX_BATCHMODE ; + + config->peer_map_unmap_v2_support =0 ; + config->use_pdev_id =1 ; + config->max_frag_entries =0xa ; + config->num_tdls_vdevs =0x1 ; + config->num_tdls_conn_table_entries =8 ; + config->beacon_tx_offload_max_vdev =0x2 ; + config->num_multicast_filter_entries =0x20 ; + config->num_wow_filters =0x16 ; + config->num_keep_alive_pattern =0x1 ; + config->num_keep_alive_pattern =0 ; +} + +static void ath11k_init_wmi_config_ipq8074 (struct ath11k_base *ab, +struct target_resource_config *config) +{ + config->num_vdevs = ab->num_radios *TARGET_NUM_VDEVS ; + +if (ab->num_radios ==2 ) { + config->num_peers =TARGET_NUM_PEERS (DBS ); + config->num_tids =TARGET_NUM_TIDS (DBS ); + }else if (ab->num_radios ==3 ) { + config->num_peers =TARGET_NUM_PEERS (DBS_SBS ); + config->num_tids =TARGET_NUM_TIDS (DBS_SBS ); + }else { +/* Control should not reach here */ + config->num_peers =TARGET_NUM_PEERS (SINGLE ); + config->num_tids =TARGET_NUM_TIDS (SINGLE ); + } + config->num_offload_peers =TARGET_NUM_OFFLD_PEERS ; + config->num_offload_reorder_buffs =TARGET_NUM_OFFLD_REORDER_BUFFS ; + config->num_peer_keys =TARGET_NUM_PEER_KEYS ; + config->ast_skid_limit =TARGET_AST_SKID_LIMIT ; + config->tx_chain_mask = (1 << ab->target_caps.num_rf_chains) -1 ; + config->rx_chain_mask = (1 << ab->target_caps.num_rf_chains) -1 ; + config->rx_timeout_pri[0 ] =TARGET_RX_TIMEOUT_LO_PRI ; + config->rx_timeout_pri[1 ] =TARGET_RX_TIMEOUT_LO_PRI ; + config->rx_timeout_pri[2 ] =TARGET_RX_TIMEOUT_LO_PRI ; + config->rx_timeout_pri[3 ] =TARGET_RX_TIMEOUT_HI_PRI ; + config->rx_decap_mode =TARGET_DECAP_MODE_NATIVE_WIFI ; + config->scan_max_pending_req =TARGET_SCAN_MAX_PENDING_REQS ; + config->bmiss_offload_max_vdev =TARGET_BMISS_OFFLOAD_MAX_VDEV ; + config->roam_offload_max_vdev =TARGET_ROAM_OFFLOAD_MAX_VDEV ; + config->roam_offload_max_ap_profiles =TARGET_ROAM_OFFLOAD_MAX_AP_PROFILES ; + config->num_mcast_groups =TARGET_NUM_MCAST_GROUPS ; + config->num_mcast_table_elems =TARGET_NUM_MCAST_TABLE_ELEMS ; + config->mcast2ucast_mode =TARGET_MCAST2UCAST_MODE ; + config->tx_dbg_log_size =TARGET_TX_DBG_LOG_SIZE ; + config->num_wds_entries =TARGET_NUM_WDS_ENTRIES ; + config->dma_burst_size =TARGET_DMA_BURST_SIZE ; + config->rx_skip_defrag_timeout_dup_detection_check = +TARGET_RX_SKIP_DEFRAG_TIMEOUT_DUP_DETECTION_CHECK ; + config->vow_config =TARGET_VOW_CONFIG ; + config->gtk_offload_max_vdev =TARGET_GTK_OFFLOAD_MAX_VDEV ; + config->num_msdu_desc =TARGET_NUM_MSDU_DESC ; + config->beacon_tx_offload_max_vdev = ab->num_radios *TARGET_MAX_BCN_OFFLD ; + config->rx_batchmode =TARGET_RX_BATCHMODE ; + config->peer_map_unmap_v2_support =1 ; + config->twt_ap_pdev_count =2 ; + config->twt_ap_sta_count =1000 ; +} +const struct ath11k_hw_ops ipq8074_ops = { .get_hw_mac_from_pdev_id = ath11k_hw_ipq8074_mac_from_pdev_id, + .wmi_init_config = ath11k_init_wmi_config_qca6390, };const struct ath11k_hw_ops ipq6018_ops = { .get_hw_mac_from_pdev_id = ath11k_hw_ipq6018_mac_from_pdev_id, + .wmi_init_config = ath11k_init_wmi_config_ipq8074, };const struct ath11k_hw_ops qca6390_ops = {
drivers/net/wireless/ath/ath11k/hw.h +4 -0
@@ -6,6 +6,8 @@#ifndef ATH11K_HW_H #define ATH11K_HW_H +#include "wmi.h" +/* Target configuration defines */ /* Num VDEVS per radio */
@@ -116,6 +118,8 @@ struct ath11k_hw_ring_mask {struct ath11k_hw_ops {u8 (*get_hw_mac_from_pdev_id)(int pdev_id); +void (*wmi_init_config)(struct ath11k_base *ab, +struct target_resource_config *config); };struct ath11k_hw_params {
drivers/net/wireless/ath/ath11k/wmi.c +3 -1
@@ -3181,7 +3181,7 @@ static int ath11k_init_cmd_send(struct ath11k_pdev_wmi *wmi, (param->num_band_to_mac *sizeof (*band_to_mac)); len =sizeof (*cmd) +TLV_HDR_SIZE +sizeof (*cfg) + hw_mode_len + - (sizeof (*host_mem_chunks) *WMI_MAX_MEM_REQS ); + (param->num_mem_chunks ? (sizeof (*host_mem_chunks) *WMI_MAX_MEM_REQS ) :0 ); skb =ath11k_wmi_alloc_skb (wmi->wmi_ab, len);if (!skb)
@@ -3387,6 +3387,8 @@ int ath11k_wmi_cmd_init(struct ath11k_base *ab) config.twt_ap_pdev_count = ab->num_radios; config.twt_ap_sta_count =1000 ; + ab->hw_params.hw_ops->wmi_init_config (ab, &config); +memcpy (&wmi_sc->wlan_resource_config, &config,sizeof (config)); init_param.res_cfg = &wmi_sc->wlan_resource_config;
Signature · 7 lines
2.7.4 -- ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH v2 11/12 ath11k: wmi: put hardware to DBS mode
In reply to Kalle ValoFrom: Carl Huang <[email protected]>
For QCA6390, host puts hardware to Dual Band Simultaneous (DBS) mode by default so both 2G and 5G bands can be used. Otherwise only the 5G band can be used. QCA6390 doesn't provide band_to_mac configuration and firmware will do the band_to_mac map.
Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.1.0.1-01238-QCAHKSWPL_SILICONZ-2
--- drivers/net/wireless/ath/ath11k/core.c | 2 ++ drivers/net/wireless/ath/ath11k/hw.h | 6 ++++++ drivers/net/wireless/ath/ath11k/wmi.c | 10 +++++----- 3 files changed, 13 insertions(+), 5 deletions(-)
drivers/net/wireless/ath/ath11k/core.c +2 -0
@@ -36,6 +36,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { .host_ce_config = ath11k_host_ce_config_ipq8074, .ce_count = 12, .single_pdev_only = false, + .needs_band_to_mac = true, }, { .name = "qca6390 hw2.0",
@@ -54,6 +55,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { .host_ce_config = ath11k_host_ce_config_qca6390, .ce_count = 9, .single_pdev_only = true, + .needs_band_to_mac = false, }, };
drivers/net/wireless/ath/ath11k/hw.h +6 -0
@@ -145,6 +145,12 @@ struct ath11k_hw_params {u32 ce_count;bool single_pdev_only; + +/* For example on QCA6390 struct +* wmi_init_cmd_param::band_to_mac_config needs to be false as the +* firmware creates the mapping. +*/ +bool needs_band_to_mac; };extern const struct ath11k_hw_ops ipq8074_ops;
drivers/net/wireless/ath/ath11k/wmi.c +5 -5
@@ -3396,13 +3396,13 @@ int ath11k_wmi_cmd_init(struct ath11k_base *ab) init_param.hw_mode_id = wmi_sc->preferred_hw_mode; init_param.mem_chunks = wmi_sc->mem_chunks; -if (wmi_sc->preferred_hw_mode ==WMI_HOST_HW_MODE_SINGLE || - ab->hw_params.single_pdev_only) +if (wmi_sc->preferred_hw_mode ==WMI_HOST_HW_MODE_SINGLE ) init_param.hw_mode_id =WMI_HOST_HW_MODE_MAX ; - init_param.num_band_to_mac = ab->num_radios; - -ath11k_fill_band_to_mac_param (ab, init_param.band_to_mac); +if (ab->hw_params.needs_band_to_mac) { + init_param.num_band_to_mac = ab->num_radios; +ath11k_fill_band_to_mac_param (ab, init_param.band_to_mac); + }return ath11k_init_cmd_send (&wmi_sc->wmi[0 ], &init_param); }
Signature · 7 lines
2.7.4 -- ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH v2 12/12 ath11k: dp: redefine peer_map and peer_unmap
In reply to Kalle ValoFrom: Carl Huang <[email protected]>
For QCA6390, it uses peer_map and peer_unmap V1. IPQ8074 uses V2. Redefine previous definition to peer_map2 and peer_unmap2.
Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.1.0.1-01238-QCAHKSWPL_SILICONZ-2
--- drivers/net/wireless/ath/ath11k/dp.h | 6 ++++-- drivers/net/wireless/ath/ath11k/dp_rx.c | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath11k/dp.h +4 -2
@@ -936,11 +936,13 @@ struct htt_rx_ring_tlv_filter {enum htt_t2h_msg_type {HTT_T2H_MSG_TYPE_VERSION_CONF , +HTT_T2H_MSG_TYPE_PEER_MAP =0x3 , +HTT_T2H_MSG_TYPE_PEER_UNMAP =0x4 ,HTT_T2H_MSG_TYPE_RX_ADDBA =0x5 ,HTT_T2H_MSG_TYPE_PKTLOG =0x8 ,HTT_T2H_MSG_TYPE_SEC_IND =0xb , -HTT_T2H_MSG_TYPE_PEER_MAP =0x1e , -HTT_T2H_MSG_TYPE_PEER_UNMAP =0x1f , +HTT_T2H_MSG_TYPE_PEER_MAP2 =0x1e , +HTT_T2H_MSG_TYPE_PEER_UNMAP2 =0x1f ,HTT_T2H_MSG_TYPE_PPDU_STATS_IND =0x1d ,HTT_T2H_MSG_TYPE_EXT_STATS_CONF =0x1c ,HTT_T2H_MSG_TYPE_BKPRESSURE_EVENT_IND =0x24 ,
drivers/net/wireless/ath/ath11k/dp_rx.c +2 -0
@@ -1569,6 +1569,7 @@ void ath11k_dp_htt_htc_t2h_msg_handler(struct ath11k_base *ab,complete (&dp->htt_tgt_version_received);break ;case HTT_T2H_MSG_TYPE_PEER_MAP : +case HTT_T2H_MSG_TYPE_PEER_MAP2 : vdev_id =FIELD_GET (HTT_T2H_PEER_MAP_INFO_VDEV_ID , resp->peer_map_ev.info); peer_id = FIELD_GET(HTT_T2H_PEER_MAP_INFO_PEER_ID,
@@ -1582,6 +1583,7 @@ void ath11k_dp_htt_htc_t2h_msg_handler(struct ath11k_base *ab,ath11k_peer_map_event (ab, vdev_id, peer_id, mac_addr, ast_hash);break ;case HTT_T2H_MSG_TYPE_PEER_UNMAP : +case HTT_T2H_MSG_TYPE_PEER_UNMAP2 : peer_id =FIELD_GET (HTT_T2H_PEER_UNMAP_INFO_PEER_ID , resp->peer_unmap_ev.info);ath11k_peer_unmap_event (ab, peer_id);
Signature · 7 lines
2.7.4 -- ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k