Skip to content

Commit e12b2e9

Browse files
committed
wifi: mt76: mt7615: increase eeprom size for mt7663
mt7663 efuse has 0x600 bytes instead of 0x400. Increase the size in order to fix issues with incomplete calibration data Signed-off-by: Felix Fietkau <nbd@nbd.name>
1 parent 27db47a commit e12b2e9

3 files changed

Lines changed: 8 additions & 2 deletions

File tree

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ static int mt7615_efuse_init(struct mt7615_dev *dev, u32 base)
4747
void *buf;
4848
u32 val;
4949

50+
if (is_mt7663(&dev->mt76))
51+
len = MT7663_EEPROM_SIZE;
52+
5053
val = mt76_rr(dev, base + MT_EFUSE_BASE_CTRL);
5154
if (val & MT_EFUSE_BASE_CTRL_EMPTY)
5255
return 0;
@@ -72,6 +75,8 @@ static int mt7615_eeprom_load(struct mt7615_dev *dev, u32 addr)
7275
{
7376
int ret;
7477

78+
BUILD_BUG_ON(MT7615_EEPROM_FULL_SIZE < MT7663_EEPROM_SIZE);
79+
7580
ret = mt76_eeprom_init(&dev->mt76, MT7615_EEPROM_FULL_SIZE);
7681
if (ret < 0)
7782
return ret;
@@ -336,7 +341,7 @@ int mt7615_eeprom_init(struct mt7615_dev *dev, u32 addr)
336341
ret = mt7615_check_eeprom(&dev->mt76);
337342
if (ret && dev->mt76.otp.data) {
338343
memcpy(dev->mt76.eeprom.data, dev->mt76.otp.data,
339-
MT7615_EEPROM_SIZE);
344+
dev->mt76.otp.size);
340345
} else {
341346
dev->flash_eeprom = true;
342347
mt7615_cal_free_data(dev);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ enum mt7615_eeprom_field {
4646

4747
MT7615_EE_MAX = 0x3bf,
4848
MT7622_EE_MAX = 0x3db,
49-
MT7663_EE_MAX = 0x400,
49+
MT7663_EE_MAX = 0x600,
5050
};
5151

5252
#define MT_EE_RATE_POWER_MASK GENMASK(5, 0)

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
#define MT7663_FIRMWARE_N9 "mediatek/mt7663_n9_rebb.bin"
5252

5353
#define MT7615_EEPROM_SIZE 1024
54+
#define MT7663_EEPROM_SIZE 1536
5455
#define MT7615_TOKEN_SIZE 4096
5556

5657
#define MT_FRAC_SCALE 12

0 commit comments

Comments
 (0)