diff options
author | Felix Fietkau <nbd@openwrt.org> | 2010-10-08 16:13:53 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-10-11 15:04:20 -0400 |
commit | b5bfc5683db44a121ad47ec0a9f4efd4aac040e0 (patch) | |
tree | b9d182f42cbbfdea95ad7ab425302617c5f40db9 /drivers/net/wireless/ath/ath9k/ar9003_phy.c | |
parent | 9d119f3ebd074bde0b801f476a44ca60d222efb2 (diff) |
ath9k_hw: move the cycle counter tracking to ath
Instead of keeping track of wraparound, clear the counters on every
access and keep separate deltas for ANI and later survey use.
Also moves the function for calculating the 'listen time' for ANI
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>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/ar9003_phy.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ar9003_phy.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.c b/drivers/net/wireless/ath/ath9k/ar9003_phy.c index efb05599b84c..669b777729b3 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c +++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c | |||
@@ -1254,13 +1254,12 @@ void ar9003_hw_bb_watchdog_dbg_info(struct ath_hw *ah) | |||
1254 | "** BB mode: BB_gen_controls=0x%08x **\n", | 1254 | "** BB mode: BB_gen_controls=0x%08x **\n", |
1255 | REG_READ(ah, AR_PHY_GEN_CTRL)); | 1255 | REG_READ(ah, AR_PHY_GEN_CTRL)); |
1256 | 1256 | ||
1257 | ath9k_hw_update_cycle_counters(ah); | 1257 | #define PCT(_field) (common->cc_survey._field * 100 / common->cc_survey.cycles) |
1258 | #define PCT(_field) (ah->cc_delta._field * 100 / ah->cc_delta.cycles) | 1258 | if (common->cc_survey.cycles) |
1259 | if (ah->cc_delta.cycles) | ||
1260 | ath_print(common, ATH_DBG_RESET, | 1259 | ath_print(common, ATH_DBG_RESET, |
1261 | "** BB busy times: rx_clear=%d%%, " | 1260 | "** BB busy times: rx_clear=%d%%, " |
1262 | "rx_frame=%d%%, tx_frame=%d%% **\n", | 1261 | "rx_frame=%d%%, tx_frame=%d%% **\n", |
1263 | PCT(rx_clear), PCT(rx_frame), PCT(tx_frame)); | 1262 | PCT(rx_busy), PCT(rx_frame), PCT(tx_frame)); |
1264 | 1263 | ||
1265 | ath_print(common, ATH_DBG_RESET, | 1264 | ath_print(common, ATH_DBG_RESET, |
1266 | "==== BB update: done ====\n\n"); | 1265 | "==== BB update: done ====\n\n"); |