diff mbox series

[v2,02/10] wifi: mt76: connac: add support for dsp firmware download

Message ID 20230605081947.12804-2-shayne.chen@mediatek.com (mailing list archive)
State Superseded
Delegated to: Felix Fietkau
Headers show
Series [v2,01/10] wifi: mt76: mt7996: move radio ctrl commands to proper functions | expand

Commit Message

Shayne Chen June 5, 2023, 8:19 a.m. UTC 
From: Peter Chiu <chui-hao.chiu@mediatek.com>

Add FW_START_WORKING_PDA_DSP for the indication of starting DSP
firmware download, which is for phy-related control.
The firmware is transparent to the 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>
---
v2:
  - merge two commits:
    - wifi: mt76: connac: add a setting bit for dsp firmware
    - wifi: mt76: mt7996: add dsp firmware download
  - move main code for loading ram to a regular function
---
 .../wireless/mediatek/mt76/mt76_connac_mcu.h  |  1 +
 .../net/wireless/mediatek/mt76/mt7996/mcu.c   | 70 +++++++++----------
 .../wireless/mediatek/mt76/mt7996/mt7996.h    |  7 ++
 .../net/wireless/mediatek/mt76/mt7996/pci.c   |  1 +
 4 files changed, 43 insertions(+), 36 deletions(-)

Comments

