developer | a46f613 | 2024-03-26 14:09:54 +0800 | [diff] [blame] | 1 | From 22607765799dad52bcf304ffd5f393878c4317bf Mon Sep 17 00:00:00 2001 |
developer | bd9fa1e | 2023-10-16 11:04:00 +0800 | [diff] [blame] | 2 | From: StanleyYP Wang <StanleyYP.Wang@mediatek.com> |
| 3 | Date: Thu, 20 Jul 2023 17:27:22 +0800 |
developer | a46f613 | 2024-03-26 14:09:54 +0800 | [diff] [blame] | 4 | Subject: [PATCH 10/17] mtk: wifi: mt76: mt7996: add eagle default bin of |
developer | 1a17367 | 2023-12-21 14:49:33 +0800 | [diff] [blame] | 5 | different sku variants |
developer | bd9fa1e | 2023-10-16 11:04:00 +0800 | [diff] [blame] | 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 |
developer | 1a17367 | 2023-12-21 14:49:33 +0800 | [diff] [blame] | 15 | index 4a823711..7505a8b7 100644 |
developer | bd9fa1e | 2023-10-16 11:04:00 +0800 | [diff] [blame] | 16 | --- a/mt7996/eeprom.c |
| 17 | +++ b/mt7996/eeprom.c |
developer | 1a17367 | 2023-12-21 14:49:33 +0800 | [diff] [blame] | 18 | @@ -26,6 +26,8 @@ static char *mt7996_eeprom_name(struct mt7996_dev *dev) |
| 19 | { |
| 20 | switch (mt76_chip(&dev->mt76)) { |
| 21 | case 0x7990: |
| 22 | + if (dev->chip_sku == MT7996_SKU_404) |
| 23 | + return MT7996_EEPROM_DEFAULT_404; |
developer | bd9fa1e | 2023-10-16 11:04:00 +0800 | [diff] [blame] | 24 | return MT7996_EEPROM_DEFAULT; |
developer | 1a17367 | 2023-12-21 14:49:33 +0800 | [diff] [blame] | 25 | case 0x7992: |
| 26 | return MT7992_EEPROM_DEFAULT; |
developer | bd9fa1e | 2023-10-16 11:04:00 +0800 | [diff] [blame] | 27 | diff --git a/mt7996/init.c b/mt7996/init.c |
developer | 753619c | 2024-02-22 13:42:45 +0800 | [diff] [blame] | 28 | index 9aa97e4a..274863dc 100644 |
developer | bd9fa1e | 2023-10-16 11:04:00 +0800 | [diff] [blame] | 29 | --- a/mt7996/init.c |
| 30 | +++ b/mt7996/init.c |
developer | eb15569 | 2024-01-11 14:08:37 +0800 | [diff] [blame] | 31 | @@ -897,6 +897,10 @@ static int mt7996_init_hardware(struct mt7996_dev *dev) |
developer | 1a17367 | 2023-12-21 14:49:33 +0800 | [diff] [blame] | 32 | INIT_LIST_HEAD(&dev->wed_rro.poll_list); |
| 33 | spin_lock_init(&dev->wed_rro.lock); |
developer | bd9fa1e | 2023-10-16 11:04:00 +0800 | [diff] [blame] | 34 | |
| 35 | + ret = mt7996_get_chip_sku(dev); |
| 36 | + if (ret) |
| 37 | + return ret; |
| 38 | + |
developer | 1a17367 | 2023-12-21 14:49:33 +0800 | [diff] [blame] | 39 | ret = mt7996_dma_init(dev); |
| 40 | if (ret) |
| 41 | return ret; |
developer | bd9fa1e | 2023-10-16 11:04:00 +0800 | [diff] [blame] | 42 | diff --git a/mt7996/mt7996.h b/mt7996/mt7996.h |
developer | 753619c | 2024-02-22 13:42:45 +0800 | [diff] [blame] | 43 | index 36d1f247..b6df2167 100644 |
developer | bd9fa1e | 2023-10-16 11:04:00 +0800 | [diff] [blame] | 44 | --- a/mt7996/mt7996.h |
| 45 | +++ b/mt7996/mt7996.h |
developer | 1a17367 | 2023-12-21 14:49:33 +0800 | [diff] [blame] | 46 | @@ -40,6 +40,7 @@ |
| 47 | #define MT7992_ROM_PATCH "mediatek/mt7996/mt7992_rom_patch.bin" |
developer | bd9fa1e | 2023-10-16 11:04:00 +0800 | [diff] [blame] | 48 | |
| 49 | #define MT7996_EEPROM_DEFAULT "mediatek/mt7996/mt7996_eeprom.bin" |
| 50 | +#define MT7996_EEPROM_DEFAULT_404 "mediatek/mt7996/mt7996_eeprom_dual_404.bin" |
developer | 1a17367 | 2023-12-21 14:49:33 +0800 | [diff] [blame] | 51 | #define MT7992_EEPROM_DEFAULT "mediatek/mt7996/mt7992_eeprom.bin" |
developer | bd9fa1e | 2023-10-16 11:04:00 +0800 | [diff] [blame] | 52 | #define MT7996_EEPROM_SIZE 7680 |
| 53 | #define MT7996_EEPROM_BLOCK_SIZE 16 |
developer | 1a17367 | 2023-12-21 14:49:33 +0800 | [diff] [blame] | 54 | @@ -88,6 +89,11 @@ struct mt7996_sta; |
developer | bd9fa1e | 2023-10-16 11:04:00 +0800 | [diff] [blame] | 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, |
developer | 1a17367 | 2023-12-21 14:49:33 +0800 | [diff] [blame] | 65 | MT7996_RAM_TYPE_WA, |
| 66 | @@ -257,6 +263,8 @@ struct mt7996_dev { |
developer | bd9fa1e | 2023-10-16 11:04:00 +0800 | [diff] [blame] | 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; |
developer | 753619c | 2024-02-22 13:42:45 +0800 | [diff] [blame] | 75 | @@ -398,6 +406,23 @@ mt7996_phy3(struct mt7996_dev *dev) |
developer | bd9fa1e | 2023-10-16 11:04:00 +0800 | [diff] [blame] | 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 | { |
developer | 753619c | 2024-02-22 13:42:45 +0800 | [diff] [blame] | 99 | @@ -405,8 +430,7 @@ mt7996_band_valid(struct mt7996_dev *dev, u8 band) |
developer | bd9fa1e | 2023-10-16 11:04:00 +0800 | [diff] [blame] | 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 | |