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

Commit 77c06c2c authored by Gertjan van Wingerde's avatar Gertjan van Wingerde Committed by John W. Linville
Browse files

rt2x00: Correctly set txmixer_gain in RT3572 channel switching. 



Align with the v2.5.0.0 Ralink RT3572 driver.

Save the EEPROM txmixer_gain values inside the rt2800 driver data structure
and use it throughout the code.

Signed-off-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Acked-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Acked-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 58b8ae14

drivers/net/wireless/rt2x00/rt2800.h

+13 −0
Original line number Original line Diff line number Diff line
@@ -1848,6 +1848,11 @@ struct mac_iveiv_entry { 
 */

 */

#define RFCSR15_TX_LO2_EN		FIELD8(0x08)

#define RFCSR15_TX_LO2_EN		FIELD8(0x08)





/*

 * RFCSR 16:

 */

#define RFCSR16_TXMIXER_GAIN		FIELD8(0x07)



/*

/*

 * RFCSR 17:

 * RFCSR 17:

 */

 */
@@ -2110,6 +2115,12 @@ struct mac_iveiv_entry { 
#define EEPROM_RSSI_A2_OFFSET2		FIELD16(0x00ff)

#define EEPROM_RSSI_A2_OFFSET2		FIELD16(0x00ff)

#define EEPROM_RSSI_A2_LNA_A2		FIELD16(0xff00)

#define EEPROM_RSSI_A2_LNA_A2		FIELD16(0xff00)





/*

 * EEPROM TXMIXER GAIN A offset (note overlaps with EEPROM RSSI A2).

 */

#define EEPROM_TXMIXER_GAIN_A		0x0026

#define EEPROM_TXMIXER_GAIN_A_VAL	FIELD16(0x0007)



/*

/*

 * EEPROM EIRP Maximum TX power values(unit: dbm)

 * EEPROM EIRP Maximum TX power values(unit: dbm)

 */

 */
@@ -2448,6 +2459,8 @@ struct rt2800_drv_data { 
	u8 calibration_bw40;

	u8 calibration_bw40;

	u8 bbp25;

	u8 bbp25;

	u8 bbp26;

	u8 bbp26;

	u8 txmixer_gain_24g;

	u8 txmixer_gain_5g;

};

};





#endif /* RT2800_H */
 
#endif /* RT2800_H */

drivers/net/wireless/rt2x00/rt2800lib.c

+27 −7
Original line number Original line Diff line number Diff line
@@ -1856,7 +1856,10 @@ static void rt2800_config_channel_rf3052(struct rt2x00_dev *rt2x00dev, 
		rt2800_rfcsr_write(rt2x00dev, 10, 0xf1);

		rt2800_rfcsr_write(rt2x00dev, 10, 0xf1);

		rt2800_rfcsr_write(rt2x00dev, 11, 0xb9);

		rt2800_rfcsr_write(rt2x00dev, 11, 0xb9);

		rt2800_rfcsr_write(rt2x00dev, 15, 0x53);

		rt2800_rfcsr_write(rt2x00dev, 15, 0x53);

		rt2800_rfcsr_write(rt2x00dev, 16, 0x4c);

		rfcsr = 0x4c;

		rt2x00_set_field8(&rfcsr, RFCSR16_TXMIXER_GAIN,

				  drv_data->txmixer_gain_24g);

		rt2800_rfcsr_write(rt2x00dev, 16, rfcsr);

		rt2800_rfcsr_write(rt2x00dev, 17, 0x23);

		rt2800_rfcsr_write(rt2x00dev, 17, 0x23);

		rt2800_rfcsr_write(rt2x00dev, 19, 0x93);

		rt2800_rfcsr_write(rt2x00dev, 19, 0x93);

		rt2800_rfcsr_write(rt2x00dev, 20, 0xb3);

		rt2800_rfcsr_write(rt2x00dev, 20, 0xb3);
@@ -1875,7 +1878,10 @@ static void rt2800_config_channel_rf3052(struct rt2x00_dev *rt2x00dev, 
		rt2800_rfcsr_write(rt2x00dev, 10, 0xf1);

		rt2800_rfcsr_write(rt2x00dev, 10, 0xf1);

		rt2800_rfcsr_write(rt2x00dev, 11, 0x00);

		rt2800_rfcsr_write(rt2x00dev, 11, 0x00);

		rt2800_rfcsr_write(rt2x00dev, 15, 0x43);

		rt2800_rfcsr_write(rt2x00dev, 15, 0x43);

		rt2800_rfcsr_write(rt2x00dev, 16, 0x7a);

		rfcsr = 0x7a;

		rt2x00_set_field8(&rfcsr, RFCSR16_TXMIXER_GAIN,

				  drv_data->txmixer_gain_5g);

		rt2800_rfcsr_write(rt2x00dev, 16, rfcsr);

		rt2800_rfcsr_write(rt2x00dev, 17, 0x23);

		rt2800_rfcsr_write(rt2x00dev, 17, 0x23);

		if (rf->channel <= 64) {

		if (rf->channel <= 64) {

			rt2800_rfcsr_write(rt2x00dev, 19, 0xb7);

			rt2800_rfcsr_write(rt2x00dev, 19, 0xb7);
@@ -3672,11 +3678,8 @@ static int rt2800_init_rfcsr(struct rt2x00_dev *rt2x00dev) 
				      &rt2x00dev->cap_flags))

				      &rt2x00dev->cap_flags))

				rt2x00_set_field8(&rfcsr, RFCSR17_R, 1);

				rt2x00_set_field8(&rfcsr, RFCSR17_R, 1);

		}

		}

		rt2x00_eeprom_read(rt2x00dev, EEPROM_TXMIXER_GAIN_BG, &eeprom);

		if (rt2x00_get_field16(eeprom, EEPROM_TXMIXER_GAIN_BG_VAL) >= 1)

		rt2x00_set_field8(&rfcsr, RFCSR17_TXMIXER_GAIN,

		rt2x00_set_field8(&rfcsr, RFCSR17_TXMIXER_GAIN,

					rt2x00_get_field16(eeprom,

				  drv_data->txmixer_gain_24g);

						EEPROM_TXMIXER_GAIN_BG_VAL));

		rt2800_rfcsr_write(rt2x00dev, 17, rfcsr);

		rt2800_rfcsr_write(rt2x00dev, 17, rfcsr);

	}

	}
