ath11k: start a timer to update REO cmd ring

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

Signed-off-by: Carl Huang <cjhuang@codeaurora.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/1601544890-13450-6-git-send-email-kvalo@codeaurora.org

diff --git a/drivers/net/wireless/ath/ath11k/dp.c b/drivers/net/wireless/ath/ath11k/dp.c
index 868bfa00c8b1a7c068907c54a6dc988fd0391160..59dd185a0cfce0fe2896698f847d283d3fff31e5 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/dp.c
+++ b/drivers/net/wireless/ath/ath11k/dp.c
@@ -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) {

diff --git a/drivers/net/wireless/ath/ath11k/dp.h b/drivers/net/wireless/ath/ath11k/dp.h
index 43fa229ccccd7b629980f9597551232f6460b8d1..ee8db812589b3cdecdfda17ba796e36b75faa0a9 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/dp.h
+++ b/drivers/net/wireless/ath/ath11k/dp.h
@@ -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 10
 
 struct 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];
 };
 

diff --git a/drivers/net/wireless/ath/ath11k/hal_rx.c b/drivers/net/wireless/ath/ath11k/hal_rx.c
index b0d6ece145beb3573d65c60d6858ec2942b423ca..fac2396edf32aa6b05de895f2af95937a6b1982e 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/hal_rx.c
+++ b/drivers/net/wireless/ath/ath11k/hal_rx.c
@@ -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);