--- Begin Message ---
- To: <broonie@xxxxxxxxxx>, <pierre-louis.bossart@xxxxxxxxxxxxxxx>
- Subject: [PATCH v2 4/8] ASoC: wm_adsp: Support DSPs that don't require firmware download
- From: Richard Fitzgerald <rf@xxxxxxxxxxxxxxxxxxxxx>
- Date: Mon, 13 Mar 2023 15:49:51 +0000
- Cc: peter.ujfalusi@xxxxxxxxxxxxxxx, yung-chuan.liao@xxxxxxxxxxxxxxx, alsa-devel@xxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx, patches@xxxxxxxxxxxxxxxxxxxxx, Simon Trimmer <simont@xxxxxxxxxxxxxxxxxxxxx>, Richard Fitzgerald <rf@xxxxxxxxxxxxxxxxxxxxx>
- In-reply-to: <20230313154955.4268-1-rf@opensource.cirrus.com>
- References: <20230313154955.4268-1-rf@opensource.cirrus.com>
From: Simon Trimmer <simont@xxxxxxxxxxxxxxxxxxxxx>
When a DSP can self-boot from ROM it is not necessary to download
firmware - when the DSP has the wmfw_optional flag set not finding a
wmfw firmware file is a successful outcome and not an error condition.
Signed-off-by: Simon Trimmer <simont@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Richard Fitzgerald <rf@xxxxxxxxxxxxxxxxxxxxx>
---
sound/soc/codecs/wm_adsp.c | 3 +++
sound/soc/codecs/wm_adsp.h | 1 +
2 files changed, 4 insertions(+)
diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index 854d9366a745..8176b6173de9 100644
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -850,6 +850,9 @@ static int wm_adsp_request_firmware_files(struct wm_adsp *dsp,
return 0;
}
+ if (dsp->wmfw_optional)
+ return 0;
+
adsp_err(dsp, "Failed to request firmware <%s>%s-%s-%s<-%s<%s>>.wmfw\n",
cirrus_dir, dsp->part, dsp->fwf_name, wm_adsp_fw[dsp->fw].file,
system_name, asoc_component_prefix);
diff --git a/sound/soc/codecs/wm_adsp.h b/sound/soc/codecs/wm_adsp.h
index dc2f7a096e26..173dcae2c260 100644
--- a/sound/soc/codecs/wm_adsp.h
+++ b/sound/soc/codecs/wm_adsp.h
@@ -34,6 +34,7 @@ struct wm_adsp {
unsigned int sys_config_size;
int fw;
+ bool wmfw_optional;
struct work_struct boot_work;
int (*pre_run)(struct wm_adsp *dsp);
--
2.30.2
--- End Message ---