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

Commit de40f316 authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

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.

Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 6b7b6cf5

drivers/net/wireless/ath/ath9k/ar5008_phy.c

+1 −1
Original line number Diff line number Diff line
@@ -873,7 +873,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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;