1 files changed, 64 insertions, 7 deletions

diff --git a/drivers/net/wireless/ath/hw.c b/drivers/net/wireless/ath/hw.c
index a8f81ea09f14..3f508e59f146 100644
--- a/drivers/net/wireless/ath/hw.c
+++ b/drivers/net/wireless/ath/hw.c
@@ -43,7 +43,7 @@
  * set of  ~ ( MAC XOR BSSID ) for all bssids we handle.
  *
  * When you do this you are essentially computing the common bits of all your
- * BSSes. Later it is assumed the harware will "and" (&) the BSSID mask with
+ * BSSes. Later it is assumed the hardware will "and" (&) the BSSID mask with
  * the MAC address to obtain the relevant bits and compare the result with
  * (frame's BSSID & mask) to see if they match.
  *
@@ -71,8 +71,8 @@
  *             On loop iteration for BSSID-02:
  *             bssid_mask &= ~(0001   ^   1001)
  *             bssid_mask =   (1010)  & ~(0001 ^ 1001)
- *             bssid_mask =   (1010)  & ~(1001)
- *             bssid_mask =   (1010)  &  (0110)
+ *             bssid_mask =   (1010)  & ~(1000)
+ *             bssid_mask =   (1010)  &  (0111)
  *             bssid_mask =   0010
  *
  * A bssid_mask of 0010 means "only pay attention to the second least
@@ -86,7 +86,7 @@
  * IFRAME-01:  0110
  *
  * An easy eye-inspeciton of this already should tell you that this frame
- * will not pass our check. This is beacuse the bssid_mask tells the
+ * will not pass our check. This is because the bssid_mask tells the
  * hardware to only look at the second least significant bit and the
  * common bit amongst the MAC and BSSIDs is 0, this frame has the 2nd LSB
  * as 1, which does not match 0.
@@ -102,11 +102,9 @@
  *
  * IFRAME-02:  0001 (we should allow)
  *
- *     allow = (0001 & 1010) == 1010
- *
  *     allow = (IFRAME-02 & bssid_mask) == (bssid_mask & MAC) ? 1 : 0;
  *  --> allow = (0001 & 0010) ==  (0010 & 0001) ? 1 :0;
- *  --> allow = (0010) == (0010)
+ *  --> allow = (0000) == (0000)
  *  --> allow = 1
  *
  * Other examples:
@@ -124,3 +122,62 @@ void ath_hw_setbssidmask(struct ath_common *common)
         REG_WRITE(ah, get_unaligned_le16(common->bssidmask + 4), AR_BSSMSKU);
 }
 EXPORT_SYMBOL(ath_hw_setbssidmask);
+
+
+/**
+ * ath_hw_cycle_counters_update - common function to update cycle counters
+ *
+ * @common: the ath_common struct for the device.
+ *
+ * This function is used to update all cycle counters in one place.
+ * It has to be called while holding common->cc_lock!
+ */
+void ath_hw_cycle_counters_update(struct ath_common *common)
+{
+        u32 cycles, busy, rx, tx;
+        void *ah = common->ah;
+
+        /* freeze */
+        REG_WRITE(ah, AR_MIBC_FMC, AR_MIBC);
+
+        /* read */
+        cycles = REG_READ(ah, AR_CCCNT);
+        busy = REG_READ(ah, AR_RCCNT);
+        rx = REG_READ(ah, AR_RFCNT);
+        tx = REG_READ(ah, AR_TFCNT);
+
+        /* clear */
+        REG_WRITE(ah, 0, AR_CCCNT);
+        REG_WRITE(ah, 0, AR_RFCNT);
+        REG_WRITE(ah, 0, AR_RCCNT);
+        REG_WRITE(ah, 0, AR_TFCNT);
+
+        /* unfreeze */
+        REG_WRITE(ah, 0, AR_MIBC);
+
+        /* update all cycle counters here */
+        common->cc_ani.cycles += cycles;
+        common->cc_ani.rx_busy += busy;
+        common->cc_ani.rx_frame += rx;
+        common->cc_ani.tx_frame += tx;
+
+        common->cc_survey.cycles += cycles;
+        common->cc_survey.rx_busy += busy;
+        common->cc_survey.rx_frame += rx;
+        common->cc_survey.tx_frame += tx;
+}
+EXPORT_SYMBOL(ath_hw_cycle_counters_update);
+
+int32_t ath_hw_get_listen_time(struct ath_common *common)
+{
+        struct ath_cycle_counters *cc = &common->cc_ani;
+        int32_t listen_time;
+
+        listen_time = (cc->cycles - cc->rx_frame - cc->tx_frame) /
+                      (common->clockrate * 1000);
+
+        memset(cc, 0, sizeof(*cc));
+
+        return listen_time;
+}
+EXPORT_SYMBOL(ath_hw_get_listen_time);