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

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

mt76: move mt76x2_ext_pa_enabled routine in mt76x02_eeprom.c 



Move mt76x2_ext_pa_enabled utility routine in mt76x02_eeprom.c
and remove duplicated code. This is a preliminary patch to
unify eeprom code between mt76x2 and mt76x0 driver

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

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

+5 −1
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ static int 
mt76x0_eeprom_param_read(struct seq_file *file, void *data)

{

	struct mt76x0_dev *dev = file->private;

	u16 val;

	int i;



	seq_printf(file, "RF freq offset: %hhx\n", dev->ee->rf_freq_off);
@@ -112,7 +113,10 @@ mt76x0_eeprom_param_read(struct seq_file *file, void *data) 
	seq_printf(file, "LNA gain 5Ghz: %hhx %hhx %hhx\n",

		   dev->ee->lna_gain_5ghz[0], dev->ee->lna_gain_5ghz[1],

		   dev->ee->lna_gain_5ghz[2]);

	seq_printf(file, "Power Amplifier type %hhx\n", dev->ee->pa_type);



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

	seq_printf(file, "Power Amplifier type %lx\n",

		   val & MT_EE_NIC_CONF_0_PA_TYPE);

	seq_printf(file, "Reg channels: %hhu-%hhu\n", dev->ee->reg.start,

		   dev->ee->reg.start + dev->ee->reg.num - 1);

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

+4 −3
Original line number Diff line number Diff line
@@ -90,9 +90,6 @@ mt76x0_set_chip_cap(struct mt76x0_dev *dev, u8 *eeprom) 
	    FIELD_GET(MT_EE_NIC_CONF_0_TX_PATH, nic_conf0) > 1)

		dev_err(dev->mt76.dev,

			"Error: device has more than 1 RX/TX stream!\n");



	dev->ee->pa_type = FIELD_GET(MT_EE_NIC_CONF_0_PA_TYPE, nic_conf0);

	dev_dbg(dev->mt76.dev, "PA Type %d\n", dev->ee->pa_type);

}



static void
@@ -330,6 +327,10 @@ mt76x0_eeprom_init(struct mt76x0_dev *dev) 
	if (ret)

		return ret;



	ret = mt76_eeprom_init(&dev->mt76, MT76X0_EEPROM_SIZE);

	if (ret < 0)

		return ret;



	dev->ee = devm_kzalloc(dev->mt76.dev, sizeof(*dev->ee), GFP_KERNEL);

	if (!dev->ee)

		return -ENOMEM;

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

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ struct mt76x0_eeprom_params { 
	s8 rssi_offset_5ghz[3];

	s8 lna_gain_2ghz;

	s8 lna_gain_5ghz[3];

	u8 pa_type;



	/* TX_PWR_CFG_* values from EEPROM for 20 and 40 Mhz bandwidths. */

	u32 tx_pwr_cfg_2g[5][2];

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

+3 −10
Original line number Diff line number Diff line
@@ -340,16 +340,12 @@ mt76x0_phy_set_band(struct mt76x0_dev *dev, enum nl80211_band band) 
	}

}



#define EXT_PA_2G_5G            0x0

#define EXT_PA_5G_ONLY          0x1

#define EXT_PA_2G_ONLY          0x2

#define INT_PA_2G_5G            0x3



static void

mt76x0_phy_set_chan_rf_params(struct mt76x0_dev *dev, u8 channel, u16 rf_bw_band)

{

	u16 rf_band = rf_bw_band & 0xff00;

	u16 rf_bw = rf_bw_band & 0x00ff;

	enum nl80211_band band;

	u32 mac_reg;

	u8 rf_val;

	int i;
@@ -496,11 +492,8 @@ mt76x0_phy_set_chan_rf_params(struct mt76x0_dev *dev, u8 channel, u16 rf_bw_band 
	mac_reg &= ~0xC; /* Clear 0x518[3:2] */

	mt76_wr(dev, MT_RF_MISC, mac_reg);



	if (dev->ee->pa_type == INT_PA_2G_5G ||

	    (dev->ee->pa_type == EXT_PA_5G_ONLY && (rf_band & RF_G_BAND)) ||

	    (dev->ee->pa_type == EXT_PA_2G_ONLY && (rf_band & RF_A_BAND))) {

		; /* Internal PA - nothing to do. */

	} else {

	band = (rf_band & RF_G_BAND) ? NL80211_BAND_2GHZ : NL80211_BAND_5GHZ;

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

		/*

			MT_RF_MISC (offset: 0x0518)

			[2]1'b1: enable external A band PA, 1'b0: disable external A band PA

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

+11 −0
Original line number Diff line number Diff line
@@ -70,3 +70,14 @@ int mt76x02_get_efuse_data(struct mt76_dev *dev, u16 base, void *buf, 
	return 0;

}

EXPORT_SYMBOL_GPL(mt76x02_get_efuse_data);



bool mt76x02_ext_pa_enabled(struct mt76_dev *dev, enum nl80211_band band)

{

	u16 conf0 = mt76x02_eeprom_get(dev, MT_EE_NIC_CONF_0);



	if (band == NL80211_BAND_5GHZ)

		return !(conf0 & MT_EE_NIC_CONF_0_PA_INT_5G);

	else

		return !(conf0 & MT_EE_NIC_CONF_0_PA_INT_2G);

}

EXPORT_SYMBOL_GPL(mt76x02_ext_pa_enabled);