ath9k: Fix RX interrupt mitigation

The threshold values for RX interrupt mitigation
are different for AR9003 and AR9002 families.

Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index ce41658a600344db2c027bcdfb9de41ccee50965..fbf43c05713f476f9e6551ad2948dc1ff412970a 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -358,6 +358,14 @@ static void ath9k_hw_init_config(struct ath_hw *ah)
 
        ah->config.rx_intr_mitigation = true;
 
 
        ah->config.rx_intr_mitigation = true;
 

+       if (AR_SREV_9300_20_OR_LATER(ah)) {
+               ah->config.rimt_last = 500;
+               ah->config.rimt_first = 2000;
+       } else {
+               ah->config.rimt_last = 250;
+               ah->config.rimt_first = 700;
+       }
+

        /*
         * We need this for PCI devices only (Cardbus, PCI, miniPCI)
         * _and_ if on non-uniprocessor systems (Multiprocessor/HT).
        /*
         * We need this for PCI devices only (Cardbus, PCI, miniPCI)
         * _and_ if on non-uniprocessor systems (Multiprocessor/HT).


@@ -1876,8 +1884,8 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
                REG_WRITE(ah, AR_OBS, 8);
 
        if (ah->config.rx_intr_mitigation) {
                REG_WRITE(ah, AR_OBS, 8);
 
        if (ah->config.rx_intr_mitigation) {

-               REG_RMW_FIELD(ah, AR_RIMT, AR_RIMT_LAST, 500);
-               REG_RMW_FIELD(ah, AR_RIMT, AR_RIMT_FIRST, 2000);
+               REG_RMW_FIELD(ah, AR_RIMT, AR_RIMT_LAST, ah->config.rimt_last);
+               REG_RMW_FIELD(ah, AR_RIMT, AR_RIMT_FIRST, ah->config.rimt_first);

        }
 
        if (ah->config.tx_intr_mitigation) {
        }
 
        if (ah->config.tx_intr_mitigation) {

diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
index e766399bdcdaede07d547832e0797a89dfb8efb1..0acd4b5a48929f4443fde73706f6ee6bb8ce7a0b 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
@@ -310,6 +310,8 @@ struct ath9k_ops_config {
        u8 max_txtrig_level;
        u16 ani_poll_interval; /* ANI poll interval in ms */
        u16 hw_hang_checks;
        u8 max_txtrig_level;
        u16 ani_poll_interval; /* ANI poll interval in ms */
        u16 hw_hang_checks;

+       u16 rimt_first;
+       u16 rimt_last;

 
        /* Platform specific config */
        u32 aspm_l1_fix;
 
        /* Platform specific config */
        u32 aspm_l1_fix;