@@ -3884,6 +3887,7 @@ EXPORT_SYMBOL_GPL(rt2800_read_eeprom_efuse); 




int rt2800_validate_eeprom(struct rt2x00_dev *rt2x00dev)

int rt2800_validate_eeprom(struct rt2x00_dev *rt2x00dev)

{

{

	struct rt2800_drv_data *drv_data = rt2x00dev->drv_data;

	u16 word;

	u16 word;

	u8 *mac;

	u8 *mac;

	u8 default_lna_gain;

	u8 default_lna_gain;
@@ -3967,6 +3971,14 @@ int rt2800_validate_eeprom(struct rt2x00_dev *rt2x00dev) 
		rt2x00_set_field16(&word, EEPROM_RSSI_BG_OFFSET1, 0);

		rt2x00_set_field16(&word, EEPROM_RSSI_BG_OFFSET1, 0);

	rt2x00_eeprom_write(rt2x00dev, EEPROM_RSSI_BG, word);

	rt2x00_eeprom_write(rt2x00dev, EEPROM_RSSI_BG, word);





	rt2x00_eeprom_read(rt2x00dev, EEPROM_TXMIXER_GAIN_BG, &word);

	if ((word & 0x00ff) != 0x00ff) {

		drv_data->txmixer_gain_24g =

			rt2x00_get_field16(word, EEPROM_TXMIXER_GAIN_BG_VAL);

	} else {

		drv_data->txmixer_gain_24g = 0;

	}



	rt2x00_eeprom_read(rt2x00dev, EEPROM_RSSI_BG2, &word);

	rt2x00_eeprom_read(rt2x00dev, EEPROM_RSSI_BG2, &word);

	if (abs(rt2x00_get_field16(word, EEPROM_RSSI_BG2_OFFSET2)) > 10)

	if (abs(rt2x00_get_field16(word, EEPROM_RSSI_BG2_OFFSET2)) > 10)

		rt2x00_set_field16(&word, EEPROM_RSSI_BG2_OFFSET2, 0);

		rt2x00_set_field16(&word, EEPROM_RSSI_BG2_OFFSET2, 0);
@@ -3976,6 +3988,14 @@ int rt2800_validate_eeprom(struct rt2x00_dev *rt2x00dev) 
				   default_lna_gain);

				   default_lna_gain);

	rt2x00_eeprom_write(rt2x00dev, EEPROM_RSSI_BG2, word);

	rt2x00_eeprom_write(rt2x00dev, EEPROM_RSSI_BG2, word);





	rt2x00_eeprom_read(rt2x00dev, EEPROM_TXMIXER_GAIN_A, &word);

	if ((word & 0x00ff) != 0x00ff) {

		drv_data->txmixer_gain_5g =

			rt2x00_get_field16(word, EEPROM_TXMIXER_GAIN_A_VAL);

	} else {

		drv_data->txmixer_gain_5g = 0;

	}



	rt2x00_eeprom_read(rt2x00dev, EEPROM_RSSI_A, &word);

	rt2x00_eeprom_read(rt2x00dev, EEPROM_RSSI_A, &word);

	if (abs(rt2x00_get_field16(word, EEPROM_RSSI_A_OFFSET0)) > 10)

	if (abs(rt2x00_get_field16(word, EEPROM_RSSI_A_OFFSET0)) > 10)

		rt2x00_set_field16(&word, EEPROM_RSSI_A_OFFSET0, 0);

		rt2x00_set_field16(&word, EEPROM_RSSI_A_OFFSET0, 0);