Skip to content

Commit

Permalink
wifi: mt76: mt7915: add mt7986, mt7916 and mt7981 pre-calibration
Browse files Browse the repository at this point in the history 
Add pre-calibration for mt7986 and mt7916. It has different data size
with mt7915. Group cal needs 54k and 94k for 2G + 5G and 2G + 6G,
respectively. DPD cal needs 300k.

Signed-off-by: Peter Chiu <chui-hao.chiu@mediatek.com>
Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
  • Loading branch information
@nbd168
Peter Chiu authored and nbd168 committed Mar 15, 2024
1 parent e5fb699 commit b4a9174
Show file tree
Hide file tree
Showing 4 changed files with 147 additions and 33 deletions.
16 changes: 7 additions & 9 deletions mt7915/eeprom.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,28 +9,26 @@ static int mt7915_eeprom_load_precal(struct mt7915_dev *dev)
{
struct mt76_dev *mdev = &dev->mt76;
u8 *eeprom = mdev->eeprom.data;
u32 val = eeprom[MT_EE_DO_PRE_CAL];
u32 offs;
u32 offs = is_mt7915(&dev->mt76) ? MT_EE_DO_PRE_CAL : MT_EE_DO_PRE_CAL_V2;
u32 size, val = eeprom[offs];
int ret;

if (!dev->flash_mode)
if (!dev->flash_mode || !val)
return 0;

if (val != (MT_EE_WIFI_CAL_DPD | MT_EE_WIFI_CAL_GROUP))
return 0;
size = mt7915_get_cal_group_size(dev) + mt7915_get_cal_dpd_size(dev);

val = MT_EE_CAL_GROUP_SIZE + MT_EE_CAL_DPD_SIZE;
dev->cal = devm_kzalloc(mdev->dev, val, GFP_KERNEL);
dev->cal = devm_kzalloc(mdev->dev, size, GFP_KERNEL);
if (!dev->cal)
return -ENOMEM;

offs = is_mt7915(&dev->mt76) ? MT_EE_PRECAL : MT_EE_PRECAL_V2;

ret = mt76_get_of_data_from_mtd(mdev, dev->cal, offs, val);
ret = mt76_get_of_data_from_mtd(mdev, dev->cal, offs, size);
if (!ret)
return ret;

return mt76_get_of_data_from_nvmem(mdev, dev->cal, "precal", val);
return mt76_get_of_data_from_nvmem(mdev, dev->cal, "precal", size);
}

static int mt7915_check_eeprom(struct mt7915_dev *dev)
Expand Down
47 changes: 44 additions & 3 deletions mt7915/eeprom.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ enum mt7915_eeprom_field {
MT_EE_DDIE_FT_VERSION = 0x050,
MT_EE_DO_PRE_CAL = 0x062,
MT_EE_WIFI_CONF = 0x190,
MT_EE_DO_PRE_CAL_V2 = 0x19a,
MT_EE_RATE_DELTA_2G = 0x252,
MT_EE_RATE_DELTA_5G = 0x29d,
MT_EE_TX0_POWER_2G = 0x2fc,
Expand All @@ -39,10 +40,19 @@ enum mt7915_eeprom_field {
};

#define MT_EE_WIFI_CAL_GROUP BIT(0)
#define MT_EE_WIFI_CAL_DPD GENMASK(2, 1)
#define MT_EE_WIFI_CAL_DPD_2G BIT(2)
#define MT_EE_WIFI_CAL_DPD_5G BIT(1)
#define MT_EE_WIFI_CAL_DPD_6G BIT(3)
#define MT_EE_WIFI_CAL_DPD GENMASK(3, 1)
#define MT_EE_CAL_UNIT 1024
#define MT_EE_CAL_GROUP_SIZE (49 * MT_EE_CAL_UNIT + 16)
#define MT_EE_CAL_DPD_SIZE (54 * MT_EE_CAL_UNIT)
#define MT_EE_CAL_GROUP_SIZE_7915 (49 * MT_EE_CAL_UNIT + 16)
#define MT_EE_CAL_GROUP_SIZE_7916 (54 * MT_EE_CAL_UNIT + 16)
#define MT_EE_CAL_GROUP_SIZE_7975 (54 * MT_EE_CAL_UNIT + 16)
#define MT_EE_CAL_GROUP_SIZE_7976 (94 * MT_EE_CAL_UNIT + 16)
#define MT_EE_CAL_GROUP_SIZE_7916_6G (94 * MT_EE_CAL_UNIT + 16)
#define MT_EE_CAL_DPD_SIZE_V1 (54 * MT_EE_CAL_UNIT)
#define MT_EE_CAL_DPD_SIZE_V2 (300 * MT_EE_CAL_UNIT)
#define MT_EE_CAL_DPD_SIZE_V2_7981 (102 * MT_EE_CAL_UNIT) /* no 6g dpd data */

#define MT_EE_WIFI_CONF0_TX_PATH GENMASK(2, 0)
#define MT_EE_WIFI_CONF0_BAND_SEL GENMASK(7, 6)
Expand Down Expand Up @@ -156,6 +166,37 @@ mt7915_tssi_enabled(struct mt7915_dev *dev, enum nl80211_band band)
return val & MT_EE_WIFI_CONF7_TSSI0_5G;
}

