Gitiles
Code Review Sign In
git01.mediatek.com / openwrt / feeds / mtk-openwrt-feeds / f6302352f5439c041e900af466926053412b0aa5 / . / autobuild_mac80211_release / mt7988_mt7996_mac80211 / package / kernel / mt76 / patches / 1029-wifi-mt76-mt7996-add-kite-fw-default-bin-for-differe.patch
blob: 8b8119a9ab091739f978d95e148d04e75dfff686 [file] [log] [blame]
developer7e2761e2023-10-12 08:11:13 +0800[diff] [blame]1From af793eb0cf8e035760bdb595ae96e7d7534df60f Mon Sep 17 00:00:00 2001
2From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
3Date: Fri, 21 Jul 2023 10:41:28 +0800
4Subject: [PATCH 62/98] wifi: mt76: mt7996: add kite fw & default bin for
5 different sku variants
6
7Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
8---
9 mt7996/eeprom.c | 10 ++++++++--
10 mt7996/mcu.c | 7 ++++++-
11 mt7996/mt7996.h | 25 ++++++++++++++++++++++++-
12 mt7996/regs.h | 2 ++
13 4 files changed, 40 insertions(+), 4 deletions(-)
14
15diff --git a/mt7996/eeprom.c b/mt7996/eeprom.c
16index 6605853..6eebbb3 100644
17--- a/mt7996/eeprom.c
18+++ b/mt7996/eeprom.c
19@@ -78,8 +78,14 @@ const char *mt7996_eeprom_name(struct mt7996_dev *dev)
20 else
21 return MT7996_EEPROM_DEFAULT;
22 case 0x7992:
23- return dev->testmode_enable ?
24- MT7992_EEPROM_DEFAULT_TM : MT7992_EEPROM_DEFAULT;
25+ if (dev->testmode_enable)
26+ return MT7992_EEPROM_DEFAULT_TM;
27+ else if (dev->chip_sku == MT7992_SKU_23)
28+ return MT7992_EEPROM_DEFAULT_23;
29+ else if (dev->chip_sku == MT7992_SKU_24)
30+ return MT7992_EEPROM_DEFAULT_24;
31+ else
32+ return MT7992_EEPROM_DEFAULT;
33 default:
34 return MT7996_EEPROM_DEFAULT;
35 }
36diff --git a/mt7996/mcu.c b/mt7996/mcu.c
37index e9088ba..b8d26ec 100644
38--- a/mt7996/mcu.c
39+++ b/mt7996/mcu.c
40@@ -18,7 +18,12 @@
41 _fw = MT7996_##name; \
42 break; \
43 case 0x7992: \
44- _fw = MT7992_##name; \
45+ if ((_dev)->chip_sku == MT7992_SKU_23) \
46+ _fw = MT7992_##name##_23; \
47+ else if ((_dev)->chip_sku == MT7992_SKU_24) \
48+ _fw = MT7992_##name##_24; \
49+ else \
50+ _fw = MT7992_##name; \
51 break; \
52 default: \
53 _fw = MT7996_##name; \
54diff --git a/mt7996/mt7996.h b/mt7996/mt7996.h
55index 433d886..6775360 100644
56--- a/mt7996/mt7996.h
57+++ b/mt7996/mt7996.h
58@@ -41,11 +41,25 @@
59 #define MT7992_FIRMWARE_WM_TM "mediatek/mt7996/mt7992_wm_tm.bin"
60 #define MT7992_ROM_PATCH "mediatek/mt7996/mt7992_rom_patch.bin"
61
62+#define MT7992_FIRMWARE_WA_24 "mediatek/mt7996/mt7992_wa_24.bin"
63+#define MT7992_FIRMWARE_WM_24 "mediatek/mt7996/mt7992_wm_24.bin"
64+#define MT7992_FIRMWARE_DSP_24 "mediatek/mt7996/mt7992_dsp_24.bin"
65+#define MT7992_FIRMWARE_WM_TM_24 "mediatek/mt7996/mt7992_wm_tm_24.bin"
66+#define MT7992_ROM_PATCH_24 "mediatek/mt7996/mt7992_rom_patch_24.bin"
67+
68+#define MT7992_FIRMWARE_WA_23 "mediatek/mt7996/mt7992_wa_23.bin"
69+#define MT7992_FIRMWARE_WM_23 "mediatek/mt7996/mt7992_wm_23.bin"
70+#define MT7992_FIRMWARE_DSP_23 "mediatek/mt7996/mt7992_dsp_23.bin"
71+#define MT7992_FIRMWARE_WM_TM_23 "mediatek/mt7996/mt7992_wm_tm_23.bin"
72+#define MT7992_ROM_PATCH_23 "mediatek/mt7996/mt7992_rom_patch_23.bin"
73+
74 #define MT7996_EEPROM_DEFAULT "mediatek/mt7996/mt7996_eeprom.bin"
75 #define MT7996_EEPROM_DEFAULT_404 "mediatek/mt7996/mt7996_eeprom_dual_404.bin"
76 #define MT7996_EEPROM_DEFAULT_TM "mediatek/mt7996/mt7996_eeprom_tm.bin"
77 #define MT7992_EEPROM_DEFAULT "mediatek/mt7996/mt7992_eeprom.bin"
78 #define MT7992_EEPROM_DEFAULT_TM "mediatek/mt7996/mt7992_eeprom_tm.bin"
79+#define MT7992_EEPROM_DEFAULT_24 "mediatek/mt7996/mt7992_eeprom_24.bin"
80+#define MT7992_EEPROM_DEFAULT_23 "mediatek/mt7996/mt7992_eeprom_23.bin"
81
82 #define MT7996_EEPROM_SIZE 7680
83 #define MT7992_EEPROM_SIZE 7680
84@@ -103,6 +117,12 @@ enum mt7996_sku_type {
85 MT7996_SKU_444,
86 };
87
88+enum mt7992_sku_type {
89+ MT7992_SKU_23,
90+ MT7992_SKU_24,
91+ MT7992_SKU_44,
92+};
93+
94 enum mt7996_ram_type {
95 MT7996_RAM_TYPE_WM,
96 MT7996_RAM_TYPE_WM_TM = MT7996_RAM_TYPE_WM,
97@@ -510,11 +530,14 @@ mt7996_get_chip_sku(struct mt7996_dev *dev)
98 {
99 u32 val = mt76_rr(dev, MT_PAD_GPIO);
100
101- /* reserve for future variants */
102 switch (mt76_chip(&dev->mt76)) {
103 case 0x7990:
104 dev->chip_sku = FIELD_GET(MT_PAD_GPIO_ADIE_COMB, val) <= 1;
105 break;
106+ case 0x7992:
107+ dev->chip_sku = !!FIELD_GET(MT_PAD_GPIO_ADIE_COMB_7992, val) +
108+ !FIELD_GET(MT_PAD_GPIO_ADIE_NUM_7992, val);
109+ break;
110 default:
111 return -EINVAL;
112 }
113diff --git a/mt7996/regs.h b/mt7996/regs.h
114index 565022a..d305c25 100644
115--- a/mt7996/regs.h
116+++ b/mt7996/regs.h
117@@ -651,6 +651,8 @@ enum offs_rev {
118
119 #define MT_PAD_GPIO 0x700056f0
120 #define MT_PAD_GPIO_ADIE_COMB GENMASK(16, 15)
121+#define MT_PAD_GPIO_ADIE_COMB_7992 GENMASK(17, 16)
122+#define MT_PAD_GPIO_ADIE_NUM_7992 BIT(15)
123
124 #define MT_HW_REV 0x70010204
125 #define MT_WF_SUBSYS_RST 0x70028600
126--
1272.18.0
128