developer | bd9fa1e | 2023-10-16 11:04:00 +0800 | [diff] [blame^] | 1 | From 10df4848e7a7116529e1f596e06d0d03891f502e Mon Sep 17 00:00:00 2001 |
| 2 | From: StanleyYP Wang <StanleyYP.Wang@mediatek.com> |
| 3 | Date: Thu, 20 Jul 2023 17:27:22 +0800 |
| 4 | Subject: [PATCH 37/98] wifi: mt76: mt7996: add eagle default bin of different |
| 5 | sku variants |
| 6 | |
| 7 | Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com> |
| 8 | --- |
| 9 | mt7996/eeprom.c | 2 ++ |
| 10 | mt7996/init.c | 4 ++++ |
| 11 | mt7996/mt7996.h | 28 ++++++++++++++++++++++++++-- |
| 12 | 3 files changed, 32 insertions(+), 2 deletions(-) |
| 13 | |
| 14 | diff --git a/mt7996/eeprom.c b/mt7996/eeprom.c |
| 15 | index 7fd318c..3276740 100644 |
| 16 | --- a/mt7996/eeprom.c |
| 17 | +++ b/mt7996/eeprom.c |
| 18 | @@ -30,6 +30,8 @@ static char *mt7996_eeprom_name(struct mt7996_dev *dev) |
| 19 | /* reserve for future variants */ |
| 20 | if (dev->testmode_enable) |
| 21 | return MT7996_EEPROM_DEFAULT_TM; |
| 22 | + else if (dev->chip_sku == MT7996_SKU_404) |
| 23 | + return MT7996_EEPROM_DEFAULT_404; |
| 24 | else |
| 25 | return MT7996_EEPROM_DEFAULT; |
| 26 | } |
| 27 | diff --git a/mt7996/init.c b/mt7996/init.c |
| 28 | index 6d39c3c..fed74d0 100644 |
| 29 | --- a/mt7996/init.c |
| 30 | +++ b/mt7996/init.c |
| 31 | @@ -789,6 +789,10 @@ static int mt7996_init_hardware(struct mt7996_dev *dev) |
| 32 | |
| 33 | INIT_WORK(&dev->init_work, mt7996_init_work); |
| 34 | |
| 35 | + ret = mt7996_get_chip_sku(dev); |
| 36 | + if (ret) |
| 37 | + return ret; |
| 38 | + |
| 39 | dev->dbdc_support = mt7996_band_valid(dev, MT_BAND1) || |
| 40 | mt7996_band_valid(dev, MT_BAND2); |
| 41 | dev->tbtc_support = mt7996_band_valid(dev, MT_BAND1) && |
| 42 | diff --git a/mt7996/mt7996.h b/mt7996/mt7996.h |
| 43 | index 3964035..efdcff7 100644 |
| 44 | --- a/mt7996/mt7996.h |
| 45 | +++ b/mt7996/mt7996.h |
| 46 | @@ -36,6 +36,7 @@ |
| 47 | #define MT7996_ROM_PATCH "mediatek/mt7996/mt7996_rom_patch.bin" |
| 48 | |
| 49 | #define MT7996_EEPROM_DEFAULT "mediatek/mt7996/mt7996_eeprom.bin" |
| 50 | +#define MT7996_EEPROM_DEFAULT_404 "mediatek/mt7996/mt7996_eeprom_dual_404.bin" |
| 51 | #define MT7996_EEPROM_DEFAULT_TM "mediatek/mt7996/mt7996_eeprom_tm.bin" |
| 52 | #define MT7996_EEPROM_SIZE 7680 |
| 53 | #define MT7996_EEPROM_BLOCK_SIZE 16 |
| 54 | @@ -83,6 +84,11 @@ struct mt7996_sta; |
| 55 | struct mt7996_dfs_pulse; |
| 56 | struct mt7996_dfs_pattern; |
| 57 | |
| 58 | +enum mt7996_sku_type { |
| 59 | + MT7996_SKU_404, |
| 60 | + MT7996_SKU_444, |
| 61 | +}; |
| 62 | + |
| 63 | enum mt7996_ram_type { |
| 64 | MT7996_RAM_TYPE_WM, |
| 65 | MT7996_RAM_TYPE_WM_TM = MT7996_RAM_TYPE_WM, |
| 66 | @@ -264,6 +270,8 @@ struct mt7996_dev { |
| 67 | struct cfg80211_chan_def rdd2_chandef; |
| 68 | struct mt7996_phy *rdd2_phy; |
| 69 | |
| 70 | + u8 chip_sku; |
| 71 | + |
| 72 | u16 chainmask; |
| 73 | u8 chainshift[__MT_MAX_BAND]; |
| 74 | u32 hif_idx; |
| 75 | @@ -417,6 +425,23 @@ mt7996_phy3(struct mt7996_dev *dev) |
| 76 | return __mt7996_phy(dev, MT_BAND2); |
| 77 | } |
| 78 | |
| 79 | +static inline int |
| 80 | +mt7996_get_chip_sku(struct mt7996_dev *dev) |
| 81 | +{ |
| 82 | + u32 val = mt76_rr(dev, MT_PAD_GPIO); |
| 83 | + |
| 84 | + /* reserve for future variants */ |
| 85 | + switch (mt76_chip(&dev->mt76)) { |
| 86 | + case 0x7990: |
| 87 | + dev->chip_sku = FIELD_GET(MT_PAD_GPIO_ADIE_COMB, val) <= 1; |
| 88 | + break; |
| 89 | + default: |
| 90 | + return -EINVAL; |
| 91 | + } |
| 92 | + |
| 93 | + return 0; |
| 94 | +} |
| 95 | + |
| 96 | static inline bool |
| 97 | mt7996_band_valid(struct mt7996_dev *dev, u8 band) |
| 98 | { |
| 99 | @@ -424,8 +449,7 @@ mt7996_band_valid(struct mt7996_dev *dev, u8 band) |
| 100 | return band <= MT_BAND1; |
| 101 | |
| 102 | /* tri-band support */ |
| 103 | - if (band <= MT_BAND2 && |
| 104 | - mt76_get_field(dev, MT_PAD_GPIO, MT_PAD_GPIO_ADIE_COMB) <= 1) |
| 105 | + if (band <= MT_BAND2 && dev->chip_sku) |
| 106 | return true; |
| 107 | |
| 108 | return band == MT_BAND0 || band == MT_BAND2; |
| 109 | -- |
| 110 | 2.18.0 |
| 111 | |