Commit 495184ac authored by Ryder Lee's avatar Ryder Lee Committed by Felix Fietkau
Browse files

mt76: mt7915: add support for applying pre-calibration data 



When the EEPROM data is read from flash, it can contain pre-calibration
data, which can save calibration time.

Note that group_cal can save 30% bootup calibration time, and dpd_cal can
save 75% channel switching time.

Tested-by: default avatarBo Jiao <bo.jiao@mediatek.com>
Signed-off-by: default avatarRyder Lee <ryder.lee@mediatek.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 4efcfd5c

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

+5 −6
Original line number Diff line number Diff line
@@ -9,8 +9,7 @@ 
#include <linux/etherdevice.h>

#include "mt76.h"



static int

mt76_get_of_eeprom(struct mt76_dev *dev, int len)

int mt76_get_of_eeprom(struct mt76_dev *dev, void *eep, int offset, int len)

{

#if defined(CONFIG_OF) && defined(CONFIG_MTD)

	struct device_node *np = dev->dev->of_node;
@@ -18,7 +17,6 @@ mt76_get_of_eeprom(struct mt76_dev *dev, int len) 
	const __be32 *list;

	const char *part;

	phandle phandle;

	int offset = 0;

	int size;

	size_t retlen;

	int ret;
@@ -54,7 +52,7 @@ mt76_get_of_eeprom(struct mt76_dev *dev, int len) 
	}



	offset = be32_to_cpup(list);

	ret = mtd_read(mtd, offset, len, &retlen, dev->eeprom.data);

	ret = mtd_read(mtd, offset, len, &retlen, eep);

	put_mtd_device(mtd);

	if (ret)

		goto out_put_node;
@@ -65,7 +63,7 @@ mt76_get_of_eeprom(struct mt76_dev *dev, int len) 
	}



	if (of_property_read_bool(dev->dev->of_node, "big-endian")) {

		u8 *data = (u8 *)dev->eeprom.data;

		u8 *data = (u8 *)eep;

		int i;



		/* convert eeprom data in Little Endian */
@@ -86,6 +84,7 @@ mt76_get_of_eeprom(struct mt76_dev *dev, int len) 
	return -ENOENT;

#endif

}

EXPORT_SYMBOL_GPL(mt76_get_of_eeprom);



void

mt76_eeprom_override(struct mt76_phy *phy)
@@ -332,6 +331,6 @@ mt76_eeprom_init(struct mt76_dev *dev, int len) 
	if (!dev->eeprom.data)

		return -ENOMEM;



	return !mt76_get_of_eeprom(dev, len);

	return !mt76_get_of_eeprom(dev, dev->eeprom.data, 0, len);

}

EXPORT_SYMBOL_GPL(mt76_eeprom_init);

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

+1 −0
Original line number Diff line number Diff line
@@ -837,6 +837,7 @@ void mt76_seq_puts_array(struct seq_file *file, const char *str, 


int mt76_eeprom_init(struct mt76_dev *dev, int len);

void mt76_eeprom_override(struct mt76_phy *phy);

int mt76_get_of_eeprom(struct mt76_dev *dev, void *data, int offset, int len);



struct mt76_queue *

mt76_init_queue(struct mt76_dev *dev, int qid, int idx, int n_desc,

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

+22 −3
Original line number Diff line number Diff line
@@ -14,6 +14,23 @@ static u32 mt7915_eeprom_read(struct mt7915_dev *dev, u32 offset) 
	return data[offset];

}



static int mt7915_eeprom_load_precal(struct mt7915_dev *dev)

{

	struct mt76_dev *mdev = &dev->mt76;

	u32 val;



	val = mt7915_eeprom_read(dev, MT_EE_DO_PRE_CAL);

	if (val != (MT_EE_WIFI_CAL_DPD | MT_EE_WIFI_CAL_GROUP))

		return 0;



	val = MT_EE_CAL_GROUP_SIZE + MT_EE_CAL_DPD_SIZE;

	dev->cal = devm_kzalloc(mdev->dev, val, GFP_KERNEL);

	if (!dev->cal)

		return -ENOMEM;



	return mt76_get_of_eeprom(mdev, dev->cal, MT_EE_PRECAL, val);

}



static int mt7915_eeprom_load(struct mt7915_dev *dev)

{

	int ret;
@@ -22,12 +39,14 @@ static int mt7915_eeprom_load(struct mt7915_dev *dev) 
	if (ret < 0)

		return ret;



	if (ret)

	if (ret) {

		dev->flash_mode = true;

	else

		ret = mt7915_eeprom_load_precal(dev);

	} else {

		memset(dev->mt76.eeprom.data, -1, MT7915_EEPROM_SIZE);

	}



	return 0;

	return ret;

}



static int mt7915_check_eeprom(struct mt7915_dev *dev)

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

+10 −1
Original line number Diff line number Diff line
@@ -17,14 +17,23 @@ enum mt7915_eeprom_field { 
	MT_EE_MAC_ADDR =	0x004,

	MT_EE_MAC_ADDR2 =	0x00a,

	MT_EE_DDIE_FT_VERSION =	0x050,

	MT_EE_DO_PRE_CAL =	0x062,

	MT_EE_WIFI_CONF =	0x190,

	MT_EE_TX0_POWER_2G =	0x2fc,

	MT_EE_TX0_POWER_5G =	0x34b,

	MT_EE_ADIE_FT_VERSION =	0x9a0,



	__MT_EE_MAX =		0xe00

	__MT_EE_MAX =		0xe00,

	/* 0xe10 ~ 0x5780 used to save group cal data */

	MT_EE_PRECAL =		0xe10

};



#define MT_EE_WIFI_CAL_GROUP			BIT(0)

#define MT_EE_WIFI_CAL_DPD			GENMASK(2, 1)

#define MT_EE_CAL_UNIT				1024

#define MT_EE_CAL_GROUP_SIZE			(44 * MT_EE_CAL_UNIT)

#define MT_EE_CAL_DPD_SIZE			(54 * MT_EE_CAL_UNIT)



#define MT_EE_WIFI_CONF0_TX_PATH		GENMASK(2, 0)

#define MT_EE_WIFI_CONF0_BAND_SEL		GENMASK(7, 6)

#define MT_EE_WIFI_CONF1_BAND_SEL		GENMASK(7, 6)

drivers/net/wireless/mediatek/mt76/mt7915/init.c

+7 −0
Original line number Diff line number Diff line
@@ -381,6 +381,13 @@ static int mt7915_init_hardware(struct mt7915_dev *dev) 
	if (ret < 0)

		return ret;





	if (dev->flash_mode) {

		ret = mt7915_mcu_apply_group_cal(dev);

		if (ret)

			return ret;

	}



	/* Beacon and mgmt frames should occupy wcid 0 */

	idx = mt76_wcid_alloc(dev->mt76.wcid_mask, MT7915_WTBL_STA - 1);

	if (idx)