developer | 7e2761e | 2023-10-12 08:11:13 +0800 | [diff] [blame^] | 1 | From 4f5af38dbe7866b635428ebe80df29ab96bd660e Mon Sep 17 00:00:00 2001 |
| 2 | From: StanleyYP Wang <StanleyYP.Wang@mediatek.com> |
| 3 | Date: Fri, 26 May 2023 14:41:27 +0800 |
| 4 | Subject: [PATCH 60/98] wifi: mt76: mt7996: add kite fwdl support |
| 5 | |
| 6 | Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com> |
| 7 | --- |
| 8 | mt76_connac_mcu.c | 3 ++- |
| 9 | mt7996/mcu.c | 26 +++++++++++++++++++++----- |
| 10 | mt7996/mt7996.h | 6 ++++++ |
| 11 | mt7996/pci.c | 4 ++++ |
| 12 | 4 files changed, 33 insertions(+), 6 deletions(-) |
| 13 | |
| 14 | diff --git a/mt76_connac_mcu.c b/mt76_connac_mcu.c |
| 15 | index 214a526..43e8ce0 100644 |
| 16 | --- a/mt76_connac_mcu.c |
| 17 | +++ b/mt76_connac_mcu.c |
| 18 | @@ -68,7 +68,8 @@ int mt76_connac_mcu_init_download(struct mt76_dev *dev, u32 addr, u32 len, |
| 19 | if ((!is_connac_v1(dev) && addr == MCU_PATCH_ADDRESS) || |
| 20 | (is_mt7921(dev) && addr == 0x900000) || |
| 21 | (is_mt7925(dev) && addr == 0x900000) || |
| 22 | - (is_mt7996(dev) && addr == 0x900000)) |
| 23 | + (is_mt7996(dev) && addr == 0x900000) || |
| 24 | + (is_mt7992(dev) && addr == 0x900000)) |
| 25 | cmd = MCU_CMD(PATCH_START_REQ); |
| 26 | else |
| 27 | cmd = MCU_CMD(TARGET_ADDRESS_LEN_REQ); |
| 28 | diff --git a/mt7996/mcu.c b/mt7996/mcu.c |
| 29 | index 3a960d1..255d0ba 100644 |
| 30 | --- a/mt7996/mcu.c |
| 31 | +++ b/mt7996/mcu.c |
| 32 | @@ -11,6 +11,22 @@ |
| 33 | #include "mac.h" |
| 34 | #include "eeprom.h" |
| 35 | |
| 36 | +#define fw_name(_dev, name, ...) ({ \ |
| 37 | + char *_fw; \ |
| 38 | + switch (mt76_chip(&(_dev)->mt76)) { \ |
| 39 | + case 0x7996: \ |
| 40 | + _fw = MT7996_##name; \ |
| 41 | + break; \ |
| 42 | + case 0x7992: \ |
| 43 | + _fw = MT7992_##name; \ |
| 44 | + break; \ |
| 45 | + default: \ |
| 46 | + _fw = MT7996_##name; \ |
| 47 | + break; \ |
| 48 | + } \ |
| 49 | + _fw; \ |
| 50 | +}) |
| 51 | + |
| 52 | struct mt7996_patch_hdr { |
| 53 | char build_date[16]; |
| 54 | char platform[4]; |
| 55 | @@ -2598,7 +2614,7 @@ static int mt7996_load_patch(struct mt7996_dev *dev) |
| 56 | return -EAGAIN; |
| 57 | } |
| 58 | |
| 59 | - ret = request_firmware(&fw, MT7996_ROM_PATCH, dev->mt76.dev); |
| 60 | + ret = request_firmware(&fw, fw_name(dev, ROM_PATCH), dev->mt76.dev); |
| 61 | if (ret) |
| 62 | goto out; |
| 63 | |
| 64 | @@ -2767,20 +2783,20 @@ static int mt7996_load_ram(struct mt7996_dev *dev) |
| 65 | int ret; |
| 66 | |
| 67 | if (dev->testmode_enable) |
| 68 | - ret = __mt7996_load_ram(dev, "WM_TM", MT7996_FIRMWARE_WM_TM, |
| 69 | + ret = __mt7996_load_ram(dev, "WM_TM", fw_name(dev, FIRMWARE_WM_TM), |
| 70 | MT7996_RAM_TYPE_WM_TM); |
| 71 | else |
| 72 | - ret = __mt7996_load_ram(dev, "WM", MT7996_FIRMWARE_WM, |
| 73 | + ret = __mt7996_load_ram(dev, "WM", fw_name(dev, FIRMWARE_WM), |
| 74 | MT7996_RAM_TYPE_WM); |
| 75 | if (ret) |
| 76 | return ret; |
| 77 | |
| 78 | - ret = __mt7996_load_ram(dev, "DSP", MT7996_FIRMWARE_DSP, |
| 79 | + ret = __mt7996_load_ram(dev, "DSP", fw_name(dev, FIRMWARE_DSP), |
| 80 | MT7996_RAM_TYPE_DSP); |
| 81 | if (ret) |
| 82 | return ret; |
| 83 | |
| 84 | - return __mt7996_load_ram(dev, "WA", MT7996_FIRMWARE_WA, |
| 85 | + return __mt7996_load_ram(dev, "WA", fw_name(dev, FIRMWARE_WA), |
| 86 | MT7996_RAM_TYPE_WA); |
| 87 | } |
| 88 | |
| 89 | diff --git a/mt7996/mt7996.h b/mt7996/mt7996.h |
| 90 | index 766de3f..eb192eb 100644 |
| 91 | --- a/mt7996/mt7996.h |
| 92 | +++ b/mt7996/mt7996.h |
| 93 | @@ -35,6 +35,12 @@ |
| 94 | #define MT7996_FIRMWARE_WM_TM "mediatek/mt7996/mt7996_wm_tm.bin" |
| 95 | #define MT7996_ROM_PATCH "mediatek/mt7996/mt7996_rom_patch.bin" |
| 96 | |
| 97 | +#define MT7992_FIRMWARE_WA "mediatek/mt7996/mt7992_wa.bin" |
| 98 | +#define MT7992_FIRMWARE_WM "mediatek/mt7996/mt7992_wm.bin" |
| 99 | +#define MT7992_FIRMWARE_DSP "mediatek/mt7996/mt7992_dsp.bin" |
| 100 | +#define MT7992_FIRMWARE_WM_TM "mediatek/mt7996/mt7992_wm_tm.bin" |
| 101 | +#define MT7992_ROM_PATCH "mediatek/mt7996/mt7992_rom_patch.bin" |
| 102 | + |
| 103 | #define MT7996_EEPROM_DEFAULT "mediatek/mt7996/mt7996_eeprom.bin" |
| 104 | #define MT7996_EEPROM_DEFAULT_404 "mediatek/mt7996/mt7996_eeprom_dual_404.bin" |
| 105 | #define MT7996_EEPROM_DEFAULT_TM "mediatek/mt7996/mt7996_eeprom_tm.bin" |
| 106 | diff --git a/mt7996/pci.c b/mt7996/pci.c |
| 107 | index e8edf77..2bb707d 100644 |
| 108 | --- a/mt7996/pci.c |
| 109 | +++ b/mt7996/pci.c |
| 110 | @@ -263,3 +263,7 @@ MODULE_FIRMWARE(MT7996_FIRMWARE_WA); |
| 111 | MODULE_FIRMWARE(MT7996_FIRMWARE_WM); |
| 112 | MODULE_FIRMWARE(MT7996_FIRMWARE_DSP); |
| 113 | MODULE_FIRMWARE(MT7996_ROM_PATCH); |
| 114 | +MODULE_FIRMWARE(MT7992_FIRMWARE_WA); |
| 115 | +MODULE_FIRMWARE(MT7992_FIRMWARE_WM); |
| 116 | +MODULE_FIRMWARE(MT7992_FIRMWARE_DSP); |
| 117 | +MODULE_FIRMWARE(MT7992_ROM_PATCH); |
| 118 | -- |
| 119 | 2.18.0 |
| 120 | |