91 lines
2.4 KiB
Diff
91 lines
2.4 KiB
Diff
--- a/drivers/net/wireless/ath/ath9k/hw.c
|
|
+++ b/drivers/net/wireless/ath/ath9k/hw.c
|
|
@@ -951,25 +951,60 @@ static bool ath9k_hw_set_global_txtimeou
|
|
|
|
void ath9k_hw_init_global_settings(struct ath_hw *ah)
|
|
{
|
|
- struct ieee80211_conf *conf = &ath9k_hw_common(ah)->hw->conf;
|
|
+ struct ath_common *common = ath9k_hw_common(ah);
|
|
+ struct ieee80211_conf *conf = &common->hw->conf;
|
|
+ const struct ath9k_channel *chan = ah->curchan;
|
|
int acktimeout;
|
|
int slottime;
|
|
int sifstime;
|
|
+ int rx_lat = 0, tx_lat = 0, eifs = 0;
|
|
+ u32 reg;
|
|
|
|
ath_dbg(ath9k_hw_common(ah), ATH_DBG_RESET, "ah->misc_mode 0x%x\n",
|
|
ah->misc_mode);
|
|
|
|
+ if (!chan)
|
|
+ return;
|
|
+
|
|
if (ah->misc_mode != 0)
|
|
REG_SET_BIT(ah, AR_PCU_MISC, ah->misc_mode);
|
|
|
|
- if (conf->channel && conf->channel->band == IEEE80211_BAND_5GHZ)
|
|
- sifstime = 16;
|
|
- else
|
|
- sifstime = 10;
|
|
+ rx_lat = 37;
|
|
+ tx_lat = 54;
|
|
+
|
|
+ if (IS_CHAN_HALF_RATE(chan)) {
|
|
+ eifs = 175;
|
|
+ rx_lat *= 2;
|
|
+ tx_lat *= 2;
|
|
+ if (IS_CHAN_A_FAST_CLOCK(ah, chan))
|
|
+ tx_lat += 11;
|
|
+
|
|
+ slottime = 13;
|
|
+ sifstime = 32;
|
|
+ } else if (IS_CHAN_QUARTER_RATE(chan)) {
|
|
+ eifs = 340;
|
|
+ rx_lat *= 4;
|
|
+ tx_lat *= 4;
|
|
+ if (IS_CHAN_A_FAST_CLOCK(ah, chan))
|
|
+ tx_lat += 22;
|
|
+
|
|
+ slottime = 21;
|
|
+ sifstime = 64;
|
|
+ } else {
|
|
+ eifs = REG_READ(ah, AR_D_GBL_IFS_EIFS);
|
|
+ reg = REG_READ(ah, AR_USEC);
|
|
+ rx_lat = MS(reg, AR_USEC_RX_LAT);
|
|
+ tx_lat = MS(reg, AR_USEC_TX_LAT);
|
|
+
|
|
+ slottime = ah->slottime;
|
|
+ if (IS_CHAN_5GHZ(chan))
|
|
+ sifstime = 16;
|
|
+ else
|
|
+ sifstime = 10;
|
|
+ }
|
|
|
|
/* As defined by IEEE 802.11-2007 17.3.8.6 */
|
|
- slottime = ah->slottime + 3 * ah->coverage_class;
|
|
- acktimeout = slottime + sifstime;
|
|
+ acktimeout = slottime + sifstime + 3 * ah->coverage_class;
|
|
|
|
/*
|
|
* Workaround for early ACK timeouts, add an offset to match the
|
|
@@ -981,11 +1016,19 @@ void ath9k_hw_init_global_settings(struc
|
|
if (conf->channel && conf->channel->band == IEEE80211_BAND_2GHZ)
|
|
acktimeout += 64 - sifstime - ah->slottime;
|
|
|
|
- ath9k_hw_setslottime(ah, ah->slottime);
|
|
+ ath9k_hw_setslottime(ah, slottime);
|
|
ath9k_hw_set_ack_timeout(ah, acktimeout);
|
|
ath9k_hw_set_cts_timeout(ah, acktimeout);
|
|
if (ah->globaltxtimeout != (u32) -1)
|
|
ath9k_hw_set_global_txtimeout(ah, ah->globaltxtimeout);
|
|
+
|
|
+ REG_WRITE(ah, AR_D_GBL_IFS_EIFS, ath9k_hw_mac_to_clks(ah, eifs));
|
|
+ REG_RMW(ah, AR_USEC,
|
|
+ (common->clockrate - 1) |
|
|
+ SM(rx_lat, AR_USEC_RX_LAT) |
|
|
+ SM(tx_lat, AR_USEC_TX_LAT),
|
|
+ AR_USEC_TX_LAT | AR_USEC_RX_LAT | AR_USEC_USEC);
|
|
+
|
|
}
|
|
EXPORT_SYMBOL(ath9k_hw_init_global_settings);
|
|
|