ath9k: further reduce false baseband hang detects on older chips
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 39847
This commit is contained in:
parent
976ae17c67
commit
646ff55b06
5 changed files with 22 additions and 17 deletions
|
@ -1,3 +1,16 @@
|
|||
commit fcb064fdd5a27bec8d24099bc0172468f34c97cb
|
||||
Author: Felix Fietkau <nbd@openwrt.org>
|
||||
Date: Sun Mar 9 09:43:09 2014 +0100
|
||||
|
||||
ath9k_hw: fix unreachable code in baseband hang detection code
|
||||
|
||||
The commit "ath9k: reduce baseband hang detection false positive rate"
|
||||
added a delay in the loop checking the baseband state, however it was
|
||||
unreachable due to previous 'continue' statements.
|
||||
|
||||
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
|
||||
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
|
||||
|
||||
commit 31959d8df39319e32c6d5ba9c135727be90cfad7
|
||||
Author: Michal Kazior <michal.kazior@tieto.com>
|
||||
Date: Fri Mar 7 08:09:38 2014 +0100
|
||||
|
@ -1197,7 +1210,7 @@ Date: Thu Jan 23 20:06:34 2014 +0100
|
|||
|
||||
if (AR_SREV_9300(ah))
|
||||
return !ath9k_hw_detect_mac_hang(ah);
|
||||
@@ -1542,9 +1542,13 @@ bool ath9k_hw_check_alive(struct ath_hw
|
||||
@@ -1542,9 +1542,14 @@ bool ath9k_hw_check_alive(struct ath_hw
|
||||
if (AR_SREV_9285_12_OR_LATER(ah))
|
||||
return true;
|
||||
|
||||
|
@ -1207,20 +1220,12 @@ Date: Thu Jan 23 20:06:34 2014 +0100
|
|||
+ if (reg != last_val)
|
||||
+ return true;
|
||||
|
||||
+ udelay(1);
|
||||
+ last_val = reg;
|
||||
if ((reg & 0x7E7FFFEF) == 0x00702400)
|
||||
continue;
|
||||
|
||||
@@ -1556,6 +1560,8 @@ bool ath9k_hw_check_alive(struct ath_hw
|
||||
default:
|
||||
return true;
|
||||
}
|
||||
+
|
||||
+ udelay(1);
|
||||
} while (count-- > 0);
|
||||
|
||||
return false;
|
||||
@@ -2051,9 +2057,8 @@ static bool ath9k_hw_set_power_awake(str
|
||||
@@ -2051,9 +2056,8 @@ static bool ath9k_hw_set_power_awake(str
|
||||
|
||||
REG_SET_BIT(ah, AR_RTC_FORCE_WAKE,
|
||||
AR_RTC_FORCE_WAKE_EN);
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
--- a/drivers/net/wireless/ath/ath9k/hw.c
|
||||
+++ b/drivers/net/wireless/ath/ath9k/hw.c
|
||||
@@ -2722,7 +2722,7 @@ void ath9k_hw_apply_txpower(struct ath_h
|
||||
@@ -2721,7 +2721,7 @@ void ath9k_hw_apply_txpower(struct ath_h
|
||||
channel = chan->chan;
|
||||
chan_pwr = min_t(int, channel->max_power * 2, MAX_RATE_POWER);
|
||||
new_pwr = min_t(int, chan_pwr, reg->power_limit);
|
||||
|
|
|
@ -94,7 +94,7 @@
|
|||
struct ath_gen_timer *ath_gen_timer_alloc(struct ath_hw *ah,
|
||||
--- a/drivers/net/wireless/ath/ath9k/hw.c
|
||||
+++ b/drivers/net/wireless/ath/ath9k/hw.c
|
||||
@@ -1736,6 +1736,20 @@ fail:
|
||||
@@ -1735,6 +1735,20 @@ fail:
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
@ -115,7 +115,7 @@
|
|||
int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
|
||||
struct ath9k_hw_cal_data *caldata, bool fastcc)
|
||||
{
|
||||
@@ -1941,6 +1955,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st
|
||||
@@ -1940,6 +1954,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st
|
||||
ar9003_hw_disable_phy_restart(ah);
|
||||
|
||||
ath9k_hw_apply_gpio_override(ah);
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
int (*external_reset)(void);
|
||||
--- a/drivers/net/wireless/ath/ath9k/hw.c
|
||||
+++ b/drivers/net/wireless/ath/ath9k/hw.c
|
||||
@@ -2329,17 +2329,25 @@ int ath9k_hw_fill_cap_info(struct ath_hw
|
||||
@@ -2328,17 +2328,25 @@ int ath9k_hw_fill_cap_info(struct ath_hw
|
||||
}
|
||||
|
||||
eeval = ah->eep_ops->get_eeprom(ah, EEP_OP_MODE);
|
||||
|
|
|
@ -40,7 +40,7 @@
|
|||
return true;
|
||||
}
|
||||
|
||||
@@ -1731,8 +1750,14 @@ static int ath9k_hw_do_fastcc(struct ath
|
||||
@@ -1730,8 +1749,14 @@ static int ath9k_hw_do_fastcc(struct ath
|
||||
if (AR_SREV_9271(ah))
|
||||
ar9002_hw_load_ani_reg(ah, chan);
|
||||
|
||||
|
@ -55,7 +55,7 @@
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
@@ -1960,6 +1985,9 @@ int ath9k_hw_reset(struct ath_hw *ah, st
|
||||
@@ -1959,6 +1984,9 @@ int ath9k_hw_reset(struct ath_hw *ah, st
|
||||
if (AR_SREV_9565(ah) && common->bt_ant_diversity)
|
||||
REG_SET_BIT(ah, AR_BTCOEX_WL_LNADIV, AR_BTCOEX_WL_LNADIV_FORCE_ON);
|
||||
|
||||
|
|
Loading…
Reference in a new issue