ath9k_hw: initialize regulatory->max_power_level in set_txpower for AR9003
PATCH 1/3 ath9k_hw: initialize regulatory->max_power_level in set_txpower for AR9003
The same is done for the older chip families as well.
--- drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +2 -0
@@ -2133,6 +2133,7 @@ static void ath9k_hw_ar9300_set_txpower(struct ath_hw *ah, u8 twiceMaxRegulatoryPower, u8 powerLimit) { +struct ath_regulatory *regulatory =ath9k_hw_regulatory (ah);struct ath_common *common =ath9k_hw_common (ah);u8 targetPowerValT2[ar9300RateSize];unsigned int i =0 ;
@@ -2180,6 +2181,7 @@ static void ath9k_hw_ar9300_set_txpower(struct ath_hw *ah, i =ALL_TARGET_HT20_0_8_16 ;/* ht20 */ ah->txpower_limit = targetPowerValT2[i]; + regulatory->max_power_level = ratesArray[i];ar9003_hw_calibration_apply (ah, chan->channel); }
Signature · 1 line
1.7.2.2
PATCH 2/3 ath9k_hw: extend ath9k_hw_set_txpowerlimit to test channel txpower
ath9k_hw_set_txpowerlimit gets an extra boolean parameter that - if set - causes the rate txpower table and the regulatory limit to be calculated and stored, without changing hardware registers.
--- drivers/net/wireless/ath/ath9k/ar5008_phy.c | 2 +- drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 12 +++-- drivers/net/wireless/ath/ath9k/ar9003_phy.c | 2 +- drivers/net/wireless/ath/ath9k/eeprom.h | 3 +- drivers/net/wireless/ath/ath9k/eeprom_4k.c | 5 ++- drivers/net/wireless/ath/ath9k/eeprom_9287.c | 23 +++++----- drivers/net/wireless/ath/ath9k/eeprom_def.c | 57 ++++++++++++------------ drivers/net/wireless/ath/ath9k/htc_drv_main.c | 2 +- drivers/net/wireless/ath/ath9k/hw.c | 6 +- drivers/net/wireless/ath/ath9k/hw.h | 2 +- drivers/net/wireless/ath/ath9k/main.c | 2 +- 11 files changed, 60 insertions(+), 56 deletions(-)
drivers/net/wireless/ath/ath9k/ar5008_phy.c +1 -1
@@ -875,7 +875,7 @@ static int ar5008_hw_process_ini(struct ath_hw *ah, channel->max_antenna_gain *2 , channel->max_power *2 ,min ((u32 )MAX_RATE_POWER , - (u32) regulatory->power_limit)); + (u32) regulatory->power_limit), false);/* Write analog registers */ if (!ath9k_hw_set_rf_regs (ah, chan, freqIndex)) {
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +7 -5
@@ -2131,7 +2131,7 @@ static void ath9k_hw_ar9300_set_txpower(struct ath_hw *ah, struct ath9k_channel *chan, u16 cfgCtl, u8 twiceAntennaReduction, u8 twiceMaxRegulatoryPower, - u8 powerLimit) + u8 powerLimit, bool test) { struct ath_regulatory *regulatory = ath9k_hw_regulatory(ah);struct ath_common *common =ath9k_hw_common (ah);
@@ -2160,9 +2160,6 @@ static void ath9k_hw_ar9300_set_txpower(struct ath_hw *ah, i++; } -/* Write target power array to registers */ -ar9003_hw_tx_power_regwrite (ah, targetPowerValT2); -/* * This is the TX power we send back to driver core, * and it can use to pass to userspace to display our
@@ -2181,8 +2178,13 @@ static void ath9k_hw_ar9300_set_txpower(struct ath_hw *ah, i =ALL_TARGET_HT20_0_8_16 ;/* ht20 */ ah->txpower_limit = targetPowerValT2[i]; - regulatory->max_power_level = ratesArray[i]; + regulatory->max_power_level = targetPowerValT2[i]; +if (test) +return ; + +/* Write target power array to registers */ +ar9003_hw_tx_power_regwrite (ah, targetPowerValT2);ar9003_hw_calibration_apply (ah, chan->channel); }
drivers/net/wireless/ath/ath9k/ar9003_phy.c +1 -1
@@ -614,7 +614,7 @@ static int ar9003_hw_process_ini(struct ath_hw *ah, channel->max_antenna_gain *2 , channel->max_power *2 ,min ((u32 )MAX_RATE_POWER , - (u32) regulatory->power_limit)); + (u32) regulatory->power_limit), false);return 0 ; }
drivers/net/wireless/ath/ath9k/eeprom.h +2 -1
@@ -680,7 +680,8 @@ struct eeprom_ops {void (*set_addac)(struct ath_hw *hw,struct ath9k_channel *chan);void (*set_txpower)(struct ath_hw *hw,struct ath9k_channel *chan,u16 cfgCtl,u8 twiceAntennaReduction, -u8 twiceMaxRegulatoryPower,u8 powerLimit); +u8 twiceMaxRegulatoryPower,u8 powerLimit, +bool test);u16 (*get_spur_channel)(struct ath_hw *ah,u16 i,bool is2GHz); };
drivers/net/wireless/ath/ath9k/eeprom_4k.c +4 -1
@@ -726,7 +726,7 @@ static void ath9k_hw_4k_set_txpower(struct ath_hw *ah,u16 cfgCtl, u8 twiceAntennaReduction, u8 twiceMaxRegulatoryPower, - u8 powerLimit) + u8 powerLimit, bool test) { struct ath_regulatory *regulatory = ath9k_hw_regulatory(ah);struct ar5416_eeprom_4k *pEepData = &ah->eeprom.map4k;
@@ -768,6 +768,9 @@ static void ath9k_hw_4k_set_txpower(struct ath_hw *ah, regulatory->max_power_level = ratesArray[i]; +if (test) +return ; +if (AR_SREV_9280_20_OR_LATER (ah)) {for (i =0 ; i < Ar5416RateSize; i++) ratesArray[i] -=AR5416_PWR_TABLE_OFFSET_DB *2 ;
drivers/net/wireless/ath/ath9k/eeprom_9287.c +11 -12
@@ -853,7 +853,7 @@ static void ath9k_hw_ar9287_set_txpower(struct ath_hw *ah, struct ath9k_channel *chan, u16 cfgCtl, u8 twiceAntennaReduction, u8 twiceMaxRegulatoryPower, - u8 powerLimit) + u8 powerLimit, bool test) { struct ath_regulatory *regulatory = ath9k_hw_regulatory(ah);struct ar9287_eeprom *pEepData = &ah->eeprom.map9287;
@@ -883,6 +883,16 @@ static void ath9k_hw_ar9287_set_txpower(struct ath_hw *ah, ratesArray[i] =AR9287_MAX_RATE_POWER ; } +if (IS_CHAN_2GHZ (chan)) + i = rate1l; +else + i = rate6mb; + + regulatory->max_power_level = ratesArray[i]; + +if (test) +return ; +if (AR_SREV_9280_20_OR_LATER (ah)) {for (i =0 ; i < Ar5416RateSize; i++) ratesArray[i] -=AR9287_PWR_TABLE_OFFSET_DB *2 ;
@@ -971,17 +981,6 @@ static void ath9k_hw_ar9287_set_txpower(struct ath_hw *ah, | ATH9K_POW_SM(ratesArray[rateDupOfdm], 8) | ATH9K_POW_SM(ratesArray[rateDupCck], 0)); } - -if (IS_CHAN_2GHZ (chan)) - i = rate1l; -else - i = rate6mb; - -if (AR_SREV_9280_20_OR_LATER (ah)) - regulatory->max_power_level = - ratesArray[i] +AR9287_PWR_TABLE_OFFSET_DB *2 ; -else - regulatory->max_power_level = ratesArray[i]; } static void ath9k_hw_ar9287_set_addac(struct ath_hw *ah,
drivers/net/wireless/ath/ath9k/eeprom_def.c +28 -29
75 lines not on this page · raw message
drivers/net/wireless/ath/ath9k/htc_drv_main.c +1 -1
@@ -29,7 +29,7 @@ static void ath_update_txpow(struct ath9k_htc_priv *priv)struct ath_hw *ah = priv->ah;if (priv->curtxpow != priv->txpowlimit) { -ath9k_hw_set_txpowerlimit (ah, priv->txpowlimit); +ath9k_hw_set_txpowerlimit (ah, priv->txpowlimit, false);/* read back in case value is clamped */ priv->curtxpow =ath9k_hw_regulatory (ah)->power_limit; }
drivers/net/wireless/ath/ath9k/hw.c +3 -3
@@ -1166,7 +1166,7 @@ static bool ath9k_hw_channel_change(struct ath_hw *ah, channel->max_antenna_gain *2 , channel->max_power *2 ,min ((u32 )MAX_RATE_POWER , - (u32) regulatory->power_limit)); + (u32) regulatory->power_limit), false);ath9k_hw_rfbus_done (ah);
@@ -2165,7 +2165,7 @@ bool ath9k_hw_disable(struct ath_hw *ah) }EXPORT_SYMBOL (ath9k_hw_disable); -void ath9k_hw_set_txpowerlimit (struct ath_hw *ah,u32 limit) +void ath9k_hw_set_txpowerlimit (struct ath_hw *ah,u32 limit,bool test) {struct ath_regulatory *regulatory =ath9k_hw_regulatory (ah);struct ath9k_channel *chan = ah->curchan;
@@ -2178,7 +2178,7 @@ void ath9k_hw_set_txpowerlimit(struct ath_hw *ah, u32 limit) channel->max_antenna_gain *2 , channel->max_power *2 ,min ((u32 )MAX_RATE_POWER , - (u32) regulatory->power_limit)); + (u32) regulatory->power_limit), test); }EXPORT_SYMBOL (ath9k_hw_set_txpowerlimit);
drivers/net/wireless/ath/ath9k/hw.h +1 -1
@@ -860,7 +860,7 @@ u32 ath9k_hw_getrxfilter(struct ath_hw *ah);void ath9k_hw_setrxfilter (struct ath_hw *ah,u32 bits);bool ath9k_hw_phy_disable (struct ath_hw *ah);bool ath9k_hw_disable (struct ath_hw *ah); -void ath9k_hw_set_txpowerlimit (struct ath_hw *ah,u32 limit); +void ath9k_hw_set_txpowerlimit (struct ath_hw *ah,u32 limit,bool test);void ath9k_hw_setopmode (struct ath_hw *ah);void ath9k_hw_setmcastfilter (struct ath_hw *ah,u32 filter0,u32 filter1);void ath9k_hw_setbssidmask (struct ath_hw *ah);
drivers/net/wireless/ath/ath9k/main.c +1 -1
@@ -23,7 +23,7 @@ static void ath_update_txpow(struct ath_softc *sc)struct ath_hw *ah = sc->sc_ah;if (sc->curtxpow != sc->config.txpowlimit) { -ath9k_hw_set_txpowerlimit (ah, sc->config.txpowlimit); +ath9k_hw_set_txpowerlimit (ah, sc->config.txpowlimit, false);/* read back in case value is clamped */ sc->curtxpow =ath9k_hw_regulatory (ah)->power_limit; }
Signature · 1 line
1.7.2.2
PATCH 3/3 ath9k: initialize per-channel tx power limits instead of hardcoding them
--- drivers/net/wireless/ath/ath9k/common.c | 15 ++++------- drivers/net/wireless/ath/ath9k/common.h | 5 ++- drivers/net/wireless/ath/ath9k/htc_drv_main.c | 4 ++- drivers/net/wireless/ath/ath9k/init.c | 33 +++++++++++++++++++++++++ 4 files changed, 45 insertions(+), 12 deletions(-)
drivers/net/wireless/ath/ath9k/common.c +6 -9
@@ -107,12 +107,10 @@ static u32 ath9k_get_extchanmode(struct ieee80211_channel *chan,/* * Update internal channel flags. */ -void ath9k_cmn_update_ichannel (struct ieee80211_hw *hw, -struct ath9k_channel *ichan) +void ath9k_cmn_update_ichannel (struct ath9k_channel *ichan, +struct ieee80211_channel *chan, +enum nl80211_channel_type channel_type) { -struct ieee80211_channel *chan = hw->conf.channel; -struct ieee80211_conf *conf = &hw->conf; - ichan->channel = chan->center_freq; ichan->chan = chan;
@@ -124,9 +122,8 @@ void ath9k_cmn_update_ichannel(struct ieee80211_hw *hw, ichan->channelFlags =CHANNEL_5GHZ |CHANNEL_OFDM ; } -if (conf_is_ht (conf)) - ichan->chanmode =ath9k_get_extchanmode (chan, - conf->channel_type); +if (channel_type !=NL80211_CHAN_NO_HT ) + ichan->chanmode =ath9k_get_extchanmode (chan, channel_type); }EXPORT_SYMBOL (ath9k_cmn_update_ichannel);
@@ -142,7 +139,7 @@ struct ath9k_channel *ath9k_cmn_get_curchannel(struct ieee80211_hw *hw, chan_idx = curchan->hw_value; channel = &ah->channels[chan_idx]; -ath9k_cmn_update_ichannel (hw, channel); +ath9k_cmn_update_ichannel (channel, curchan, hw->conf.channel_type);return channel; }
drivers/net/wireless/ath/ath9k/common.h +3 -2
@@ -62,8 +62,9 @@ enum ath_stomp_type {int ath9k_cmn_padpos (__le16 frame_control);int ath9k_cmn_get_hw_crypto_keytype (struct sk_buff *skb); -void ath9k_cmn_update_ichannel (struct ieee80211_hw *hw, -struct ath9k_channel *ichan); +void ath9k_cmn_update_ichannel (struct ath9k_channel *ichan, +struct ieee80211_channel *chan, +enum nl80211_channel_type channel_type);struct ath9k_channel *ath9k_cmn_get_curchannel (struct ieee80211_hw *hw,struct ath_hw *ah);int ath9k_cmn_count_streams (unsigned int chainmask,int max);
drivers/net/wireless/ath/ath9k/htc_drv_main.c +3 -1
@@ -1397,7 +1397,9 @@ static int ath9k_htc_config(struct ieee80211_hw *hw, u32 changed)ath_print (common,ATH_DBG_CONFIG ,"Set channel: %d MHz\n" , curchan->center_freq); -ath9k_cmn_update_ichannel (hw, &priv->ah->channels[pos]); +ath9k_cmn_update_ichannel (&priv->ah->channels[pos], + hw->conf.channel, + hw->conf.channel_type);if (ath9k_htc_set_channel (priv, hw, &priv->ah->channels[pos]) <0 ) { ath_print(common, ATH_DBG_FATAL,
drivers/net/wireless/ath/ath9k/init.c +33 -0
@@ -642,6 +642,37 @@ err_hw:return ret; } +static void ath9k_init_band_txpower (struct ath_softc *sc,int band) +{ +struct ieee80211_supported_band *sband; +struct ieee80211_channel *chan; +struct ath_hw *ah = sc->sc_ah; +struct ath_regulatory *reg =ath9k_hw_regulatory (ah); +int i; + + sband = &sc->sbands[band]; +for (i =0 ; i < sband->n_channels; i++) { + chan = &sband->channels[i]; + ah->curchan = &ah->channels[chan->hw_value]; +ath9k_cmn_update_ichannel (ah->curchan, chan,NL80211_CHAN_HT20 ); +ath9k_hw_set_txpowerlimit (ah,MAX_RATE_POWER , true); + chan->max_power = reg->max_power_level /2 ; + } +} + +static void ath9k_init_txpower_limits (struct ath_softc *sc) +{ +struct ath_hw *ah = sc->sc_ah; +struct ath9k_channel *curchan = ah->curchan; + +if (ah->caps.hw_caps &ATH9K_HW_CAP_2GHZ ) +ath9k_init_band_txpower (sc,IEEE80211_BAND_2GHZ ); +if (ah->caps.hw_caps &ATH9K_HW_CAP_5GHZ ) +ath9k_init_band_txpower (sc,IEEE80211_BAND_5GHZ ); + + ah->curchan = curchan; +} +void ath9k_set_hw_capab (struct ath_softc *sc,struct ieee80211_hw *hw) {struct ath_common *common =ath9k_hw_common (sc->sc_ah);
@@ -736,6 +767,8 @@ int ath9k_init_device(u16 devid, struct ath_softc *sc, u16 subsysid,if (error !=0 ) goto error_rx; +ath9k_init_txpower_limits (sc); +/* Register with mac80211 */ error =ieee80211_register_hw (hw);if (error)
Signature · 1 line
1.7.2.2
PATCH v2 2/3 ath9k_hw: extend ath9k_hw_set_txpowerlimit to test channel txpower
In reply to Felix Fietkauath9k_hw_set_txpowerlimit gets an extra boolean parameter that - if set - causes the rate txpower table and the regulatory limit to be calculated and stored, without changing hardware registers.
---
v2: use the maximum tx power from the rate table instead of the channel default
drivers/net/wireless/ath/ath9k/ar5008_phy.c | 2 +- drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 20 +++++-- drivers/net/wireless/ath/ath9k/ar9003_phy.c | 2 +- drivers/net/wireless/ath/ath9k/eeprom.h | 3 +- drivers/net/wireless/ath/ath9k/eeprom_4k.c | 9 +++- drivers/net/wireless/ath/ath9k/eeprom_9287.c | 27 ++++++----- drivers/net/wireless/ath/ath9k/eeprom_def.c | 62 +++++++++++++----------- drivers/net/wireless/ath/ath9k/htc_drv_main.c | 2 +- drivers/net/wireless/ath/ath9k/hw.c | 6 +- drivers/net/wireless/ath/ath9k/hw.h | 2 +- drivers/net/wireless/ath/ath9k/main.c | 2 +- 11 files changed, 79 insertions(+), 58 deletions(-)
drivers/net/wireless/ath/ath9k/ar5008_phy.c +1 -1
@@ -875,7 +875,7 @@ static int ar5008_hw_process_ini(struct ath_hw *ah, channel->max_antenna_gain *2 , channel->max_power *2 ,min ((u32 )MAX_RATE_POWER , - (u32) regulatory->power_limit)); + (u32) regulatory->power_limit), false);/* Write analog registers */ if (!ath9k_hw_set_rf_regs (ah, chan, freqIndex)) {
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +14 -6
@@ -2131,7 +2131,7 @@ static void ath9k_hw_ar9300_set_txpower(struct ath_hw *ah, struct ath9k_channel *chan, u16 cfgCtl, u8 twiceAntennaReduction, u8 twiceMaxRegulatoryPower, - u8 powerLimit) + u8 powerLimit, bool test) { struct ath_regulatory *regulatory = ath9k_hw_regulatory(ah);struct ath_common *common =ath9k_hw_common (ah);
@@ -2145,7 +2145,16 @@ static void ath9k_hw_ar9300_set_txpower(struct ath_hw *ah, twiceMaxRegulatoryPower, powerLimit); -while (i < ar9300RateSize) { + regulatory->max_power_level =0 ; +for (i =0 ; i < ar9300RateSize; i++) { +if (targetPowerValT2[i] > regulatory->max_power_level) + regulatory->max_power_level = targetPowerValT2[i]; + } + +if (test) +return ; + +for (i =0 ; i < ar9300RateSize; i++) {ath_print (common,ATH_DBG_EEPROM ,"TPC[%02d] 0x%08x " , i, targetPowerValT2[i]); i++;
@@ -2160,9 +2169,6 @@ static void ath9k_hw_ar9300_set_txpower(struct ath_hw *ah, i++; } -/* Write target power array to registers */ -ar9003_hw_tx_power_regwrite (ah, targetPowerValT2); -/* * This is the TX power we send back to driver core, * and it can use to pass to userspace to display our
@@ -2181,8 +2187,10 @@ static void ath9k_hw_ar9300_set_txpower(struct ath_hw *ah, i =ALL_TARGET_HT20_0_8_16 ;/* ht20 */ ah->txpower_limit = targetPowerValT2[i]; - regulatory->max_power_level = ratesArray[i]; + regulatory->max_power_level = targetPowerValT2[i]; +/* Write target power array to registers */ +ar9003_hw_tx_power_regwrite (ah, targetPowerValT2);ar9003_hw_calibration_apply (ah, chan->channel); }
drivers/net/wireless/ath/ath9k/ar9003_phy.c +1 -1
@@ -614,7 +614,7 @@ static int ar9003_hw_process_ini(struct ath_hw *ah, channel->max_antenna_gain *2 , channel->max_power *2 ,min ((u32 )MAX_RATE_POWER , - (u32) regulatory->power_limit)); + (u32) regulatory->power_limit), false);return 0 ; }
drivers/net/wireless/ath/ath9k/eeprom.h +2 -1
@@ -680,7 +680,8 @@ struct eeprom_ops {void (*set_addac)(struct ath_hw *hw,struct ath9k_channel *chan);void (*set_txpower)(struct ath_hw *hw,struct ath9k_channel *chan,u16 cfgCtl,u8 twiceAntennaReduction, -u8 twiceMaxRegulatoryPower,u8 powerLimit); +u8 twiceMaxRegulatoryPower,u8 powerLimit, +bool test);u16 (*get_spur_channel)(struct ath_hw *ah,u16 i,bool is2GHz); };
drivers/net/wireless/ath/ath9k/eeprom_4k.c +7 -2
@@ -726,7 +726,7 @@ static void ath9k_hw_4k_set_txpower(struct ath_hw *ah,u16 cfgCtl, u8 twiceAntennaReduction, u8 twiceMaxRegulatoryPower, - u8 powerLimit) + u8 powerLimit, bool test) { struct ath_regulatory *regulatory = ath9k_hw_regulatory(ah);struct ar5416_eeprom_4k *pEepData = &ah->eeprom.map4k;
@@ -751,15 +751,20 @@ static void ath9k_hw_4k_set_txpower(struct ath_hw *ah,ath9k_hw_set_4k_power_cal_table (ah, chan, &txPowerIndexOffset); + regulatory->max_power_level =0 ;for (i =0 ; i <ARRAY_SIZE (ratesArray); i++) { ratesArray[i] = (int16_t )(txPowerIndexOffset + ratesArray[i]);if (ratesArray[i] >AR5416_MAX_RATE_POWER ) ratesArray[i] =AR5416_MAX_RATE_POWER ; + +if (ratesArray[i] > regulatory->max_power_level) + regulatory->max_power_level = ratesArray[i]; } +if (test) +return ;/* Update regulatory */ - i = rate6mb;if (IS_CHAN_HT40 (chan)) i = rateHt40_0;
drivers/net/wireless/ath/ath9k/eeprom_9287.c +15 -12
@@ -853,7 +853,7 @@ static void ath9k_hw_ar9287_set_txpower(struct ath_hw *ah, struct ath9k_channel *chan, u16 cfgCtl, u8 twiceAntennaReduction, u8 twiceMaxRegulatoryPower, - u8 powerLimit) + u8 powerLimit, bool test) { struct ath_regulatory *regulatory = ath9k_hw_regulatory(ah);struct ar9287_eeprom *pEepData = &ah->eeprom.map9287;
@@ -877,12 +877,26 @@ static void ath9k_hw_ar9287_set_txpower(struct ath_hw *ah,ath9k_hw_set_ar9287_power_cal_table (ah, chan, &txPowerIndexOffset); + regulatory->max_power_level =0 ;for (i =0 ; i <ARRAY_SIZE (ratesArray); i++) { ratesArray[i] = (int16_t )(txPowerIndexOffset + ratesArray[i]);if (ratesArray[i] >AR9287_MAX_RATE_POWER ) ratesArray[i] =AR9287_MAX_RATE_POWER ; + +if (ratesArray[i] > regulatory->max_power_level) + regulatory->max_power_level = ratesArray[i]; } +if (test) +return ; + +if (IS_CHAN_2GHZ (chan)) + i = rate1l; +else + i = rate6mb; + + regulatory->max_power_level = ratesArray[i]; +if (AR_SREV_9280_20_OR_LATER (ah)) {for (i =0 ; i < Ar5416RateSize; i++) ratesArray[i] -=AR9287_PWR_TABLE_OFFSET_DB *2 ;
@@ -971,17 +985,6 @@ static void ath9k_hw_ar9287_set_txpower(struct ath_hw *ah, | ATH9K_POW_SM(ratesArray[rateDupOfdm], 8) | ATH9K_POW_SM(ratesArray[rateDupCck], 0)); } - -if (IS_CHAN_2GHZ (chan)) - i = rate1l; -else - i = rate6mb; - -if (AR_SREV_9280_20_OR_LATER (ah)) - regulatory->max_power_level = - ratesArray[i] +AR9287_PWR_TABLE_OFFSET_DB *2 ; -else - regulatory->max_power_level = ratesArray[i]; } static void ath9k_hw_ar9287_set_addac(struct ath_hw *ah,
drivers/net/wireless/ath/ath9k/eeprom_def.c +33 -29
86 lines not on this page · raw message
drivers/net/wireless/ath/ath9k/htc_drv_main.c +1 -1
@@ -29,7 +29,7 @@ static void ath_update_txpow(struct ath9k_htc_priv *priv)struct ath_hw *ah = priv->ah;if (priv->curtxpow != priv->txpowlimit) { -ath9k_hw_set_txpowerlimit (ah, priv->txpowlimit); +ath9k_hw_set_txpowerlimit (ah, priv->txpowlimit, false);/* read back in case value is clamped */ priv->curtxpow =ath9k_hw_regulatory (ah)->power_limit; }
drivers/net/wireless/ath/ath9k/hw.c +3 -3
@@ -1166,7 +1166,7 @@ static bool ath9k_hw_channel_change(struct ath_hw *ah, channel->max_antenna_gain *2 , channel->max_power *2 ,min ((u32 )MAX_RATE_POWER , - (u32) regulatory->power_limit)); + (u32) regulatory->power_limit), false);ath9k_hw_rfbus_done (ah);
@@ -2165,7 +2165,7 @@ bool ath9k_hw_disable(struct ath_hw *ah) }EXPORT_SYMBOL (ath9k_hw_disable); -void ath9k_hw_set_txpowerlimit (struct ath_hw *ah,u32 limit) +void ath9k_hw_set_txpowerlimit (struct ath_hw *ah,u32 limit,bool test) {struct ath_regulatory *regulatory =ath9k_hw_regulatory (ah);struct ath9k_channel *chan = ah->curchan;
@@ -2178,7 +2178,7 @@ void ath9k_hw_set_txpowerlimit(struct ath_hw *ah, u32 limit) channel->max_antenna_gain *2 , channel->max_power *2 ,min ((u32 )MAX_RATE_POWER , - (u32) regulatory->power_limit)); + (u32) regulatory->power_limit), test); }EXPORT_SYMBOL (ath9k_hw_set_txpowerlimit);
drivers/net/wireless/ath/ath9k/hw.h +1 -1
@@ -860,7 +860,7 @@ u32 ath9k_hw_getrxfilter(struct ath_hw *ah);void ath9k_hw_setrxfilter (struct ath_hw *ah,u32 bits);bool ath9k_hw_phy_disable (struct ath_hw *ah);bool ath9k_hw_disable (struct ath_hw *ah); -void ath9k_hw_set_txpowerlimit (struct ath_hw *ah,u32 limit); +void ath9k_hw_set_txpowerlimit (struct ath_hw *ah,u32 limit,bool test);void ath9k_hw_setopmode (struct ath_hw *ah);void ath9k_hw_setmcastfilter (struct ath_hw *ah,u32 filter0,u32 filter1);void ath9k_hw_setbssidmask (struct ath_hw *ah);
drivers/net/wireless/ath/ath9k/main.c +1 -1
@@ -23,7 +23,7 @@ static void ath_update_txpow(struct ath_softc *sc)struct ath_hw *ah = sc->sc_ah;if (sc->curtxpow != sc->config.txpowlimit) { -ath9k_hw_set_txpowerlimit (ah, sc->config.txpowlimit); +ath9k_hw_set_txpowerlimit (ah, sc->config.txpowlimit, false);/* read back in case value is clamped */ sc->curtxpow =ath9k_hw_regulatory (ah)->power_limit; }