static inline u32
mt7915_get_cal_group_size(struct mt7915_dev *dev)
{
u8 *eep = dev->mt76.eeprom.data;
u32 val;

if (is_mt7915(&dev->mt76)) {
return MT_EE_CAL_GROUP_SIZE_7915;
} else if (is_mt7916(&dev->mt76)) {
val = eep[MT_EE_WIFI_CONF + 1];
val = FIELD_GET(MT_EE_WIFI_CONF0_BAND_SEL, val);
return (val == MT_EE_V2_BAND_SEL_6GHZ) ? MT_EE_CAL_GROUP_SIZE_7916_6G :
MT_EE_CAL_GROUP_SIZE_7916;
} else if (mt7915_check_adie(dev, false)) {
return MT_EE_CAL_GROUP_SIZE_7976;
} else {
return MT_EE_CAL_GROUP_SIZE_7975;
}
}

static inline u32
mt7915_get_cal_dpd_size(struct mt7915_dev *dev)
{
if (is_mt7915(&dev->mt76))
return MT_EE_CAL_DPD_SIZE_V1;
else if (is_mt7981(&dev->mt76))
return MT_EE_CAL_DPD_SIZE_V2_7981;
else
return MT_EE_CAL_DPD_SIZE_V2;
}

extern const u8 mt7915_sku_group_len[MAX_SKU_RATE_GROUP_NUM];

#endif
113 changes: 92 additions & 21 deletions mt7915/mcu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2903,9 +2903,10 @@ static int mt7915_mcu_set_pre_cal(struct mt7915_dev *dev, u8 idx,
int mt7915_mcu_apply_group_cal(struct mt7915_dev *dev)
{
u8 idx = 0, *cal = dev->cal, *eep = dev->mt76.eeprom.data;
u32 total = MT_EE_CAL_GROUP_SIZE;
u32 total = mt7915_get_cal_group_size(dev);
u32 offs = is_mt7915(&dev->mt76) ? MT_EE_DO_PRE_CAL : MT_EE_DO_PRE_CAL_V2;

if (1 || !(eep[MT_EE_DO_PRE_CAL] & MT_EE_WIFI_CAL_GROUP))
if (!(eep[offs] & MT_EE_WIFI_CAL_GROUP))
return 0;

/*
Expand Down Expand Up @@ -2941,75 +2942,145 @@ static int mt7915_find_freq_idx(const u16 *freqs, int n_freqs, u16 cur)
return -1;
}

static int mt7915_dpd_freq_idx(u16 freq, u8 bw)
static int mt7915_dpd_freq_idx(struct mt7915_dev *dev, u16 freq, u8 bw)
{
static const u16 freq_list[] = {
const u16 freq_list_v1[] = {
5180, 5200, 5220, 5240,
5260, 5280, 5300, 5320,
5500, 5520, 5540, 5560,
5580, 5600, 5620, 5640,
5660, 5680, 5700, 5745,
5765, 5785, 5805, 5825
};
int offset_2g = ARRAY_SIZE(freq_list);
const u16 freq_list_v2[] = {
/* 6G BW20*/
5955, 5975, 5995, 6015,
6035, 6055, 6075, 6095,
6115, 6135, 6155, 6175,
6195, 6215, 6235, 6255,
6275, 6295, 6315, 6335,
6355, 6375, 6395, 6415,
6435, 6455, 6475, 6495,
6515, 6535, 6555, 6575,
6595, 6615, 6635, 6655,
6675, 6695, 6715, 6735,
6755, 6775, 6795, 6815,
6835, 6855, 6875, 6895,
6915, 6935, 6955, 6975,
6995, 7015, 7035, 7055,
7075, 7095, 7115,
/* 6G BW160 */
6025, 6185, 6345, 6505,
6665, 6825, 6985,
/* 5G BW20 */
5180, 5200, 5220, 5240,
5260, 5280, 5300, 5320,
5500, 5520, 5540, 5560,
5580, 5600, 5620, 5640,
5660, 5680, 5700, 5720,
5745, 5765, 5785, 5805,
5825, 5845, 5865, 5885,
/* 5G BW160 */
5250, 5570, 5815
};
const u16 freq_list_v2_7981[] = {
/* 5G BW20 */
5180, 5200, 5220, 5240,
5260, 5280, 5300, 5320,
5500, 5520, 5540, 5560,
5580, 5600, 5620, 5640,
5660, 5680, 5700, 5720,
5745, 5765, 5785, 5805,
5825, 5845, 5865, 5885,
/* 5G BW160 */
5250, 5570, 5815
};
const u16 *freq_list = freq_list_v1;
int n_freqs = ARRAY_SIZE(freq_list_v1);
int idx;

if (!is_mt7915(&dev->mt76)) {
if (is_mt7981(&dev->mt76)) {
freq_list = freq_list_v2_7981;
n_freqs = ARRAY_SIZE(freq_list_v2_7981);
} else {
freq_list = freq_list_v2;
n_freqs = ARRAY_SIZE(freq_list_v2);
}
}

if (freq < 4000) {
if (freq < 2432)
return offset_2g;
return n_freqs;
if (freq < 2457)
return offset_2g + 1;
return n_freqs + 1;

return offset_2g + 2;
return n_freqs + 2;
}

if (bw == NL80211_CHAN_WIDTH_80P80 || bw == NL80211_CHAN_WIDTH_160)
if (bw == NL80211_CHAN_WIDTH_80P80)
return -1;

if (bw != NL80211_CHAN_WIDTH_20) {
idx = mt7915_find_freq_idx(freq_list, ARRAY_SIZE(freq_list),
freq + 10);
idx = mt7915_find_freq_idx(freq_list, n_freqs, freq + 10);
if (idx >= 0)
return idx;

idx = mt7915_find_freq_idx(freq_list, ARRAY_SIZE(freq_list),
freq - 10);
idx = mt7915_find_freq_idx(freq_list, n_freqs, freq - 10);
if (idx >= 0)
return idx;
}

return mt7915_find_freq_idx(freq_list, ARRAY_SIZE(freq_list), freq);
return mt7915_find_freq_idx(freq_list, n_freqs, freq);
}