Lorenzo Bianconi June 5, 2023, 8:38 a.m. UTC | #1 
> From: Peter Chiu <chui-hao.chiu@mediatek.com>
> 
> Add FW_START_WORKING_PDA_DSP for the indication of starting DSP
> firmware download, which is for phy-related control.
> The firmware is transparent to the 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>
> ---
> v2:
>   - merge two commits:
>     - wifi: mt76: connac: add a setting bit for dsp firmware
>     - wifi: mt76: mt7996: add dsp firmware download
>   - move main code for loading ram to a regular function
> ---
>  .../wireless/mediatek/mt76/mt76_connac_mcu.h  |  1 +
>  .../net/wireless/mediatek/mt76/mt7996/mcu.c   | 70 +++++++++----------
>  .../wireless/mediatek/mt76/mt7996/mt7996.h    |  7 ++
>  .../net/wireless/mediatek/mt76/mt7996/pci.c   |  1 +
>  4 files changed, 43 insertions(+), 36 deletions(-)
> 
> diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
> index ca1ce97a6d2f..4a21c237ea6e 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
> +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
> @@ -22,6 +22,7 @@
>  
>  #define FW_START_OVERRIDE		BIT(0)
>  #define FW_START_WORKING_PDA_CR4	BIT(2)
> +#define FW_START_WORKING_PDA_DSP	BIT(3)
>  
>  #define PATCH_SEC_NOT_SUPPORT		GENMASK(31, 0)
>  #define PATCH_SEC_TYPE_MASK		GENMASK(15, 0)
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
> index 88e2f9d0e513..28930693a75a 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,19 +2197,22 @@ 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);
>  }
>  
> -static int mt7996_load_ram(struct mt7996_dev *dev)
> +static int __mt7996_load_ram(struct mt7996_dev *dev, const char *fw_type,
> +			     const char *fw_file, enum mt7996_ram_type ram_type)
>  {
>  	const struct mt7996_fw_trailer *hdr;
>  	const struct firmware *fw;
>  	int ret;
>  
> -	ret = request_firmware(&fw, MT7996_FIRMWARE_WM, dev->mt76.dev);
> +	ret = request_firmware(&fw, fw_file, dev->mt76.dev);
>  	if (ret)
>  		return ret;
>  
> @@ -2217,48 +2222,41 @@ static int mt7996_load_ram(struct mt7996_dev *dev)
>  		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);
> +	hdr = (const void *)(fw->data + fw->size - sizeof(*hdr));
> +	dev_info(dev->mt76.dev, "%s Firmware Version: %.10s, Build Time: %.15s\n",
> +		 fw_type, hdr->fw_ver, hdr->build_date);
>  
> -	ret = mt7996_mcu_send_ram_firmware(dev, hdr, fw->data, false);
> +	ret = mt7996_mcu_send_ram_firmware(dev, hdr, fw->data, ram_type);
>  	if (ret) {
> -		dev_err(dev->mt76.dev, "Failed to start WM firmware\n");
> +		dev_err(dev->mt76.dev, "Failed to start %s firmware\n", fw_type);
>  		goto out;
>  	}
>  
> +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);
> +	return ret;
> +}
>  
> -	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;
> -	}
> +static int mt7996_load_ram(struct mt7996_dev *dev)
> +{
> +	int ret;
>  
> -	snprintf(dev->mt76.hw->wiphy->fw_version,
> -		 sizeof(dev->mt76.hw->wiphy->fw_version),
> -		 "%.10s-%.15s", hdr->fw_ver, hdr->build_date);

doing so we do not advertise fw version through ethtool as before.

> +#define LOAD_RAM(_type) \
> +	do {								\
> +		ret = __mt7996_load_ram(dev, #_type,			\
> +					MT7996_FIRMWARE_##_type,	\
> +					MT7996_RAM_TYPE_##_type);	\
> +		if (ret)						\
> +			return ret;					\
> +	} while (0)
>  
> -out:
> -	release_firmware(fw);
> +	LOAD_RAM(WM);
> +	LOAD_RAM(DSP);
> +	LOAD_RAM(WA);

can you please run the function directly instead of using macros?

Regards,
Lorenzo

> +#undef LOAD_RAM
>  
> -	return ret;
> +	return 0;
>  }
>  
>  static int
> 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
>
Shayne Chen June 5, 2023, 9:33 a.m. UTC | #2 
On Mon, 2023-06-05 at 10:38 +0200, Lorenzo Bianconi wrote:
> > From: Peter Chiu <chui-hao.chiu@mediatek.com>
> > 
> > Add FW_START_WORKING_PDA_DSP for the indication of starting DSP
> > firmware download, which is for phy-related control.
> > The firmware is transparent to the 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>
> > ---
> > v2:
> >   - merge two commits:
> >     - wifi: mt76: connac: add a setting bit for dsp firmware
> >     - wifi: mt76: mt7996: add dsp firmware download
> >   - move main code for loading ram to a regular function
> > ---
> >  .../wireless/mediatek/mt76/mt76_connac_mcu.h  |  1 +
> >  .../net/wireless/mediatek/mt76/mt7996/mcu.c   | 70 +++++++++----
> > ------
> >  .../wireless/mediatek/mt76/mt7996/mt7996.h    |  7 ++
> >  .../net/wireless/mediatek/mt76/mt7996/pci.c   |  1 +
> >  4 files changed, 43 insertions(+), 36 deletions(-)
> > 
> > diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
> > b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
> > index ca1ce97a6d2f..4a21c237ea6e 100644
> > --- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
> > +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
> > @@ -22,6 +22,7 @@
> >  
> >  #define FW_START_OVERRIDE		BIT(0)
> >  #define FW_START_WORKING_PDA_CR4	BIT(2)
> > +#define FW_START_WORKING_PDA_DSP	BIT(3)
> >  
> >  #define PATCH_SEC_NOT_SUPPORT		GENMASK(31, 0)
> >  #define PATCH_SEC_TYPE_MASK		GENMASK(15, 0)
> > diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
> > b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
> > index 88e2f9d0e513..28930693a75a 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,19 +2197,22 @@ 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);
> >  }
> >  
> > -static int mt7996_load_ram(struct mt7996_dev *dev)
> > +static int __mt7996_load_ram(struct mt7996_dev *dev, const char
> > *fw_type,
> > +			     const char *fw_file, enum mt7996_ram_type
> > ram_type)
> >  {
> >  	const struct mt7996_fw_trailer *hdr;
> >  	const struct firmware *fw;
> >  	int ret;
> >  
> > -	ret = request_firmware(&fw, MT7996_FIRMWARE_WM, dev->mt76.dev);
> > +	ret = request_firmware(&fw, fw_file, dev->mt76.dev);
> >  	if (ret)
> >  		return ret;
> >  
> > @@ -2217,48 +2222,41 @@ static int mt7996_load_ram(struct
> > mt7996_dev *dev)
> >  		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);
> > +	hdr = (const void *)(fw->data + fw->size - sizeof(*hdr));
> > +	dev_info(dev->mt76.dev, "%s Firmware Version: %.10s, Build
> > Time: %.15s\n",
> > +		 fw_type, hdr->fw_ver, hdr->build_date);
> >  
> > -	ret = mt7996_mcu_send_ram_firmware(dev, hdr, fw->data, false);
> > +	ret = mt7996_mcu_send_ram_firmware(dev, hdr, fw->data,
> > ram_type);
> >  	if (ret) {
> > -		dev_err(dev->mt76.dev, "Failed to start WM
> > firmware\n");
> > +		dev_err(dev->mt76.dev, "Failed to start %s firmware\n",
> > fw_type);
> >  		goto out;
> >  	}
> >  
> > +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);
> > +	return ret;
> > +}
> >  
> > -	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;
> > -	}
> > +static int mt7996_load_ram(struct mt7996_dev *dev)
> > +{
> > +	int ret;
> >  
> > -	snprintf(dev->mt76.hw->wiphy->fw_version,
> > -		 sizeof(dev->mt76.hw->wiphy->fw_version),
> > -		 "%.10s-%.15s", hdr->fw_ver, hdr->build_date);
> 
> doing so we do not advertise fw version through ethtool as before.
> 
> > +#define LOAD_RAM(_type) \
> > +	do {								
> > \
> > +		ret = __mt7996_load_ram(dev, #_type,			
> > \
> > +					MT7996_FIRMWARE_##_type,	\
> > +					MT7996_RAM_TYPE_##_type);	\
> > +		if (ret)						\
> > +			return ret;					\
> > +	} while (0)
> >  
> > -out:
> > -	release_firmware(fw);
> > +	LOAD_RAM(WM);
> > +	LOAD_RAM(DSP);
> > +	LOAD_RAM(WA);
> 
> can you please run the function directly instead of using macros?
> 
> Regards,
> Lorenzo

Hi Lorenzo,

Will add 
> 
> > +#undef LOAD_RAM
> >  
> > -	return ret;
> > +	return 0;
> >  }
> >  
> >  static int
> > 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_pat
> > ch.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
> >
Shayne Chen June 5, 2023, 9:36 a.m. UTC | #3 
On Mon, 2023-06-05 at 17:33 +0800, Shayne Chen wrote:
> On Mon, 2023-06-05 at 10:38 +0200, Lorenzo Bianconi wrote:
> > > From: Peter Chiu <chui-hao.chiu@mediatek.com>
> > > 
> > > Add FW_START_WORKING_PDA_DSP for the indication of starting DSP
> > > firmware download, which is for phy-related control.
> > > The firmware is transparent to the 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>
> > > ---
> > > v2:
> > >   - merge two commits:
> > >     - wifi: mt76: connac: add a setting bit for dsp firmware
> > >     - wifi: mt76: mt7996: add dsp firmware download
> > >   - move main code for loading ram to a regular function
> > > ---
> > >  .../wireless/mediatek/mt76/mt76_connac_mcu.h  |  1 +
> > >  .../net/wireless/mediatek/mt76/mt7996/mcu.c   | 70 +++++++++----
> > > ------
> > >  .../wireless/mediatek/mt76/mt7996/mt7996.h    |  7 ++
> > >  .../net/wireless/mediatek/mt76/mt7996/pci.c   |  1 +
> > >  4 files changed, 43 insertions(+), 36 deletions(-)
> > > 
> > > diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
> > > b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
> > > index ca1ce97a6d2f..4a21c237ea6e 100644
> > > --- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
> > > +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
> > > @@ -22,6 +22,7 @@
> > >  
> > >  #define FW_START_OVERRIDE		BIT(0)
> > >  #define FW_START_WORKING_PDA_CR4	BIT(2)
> > > +#define FW_START_WORKING_PDA_DSP	BIT(3)
> > >  
> > >  #define PATCH_SEC_NOT_SUPPORT		GENMASK(31, 0)
> > >  #define PATCH_SEC_TYPE_MASK		GENMASK(15, 0)
> > > diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
> > > b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
> > > index 88e2f9d0e513..28930693a75a 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,19 +2197,22 @@ 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);
> > >  }
> > >  
> > > -static int mt7996_load_ram(struct mt7996_dev *dev)
> > > +static int __mt7996_load_ram(struct mt7996_dev *dev, const char
> > > *fw_type,
> > > +			     const char *fw_file, enum mt7996_ram_type
> > > ram_type)
> > >  {
> > >  	const struct mt7996_fw_trailer *hdr;
> > >  	const struct firmware *fw;
> > >  	int ret;
> > >  
> > > -	ret = request_firmware(&fw, MT7996_FIRMWARE_WM, dev->mt76.dev);
> > > +	ret = request_firmware(&fw, fw_file, dev->mt76.dev);
> > >  	if (ret)
> > >  		return ret;
> > >  
> > > @@ -2217,48 +2222,41 @@ static int mt7996_load_ram(struct
> > > mt7996_dev *dev)
> > >  		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);
> > > +	hdr = (const void *)(fw->data + fw->size - sizeof(*hdr));
> > > +	dev_info(dev->mt76.dev, "%s Firmware Version: %.10s, Build
> > > Time: %.15s\n",
> > > +		 fw_type, hdr->fw_ver, hdr->build_date);
> > >  
> > > -	ret = mt7996_mcu_send_ram_firmware(dev, hdr, fw->data, false);
> > > +	ret = mt7996_mcu_send_ram_firmware(dev, hdr, fw->data,
> > > ram_type);
> > >  	if (ret) {
> > > -		dev_err(dev->mt76.dev, "Failed to start WM
> > > firmware\n");
> > > +		dev_err(dev->mt76.dev, "Failed to start %s firmware\n",
> > > fw_type);
> > >  		goto out;
> > >  	}
> > >  
> > > +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);
> > > +	return ret;
> > > +}
> > >  
> > > -	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;
> > > -	}
> > > +static int mt7996_load_ram(struct mt7996_dev *dev)
> > > +{
> > > +	int ret;
> > >  
> > > -	snprintf(dev->mt76.hw->wiphy->fw_version,
> > > -		 sizeof(dev->mt76.hw->wiphy->fw_version),
> > > -		 "%.10s-%.15s", hdr->fw_ver, hdr->build_date);
> > 
> > doing so we do not advertise fw version through ethtool as before.
> > 
> > > +#define LOAD_RAM(_type) \
> > > +	do {								
> > > \
> > > +		ret = __mt7996_load_ram(dev, #_type,			
> > > \
> > > +					MT7996_FIRMWARE_##_type,	\
> > > +					MT7996_RAM_TYPE_##_type);	\
> > > +		if (ret)						\
> > > +			return ret;					\
> > > +	} while (0)
> > >  
> > > -out:
> > > -	release_firmware(fw);
> > > +	LOAD_RAM(WM);
> > > +	LOAD_RAM(DSP);
> > > +	LOAD_RAM(WA);
> > 
> > can you please run the function directly instead of using macros?
> > 
> > Regards,
> > Lorenzo
> 
> Hi Lorenzo,
> 
> Will add

(Sorry for accidentally pressing send)

Hi Lorenzo,

Will add back missing code for recording fw_version, and expand macros
to directly call load ram function.

Thanks,
Shayne
> > 
> > > +#undef LOAD_RAM
> > >  
> > > -	return ret;
> > > +	return 0;
> > >  }
> > >  
> > >  static int
> > > 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_pat
> > > ch.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
> > >
diff mbox series

Patch

diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
index ca1ce97a6d2f..4a21c237ea6e 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
@@ -22,6 +22,7 @@ 
 
 #define FW_START_OVERRIDE		BIT(0)
 #define FW_START_WORKING_PDA_CR4	BIT(2)
+#define FW_START_WORKING_PDA_DSP	BIT(3)
 
 #define PATCH_SEC_NOT_SUPPORT		GENMASK(31, 0)
 #define PATCH_SEC_TYPE_MASK		GENMASK(15, 0)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
index 88e2f9d0e513..28930693a75a 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,19 +2197,22 @@  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);
 }
 
