ath9k_hw: fix noisefloor history buffer usage on AR9271

Noisefloor calibration involves querying hardware for samples
and storing this information on a history buffer in hardware for
actual noisefloor calibration processing in hardware. The history
buffer supports collecting information for all Atheros hardware,
one history buffer slot for each chain on each channel used for
MIMO operation. For current hardware this means one history
buffer slot for each chain on both the control (or primary) channel
and the extension (or secondary) channel. We know which noisefloor
registers to poke for collecting noisefloor data through the
chainmask.

For AR9285 and AR9271 devices, both 1x1, the chaimmask is defined as
0x9 = 0b0001001. The first four bits represent each chain out of
a maximum of 4 chains [0-3] on the primary channel. The last four
bits represent each chain on the extension channel. A chainmask
of 0x9 therefore indicates chain 1 is active on both the primary
and the extension channel.

AR9271 only requires collecting and storing noisefloor history buffer
data for the first chain on both the control and extension channel
(nfarray[0] and nfarray[3]) so fix the code and avoid which reads
and writes to the history buffer for the other chains.

Since the noisefloor varies depending on the number of chains your
device supports also initialize the noisefloor history buffer with
reasonable values seen on 1x1 devices such as AR9285.

Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/ath/ath9k/calib.c b/drivers/net/wireless/ath/ath9k/calib.c
index 238a5744d8e9ad0ab77049f1f013f407d1ad8060..0c3e9c8fa017fd193df64e94e8eb91007082bed6 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/calib.c
+++ b/drivers/net/wireless/ath/ath9k/calib.c
@@ -103,7 +103,7 @@ static void ath9k_hw_do_getnf(struct ath_hw *ah,
                  "NF calibrated [ctl] [chain 0] is %d\n", nf);
        nfarray[0] = nf;
 
-       if (!AR_SREV_9285(ah)) {
+       if (!AR_SREV_9285(ah) && !AR_SREV_9271(ah)) {
                if (AR_SREV_9280_10_OR_LATER(ah))
                        nf = MS(REG_READ(ah, AR_PHY_CH1_CCA),
                                        AR9280_PHY_CH1_MINCCA_PWR);
@@ -141,7 +141,7 @@ static void ath9k_hw_do_getnf(struct ath_hw *ah,
                  "NF calibrated [ext] [chain 0] is %d\n", nf);
        nfarray[3] = nf;
 
-       if (!AR_SREV_9285(ah)) {
+       if (!AR_SREV_9285(ah) && !AR_SREV_9271(ah)) {
                if (AR_SREV_9280_10_OR_LATER(ah))
                        nf = MS(REG_READ(ah, AR_PHY_CH1_EXT_CCA),
                                        AR9280_PHY_CH1_EXT_MINCCA_PWR);
@@ -621,7 +621,7 @@ void ath9k_hw_loadnf(struct ath_hw *ah, struct ath9k_channel *chan)
        u8 chainmask, rx_chain_status;
 
        rx_chain_status = REG_READ(ah, AR_PHY_RX_CHAINMASK);
-       if (AR_SREV_9285(ah))
+       if (AR_SREV_9285(ah) || AR_SREV_9271(ah))
                chainmask = 0x9;
        else if (AR_SREV_9280(ah) || AR_SREV_9287(ah)) {
                if ((rx_chain_status & 0x2) || (rx_chain_status & 0x4))
@@ -715,7 +715,7 @@ void ath9k_init_nfcal_hist_buffer(struct ath_hw *ah)
 
        if (AR_SREV_9280(ah))
                noise_floor = AR_PHY_CCA_MAX_AR9280_GOOD_VALUE;
-       else if (AR_SREV_9285(ah))
+       else if (AR_SREV_9285(ah) || AR_SREV_9271(ah))
                noise_floor = AR_PHY_CCA_MAX_AR9285_GOOD_VALUE;
        else if (AR_SREV_9287(ah))
                noise_floor = AR_PHY_CCA_MAX_AR9287_GOOD_VALUE;