| Message ID | 20230602152108.26860-3-shayne.chen@mediatek.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Felix Fietkau |
| Headers | show |
| Series | [01/12] wifi: mt76: mt7996: move radio ctrl commands to proper functions | expand |
> From: Peter Chiu <chui-hao.chiu@mediatek.com> > > Add DSP firmware for phy-related control. The firmware is transparent to > driver, but it's necessary for the firmware download process. > > Reviewed-by: Shayne Chen <shayne.chen@mediatek.com> > Signed-off-by: Peter Chiu <chui-hao.chiu@mediatek.com> > Signed-off-by: Shayne Chen <shayne.chen@mediatek.com> > --- > .../net/wireless/mediatek/mt76/mt7996/mcu.c | 94 ++++++++----------- > .../wireless/mediatek/mt76/mt7996/mt7996.h | 7 ++ > .../net/wireless/mediatek/mt76/mt7996/pci.c | 1 + > 3 files changed, 49 insertions(+), 53 deletions(-) > > diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c > index 88e2f9d0e513..243647dbd8c7 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c > +++ b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c > @@ -2155,7 +2155,7 @@ static int mt7996_load_patch(struct mt7996_dev *dev) > static int > mt7996_mcu_send_ram_firmware(struct mt7996_dev *dev, > const struct mt7996_fw_trailer *hdr, > - const u8 *data, bool is_wa) > + const u8 *data, enum mt7996_ram_type type) > { > int i, offset = 0; > u32 override = 0, option = 0; > @@ -2167,8 +2167,10 @@ mt7996_mcu_send_ram_firmware(struct mt7996_dev *dev, > > region = (const struct mt7996_fw_region *)((const u8 *)hdr - > (hdr->n_region - i) * sizeof(*region)); > + /* DSP and WA use same mode */ > mode = mt76_connac_mcu_gen_dl_mode(&dev->mt76, > - region->feature_set, is_wa); > + region->feature_set, > + type != MT7996_RAM_TYPE_WM); > len = le32_to_cpu(region->len); > addr = le32_to_cpu(region->addr); > > @@ -2195,8 +2197,10 @@ mt7996_mcu_send_ram_firmware(struct mt7996_dev *dev, > if (override) > option |= FW_START_OVERRIDE; > > - if (is_wa) > + if (type == MT7996_RAM_TYPE_WA) > option |= FW_START_WORKING_PDA_CR4; > + else if (type == MT7996_RAM_TYPE_DSP) > + option |= FW_START_WORKING_PDA_DSP; > > return mt76_connac_mcu_start_firmware(&dev->mt76, override, option); > } > @@ -2207,56 +2211,40 @@ static int mt7996_load_ram(struct mt7996_dev *dev) > const struct firmware *fw; > int ret; > > - ret = request_firmware(&fw, MT7996_FIRMWARE_WM, dev->mt76.dev); > - if (ret) > - return ret; > - > - if (!fw || !fw->data || fw->size < sizeof(*hdr)) { > - dev_err(dev->mt76.dev, "Invalid firmware\n"); > - ret = -EINVAL; > - goto out; > - } > - > - hdr = (const struct mt7996_fw_trailer *)(fw->data + fw->size - sizeof(*hdr)); > - > - dev_info(dev->mt76.dev, "WM Firmware Version: %.10s, Build Time: %.15s\n", > - hdr->fw_ver, hdr->build_date); > - > - ret = mt7996_mcu_send_ram_firmware(dev, hdr, fw->data, false); > - if (ret) { > - dev_err(dev->mt76.dev, "Failed to start WM firmware\n"); > - goto out; > - } > - > - release_firmware(fw); > - > - ret = request_firmware(&fw, MT7996_FIRMWARE_WA, dev->mt76.dev); > - if (ret) > - return ret; > - > - if (!fw || !fw->data || fw->size < sizeof(*hdr)) { > - dev_err(dev->mt76.dev, "Invalid firmware\n"); > - ret = -EINVAL; > - goto out; > - } > - > - hdr = (const struct mt7996_fw_trailer *)(fw->data + fw->size - sizeof(*hdr)); > - > - dev_info(dev->mt76.dev, "WA Firmware Version: %.10s, Build Time: %.15s\n", > - hdr->fw_ver, hdr->build_date); > - > - ret = mt7996_mcu_send_ram_firmware(dev, hdr, fw->data, true); > - if (ret) { > - dev_err(dev->mt76.dev, "Failed to start WA firmware\n"); > - goto out; > - } > - > - snprintf(dev->mt76.hw->wiphy->fw_version, > - sizeof(dev->mt76.hw->wiphy->fw_version), > - "%.10s-%.15s", hdr->fw_ver, hdr->build_date); > - > -out: > - release_firmware(fw); > +#define LOAD_RAM(_type) \ I think it would be better to used a regular function instead of a macro, the code would be much easier to read. Regards, Lorenzo > + do { \ > + ret = request_firmware(&fw, MT7996_FIRMWARE_##_type, dev->mt76.dev);\ > + if (ret) \ > + return ret; \ > + \ > + if (!fw || !fw->data || fw->size < sizeof(*hdr)) { \ > + dev_err(dev->mt76.dev, "Invalid firmware\n"); \ > + release_firmware(fw); \ > + return -EINVAL; \ > + } \ > + \ > + hdr = (const struct mt7996_fw_trailer *) \ > + (fw->data + fw->size - sizeof(*hdr)); \ > + \ > + dev_info(dev->mt76.dev, \ > + "%s Firmware Version: %.10s, Build Time: %.15s\n", \ > + #_type, hdr->fw_ver, hdr->build_date); \ > + \ > + ret = mt7996_mcu_send_ram_firmware(dev, hdr, fw->data, \ > + MT7996_RAM_TYPE_##_type); \ > + if (ret) { \ > + dev_err(dev->mt76.dev, "Failed to start %s firmware\n", #_type);\ > + release_firmware(fw); \ > + return ret; \ > + } \ > + \ > + release_firmware(fw); \ > + } while (0) > + > + LOAD_RAM(WM); > + LOAD_RAM(DSP); > + LOAD_RAM(WA); > +#undef LOAD_RAM > > return ret; > } > diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h b/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h > index 4d7dcb95a620..7dfdc7384056 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h > +++ b/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h > @@ -29,6 +29,7 @@ > > #define MT7996_FIRMWARE_WA "mediatek/mt7996/mt7996_wa.bin" > #define MT7996_FIRMWARE_WM "mediatek/mt7996/mt7996_wm.bin" > +#define MT7996_FIRMWARE_DSP "mediatek/mt7996/mt7996_dsp.bin" > #define MT7996_ROM_PATCH "mediatek/mt7996/mt7996_rom_patch.bin" > > #define MT7996_EEPROM_DEFAULT "mediatek/mt7996/mt7996_eeprom.bin" > @@ -52,6 +53,12 @@ struct mt7996_sta; > struct mt7996_dfs_pulse; > struct mt7996_dfs_pattern; > > +enum mt7996_ram_type { > + MT7996_RAM_TYPE_WM, > + MT7996_RAM_TYPE_WA, > + MT7996_RAM_TYPE_DSP, > +}; > + > enum mt7996_txq_id { > MT7996_TXQ_FWDL = 16, > MT7996_TXQ_MCU_WM, > diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/pci.c b/drivers/net/wireless/mediatek/mt76/mt7996/pci.c > index 64aee3fb5445..c5301050ff8b 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt7996/pci.c > +++ b/drivers/net/wireless/mediatek/mt76/mt7996/pci.c > @@ -219,4 +219,5 @@ MODULE_DEVICE_TABLE(pci, mt7996_pci_device_table); > MODULE_DEVICE_TABLE(pci, mt7996_hif_device_table); > MODULE_FIRMWARE(MT7996_FIRMWARE_WA); > MODULE_FIRMWARE(MT7996_FIRMWARE_WM); > +MODULE_FIRMWARE(MT7996_FIRMWARE_DSP); > MODULE_FIRMWARE(MT7996_ROM_PATCH); > -- > 2.39.2 >
(I moved Lorenzo's comment to better see the macro) Lorenzo Bianconi <lorenzo@kernel.org> writes: >> From: Peter Chiu <chui-hao.chiu@mediatek.com> >> >> Add DSP firmware for phy-related control. The firmware is transparent to >> driver, but it's necessary for the firmware download process. >> >> Reviewed-by: Shayne Chen <shayne.chen@mediatek.com> >> Signed-off-by: Peter Chiu <chui-hao.chiu@mediatek.com> >> Signed-off-by: Shayne Chen <shayne.chen@mediatek.com> [...] >> +#define LOAD_RAM(_type) \ >> + do { \ >> + ret = request_firmware(&fw, MT7996_FIRMWARE_##_type, dev->mt76.dev);\ >> + if (ret) \ >> + return ret; \ >> + \ >> + if (!fw || !fw->data || fw->size < sizeof(*hdr)) { \ >> + dev_err(dev->mt76.dev, "Invalid firmware\n"); \ >> + release_firmware(fw); \ >> + return -EINVAL; \ >> + } \ >> + \ >> + hdr = (const struct mt7996_fw_trailer *) \ >> + (fw->data + fw->size - sizeof(*hdr)); \ >> + \ >> + dev_info(dev->mt76.dev, \ >> + "%s Firmware Version: %.10s, Build Time: %.15s\n", \ >> + #_type, hdr->fw_ver, hdr->build_date); \ >> + \ >> + ret = mt7996_mcu_send_ram_firmware(dev, hdr, fw->data, \ >> + MT7996_RAM_TYPE_##_type); \ >> + if (ret) { \ >> + dev_err(dev->mt76.dev, "Failed to start %s firmware\n", #_type);\ >> + release_firmware(fw); \ >> + return ret; \ >> + } \ >> + \ >> + release_firmware(fw); \ >> + } while (0) >> + >> + LOAD_RAM(WM); >> + LOAD_RAM(DSP); >> + LOAD_RAM(WA); >> +#undef LOAD_RAM > > I think it would be better to used a regular function instead of a macro, the > code would be much easier to read. Yeah, a function is preferred. I think Andrew Morton says: prefer C over CPP
diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c index 88e2f9d0e513..243647dbd8c7 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c @@ -2155,7 +2155,7 @@ static int mt7996_load_patch(struct mt7996_dev *dev) static int mt7996_mcu_send_ram_firmware(struct mt7996_dev *dev, const struct mt7996_fw_trailer *hdr, - const u8 *data, bool is_wa) + const u8 *data, enum mt7996_ram_type type) { int i, offset = 0; u32 override = 0, option = 0; @@ -2167,8 +2167,10 @@ mt7996_mcu_send_ram_firmware(struct mt7996_dev *dev, region = (const struct mt7996_fw_region *)((const u8 *)hdr - (hdr->n_region - i) * sizeof(*region)); + /* DSP and WA use same mode */ mode = mt76_connac_mcu_gen_dl_mode(&dev->mt76, - region->feature_set, is_wa); + region->feature_set, + type != MT7996_RAM_TYPE_WM); len = le32_to_cpu(region->len); addr = le32_to_cpu(region->addr); @@ -2195,8 +2197,10 @@ mt7996_mcu_send_ram_firmware(struct mt7996_dev *dev, if (override) option |= FW_START_OVERRIDE; - if (is_wa) + if (type == MT7996_RAM_TYPE_WA) option |= FW_START_WORKING_PDA_CR4; + else if (type == MT7996_RAM_TYPE_DSP) + option |= FW_START_WORKING_PDA_DSP; return mt76_connac_mcu_start_firmware(&dev->mt76, override, option); } @@ -2207,56 +2211,40 @@ static int mt7996_load_ram(struct mt7996_dev *dev) const struct firmware *fw; int ret; - ret = request_firmware(&fw, MT7996_FIRMWARE_WM, dev->mt76.dev); - if (ret) - return ret; - - if (!fw || !fw->data || fw->size < sizeof(*hdr)) { - dev_err(dev->mt76.dev, "Invalid firmware\n"); - ret = -EINVAL; - goto out; - } - - hdr = (const struct mt7996_fw_trailer *)(fw->data + fw->size - sizeof(*hdr)); - - dev_info(dev->mt76.dev, "WM Firmware Version: %.10s, Build Time: %.15s\n", - hdr->fw_ver, hdr->build_date); - - ret = mt7996_mcu_send_ram_firmware(dev, hdr, fw->data, false); - if (ret) { - dev_err(dev->mt76.dev, "Failed to start WM firmware\n"); - goto out; - } - - release_firmware(fw); - - ret = request_firmware(&fw, MT7996_FIRMWARE_WA, dev->mt76.dev); - if (ret) - return ret; - - if (!fw || !fw->data || fw->size < sizeof(*hdr)) { - dev_err(dev->mt76.dev, "Invalid firmware\n"); - ret = -EINVAL; - goto out; - } - - hdr = (const struct mt7996_fw_trailer *)(fw->data + fw->size - sizeof(*hdr)); - - dev_info(dev->mt76.dev, "WA Firmware Version: %.10s, Build Time: %.15s\n", - hdr->fw_ver, hdr->build_date); - - ret = mt7996_mcu_send_ram_firmware(dev, hdr, fw->data, true); - if (ret) { - dev_err(dev->mt76.dev, "Failed to start WA firmware\n"); - goto out; - } - - snprintf(dev->mt76.hw->wiphy->fw_version, - sizeof(dev->mt76.hw->wiphy->fw_version), - "%.10s-%.15s", hdr->fw_ver, hdr->build_date); - -out: - release_firmware(fw); +#define LOAD_RAM(_type) \ + do { \ + ret = request_firmware(&fw, MT7996_FIRMWARE_##_type, dev->mt76.dev);\ + if (ret) \ + return ret; \ + \ + if (!fw || !fw->data || fw->size < sizeof(*hdr)) { \ + dev_err(dev->mt76.dev, "Invalid firmware\n"); \ + release_firmware(fw); \ + return -EINVAL; \ + } \ + \ + hdr = (const struct mt7996_fw_trailer *) \ + (fw->data + fw->size - sizeof(*hdr)); \ + \ + dev_info(dev->mt76.dev, \ + "%s Firmware Version: %.10s, Build Time: %.15s\n", \ + #_type, hdr->fw_ver, hdr->build_date); \ + \ + ret = mt7996_mcu_send_ram_firmware(dev, hdr, fw->data, \ + MT7996_RAM_TYPE_##_type); \ + if (ret) { \ + dev_err(dev->mt76.dev, "Failed to start %s firmware\n", #_type);\ + release_firmware(fw); \ + return ret; \ + } \ + \ + release_firmware(fw); \ + } while (0) + + LOAD_RAM(WM); + LOAD_RAM(DSP); + LOAD_RAM(WA); +#undef LOAD_RAM return ret; } diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h b/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h index 4d7dcb95a620..7dfdc7384056 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h +++ b/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h @@ -29,6 +29,7 @@ #define MT7996_FIRMWARE_WA "mediatek/mt7996/mt7996_wa.bin" #define MT7996_FIRMWARE_WM "mediatek/mt7996/mt7996_wm.bin" +#define MT7996_FIRMWARE_DSP "mediatek/mt7996/mt7996_dsp.bin" #define MT7996_ROM_PATCH "mediatek/mt7996/mt7996_rom_patch.bin" #define MT7996_EEPROM_DEFAULT "mediatek/mt7996/mt7996_eeprom.bin" @@ -52,6 +53,12 @@ struct mt7996_sta; struct mt7996_dfs_pulse; struct mt7996_dfs_pattern; +enum mt7996_ram_type { + MT7996_RAM_TYPE_WM, + MT7996_RAM_TYPE_WA, + MT7996_RAM_TYPE_DSP, +}; + enum mt7996_txq_id { MT7996_TXQ_FWDL = 16, MT7996_TXQ_MCU_WM, diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/pci.c b/drivers/net/wireless/mediatek/mt76/mt7996/pci.c index 64aee3fb5445..c5301050ff8b 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7996/pci.c +++ b/drivers/net/wireless/mediatek/mt76/mt7996/pci.c @@ -219,4 +219,5 @@ MODULE_DEVICE_TABLE(pci, mt7996_pci_device_table); MODULE_DEVICE_TABLE(pci, mt7996_hif_device_table); MODULE_FIRMWARE(MT7996_FIRMWARE_WA); MODULE_FIRMWARE(MT7996_FIRMWARE_WM); +MODULE_FIRMWARE(MT7996_FIRMWARE_DSP); MODULE_FIRMWARE(MT7996_ROM_PATCH);