ath11k: enable shadow register for QCA6390
cover ath11k: enable shadow register for QCA6390
Enable the shadow register feature for QCA6390, so that it can enter idle power save mode. Shadow registers can be accessed regardless target's power state, and hardware will forward the value to target register automatically.
Also implement a workaround to fix a shadow register deficit.
This depends on patchset: ath11k: qca6390: packet log support and fixes for crashes
Kalle
Carl Huang (7):
ath11k: read and write registers below unwindowed address
ath11k: enable shadow register configuration and access
ath11k: set WMI pipe credit to 1 for QCA6390
ath11k: start a timer to update TCL HP
ath11k: start a timer to update REO cmd ring
ath11k: start a timer to update HP for CE pipe 4
ath11k: enable idle power save mode
Kalle Valo (1):
ath11k: remove unnecessary casts to u32
drivers/net/wireless/ath/ath11k/ce.c | 80 ++++++++++++++++++ drivers/net/wireless/ath/ath11k/ce.h | 3 + drivers/net/wireless/ath/ath11k/core.c | 7 ++ drivers/net/wireless/ath/ath11k/dp.c | 97 ++++++++++++++++++++++ drivers/net/wireless/ath/ath11k/dp.h | 24 ++++++ drivers/net/wireless/ath/ath11k/dp_tx.c | 2 + drivers/net/wireless/ath/ath11k/hal.c | 135 +++++++++++++++++++++++++++++-- drivers/net/wireless/ath/ath11k/hal.h | 19 ++++- drivers/net/wireless/ath/ath11k/hal_rx.c | 2 + drivers/net/wireless/ath/ath11k/htc.c | 6 ++ drivers/net/wireless/ath/ath11k/hw.h | 2 + drivers/net/wireless/ath/ath11k/mac.c | 9 +++ drivers/net/wireless/ath/ath11k/pci.c | 38 +++++++++ drivers/net/wireless/ath/ath11k/pci.h | 7 ++ drivers/net/wireless/ath/ath11k/qmi.c | 13 ++- drivers/net/wireless/ath/ath11k/qmi.h | 2 +- 16 files changed, 434 insertions(+), 12 deletions(-)
Signature · 1 line
2.7.4
PATCH 1/8 ath11k: read and write registers below unwindowed address
From: Carl Huang <[email protected]>
For QCA6390, host can read and write registers below unwindowed address directly without programming the window register. For registers below bar0 + 4k - 32, host can read and write regardless of the power save state. Shadow registers are located below bar0 + 4K - 32.
Before MHI power up, there is no need to wakeup MHI so ini_done is added to indicate it.
Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1
--- drivers/net/wireless/ath/ath11k/pci.c | 35 +++++++++++++++++++++++++++++++++++ drivers/net/wireless/ath/ath11k/pci.h | 7 +++++++ 2 files changed, 42 insertions(+)
drivers/net/wireless/ath/ath11k/pci.c +35 -0
@@ -28,6 +28,12 @@#define TCSR_SOC_HW_VERSION_MAJOR_MASK GENMASK(16, 8)#define TCSR_SOC_HW_VERSION_MINOR_MASK GENMASK(7, 0) +/* BAR0 + 4k is always accessible, and no +* need to force wakeup. +* 4K - 32 = 0xFE0 +*/ +#define ACCESS_ALWAYS_OFF 0xFE0 +#define QCA6390_DEVICE_ID 0x1101static const struct pci_device_id ath11k_pci_id_table[] = {
@@ -128,6 +134,13 @@ void ath11k_pci_write32(struct ath11k_base *ab, u32 offset, u32 value) {struct ath11k_pci *ab_pci =ath11k_pci_priv (ab); +/* for offset beyond BAR + 4K - 32, may +* need to wakeup MHI to access. +*/ +if (test_bit (ATH11K_PCI_FLAG_INIT_DONE , &ab_pci->flags) && + offset >=ACCESS_ALWAYS_OFF ) +mhi_device_get_sync (ab_pci->mhi_ctrl->mhi_dev); +if (offset <WINDOW_START ) {iowrite32 (value, ab->mem + offset); }else {
@@ -136,6 +149,10 @@ void ath11k_pci_write32(struct ath11k_base *ab, u32 offset, u32 value)iowrite32 (value, ab->mem +WINDOW_START + (offset &WINDOW_RANGE_MASK ));spin_unlock_bh (&ab_pci->window_lock); } + +if (test_bit (ATH11K_PCI_FLAG_INIT_DONE , &ab_pci->flags) && + offset >=ACCESS_ALWAYS_OFF ) +mhi_device_put (ab_pci->mhi_ctrl->mhi_dev); }u32 ath11k_pci_read32 (struct ath11k_base *ab,u32 offset)
@@ -143,6 +160,13 @@ u32 ath11k_pci_read32(struct ath11k_base *ab, u32 offset)struct ath11k_pci *ab_pci =ath11k_pci_priv (ab);u32 val; +/* for offset beyond BAR + 4K - 32, may +* need to wakeup MHI to access. +*/ +if (test_bit (ATH11K_PCI_FLAG_INIT_DONE , &ab_pci->flags) && + offset >=ACCESS_ALWAYS_OFF ) +mhi_device_get_sync (ab_pci->mhi_ctrl->mhi_dev); +if (offset <WINDOW_START ) { val =ioread32 (ab->mem + offset); }else {
@@ -152,6 +176,10 @@ u32 ath11k_pci_read32(struct ath11k_base *ab, u32 offset)spin_unlock_bh (&ab_pci->window_lock); } +if (test_bit (ATH11K_PCI_FLAG_INIT_DONE , &ab_pci->flags) && + offset >=ACCESS_ALWAYS_OFF ) +mhi_device_put (ab_pci->mhi_ctrl->mhi_dev); +return val; }
@@ -731,6 +759,8 @@ static int ath11k_pci_power_up(struct ath11k_base *ab)struct ath11k_pci *ab_pci =ath11k_pci_priv (ab);int ret; + ab_pci->register_window =0 ; +clear_bit (ATH11K_PCI_FLAG_INIT_DONE , &ab_pci->flags);ath11k_pci_sw_reset (ab_pci->ab); ret =ath11k_mhi_start (ab_pci);
@@ -747,6 +777,7 @@ static void ath11k_pci_power_down(struct ath11k_base *ab)struct ath11k_pci *ab_pci =ath11k_pci_priv (ab);ath11k_mhi_stop (ab_pci); +clear_bit (ATH11K_PCI_FLAG_INIT_DONE , &ab_pci->flags);ath11k_pci_force_wake (ab_pci->ab);ath11k_pci_sw_reset (ab_pci->ab); }
@@ -775,6 +806,10 @@ static void ath11k_pci_stop(struct ath11k_base *ab)static int ath11k_pci_start (struct ath11k_base *ab) { +struct ath11k_pci *ab_pci =ath11k_pci_priv (ab); + +set_bit (ATH11K_PCI_FLAG_INIT_DONE , &ab_pci->flags); +ath11k_pci_ce_irqs_enable (ab);ath11k_ce_rx_post_buf (ab);
drivers/net/wireless/ath/ath11k/pci.h +7 -0
@@ -36,6 +36,10 @@ struct ath11k_msi_config {struct ath11k_msi_user *users; }; +enum ath11k_pci_flags { +ATH11K_PCI_FLAG_INIT_DONE , +}; +struct ath11k_pci {struct pci_dev *pdev;struct ath11k_base *ab;
@@ -48,6 +52,9 @@ struct ath11k_pci {/* protects register_window above */ spinlock_t window_lock; + +/* enum ath11k_pci_flags */ +unsigned long flags; };static inline struct ath11k_pci *ath11k_pci_priv (struct ath11k_base *ab)
Signature · 1 line
2.7.4
Re: [PATCH 1/8] ath11k: read and write registers below unwindowed address
Quoted 6 lines · Kalle Valo
For QCA6390, host can read and write registers below unwindowed address directly without programming the window register. For registers below bar0 + 4k - 32, host can read and write regardless of the power save state. Shadow registers are located below bar0 + 4K - 32.
Quoted 7 lines
Before MHI power up, there is no need to wakeup MHI so
ini_doneis added to indicate it.Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1
Signed-off-by Carl Huang <[email protected]>Signed-off-by Kalle Valo <[email protected]>
8 patches applied to ath-next branch of ath.git, thanks.
a05bd8513335 ath11k: read and write registers below unwindowed address e838c14a9ee1 ath11k: enable shadow register configuration and access 9df6d8399d67 ath11k: set WMI pipe credit to 1 for QCA6390 8ec5a6ab9c7e ath11k: start a timer to update TCL HP 506e7e9bbf3f ath11k: start a timer to update REO cmd ring 9b309970c4ea ath11k: start a timer to update HP for CE pipe 4 c83c500b55b6 ath11k: enable idle power save mode 404f5de2f997 ath11k: remove unnecessary casts to u32
Signature · 9 lines
https://patchwork.kernel.org/patch/11811243/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches -- ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
Re: [PATCH 1/8] ath11k: read and write registers below unwindowed address
In reply to Kalle ValoQuoted 6 lines · Kalle Valo
For QCA6390, host can read and write registers below unwindowed address directly without programming the window register. For registers below bar0 + 4k - 32, host can read and write regardless of the power save state. Shadow registers are located below bar0 + 4K - 32.
Quoted 7 lines
Before MHI power up, there is no need to wakeup MHI so
ini_doneis added to indicate it.Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1
Signed-off-by Carl Huang <[email protected]>Signed-off-by Kalle Valo <[email protected]>
8 patches applied to ath-next branch of ath.git, thanks.
a05bd8513335 ath11k: read and write registers below unwindowed address e838c14a9ee1 ath11k: enable shadow register configuration and access 9df6d8399d67 ath11k: set WMI pipe credit to 1 for QCA6390 8ec5a6ab9c7e ath11k: start a timer to update TCL HP 506e7e9bbf3f ath11k: start a timer to update REO cmd ring 9b309970c4ea ath11k: start a timer to update HP for CE pipe 4 c83c500b55b6 ath11k: enable idle power save mode 404f5de2f997 ath11k: remove unnecessary casts to u32
Signature · 3 lines
https://patchwork.kernel.org/patch/11811243/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
PATCH 2/8 ath11k: enable shadow register configuration and access
In reply to Kalle ValoFrom: Carl Huang <[email protected]>
To enable shadow register access, host needs to pass shadow register configuration to firmware via qmi message. Host also needs to update ring's HP or TP address to shadow register address. The write operation to shadow register will be forwarded to target register by hardware automatically, and the write operation to shadow register is permitted even when the target is in power save or sleep mode.
Update the shadow config whenever power up happens.
This feature is controlled by hw parameter supports_shadow_regs which is only enabled for QCA6390.
Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1
--- drivers/net/wireless/ath/ath11k/ce.c | 46 +++++++++++++ drivers/net/wireless/ath/ath11k/ce.h | 2 + drivers/net/wireless/ath/ath11k/core.c | 4 ++ drivers/net/wireless/ath/ath11k/hal.c | 114 ++++++++++++++++++++++++++++++++- drivers/net/wireless/ath/ath11k/hal.h | 17 +++-- drivers/net/wireless/ath/ath11k/hw.h | 1 + drivers/net/wireless/ath/ath11k/pci.c | 3 + drivers/net/wireless/ath/ath11k/qmi.c | 13 +++- drivers/net/wireless/ath/ath11k/qmi.h | 2 +- 9 files changed, 194 insertions(+), 8 deletions(-)
drivers/net/wireless/ath/ath11k/ce.c +46 -0
@@ -713,6 +713,49 @@ static void ath11k_ce_rx_pipe_cleanup(struct ath11k_ce_pipe *pipe) } } +static void ath11k_ce_shadow_config (struct ath11k_base *ab) +{ +int i; + +for (i =0 ; i < ab->hw_params.ce_count; i++) { +if (ab->hw_params.host_ce_config[i].src_nentries) +ath11k_hal_srng_update_shadow_config (ab, +HAL_CE_SRC , i); + +if (ab->hw_params.host_ce_config[i].dest_nentries) { +ath11k_hal_srng_update_shadow_config (ab, +HAL_CE_DST , i); + +ath11k_hal_srng_update_shadow_config (ab, +HAL_CE_DST_STATUS , i); + } + } +} + +void ath11k_ce_get_shadow_config (struct ath11k_base *ab, +u32 **shadow_cfg,u32 *shadow_cfg_len) +{ +if (!ab->hw_params.supports_shadow_regs) +return ; + +ath11k_hal_srng_get_shadow_config (ab, shadow_cfg, shadow_cfg_len); + +/* shadow is already configured */ +if (*shadow_cfg_len) +return ; + +/* shadow isn't configured yet, configure now. +* non-CE srngs are configured firstly, then +* all CE srngs. +*/ +ath11k_hal_srng_shadow_config (ab); +ath11k_ce_shadow_config (ab); + +/* get the shadow configuration */ +ath11k_hal_srng_get_shadow_config (ab, shadow_cfg, shadow_cfg_len); +} +EXPORT_SYMBOL (ath11k_ce_get_shadow_config); +void ath11k_ce_cleanup_pipes (struct ath11k_base *ab) {struct ath11k_ce_pipe *pipe;
@@ -767,6 +810,9 @@ int ath11k_ce_init_pipes(struct ath11k_base *ab)int i;int ret; +ath11k_ce_get_shadow_config (ab, &ab->qmi.ce_cfg.shadow_reg_v2, + &ab->qmi.ce_cfg.shadow_reg_v2_len); +for (i =0 ; i < ab->hw_params.ce_count; i++) { pipe = &ab->ce.ce_pipe[i];
drivers/net/wireless/ath/ath11k/ce.h +2 -0
@@ -187,4 +187,6 @@ 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); +void ath11k_ce_get_shadow_config (struct ath11k_base *ab, +u32 **shadow_cfg,u32 *shadow_cfg_len);#endif
drivers/net/wireless/ath/ath11k/core.c +4 -0
@@ -63,6 +63,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {BIT (NL80211_IFTYPE_AP ) | BIT(NL80211_IFTYPE_MESH_POINT), .supports_monitor = true, + .supports_shadow_regs = false, }, { .hw_rev = ATH11K_HW_IPQ6018_HW10,
@@ -98,6 +99,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {BIT (NL80211_IFTYPE_AP ) | BIT(NL80211_IFTYPE_MESH_POINT), .supports_monitor = true, + .supports_shadow_regs = false, }, { .name = "qca6390 hw2.0",
@@ -132,6 +134,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { .interface_modes = BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_AP), .supports_monitor = false, + .supports_shadow_regs = true, }, };
@@ -412,6 +415,7 @@ static void ath11k_core_stop(struct ath11k_base *ab) {if (!test_bit (ATH11K_FLAG_CRASH_FLUSH , &ab->dev_flags))ath11k_qmi_firmware_stop (ab); +ath11k_hif_stop (ab);ath11k_wmi_detach (ab);ath11k_dp_pdev_reo_cleanup (ab);
drivers/net/wireless/ath/ath11k/hal.c +112 -2
135 lines not on this page · raw message
drivers/net/wireless/ath/ath11k/hal.h +13 -4
@@ -31,8 +31,12 @@ struct ath11k_base;#define HAL_DSCP_TID_TBL_SIZE 24/* calculate the register address from bar0 of shadow register x */ -#define SHADOW_BASE_ADDRESS 0x00003024 -#define SHADOW_NUM_REGISTERS 36 +#define HAL_SHADOW_BASE_ADDR 0x000008fc +#define HAL_SHADOW_NUM_REGS 36 +#define HAL_HP_OFFSET_IN_REG_START 1 +#define HAL_OFFSET_FROM_HP_TO_TP 4 + +#define HAL_SHADOW_REG (x) (HAL_SHADOW_BASE_ADDR + (4 * (x)))/* WCSS Relative address */ #define HAL_SEQ_WCSS_UMAC_REO_REG 0x00a38000
@@ -882,7 +886,7 @@ struct ath11k_hal {u8 current_blk_index;/* shadow register configuration */ -u32 shadow_reg_addr[SHADOW_NUM_REGISTERS ]; +u32 shadow_reg_addr[HAL_SHADOW_NUM_REGS ];int num_shadow_reg_configured; };
@@ -935,5 +939,10 @@ int ath11k_hal_srng_setup(struct ath11k_base *ab, enum hal_ring_type type,int ath11k_hal_srng_init (struct ath11k_base *ath11k);void ath11k_hal_srng_deinit (struct ath11k_base *ath11k);void ath11k_hal_dump_srng_stats (struct ath11k_base *ab); - +void ath11k_hal_srng_get_shadow_config (struct ath11k_base *ab, +u32 **cfg,u32 *len); +int ath11k_hal_srng_update_shadow_config (struct ath11k_base *ab, +enum hal_ring_type ring_type, +int ring_num); +void ath11k_hal_srng_shadow_config (struct ath11k_base *ab);#endif
drivers/net/wireless/ath/ath11k/hw.h +1 -0
@@ -159,6 +159,7 @@ struct ath11k_hw_params {u16 interface_modes;bool supports_monitor; +bool supports_shadow_regs; };struct ath11k_hw_ops {
drivers/net/wireless/ath/ath11k/pci.c +3 -0
@@ -614,6 +614,9 @@ static void ath11k_pci_init_qmi_ce_config(struct ath11k_base *ab) cfg->svc_to_ce_map = ab->hw_params.svc_to_ce_map; cfg->svc_to_ce_map_len = ab->hw_params.svc_to_ce_map_len; ab->qmi.service_ins_id =ATH11K_QMI_WLFW_SERVICE_INS_ID_V01_QCA6390 ; + +ath11k_ce_get_shadow_config (ab, &cfg->shadow_reg_v2, + &cfg->shadow_reg_v2_len); }static void ath11k_pci_ce_irqs_enable (struct ath11k_base *ab)
drivers/net/wireless/ath/ath11k/qmi.c +12 -1
@@ -2275,7 +2275,18 @@ static int ath11k_qmi_wlanfw_wlan_cfg_send(struct ath11k_base *ab) req->svc_cfg[pipe_num].pipe_num = svc_cfg[pipe_num].pipenum; } req->shadow_reg_valid =0 ; - req->shadow_reg_v2_valid =0 ; + +/* set shadow v2 configuration */ +if (ab->hw_params.supports_shadow_regs) { + req->shadow_reg_v2_valid =1 ; + req->shadow_reg_v2_len =min_t (u32, + ab->qmi.ce_cfg.shadow_reg_v2_len, +QMI_WLANFW_MAX_NUM_SHADOW_REG_V2_V01 ); +memcpy (&req->shadow_reg_v2, ab->qmi.ce_cfg.shadow_reg_v2, +sizeof (u32) * req->shadow_reg_v2_len); + }else { + req->shadow_reg_v2_valid =0 ; + } ret =qmi_txn_init (&ab->qmi.handle, &txn, qmi_wlanfw_wlan_cfg_resp_msg_v01_ei, &resp);
drivers/net/wireless/ath/ath11k/qmi.h +1 -1
@@ -77,7 +77,7 @@ struct ath11k_qmi_ce_cfg {int svc_to_ce_map_len;const u8 *shadow_reg;int shadow_reg_len; -u8 *shadow_reg_v2; +u32 *shadow_reg_v2;int shadow_reg_v2_len; };
Signature · 7 lines
2.7.4 -- ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH 3/8 ath11k: set WMI pipe credit to 1 for QCA6390
In reply to Kalle ValoFrom: Carl Huang <[email protected]>
For QCA6390, set wmi credit to 1 to avoid back-to-back write to shadow register when shadow register is enabled.
Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1
--- drivers/net/wireless/ath/ath11k/htc.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/wireless/ath/ath11k/htc.c +6 -0
@@ -515,6 +515,12 @@ int ath11k_htc_wait_target(struct ath11k_htc *htc)return -ECOMM ; } +/* For QCA6390, wmi endpoint uses 1 credit to avoid +* back-to-back write. +*/ +if (ab->hw_params.supports_shadow_regs) + htc->total_transmit_credits =1 ; +ath11k_htc_setup_target_buffer_assignments (htc);return 0 ;
Signature · 1 line
2.7.4
PATCH 4/8 ath11k: start a timer to update TCL HP
In reply to Kalle ValoFrom: Carl Huang <[email protected]>
The timer is to check if TCL HP isn't updated to target. The timer will postpone itself if there are TX operations during the interval, otherwise the timer handler updates the HP again so the index value in HP register will be forwarded to target register, and the timer stops afterwards.
Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1
--- drivers/net/wireless/ath/ath11k/dp.c | 91 +++++++++++++++++++++++++++++++++ drivers/net/wireless/ath/ath11k/dp.h | 22 ++++++++ drivers/net/wireless/ath/ath11k/dp_tx.c | 2 + drivers/net/wireless/ath/ath11k/hal.c | 13 +++++ drivers/net/wireless/ath/ath11k/hal.h | 2 + 5 files changed, 130 insertions(+)
drivers/net/wireless/ath/ath11k/dp.c +91 -0
@@ -304,11 +304,23 @@ int ath11k_dp_srng_setup(struct ath11k_base *ab, struct dp_srng *ring,return 0 ; } +static void ath11k_dp_stop_shadow_timers (struct ath11k_base *ab) +{ +int i; + +if (!ab->hw_params.supports_shadow_regs) +return ; + +for (i =0 ; i <DP_TCL_NUM_RING_MAX ; i++) +ath11k_dp_shadow_stop_timer (ab, &ab->dp.tx_ring_timer[i]); +} +static void ath11k_dp_srng_common_cleanup (struct ath11k_base *ab) {struct ath11k_dp *dp = &ab->dp;int i; +ath11k_dp_stop_shadow_timers (ab);ath11k_dp_srng_cleanup (ab, &dp->wbm_desc_rel_ring);ath11k_dp_srng_cleanup (ab, &dp->tcl_cmd_ring);ath11k_dp_srng_cleanup (ab, &dp->tcl_status_ring);
@@ -374,6 +386,10 @@ static int ath11k_dp_srng_common_setup(struct ath11k_base *ab) srng = &ab->hal.srng_list[dp->tx_ring[i].tcl_data_ring.ring_id];ath11k_hal_tx_init_data_ring (ab, srng); + +ath11k_dp_shadow_init_timer (ab, &dp->tx_ring_timer[i], +ATH11K_SHADOW_DP_TIMER_INTERVAL , + dp->tx_ring[i].tcl_data_ring.ring_id); } ret = ath11k_dp_srng_setup(ab, &dp->reo_reinject_ring, HAL_REO_REINJECT,
@@ -1066,3 +1082,78 @@ int ath11k_dp_alloc(struct ath11k_base *ab)return ret; } + +static void ath11k_dp_shadow_timer_handler (struct timer_list *t) +{ +struct ath11k_hp_update_timer *update_timer =from_timer (update_timer, + t, timer); +struct ath11k_base *ab = update_timer->ab; +struct hal_srng *srng = &ab->hal.srng_list[update_timer->ring_id]; + +spin_lock_bh (&srng->lock); + +/* when the timer is fired, the handler checks whether there +* are new TX happened. The handler updates HP only when there +* are no TX operations during the timeout interval, and stop +* the timer. Timer will be started again when TX happens again. +*/ +if (update_timer->timer_tx_num != update_timer->tx_num) { + update_timer->timer_tx_num = update_timer->tx_num; +mod_timer (&update_timer->timer, jiffies + +msecs_to_jiffies (update_timer->interval)); + }else { + update_timer->started = false; +ath11k_hal_srng_shadow_update_hp_tp (ab, srng); + } + +spin_unlock_bh (&srng->lock); +} + +void ath11k_dp_shadow_start_timer (struct ath11k_base *ab, +struct hal_srng *srng, +struct ath11k_hp_update_timer *update_timer) +{ +lockdep_assert_held (&srng->lock); + +if (!ab->hw_params.supports_shadow_regs) +return ; + + update_timer->tx_num++; + +if (update_timer->started) +return ; + + update_timer->started = true; + update_timer->timer_tx_num = update_timer->tx_num; +mod_timer (&update_timer->timer, jiffies + +msecs_to_jiffies (update_timer->interval)); +} + +void ath11k_dp_shadow_stop_timer (struct ath11k_base *ab, +struct ath11k_hp_update_timer *update_timer) +{ +if (!ab->hw_params.supports_shadow_regs) +return ; + +if (!update_timer->init) +return ; + +del_timer_sync (&update_timer->timer); +} + +void ath11k_dp_shadow_init_timer (struct ath11k_base *ab, +struct ath11k_hp_update_timer *update_timer, +u32 interval,u32 ring_id) +{ +if (!ab->hw_params.supports_shadow_regs) +return ; + + update_timer->tx_num =0 ; + update_timer->timer_tx_num =0 ; + update_timer->ab = ab; + update_timer->ring_id = ring_id; + update_timer->interval = interval; + update_timer->init = true; +timer_setup (&update_timer->timer, + ath11k_dp_shadow_timer_handler,0 ); +}
drivers/net/wireless/ath/ath11k/dp.h +22 -0
@@ -206,6 +206,19 @@ struct ath11k_pdev_dp {#define DP_TX_DESC_ID_MSDU_ID GENMASK(18, 2)#define DP_TX_DESC_ID_POOL_ID GENMASK(20, 19) +#define ATH11K_SHADOW_DP_TIMER_INTERVAL 20 + +struct ath11k_hp_update_timer { +struct timer_list timer; +bool started; +bool init; +u32 tx_num; +u32 timer_tx_num; +u32 ring_id; +u32 interval; +struct ath11k_base *ab; +}; +struct ath11k_dp {struct ath11k_base *ab;enum ath11k_htc_ep_id eid;
@@ -235,6 +248,7 @@ struct ath11k_dp {* - reo_cmd_cache_flush_count */ spinlock_t reo_cmd_lock; +struct ath11k_hp_update_timer tx_ring_timer[DP_TCL_NUM_RING_MAX ]; };/* HTT definitions */
@@ -1616,5 +1630,13 @@ int ath11k_dp_link_desc_setup(struct ath11k_base *ab,struct dp_link_desc_bank *link_desc_banks, u32 ring_type, struct hal_srng *srng, u32 n_link_desc); +void ath11k_dp_shadow_start_timer (struct ath11k_base *ab, +struct hal_srng *srng, +struct ath11k_hp_update_timer *update_timer); +void ath11k_dp_shadow_stop_timer (struct ath11k_base *ab, +struct ath11k_hp_update_timer *update_timer); +void ath11k_dp_shadow_init_timer (struct ath11k_base *ab, +struct ath11k_hp_update_timer *update_timer, +u32 interval,u32 ring_id);#endif
drivers/net/wireless/ath/ath11k/dp_tx.c +2 -0
@@ -254,6 +254,8 @@ int ath11k_dp_tx(struct ath11k *ar, struct ath11k_vif *arvif,ath11k_hal_srng_access_end (ab, tcl_ring); +ath11k_dp_shadow_start_timer (ab, tcl_ring, &dp->tx_ring_timer[ti.ring_id]); +spin_unlock_bh (&tcl_ring->lock); ath11k_dbg_dump(ab, ATH11K_DBG_DP_TX, NULL, "dp tx msdu: ",
drivers/net/wireless/ath/ath11k/hal.c +13 -0
@@ -1174,6 +1174,19 @@ void ath11k_hal_srng_get_shadow_config(struct ath11k_base *ab, *cfg = hal->shadow_reg_addr; } +void ath11k_hal_srng_shadow_update_hp_tp (struct ath11k_base *ab, +struct hal_srng *srng) +{ +lockdep_assert_held (&srng->lock); + +/* check whether the ring is emptry. Update the shadow +* HP only when then ring isn't' empty. +*/ +if (srng->ring_dir ==HAL_SRNG_DIR_SRC && + *srng->u.src_ring.tp_addr != srng->u.src_ring.hp) +ath11k_hal_srng_access_end (ab, srng); +} +static int ath11k_hal_srng_create_config (struct ath11k_base *ab) {struct ath11k_hal *hal = &ab->hal;
drivers/net/wireless/ath/ath11k/hal.h +2 -0
@@ -945,4 +945,6 @@ int ath11k_hal_srng_update_shadow_config(struct ath11k_base *ab,enum hal_ring_type ring_type, int ring_num);void ath11k_hal_srng_shadow_config (struct ath11k_base *ab); +void ath11k_hal_srng_shadow_update_hp_tp (struct ath11k_base *ab, +struct hal_srng *srng);#endif
Signature · 7 lines
2.7.4 -- ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH 5/8 ath11k: start a timer to update REO cmd ring
In reply to Kalle ValoFrom: Carl Huang <[email protected]>
Start a timer to update REO HP if HP isn't updated to target.
Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1
--- drivers/net/wireless/ath/ath11k/dp.c | 6 ++++++ drivers/net/wireless/ath/ath11k/dp.h | 2 ++ drivers/net/wireless/ath/ath11k/hal_rx.c | 2 ++ 3 files changed, 10 insertions(+)
drivers/net/wireless/ath/ath11k/dp.c +6 -0
@@ -313,6 +313,8 @@ static void ath11k_dp_stop_shadow_timers(struct ath11k_base *ab)for (i =0 ; i <DP_TCL_NUM_RING_MAX ; i++)ath11k_dp_shadow_stop_timer (ab, &ab->dp.tx_ring_timer[i]); + +ath11k_dp_shadow_stop_timer (ab, &ab->dp.reo_cmd_timer); }static void ath11k_dp_srng_common_cleanup (struct ath11k_base *ab)
@@ -425,6 +427,10 @@ static int ath11k_dp_srng_common_setup(struct ath11k_base *ab) srng = &ab->hal.srng_list[dp->reo_cmd_ring.ring_id];ath11k_hal_reo_init_cmd_ring (ab, srng); +ath11k_dp_shadow_init_timer (ab, &dp->reo_cmd_timer, +ATH11K_SHADOW_CTRL_TIMER_INTERVAL , + dp->reo_cmd_ring.ring_id); + ret =ath11k_dp_srng_setup (ab, &dp->reo_status_ring,HAL_REO_STATUS ,0 ,0 ,DP_REO_STATUS_RING_SIZE );if (ret) {
drivers/net/wireless/ath/ath11k/dp.h +2 -0
@@ -207,6 +207,7 @@ struct ath11k_pdev_dp {#define DP_TX_DESC_ID_POOL_ID GENMASK(20, 19)#define ATH11K_SHADOW_DP_TIMER_INTERVAL 20 +#define ATH11K_SHADOW_CTRL_TIMER_INTERVAL 10struct ath11k_hp_update_timer {struct timer_list timer;
@@ -248,6 +249,7 @@ struct ath11k_dp {* - reo_cmd_cache_flush_count */ spinlock_t reo_cmd_lock; +struct ath11k_hp_update_timer reo_cmd_timer;struct ath11k_hp_update_timer tx_ring_timer[DP_TCL_NUM_RING_MAX ]; };
drivers/net/wireless/ath/ath11k/hal_rx.c +2 -0
@@ -256,6 +256,8 @@ int ath11k_hal_reo_cmd_send(struct ath11k_base *ab, struct hal_srng *srng,break ; } +ath11k_dp_shadow_start_timer (ab, srng, &ab->dp.reo_cmd_timer); + out:ath11k_hal_srng_access_end (ab, srng);spin_unlock_bh (&srng->lock);
Signature · 7 lines
2.7.4 -- ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH 6/8 ath11k: start a timer to update HP for CE pipe 4
In reply to Kalle ValoFrom: Carl Huang <[email protected]>
For QCA6390, Start a timer to update CE pipe 4 ring HP when shadow register is enabled. Its' to avoid that HP isn't updated to target register.
Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1
--- drivers/net/wireless/ath/ath11k/ce.c | 34 ++++++++++++++++++++++++++++++++++ drivers/net/wireless/ath/ath11k/ce.h | 1 + 2 files changed, 35 insertions(+)
drivers/net/wireless/ath/ath11k/ce.c +34 -0
@@ -187,6 +187,26 @@ const struct ce_attr ath11k_host_ce_config_qca6390[] = { }; +static bool ath11k_ce_need_shadow_fix (int ce_id) +{ +/* only ce4 needs shadow workaroud*/ +if (ce_id ==4 ) +return true; +return false; +} + +static void ath11k_ce_stop_shadow_timers (struct ath11k_base *ab) +{ +int i; + +if (!ab->hw_params.supports_shadow_regs) +return ; + +for (i =0 ; i < ab->hw_params.ce_count; i++) +if (ath11k_ce_need_shadow_fix (i)) +ath11k_dp_shadow_stop_timer (ab, &ab->ce.hp_timer[i]); +} +static int ath11k_ce_rx_buf_enqueue_pipe (struct ath11k_ce_pipe *pipe,struct sk_buff *skb,dma_addr_t paddr) {
@@ -505,6 +525,12 @@ static int ath11k_ce_init_ring(struct ath11k_base *ab, ce_ring->hal_ring_id = ret; +if (ab->hw_params.supports_shadow_regs && +ath11k_ce_need_shadow_fix (ce_id)) +ath11k_dp_shadow_init_timer (ab, &ab->ce.hp_timer[ce_id], +ATH11K_SHADOW_CTRL_TIMER_INTERVAL , + ce_ring->hal_ring_id); +return 0 ; }
@@ -677,6 +703,9 @@ int ath11k_ce_send(struct ath11k_base *ab, struct sk_buff *skb, u8 pipe_id,ath11k_hal_srng_access_end (ab, srng); +if (ath11k_ce_need_shadow_fix (pipe_id)) +ath11k_dp_shadow_start_timer (ab, srng, &ab->ce.hp_timer[pipe_id]); +spin_unlock_bh (&srng->lock);spin_unlock_bh (&ab->ce.ce_lock);
@@ -761,6 +790,8 @@ void ath11k_ce_cleanup_pipes(struct ath11k_base *ab)struct ath11k_ce_pipe *pipe;int pipe_num; +ath11k_ce_stop_shadow_timers (ab); +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);
@@ -874,6 +905,9 @@ void ath11k_ce_free_pipes(struct ath11k_base *ab)for (i =0 ; i < ab->hw_params.ce_count; i++) { pipe = &ab->ce.ce_pipe[i]; +if (ath11k_ce_need_shadow_fix (i)) +ath11k_dp_shadow_stop_timer (ab, &ab->ce.hp_timer[i]); +if (pipe->src_ring) { desc_sz =ath11k_hal_ce_get_desc_size (HAL_CE_DESC_SRC ); dma_free_coherent(ab->dev,
drivers/net/wireless/ath/ath11k/ce.h +1 -0
@@ -168,6 +168,7 @@ struct ath11k_ce {struct ath11k_ce_pipe ce_pipe[CE_COUNT_MAX ];/* Protects rings of all ce pipes */ spinlock_t ce_lock; +struct ath11k_hp_update_timer hp_timer[CE_COUNT_MAX ]; };extern const struct ce_attr ath11k_host_ce_config_ipq8074[];
Signature · 7 lines
2.7.4 -- ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH 7/8 ath11k: enable idle power save mode
In reply to Kalle ValoFrom: Carl Huang <[email protected]>
Host sends wmi command to allow hardware enter idle power save mode in ath11k_mac_op_start function.
hw parameter idle_ps indicates whether idle power save is supported.
Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1
--- drivers/net/wireless/ath/ath11k/core.c | 3 +++ drivers/net/wireless/ath/ath11k/hw.h | 1 + drivers/net/wireless/ath/ath11k/mac.c | 9 +++++++++ 3 files changed, 13 insertions(+)
drivers/net/wireless/ath/ath11k/core.c +3 -0
@@ -64,6 +64,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { BIT(NL80211_IFTYPE_MESH_POINT), .supports_monitor = true, .supports_shadow_regs = false, + .idle_ps = false, }, { .hw_rev = ATH11K_HW_IPQ6018_HW10,
@@ -100,6 +101,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { BIT(NL80211_IFTYPE_MESH_POINT), .supports_monitor = true, .supports_shadow_regs = false, + .idle_ps = false, }, { .name = "qca6390 hw2.0",
@@ -135,6 +137,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {BIT (NL80211_IFTYPE_AP ), .supports_monitor = false, .supports_shadow_regs = true, + .idle_ps = true, }, };
drivers/net/wireless/ath/ath11k/hw.h +1 -0
@@ -160,6 +160,7 @@ struct ath11k_hw_params {u16 interface_modes;bool supports_monitor;bool supports_shadow_regs; +bool idle_ps; };struct ath11k_hw_ops {
drivers/net/wireless/ath/ath11k/mac.c +9 -0
@@ -4208,6 +4208,15 @@ static int ath11k_mac_op_start(struct ieee80211_hw *hw)rcu_assign_pointer (ab->pdevs_active[ar->pdev_idx], &ab->pdevs[ar->pdev_idx]); +/* allow device to enter IMPS */ +if (ab->hw_params.idle_ps) { + ret =ath11k_wmi_pdev_set_param (ar,WMI_PDEV_PARAM_IDLE_PS_CONFIG , +1 , pdev->pdev_id); +if (ret) { +ath11k_err (ab,"failed to enable idle ps: %d\n" , ret); + goto err; + } + }return 0 ; err:
Signature · 7 lines
2.7.4 -- ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH 8/8 ath11k: remove unnecessary casts to u32
In reply to Kalle ValoThese casts are not needed. No changes in functionality.
Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1
--- drivers/net/wireless/ath/ath11k/hal.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/wireless/ath/ath11k/hal.c +4 -4
@@ -330,7 +330,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 (ab), - (u32 )srng->msi_addr); + srng->msi_addr); val = FIELD_PREP(HAL_REO1_RING_MSI1_BASE_MSB_ADDR, ((u64)srng->msi_addr >>
@@ -344,7 +344,7 @@ static void ath11k_hal_srng_dst_hw_init(struct ath11k_base *ab, srng->msi_data); } -ath11k_hif_write32 (ab, reg_base, (u32 )srng->ring_base_paddr); +ath11k_hif_write32 (ab, reg_base, srng->ring_base_paddr); val = FIELD_PREP(HAL_REO1_RING_BASE_MSB_RING_BASE_ADDR_MSB, ((u64)srng->ring_base_paddr >>
@@ -409,7 +409,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 (ab), - (u32 )srng->msi_addr); + srng->msi_addr); val = FIELD_PREP(HAL_TCL1_RING_MSI1_BASE_MSB_ADDR, ((u64)srng->msi_addr >>
@@ -424,7 +424,7 @@ static void ath11k_hal_srng_src_hw_init(struct ath11k_base *ab, srng->msi_data); } -ath11k_hif_write32 (ab, reg_base, (u32 )srng->ring_base_paddr); +ath11k_hif_write32 (ab, reg_base, srng->ring_base_paddr); val = FIELD_PREP(HAL_TCL1_RING_BASE_MSB_RING_BASE_ADDR_MSB, ((u64)srng->ring_base_paddr >>
Signature · 7 lines
2.7.4 -- ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k