Re: [PATCH] Asoc: wm_adsp: Add support for loading firmware with prefix name

[Richard Fitzgerald via Alsa-devel <alsa-devel@xxxxxxxxxxxxxxxx>]

--- Begin Message ---

• To: Jianhua Lu <lujianhua000@xxxxxxxxx>, Liam Girdwood <lgirdwood@xxxxxxxxx>, Mark Brown <broonie@xxxxxxxxxx>, Jaroslav Kysela <perex@xxxxxxxx>, Takashi Iwai <tiwai@xxxxxxxx>, Simon Trimmer <simont@xxxxxxxxxxxxxxxxxxxxx>, Charles Keepax <ckeepax@xxxxxxxxxxxxxxxxxxxxx>, Cristian Ciocaltea <cristian.ciocaltea@xxxxxxxxxxxxx>
• Subject: Re: [PATCH] Asoc: wm_adsp: Add support for loading firmware with prefix name
• From: Richard Fitzgerald <rf@xxxxxxxxxxxxxxxxxxxxx>
• Date: Wed, 29 Mar 2023 16:33:08 +0100
• Cc: patches@xxxxxxxxxxxxxxxxxxxxx, alsa-devel@xxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx, ~postmarketos/upstreaming@xxxxxxxxxxx, phone-devel@xxxxxxxxxxxxxxx
• In-reply-to: <20230329130525.15830-1-lujianhua000@gmail.com>
• References: <20230329130525.15830-1-lujianhua000@gmail.com>
• User-agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.8.0

On 29/3/23 14:05, Jianhua Lu wrote:

For platform using fdt, system_name is NULL, it doesn't provide
a way to load firmware with prefix name, so add it.

This is intended behavior.

To load per-amp tuning you must know the function of each amp.
You only know that if you know what hardware platform you are running
on.

So if system_name is NULL it should fall back to generic firmware.

Signed-off-by: Jianhua Lu <lujianhua000@xxxxxxxxx>
---
  sound/soc/codecs/wm_adsp.c | 14 ++++++++++++++
  1 file changed, 14 insertions(+)

diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index 216120b68b64..17481e42d440 100644
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -760,6 +760,10 @@ static int wm_adsp_request_firmware_file(struct wm_adsp *dsp,
  		*filename = kasprintf(GFP_KERNEL, "%s%s-%s-%s-%s.%s", dir, dsp->part,
  				      dsp->fwf_name, wm_adsp_fw[dsp->fw].file, system_name,
  				      filetype);
+	else if (asoc_component_prefix)
+		*filename = kasprintf(GFP_KERNEL, "%s%s-%s-%s-%s.%s", dir, dsp->part,
+				      dsp->fwf_name, wm_adsp_fw[dsp->fw].file, asoc_component_prefix,
+				      filetype);
  	else
  		*filename = kasprintf(GFP_KERNEL, "%s%s-%s-%s.%s", dir, dsp->part, dsp->fwf_name,
  				      wm_adsp_fw[dsp->fw].file, filetype);
@@ -831,6 +835,16 @@ static int wm_adsp_request_firmware_files(struct wm_adsp *dsp,
  							      NULL, "bin");
  			return 0;
  		}
+	} else if (asoc_component_prefix) {
+		if (!wm_adsp_request_firmware_file(dsp, wmfw_firmware, wmfw_filename,
+						   cirrus_dir, NULL,
+						   asoc_component_prefix, "wmfw")) {
+			adsp_dbg(dsp, "Found '%s'\n", *wmfw_filename);
+			wm_adsp_request_firmware_file(dsp, coeff_firmware, coeff_filename,
+							      cirrus_dir, NULL,
+							      asoc_component_prefix, "bin");
+			return 0;
+		}
  	}

if (!wm_adsp_request_firmware_file(dsp, wmfw_firmware, wmfw_filename,

--- End Message ---