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

mt76: move mt76x2_tssi_enabled in mt76x02_eeprom.h 



Move mt76x2_tssi_enabled and mt76x02_temp_tx_alc_enabled in
mt76x02_eeprom.h in order to be reused in mt76x0 driver

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

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

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

}



static inline bool

mt76x02_temp_tx_alc_enabled(struct mt76_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 mt76_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 mt76_dev *dev, enum nl80211_band band);

int mt76x02_get_efuse_data(struct mt76_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
@@ -493,7 +493,7 @@ void mt76x2_get_power_info(struct mt76x2_dev *dev, 
					 MT_EE_TX_POWER_1_START_2G);

	}



	if (mt76x2_tssi_enabled(dev) ||

	if (mt76x02_tssi_enabled(&dev->mt76) ||

	    !mt76x02_field_valid(t->target_power))

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


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



	if (!mt76x2_temp_tx_alc_enabled(dev))

	if (!mt76x02_temp_tx_alc_enabled(&dev->mt76))

		return -EINVAL;



	if (!mt76x02_ext_pa_enabled(&dev->mt76, band))

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

+0 −21
Original line number Diff line number Diff line
@@ -60,27 +60,6 @@ void mt76x2_get_power_info(struct mt76x2_dev *dev, 
int mt76x2_get_temp_comp(struct mt76x2_dev *dev, struct mt76x2_temp_comp *t);

void mt76x2_read_rx_gain(struct mt76x2_dev *dev);



static inline bool

mt76x2_temp_tx_alc_enabled(struct mt76x2_dev *dev)

{

	u16 val;



	val = mt76x02_eeprom_get(&dev->mt76, MT_EE_TX_POWER_EXT_PA_5G);

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

		return false;



	return mt76x02_eeprom_get(&dev->mt76, MT_EE_NIC_CONF_1) &

	       MT_EE_NIC_CONF_1_TEMP_TX_ALC;

}



static inline bool

mt76x2_tssi_enabled(struct mt76x2_dev *dev)

{

	return !mt76x2_temp_tx_alc_enabled(dev) &&

	       (mt76x02_eeprom_get(&dev->mt76, MT_EE_NIC_CONF_1) &

		MT_EE_NIC_CONF_1_TX_ALC_EN);

}



static inline bool

mt76x2_has_ext_lna(struct mt76x2_dev *dev)

{

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

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ mt76x2_phy_tssi_init_cal(struct mt76x2_dev *dev) 
	struct ieee80211_channel *chan = dev->mt76.chandef.chan;

	u32 flag = 0;



	if (!mt76x2_tssi_enabled(dev))

	if (!mt76x02_tssi_enabled(&dev->mt76))

		return false;



	if (mt76x2_channel_silent(dev))
@@ -390,7 +390,7 @@ int mt76x2_phy_set_channel(struct mt76x2_dev *dev, 
	       sizeof(dev->cal.agc_gain_cur));



	/* init default values for temp compensation */

	if (mt76x2_tssi_enabled(dev)) {

	if (mt76x02_tssi_enabled(&dev->mt76)) {

		mt76_rmw_field(dev, MT_TX_ALC_CFG_1, MT_TX_ALC_CFG_1_TEMP_COMP,

			       0x38);

		mt76_rmw_field(dev, MT_TX_ALC_CFG_2, MT_TX_ALC_CFG_2_TEMP_COMP,

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

+1 −1
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ int mt76x2u_phy_set_channel(struct mt76x2_dev *dev, 
	if (scan)

		return 0;



	if (mt76x2_tssi_enabled(dev)) {

	if (mt76x02_tssi_enabled(&dev->mt76)) {

		/* init default values for temp compensation */

		mt76_rmw_field(dev, MT_TX_ALC_CFG_1, MT_TX_ALC_CFG_1_TEMP_COMP,

			       0x38);

CRA Git | Maintained and supported by SUSTech CRA and CCSE