Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c57581d authored by Nick Kossifidis's avatar Nick Kossifidis Committed by John W. Linville
Browse files

ath5k: Skip powertable setting when we are on the same channel 



 * Only set power table if we are changing channel/mode
 there is no need to recalculate and reset the power table
 all the time.

 Signed-off-by: default avatarNick Kossifidis <mickflemm@gmail.com>

Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f08fbf6c

drivers/net/wireless/ath/ath5k/phy.c

+42 −23
Original line number Diff line number Diff line
@@ -3090,7 +3090,7 @@ ath5k_setup_rate_powertable(struct ath5k_hw *ah, u16 max_pwr, 
 */

static int

ath5k_hw_txpower(struct ath5k_hw *ah, struct ieee80211_channel *channel,

		u8 ee_mode, u8 txpower)

		u8 ee_mode, u8 txpower, bool fast)

{

	struct ath5k_rate_pcal_info rate_info;

	u8 type;
@@ -3126,10 +3126,15 @@ ath5k_hw_txpower(struct ath5k_hw *ah, struct ieee80211_channel *channel, 
		return -EINVAL;

	}



	/* FIXME: Only on channel/mode change */

	ret = ath5k_setup_channel_powertable(ah, channel, ee_mode, type);

	/* If fast is set it means we are on the same channel/mode

	 * so there is no need to recalculate the powertable, we 'll

	 * just use the cached one */

	if (!fast) {

		ret = ath5k_setup_channel_powertable(ah, channel,

							ee_mode, type);

			if (ret)

				return ret;

	}



	/* Limit max power if we have a CTL available */

	ath5k_get_max_ctl_power(ah, channel);
@@ -3210,7 +3215,7 @@ int ath5k_hw_set_txpower_limit(struct ath5k_hw *ah, u8 txpower) 
	ATH5K_DBG(ah->ah_sc, ATH5K_DEBUG_TXPOWER,

		"changing txpower to %d\n", txpower);



	return ath5k_hw_txpower(ah, channel, ee_mode, txpower);

	return ath5k_hw_txpower(ah, channel, ee_mode, txpower, true);

}



/*************\
@@ -3220,34 +3225,55 @@ int ath5k_hw_set_txpower_limit(struct ath5k_hw *ah, u8 txpower) 
int ath5k_hw_phy_init(struct ath5k_hw *ah, struct ieee80211_channel *channel,

						u8 mode, u8 ee_mode, u8 freq)

{

	struct ieee80211_channel *curr_channel;

	int ret, i;

	u32 phy_tst1;



	bool fast_txp;

	ret = 0;



	/*

	 * 5211/5212 Specific

	 * If we don't change channel/mode skip

	 * tx powertable calculation and use the

	 * cached one.

	 */

	if (ah->ah_version != AR5K_AR5210) {

	curr_channel = ah->ah_current_channel;

	if ((channel->hw_value == curr_channel->hw_value) &&

	(channel->center_freq == curr_channel->center_freq))

		fast_txp = true;

	else

		fast_txp = false;



	/*

		 * Write initial RF gain settings

		 * This should work for both 5111/5112

	 * Set TX power

	 *

	 * Note: We need to do that before we set

	 * RF buffer settings on 5211/5212+ so that we

	 * properly set curve indices.

	 */

		ret = ath5k_hw_rfgain_init(ah, freq);

	ret = ath5k_hw_txpower(ah, channel, ee_mode,

				ah->ah_txpower.txp_max_pwr / 2,

				fast_txp);

	if (ret)

		return ret;



		mdelay(1);

	/*

	 * For 5210 we do all initialization using

	 * initvals, so we don't have to modify

	 * any settings (5210 also only supports

	 * a/aturbo modes)

	 */

	if (ah->ah_version != AR5K_AR5210) {



		/*

		 * Set TX power

		 * Write initial RF gain settings

		 * This should work for both 5111/5112

		 */

		ret = ath5k_hw_txpower(ah, channel, ee_mode,

					ah->ah_txpower.txp_max_pwr / 2);

		ret = ath5k_hw_rfgain_init(ah, freq);

		if (ret)

			return ret;



		mdelay(1);



		/*

		 * Write RF buffer

		 */
@@ -3255,7 +3281,6 @@ int ath5k_hw_phy_init(struct ath5k_hw *ah, struct ieee80211_channel *channel, 
		if (ret)

			return ret;





		/* Write OFDM timings on 5212*/

		if (ah->ah_version == AR5K_AR5212 &&

			channel->hw_value & CHANNEL_OFDM) {
@@ -3284,12 +3309,6 @@ int ath5k_hw_phy_init(struct ath5k_hw *ah, struct ieee80211_channel *channel, 
		}



	} else {

		/*

		 * For 5210 we do all initialization using

		 * initvals, so we don't have to modify

		 * any settings (5210 also only supports

		 * a/aturbo modes)

		 */

		mdelay(1);

		/* Disable phy and wait */

		ath5k_hw_reg_write(ah, AR5K_PHY_ACT_DISABLE, AR5K_PHY_ACT);