From 1afabe78cfc529773160036fa291411468da1221 Mon Sep 17 00:00:00 2001 From: Lorenzo Bianconi Date: Sun, 26 Apr 2020 16:40:18 +0200 Subject: [PATCH] mt76: mt7663: add the possibility to load firmware v2 mt7663 firmware v2 is used for embedded devices since it has more completed features in AP mode. Add the capability to specify in mt7615 Kconfig which firmware load first (v3 or v2) and fallback to the other one if the selected firmware fails to load Signed-off-by: Lorenzo Bianconi Signed-off-by: Felix Fietkau --- mt7615/Kconfig | 13 +++++++++++++ mt7615/mcu.c | 50 +++++++++++++++++++++++++++++++++++++++++++------ mt7615/mt7615.h | 6 ++++-- mt7615/pci.c | 2 ++ mt7615/usb.c | 2 ++ 5 files changed, 65 insertions(+), 8 deletions(-) diff --git a/mt7615/Kconfig b/mt7615/Kconfig index e25db113..c04d6a18 100644 --- a/mt7615/Kconfig +++ b/mt7615/Kconfig @@ -38,3 +38,16 @@ config MT7663U This adds support for MT7663U 802.11ax 2x2:2 wireless devices. To compile this driver as a module, choose M here. + +config MT7615_OFFLOAD_FIRMWARE + bool "Prefer client mode offload firmware (MT7663)" + depends on MT7615E || MT7663U + default y + help + Load MT7663 client mode offload firmware (v3) as primary option + and fallback to MT7663 firmware v2 in case of failure. + If MT7615_OFFLOAD_FIRMWARE is not selected MT7663 firmware v2 + will be used as primary option. + MT7663 client mode offload firmware supports low power features + (hw frequency scanning, scheduled frequency scanning, WoW, + 802.11 power save) but is more limited in AP mode diff --git a/mt7615/mcu.c b/mt7615/mcu.c index a661548c..61f3e618 100644 --- a/mt7615/mcu.c +++ b/mt7615/mcu.c @@ -1734,7 +1734,7 @@ static int mt7615_load_patch(struct mt7615_dev *dev, u32 addr, const char *name) return -EAGAIN; } - ret = request_firmware(&fw, name, dev->mt76.dev); + ret = firmware_request_nowarn(&fw, name, dev->mt76.dev); if (ret) goto out; @@ -2087,8 +2087,49 @@ out: return ret; } +static int +mt7663_load_rom_patch(struct mt7615_dev *dev, const char **n9_firmware) +{ + const char *selected_rom, *secondary_rom = MT7663_ROM_PATCH; + const char *primary_rom = MT7663_OFFLOAD_ROM_PATCH; + int ret; + + if (!IS_ENABLED(CONFIG_MT7615_OFFLOAD_FIRMWARE)) { + secondary_rom = MT7663_OFFLOAD_ROM_PATCH; + primary_rom = MT7663_ROM_PATCH; + } + selected_rom = primary_rom; + + ret = mt7615_load_patch(dev, MT7663_PATCH_ADDRESS, primary_rom); + if (ret) { + dev_info(dev->mt76.dev, "%s not found, switching to %s", + primary_rom, secondary_rom); + ret = mt7615_load_patch(dev, MT7663_PATCH_ADDRESS, + secondary_rom); + if (ret) { + dev_err(dev->mt76.dev, "failed to load %s", + secondary_rom); + return ret; + } + selected_rom = secondary_rom; + } + + if (!strcmp(selected_rom, MT7663_OFFLOAD_ROM_PATCH)) { + *n9_firmware = MT7663_OFFLOAD_FIRMWARE_N9; + dev->fw_ver = MT7615_FIRMWARE_V3; + dev->mcu_ops = &uni_update_ops; + } else { + *n9_firmware = MT7663_FIRMWARE_N9; + dev->fw_ver = MT7615_FIRMWARE_V2; + dev->mcu_ops = &sta_update_ops; + } + + return 0; +} + int __mt7663_load_firmware(struct mt7615_dev *dev) { + const char *n9_firmware; int ret; ret = mt76_get_field(dev, MT_CONN_ON_MISC, MT_TOP_MISC2_FW_N9_RDY); @@ -2097,14 +2138,11 @@ int __mt7663_load_firmware(struct mt7615_dev *dev) return -EIO; } - ret = mt7615_load_patch(dev, MT7663_PATCH_ADDRESS, MT7663_ROM_PATCH); + ret = mt7663_load_rom_patch(dev, &n9_firmware); if (ret) return ret; - dev->fw_ver = MT7615_FIRMWARE_V3; - dev->mcu_ops = &uni_update_ops; - - ret = mt7663_load_n9(dev, MT7663_FIRMWARE_N9); + ret = mt7663_load_n9(dev, n9_firmware); if (ret) return ret; diff --git a/mt7615/mt7615.h b/mt7615/mt7615.h index 44eb3d8d..0476b942 100644 --- a/mt7615/mt7615.h +++ b/mt7615/mt7615.h @@ -42,8 +42,10 @@ #define MT7615_FIRMWARE_V2 2 #define MT7615_FIRMWARE_V3 3 -#define MT7663_ROM_PATCH "mediatek/mt7663pr2h.bin" -#define MT7663_FIRMWARE_N9 "mediatek/mt7663_n9_v3.bin" +#define MT7663_OFFLOAD_ROM_PATCH "mediatek/mt7663pr2h.bin" +#define MT7663_OFFLOAD_FIRMWARE_N9 "mediatek/mt7663_n9_v3.bin" +#define MT7663_ROM_PATCH "mediatek/mt7663pr2h_rebb.bin" +#define MT7663_FIRMWARE_N9 "mediatek/mt7663_n9_rebb.bin" #define MT7615_EEPROM_SIZE 1024 #define MT7615_TOKEN_SIZE 4096 diff --git a/mt7615/pci.c b/mt7615/pci.c index 21b3ec29..f9469198 100644 --- a/mt7615/pci.c +++ b/mt7615/pci.c @@ -68,5 +68,7 @@ MODULE_DEVICE_TABLE(pci, mt7615_pci_device_table); MODULE_FIRMWARE(MT7615_FIRMWARE_CR4); MODULE_FIRMWARE(MT7615_FIRMWARE_N9); MODULE_FIRMWARE(MT7615_ROM_PATCH); +MODULE_FIRMWARE(MT7663_OFFLOAD_FIRMWARE_N9); +MODULE_FIRMWARE(MT7663_OFFLOAD_ROM_PATCH); MODULE_FIRMWARE(MT7663_FIRMWARE_N9); MODULE_FIRMWARE(MT7663_ROM_PATCH); diff --git a/mt7615/usb.c b/mt7615/usb.c index bcd13196..9353175b 100644 --- a/mt7615/usb.c +++ b/mt7615/usb.c @@ -386,6 +386,8 @@ mt7663u_resume(struct usb_interface *intf) } MODULE_DEVICE_TABLE(usb, mt7615_device_table); +MODULE_FIRMWARE(MT7663_OFFLOAD_FIRMWARE_N9); +MODULE_FIRMWARE(MT7663_OFFLOAD_ROM_PATCH); MODULE_FIRMWARE(MT7663_FIRMWARE_N9); MODULE_FIRMWARE(MT7663_ROM_PATCH);