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

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

mt76: use mt76x02_dev instead of mt76_dev in mt76x02_eeprom.c 



Use mt76x02_dev data structure as reference in mt76x02_eeprom.c
instead of mt76_dev

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

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

+24 −26
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ mt76x0_efuse_physical_size_check(struct mt76x02_dev *dev) 
	int ret, i;

	u32 start = 0, end = 0, cnt_free;



	ret = mt76x02_get_efuse_data(&dev->mt76, MT_EE_USAGE_MAP_START,

				     data, sizeof(data), MT_EE_PHYSICAL_READ);

	ret = mt76x02_get_efuse_data(dev, MT_EE_USAGE_MAP_START, data,

				     sizeof(data), MT_EE_PHYSICAL_READ);

	if (ret)

		return ret;
@@ -55,10 +55,10 @@ mt76x0_efuse_physical_size_check(struct mt76x02_dev *dev) 


static void mt76x0_set_chip_cap(struct mt76x02_dev *dev)

{

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

	u16 nic_conf1 = mt76x02_eeprom_get(&dev->mt76, MT_EE_NIC_CONF_1);

	u16 nic_conf0 = mt76x02_eeprom_get(dev, MT_EE_NIC_CONF_0);

	u16 nic_conf1 = mt76x02_eeprom_get(dev, MT_EE_NIC_CONF_1);



	mt76x02_eeprom_parse_hw_cap(&dev->mt76);

	mt76x02_eeprom_parse_hw_cap(dev);

	dev_dbg(dev->mt76.dev, "2GHz %d 5GHz %d\n",

		dev->mt76.cap.has_2ghz, dev->mt76.cap.has_5ghz);
@@ -86,7 +86,7 @@ static void mt76x0_set_temp_offset(struct mt76x02_dev *dev) 
{

	u8 val;



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

	val = mt76x02_eeprom_get(dev, MT_EE_2G_TARGET_POWER) >> 8;

	if (mt76x02_field_valid(val))

		dev->cal.rx.temp_offset = mt76x02_sign_extend(val, 8);

	else
@@ -98,12 +98,12 @@ static void mt76x0_set_freq_offset(struct mt76x02_dev *dev) 
	struct mt76x02_rx_freq_cal *caldata = &dev->cal.rx;

	u8 val;



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

	val = mt76x02_eeprom_get(dev, MT_EE_FREQ_OFFSET);

	if (!mt76x02_field_valid(val))

		val = 0;

	caldata->freq_offset = val;



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

	val = mt76x02_eeprom_get(dev, MT_EE_TSSI_BOUND4) >> 8;

	if (!mt76x02_field_valid(val))

		val = 0;
@@ -118,10 +118,8 @@ void mt76x0_read_rx_gain(struct mt76x02_dev *dev) 
	u16 rssi_offset;

	int i;



	mt76x02_get_rx_gain(&dev->mt76, chan->band, &rssi_offset,

			    &lna_2g, lna_5g);

	caldata->lna_gain = mt76x02_get_lna_gain(&dev->mt76, &lna_2g,

						 lna_5g, chan);

	mt76x02_get_rx_gain(dev, chan->band, &rssi_offset, &lna_2g, lna_5g);

	caldata->lna_gain = mt76x02_get_lna_gain(dev, &lna_2g, lna_5g, chan);



	for (i = 0; i < ARRAY_SIZE(caldata->rssi_offset); i++) {

		val = rssi_offset >> (8 * i);
@@ -132,9 +130,9 @@ void mt76x0_read_rx_gain(struct mt76x02_dev *dev) 
	}

}



static s8 mt76x0_get_delta(struct mt76_dev *dev)

static s8 mt76x0_get_delta(struct mt76x02_dev *dev)

{

	struct cfg80211_chan_def *chandef = &dev->chandef;

	struct cfg80211_chan_def *chandef = &dev->mt76.chandef;

	u8 val;



	if (mt76x02_tssi_enabled(dev))
@@ -162,54 +160,54 @@ void mt76x0_get_tx_power_per_rate(struct mt76x02_dev *dev) 
	struct ieee80211_channel *chan = dev->mt76.chandef.chan;

	bool is_2ghz = chan->band == NL80211_BAND_2GHZ;

	struct mt76_rate_power *t = &dev->mt76.rate_power;

	s8 delta = mt76x0_get_delta(&dev->mt76);

	s8 delta = mt76x0_get_delta(dev);

	u16 val, addr;



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



	/* cck 1M, 2M, 5.5M, 11M */

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

	val = mt76x02_eeprom_get(dev, MT_EE_TX_POWER_BYRATE_BASE);

	t->cck[0] = t->cck[1] = s6_to_s8(val);

	t->cck[2] = t->cck[3] = s6_to_s8(val >> 8);



	/* ofdm 6M, 9M, 12M, 18M */

	addr = is_2ghz ? MT_EE_TX_POWER_BYRATE_BASE + 2 : 0x120;

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

	val = mt76x02_eeprom_get(dev, addr);

	t->ofdm[0] = t->ofdm[1] = s6_to_s8(val);

	t->ofdm[2] = t->ofdm[3] = s6_to_s8(val >> 8);



	/* ofdm 24M, 36M, 48M, 54M */

	addr = is_2ghz ? MT_EE_TX_POWER_BYRATE_BASE + 4 : 0x122;

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

	val = mt76x02_eeprom_get(dev, addr);

	t->ofdm[4] = t->ofdm[5] = s6_to_s8(val);

	t->ofdm[6] = t->ofdm[7] = s6_to_s8(val >> 8);



	/* ht-vht mcs 1ss 0, 1, 2, 3 */

	addr = is_2ghz ? MT_EE_TX_POWER_BYRATE_BASE + 6 : 0x124;

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

	val = mt76x02_eeprom_get(dev, addr);

	t->ht[0] = t->ht[1] = t->vht[0] = t->vht[1] = s6_to_s8(val);

	t->ht[2] = t->ht[3] = t->vht[2] = t->vht[3] = s6_to_s8(val >> 8);



	/* ht-vht mcs 1ss 4, 5, 6 */

	addr = is_2ghz ? MT_EE_TX_POWER_BYRATE_BASE + 8 : 0x126;

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

	val = mt76x02_eeprom_get(dev, addr);

	t->ht[4] = t->ht[5] = t->vht[4] = t->vht[5] = s6_to_s8(val);

	t->ht[6] = t->vht[6] = s6_to_s8(val >> 8);



	/* ht-vht mcs 1ss 0, 1, 2, 3 stbc */

	addr = is_2ghz ? MT_EE_TX_POWER_BYRATE_BASE + 14 : 0xec;

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

	val = mt76x02_eeprom_get(dev, addr);

	t->stbc[0] = t->stbc[1] = s6_to_s8(val);

	t->stbc[2] = t->stbc[3] = s6_to_s8(val >> 8);



	/* ht-vht mcs 1ss 4, 5, 6 stbc */

	addr = is_2ghz ? MT_EE_TX_POWER_BYRATE_BASE + 16 : 0xee;

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

	val = mt76x02_eeprom_get(dev, addr);

	t->stbc[4] = t->stbc[5] = s6_to_s8(val);

	t->stbc[6] = t->stbc[7] = s6_to_s8(val >> 8);



	/* vht mcs 8, 9 5GHz */

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

	val = mt76x02_eeprom_get(dev, 0x132);

	t->vht[7] = s6_to_s8(val);

	t->vht[8] = s6_to_s8(val >> 8);
@@ -266,7 +264,7 @@ void mt76x0_get_power_info(struct mt76x02_dev *dev, u8 *info) 
		addr = MT_EE_TX_POWER_0_GRP4_TSSI_SLOPE + 2 + offset;

	}



	data = mt76x02_eeprom_get(&dev->mt76, addr);

	data = mt76x02_eeprom_get(dev, addr);



	info[0] = data;

	if (!info[0] || info[0] > 0x3f)
@@ -312,7 +310,7 @@ static int mt76x0_load_eeprom(struct mt76x02_dev *dev) 
	if (found < 0)

		return found;



	return mt76x02_get_efuse_data(&dev->mt76, 0, dev->mt76.eeprom.data,

	return mt76x02_get_efuse_data(dev, 0, dev->mt76.eeprom.data,

				      MT76X0_EEPROM_SIZE, MT_EE_READ);

}
@@ -326,7 +324,7 @@ int mt76x0_eeprom_init(struct mt76x02_dev *dev) 
	if (err < 0)

		return err;



	data = mt76x02_eeprom_get(&dev->mt76, MT_EE_VERSION);

	data = mt76x02_eeprom_get(dev, MT_EE_VERSION);

	version = data >> 8;

	fae = data;

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

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static int mt76x0e_register_device(struct mt76x02_dev *dev) 
		u16 val;



		mt76_clear(dev, MT_COEXCFG0, BIT(0));

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

		val = mt76x02_eeprom_get(dev, MT_EE_NIC_CONF_0);

		if (val & MT_EE_NIC_CONF_0_PA_IO_CURRENT) {

			u32 data;

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

+1 −1
Original line number Diff line number Diff line
@@ -490,7 +490,7 @@ mt76x0_phy_set_chan_rf_params(struct mt76x02_dev *dev, u8 channel, u16 rf_bw_ban 
	mt76_wr(dev, MT_RF_MISC, mac_reg);



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

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

	if (mt76x02_ext_pa_enabled(dev, 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

+15 −18
Original line number Diff line number Diff line
@@ -17,46 +17,43 @@ 


#include <asm/unaligned.h>



#include "mt76.h"

#include "mt76x02_eeprom.h"

#include "mt76x02_regs.h"



static int

mt76x02_efuse_read(struct mt76_dev *dev, u16 addr, u8 *data,

mt76x02_efuse_read(struct mt76x02_dev *dev, u16 addr, u8 *data,

		   enum mt76x02_eeprom_modes mode)

{

	u32 val;

	int i;



	val = __mt76_rr(dev, MT_EFUSE_CTRL);

	val = mt76_rr(dev, MT_EFUSE_CTRL);

	val &= ~(MT_EFUSE_CTRL_AIN |

		 MT_EFUSE_CTRL_MODE);

	val |= FIELD_PREP(MT_EFUSE_CTRL_AIN, addr & ~0xf);

	val |= FIELD_PREP(MT_EFUSE_CTRL_MODE, mode);

	val |= MT_EFUSE_CTRL_KICK;

	__mt76_wr(dev, MT_EFUSE_CTRL, val);

	mt76_wr(dev, MT_EFUSE_CTRL, val);



	if (!__mt76_poll_msec(dev, MT_EFUSE_CTRL, MT_EFUSE_CTRL_KICK,

			      0, 1000))

	if (!mt76_poll_msec(dev, MT_EFUSE_CTRL, MT_EFUSE_CTRL_KICK, 0, 1000))

		return -ETIMEDOUT;



	udelay(2);



	val = __mt76_rr(dev, MT_EFUSE_CTRL);

	val = mt76_rr(dev, MT_EFUSE_CTRL);

	if ((val & MT_EFUSE_CTRL_AOUT) == MT_EFUSE_CTRL_AOUT) {

		memset(data, 0xff, 16);

		return 0;

	}



	for (i = 0; i < 4; i++) {

		val = __mt76_rr(dev, MT_EFUSE_DATA(i));

		val = mt76_rr(dev, MT_EFUSE_DATA(i));

		put_unaligned_le32(val, data + 4 * i);

	}



	return 0;

}



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

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

			   int len, enum mt76x02_eeprom_modes mode)

{

	int ret, i;
@@ -71,26 +68,26 @@ int mt76x02_get_efuse_data(struct mt76_dev *dev, u16 base, void *buf, 
}

EXPORT_SYMBOL_GPL(mt76x02_get_efuse_data);



void mt76x02_eeprom_parse_hw_cap(struct mt76_dev *dev)

void mt76x02_eeprom_parse_hw_cap(struct mt76x02_dev *dev)

{

	u16 val = mt76x02_eeprom_get(dev, MT_EE_NIC_CONF_0);



	switch (FIELD_GET(MT_EE_NIC_CONF_0_BOARD_TYPE, val)) {

	case BOARD_TYPE_5GHZ:

		dev->cap.has_5ghz = true;

		dev->mt76.cap.has_5ghz = true;

		break;

	case BOARD_TYPE_2GHZ:

		dev->cap.has_2ghz = true;

		dev->mt76.cap.has_2ghz = true;

		break;

	default:

		dev->cap.has_2ghz = true;

		dev->cap.has_5ghz = true;

		dev->mt76.cap.has_2ghz = true;

		dev->mt76.cap.has_5ghz = true;

		break;

	}

}

EXPORT_SYMBOL_GPL(mt76x02_eeprom_parse_hw_cap);



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

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

{

	u16 conf0 = mt76x02_eeprom_get(dev, MT_EE_NIC_CONF_0);
@@ -101,7 +98,7 @@ bool mt76x02_ext_pa_enabled(struct mt76_dev *dev, enum nl80211_band band) 
}

EXPORT_SYMBOL_GPL(mt76x02_ext_pa_enabled);



void mt76x02_get_rx_gain(struct mt76_dev *dev, enum nl80211_band band,

void mt76x02_get_rx_gain(struct mt76x02_dev *dev, enum nl80211_band band,

			 u16 *rssi_offset, s8 *lna_2g, s8 *lna_5g)

{

	u16 val;
@@ -129,7 +126,7 @@ void mt76x02_get_rx_gain(struct mt76_dev *dev, enum nl80211_band band, 
}

EXPORT_SYMBOL_GPL(mt76x02_get_rx_gain);



u8 mt76x02_get_lna_gain(struct mt76_dev *dev,

u8 mt76x02_get_lna_gain(struct mt76x02_dev *dev,

			s8 *lna_2g, s8 *lna_5g,

			struct ieee80211_channel *chan)

{

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

+11 −9
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 
#ifndef __MT76x02_EEPROM_H

#define __MT76x02_EEPROM_H



#include "mt76x02.h"



enum mt76x02_eeprom_field {

	MT_EE_CHIP_ID =				0x000,

	MT_EE_VERSION =				0x002,
@@ -168,17 +170,17 @@ static inline s8 mt76x02_rate_power_val(u8 val) 
}



static inline int

mt76x02_eeprom_get(struct mt76_dev *dev,

mt76x02_eeprom_get(struct mt76x02_dev *dev,

		   enum mt76x02_eeprom_field field)

{

	if ((field & 1) || field >= __MT_EE_MAX)

		return -1;



	return get_unaligned_le16(dev->eeprom.data + field);

	return get_unaligned_le16(dev->mt76.eeprom.data + field);

}



static inline bool

mt76x02_temp_tx_alc_enabled(struct mt76_dev *dev)

mt76x02_temp_tx_alc_enabled(struct mt76x02_dev *dev)

{

	u16 val;
@@ -191,21 +193,21 @@ mt76x02_temp_tx_alc_enabled(struct mt76_dev *dev) 
}



static inline bool

mt76x02_tssi_enabled(struct mt76_dev *dev)

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

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

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);

void mt76x02_get_rx_gain(struct mt76_dev *dev, enum nl80211_band band,

void mt76x02_get_rx_gain(struct mt76x02_dev *dev, enum nl80211_band band,

			 u16 *rssi_offset, s8 *lna_2g, s8 *lna_5g);

u8 mt76x02_get_lna_gain(struct mt76_dev *dev,

u8 mt76x02_get_lna_gain(struct mt76x02_dev *dev,

			s8 *lna_2g, s8 *lna_5g,

			struct ieee80211_channel *chan);

void mt76x02_eeprom_parse_hw_cap(struct mt76_dev *dev);

void mt76x02_eeprom_parse_hw_cap(struct mt76x02_dev *dev);



#endif /* __MT76x02_EEPROM_H */