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

Commit bcb0f68a authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Kalle Valo
Browse files

mt76x2: fix tx_alc_enabled check 



Fix mt76x2_temp_tx_alc_enabled routine since in order to enable tx_alc
temperature compensation it necessary to take into account BIT(15) of
MT_EE_TX_POWER_EXT_PA_5G eeprom info

Fixes: 7bc04215 ("mt76: add driver code for MT76x2e")
Signed-off-by: default avatarLorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent cf7b411d

drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.c

+1 −5
Original line number Diff line number Diff line
@@ -609,17 +609,13 @@ int mt76x2_get_temp_comp(struct mt76x2_dev *dev, struct mt76x2_temp_comp *t) 


	memset(t, 0, sizeof(*t));



	val = mt76x2_eeprom_get(dev, MT_EE_NIC_CONF_1);

	if (!(val & MT_EE_NIC_CONF_1_TEMP_TX_ALC))

	if (!mt76x2_temp_tx_alc_enabled(dev))

		return -EINVAL;



	if (!mt76x2_ext_pa_enabled(dev, band))

		return -EINVAL;



	val = mt76x2_eeprom_get(dev, MT_EE_TX_POWER_EXT_PA_5G) >> 8;

	if (!(val & BIT(7)))

		return -EINVAL;



	t->temp_25_ref = val & 0x7f;

	if (band == NL80211_BAND_5GHZ) {

		slope = mt76x2_eeprom_get(dev, MT_EE_RF_TEMP_COMP_SLOPE_5G);

drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.h

+6 −0
Original line number Diff line number Diff line
@@ -159,6 +159,12 @@ void mt76x2_read_rx_gain(struct mt76x2_dev *dev); 
static inline bool

mt76x2_temp_tx_alc_enabled(struct mt76x2_dev *dev)

{

	u16 val;



	val = mt76x2_eeprom_get(dev, MT_EE_TX_POWER_EXT_PA_5G);

	if (!(val & BIT(15)))

		return false;



	return mt76x2_eeprom_get(dev, MT_EE_NIC_CONF_1) &

	       MT_EE_NIC_CONF_1_TEMP_TX_ALC;

}