-static int mt7996_load_ram(struct mt7996_dev *dev)
+static int __mt7996_load_ram(struct mt7996_dev *dev, const char *fw_type,
+			     const char *fw_file, enum mt7996_ram_type ram_type)
 {
 	const struct mt7996_fw_trailer *hdr;
 	const struct firmware *fw;
 	int ret;
 
-	ret = request_firmware(&fw, MT7996_FIRMWARE_WM, dev->mt76.dev);
+	ret = request_firmware(&fw, fw_file, dev->mt76.dev);
 	if (ret)
 		return ret;
 
@@ -2217,48 +2222,41 @@  static int mt7996_load_ram(struct mt7996_dev *dev)
 		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);
+	hdr = (const void *)(fw->data + fw->size - sizeof(*hdr));
+	dev_info(dev->mt76.dev, "%s Firmware Version: %.10s, Build Time: %.15s\n",
+		 fw_type, hdr->fw_ver, hdr->build_date);
 
-	ret = mt7996_mcu_send_ram_firmware(dev, hdr, fw->data, false);
+	ret = mt7996_mcu_send_ram_firmware(dev, hdr, fw->data, ram_type);
 	if (ret) {
-		dev_err(dev->mt76.dev, "Failed to start WM firmware\n");
+		dev_err(dev->mt76.dev, "Failed to start %s firmware\n", fw_type);
 		goto out;
 	}
 
+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);
+	return ret;
+}
 
-	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;
-	}
+static int mt7996_load_ram(struct mt7996_dev *dev)
+{
+	int ret;
 
-	snprintf(dev->mt76.hw->wiphy->fw_version,
-		 sizeof(dev->mt76.hw->wiphy->fw_version),
-		 "%.10s-%.15s", hdr->fw_ver, hdr->build_date);
+#define LOAD_RAM(_type) \
+	do {								\
+		ret = __mt7996_load_ram(dev, #_type,			\
+					MT7996_FIRMWARE_##_type,	\
+					MT7996_RAM_TYPE_##_type);	\
+		if (ret)						\
+			return ret;					\
+	} while (0)
 
-out:
-	release_firmware(fw);
+	LOAD_RAM(WM);
+	LOAD_RAM(DSP);
+	LOAD_RAM(WA);
+#undef LOAD_RAM
 
-	return ret;
+	return 0;
 }
 
 static int
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);