ath11k: start a timer to update HP for CE pipe 4

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

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

diff --git a/drivers/net/wireless/ath/ath11k/ce.c b/drivers/net/wireless/ath/ath11k/ce.c
index caa356dde8804e7fa218ee2f69773ff0315492f8..9d730f8ac81614e4dd02bc6936e9daeca1aa5f1c 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/ce.c
+++ b/drivers/net/wireless/ath/ath11k/ce.c
@@ -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,

diff --git a/drivers/net/wireless/ath/ath11k/ce.h b/drivers/net/wireless/ath/ath11k/ce.h
index 26ef65e2528e796499f1f42a48d2a0cb759881fc..269b599ac0b094506927e4b4efe4e77d9d3cc930 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/ce.h
+++ b/drivers/net/wireless/ath/ath11k/ce.h
@@ -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[];