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

Commit 4afeb396 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files

mt76x0: eeprom: introduce mt76x0_tssi_enabled routine 



Add mt76x0_tssi_enabled in order to check if tssi compensation
is enabled since mt76x0 condition differs from mt76x2 one.
Moreover move back mt76x02_temp_tx_alc_enabled and mt76x02_tssi_enabled
routines in mt76x2/eeprom.h since they are mt76x2 specific

Signed-off-by: default avatarLorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 592ebc9c

drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ static s8 mt76x0_get_delta(struct mt76x02_dev *dev) 
	struct cfg80211_chan_def *chandef = &dev->mt76.chandef;

	u8 val;



	if (mt76x02_tssi_enabled(dev))

	if (mt76x0_tssi_enabled(dev))

		return 0;



	if (chandef->width == NL80211_CHAN_WIDTH_80) {

drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.h

+6 −0
Original line number Diff line number Diff line
@@ -37,4 +37,10 @@ static inline s8 s6_to_s8(u32 val) 
	return ret;

}



static inline bool mt76x0_tssi_enabled(struct mt76x02_dev *dev)

{

	return (mt76x02_eeprom_get(dev, MT_EE_NIC_CONF_1) &

		MT_EE_NIC_CONF_1_TX_ALC_EN);

}



#endif

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

+0 −21
Original line number Diff line number Diff line
@@ -179,27 +179,6 @@ mt76x02_eeprom_get(struct mt76x02_dev *dev, 
	return get_unaligned_le16(dev->mt76.eeprom.data + field);

}



static inline bool

mt76x02_temp_tx_alc_enabled(struct mt76x02_dev *dev)

{

	u16 val;



	val = mt76x02_eeprom_get(dev, MT_EE_TX_POWER_EXT_PA_5G);

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

		return false;



	return mt76x02_eeprom_get(dev, MT_EE_NIC_CONF_1) &

	       MT_EE_NIC_CONF_1_TEMP_TX_ALC;

}



static inline bool

mt76x02_tssi_enabled(struct mt76x02_dev *dev)

{

	return !mt76x02_temp_tx_alc_enabled(dev) &&

	       (mt76x02_eeprom_get(dev, MT_EE_NIC_CONF_1) &

		MT_EE_NIC_CONF_1_TX_ALC_EN);

}



bool mt76x02_ext_pa_enabled(struct mt76x02_dev *dev, enum nl80211_band band);

int mt76x02_get_efuse_data(struct mt76x02_dev *dev, u16 base, void *buf,

			   int len, enum mt76x02_eeprom_modes mode);

drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.c

+2 −2
Original line number Diff line number Diff line
@@ -464,7 +464,7 @@ void mt76x2_get_power_info(struct mt76x02_dev *dev, 
					 MT_EE_TX_POWER_1_START_2G);

	}



	if (mt76x02_tssi_enabled(dev) ||

	if (mt76x2_tssi_enabled(dev) ||

	    !mt76x02_field_valid(t->target_power))

		t->target_power = t->chain[0].target_power;
@@ -481,7 +481,7 @@ int mt76x2_get_temp_comp(struct mt76x02_dev *dev, struct mt76x2_temp_comp *t) 


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



	if (!mt76x02_temp_tx_alc_enabled(dev))

	if (!mt76x2_temp_tx_alc_enabled(dev))

		return -EINVAL;



	if (!mt76x02_ext_pa_enabled(dev, band))

drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.h

+21 −0
Original line number Diff line number Diff line
@@ -70,4 +70,25 @@ mt76x2_has_ext_lna(struct mt76x02_dev *dev) 
		return val & MT_EE_NIC_CONF_1_LNA_EXT_5G;

}



static inline bool

mt76x2_temp_tx_alc_enabled(struct mt76x02_dev *dev)

{

	u16 val;



	val = mt76x02_eeprom_get(dev, MT_EE_TX_POWER_EXT_PA_5G);

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

		return false;



	return mt76x02_eeprom_get(dev, MT_EE_NIC_CONF_1) &

	       MT_EE_NIC_CONF_1_TEMP_TX_ALC;

}



static inline bool

mt76x2_tssi_enabled(struct mt76x02_dev *dev)

{

	return !mt76x2_temp_tx_alc_enabled(dev) &&

	       (mt76x02_eeprom_get(dev, MT_EE_NIC_CONF_1) &

		MT_EE_NIC_CONF_1_TX_ALC_EN);

}



#endif