ath5k: use the common cycle counter / listen time implementation

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: Bruno Randolf <br1@einfach.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 14 insertions, 27 deletions

diff --git a/drivers/net/wireless/ath/ath5k/ani.c b/drivers/net/wireless/ath/ath5k/ani.c
index e4a5f046bba4..f1419198a479 100644
--- a/drivers/net/wireless/ath/ath5k/ani.c
+++ b/drivers/net/wireless/ath/ath5k/ani.c
@@ -355,41 +355,28 @@ ath5k_ani_lower_immunity(struct ath5k_hw *ah, struct ath5k_ani_state *as)
 
 
 /**
- * ath5k_hw_ani_get_listen_time() - Calculate time spent listening
+ * ath5k_hw_ani_get_listen_time() - Update counters and return listening time
  *
  * Return an approximation of the time spent "listening" in milliseconds (ms)
- * since the last call of this function by deducting the cycles spent
- * transmitting and receiving from the total cycle count.
- * Save profile count values for debugging/statistics and because we might want
- * to use them later.
- *
- * We assume no one else clears these registers!
+ * since the last call of this function.
+ * Save a snapshot of the counter values for debugging/statistics.
  */
 static int
 ath5k_hw_ani_get_listen_time(struct ath5k_hw *ah, struct ath5k_ani_state *as)
 {
+        struct ath_common *common = ath5k_hw_common(ah);
         int listen;
 
-        /* freeze */
-        ath5k_hw_reg_write(ah, AR5K_MIBC_FMC, AR5K_MIBC);
-        /* read */
-        as->pfc_cycles = ath5k_hw_reg_read(ah, AR5K_PROFCNT_CYCLE);
-        as->pfc_busy = ath5k_hw_reg_read(ah, AR5K_PROFCNT_RXCLR);
-        as->pfc_tx = ath5k_hw_reg_read(ah, AR5K_PROFCNT_TX);
-        as->pfc_rx = ath5k_hw_reg_read(ah, AR5K_PROFCNT_RX);
-        /* clear */
-        ath5k_hw_reg_write(ah, 0, AR5K_PROFCNT_TX);
-        ath5k_hw_reg_write(ah, 0, AR5K_PROFCNT_RX);
-        ath5k_hw_reg_write(ah, 0, AR5K_PROFCNT_RXCLR);
-        ath5k_hw_reg_write(ah, 0, AR5K_PROFCNT_CYCLE);
-        /* un-freeze */
-        ath5k_hw_reg_write(ah, 0, AR5K_MIBC);
-
-        /* TODO: where does 44000 come from? (11g clock rate?) */
-        listen = (as->pfc_cycles - as->pfc_rx - as->pfc_tx) / 44000;
-
-        if (as->pfc_cycles == 0 || listen < 0)
-                return 0;
+        spin_lock_bh(&common->cc_lock);
+
+        ath_hw_cycle_counters_update(common);
+        memcpy(&as->last_cc, &common->cc_ani, sizeof(as->last_cc));
+
+        /* clears common->cc_ani */
+        listen = ath_hw_get_listen_time(common);
+
+        spin_unlock_bh(&common->cc_lock);
+
         return listen;
 }