int mt7915_mcu_apply_tx_dpd(struct mt7915_phy *phy)
{
struct mt7915_dev *dev = phy->dev;
struct cfg80211_chan_def *chandef = &phy->mt76->chandef;
u16 total = 2, center_freq = chandef->center_freq1;
enum nl80211_band band = chandef->chan->band;
u32 offs = is_mt7915(&dev->mt76) ? MT_EE_DO_PRE_CAL : MT_EE_DO_PRE_CAL_V2;
u16 center_freq = chandef->center_freq1;
u8 *cal = dev->cal, *eep = dev->mt76.eeprom.data;
u8 dpd_mask, cal_num = is_mt7915(&dev->mt76) ? 2 : 3;
int idx;

if (1 || !(eep[MT_EE_DO_PRE_CAL] & MT_EE_WIFI_CAL_DPD))
switch (band) {
case NL80211_BAND_2GHZ:
dpd_mask = MT_EE_WIFI_CAL_DPD_2G;
break;
case NL80211_BAND_5GHZ:
dpd_mask = MT_EE_WIFI_CAL_DPD_5G;
break;
case NL80211_BAND_6GHZ:
dpd_mask = MT_EE_WIFI_CAL_DPD_6G;
break;
default:
dpd_mask = 0;
break;
}

if (!(eep[offs] & dpd_mask))
return 0;

idx = mt7915_dpd_freq_idx(center_freq, chandef->width);
idx = mt7915_dpd_freq_idx(dev, center_freq, chandef->width);
if (idx < 0)
return -EINVAL;

/* Items: Tx DPD, Tx Flatness */
idx = idx * 2;
cal += MT_EE_CAL_GROUP_SIZE;
idx = idx * cal_num;
cal += mt7915_get_cal_group_size(dev) + (idx * MT_EE_CAL_UNIT);

while (total--) {
while (cal_num--) {
int ret;

cal += (idx * MT_EE_CAL_UNIT);
ret = mt7915_mcu_set_pre_cal(dev, idx, cal, MT_EE_CAL_UNIT,
MCU_EXT_CMD(DPD_PRE_CAL_INFO));
if (ret)
return ret;

idx++;
cal += MT_EE_CAL_UNIT;
}

return 0;
Expand Down
4 changes: 4 additions & 0 deletions mt7915/mt7915.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,10 @@ struct mt7915_dev {
struct rchan *relay_fwlog;

void *cal;
u32 cur_prek_offset;
u8 dpd_chan_num_2g;
u8 dpd_chan_num_5g;
u8 dpd_chan_num_6g;

struct {
u8 debug_wm;
Expand Down

0 comments on commit b4a9174

Please sign in to comment.