aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/sound/soc/sof/loader.c
diff options
context:
space:
mode:
authorMarc Herbert <marc.herbert@intel.com>2021-09-16 11:50:08 +0300
committerMark Brown <broonie@kernel.org>2021-09-16 14:01:54 +0100
commit8a8e1813ffc35111fc0b6db49968ceb0e1615ced (patch)
tree0f5085c9930ce432bc6550d72dee09ed04cc81dc /sound/soc/sof/loader.c
parentASoC: SOF: imx: imx8m: Bar index is only valid for IRAM and SRAM types (diff)
downloadwireguard-linux-8a8e1813ffc35111fc0b6db49968ceb0e1615ced.tar.xz
wireguard-linux-8a8e1813ffc35111fc0b6db49968ceb0e1615ced.zip
ASoC: SOF: loader: release_firmware() on load failure to avoid batching
Invoke release_firmware() when the firmware fails to boot in sof_probe_continue(). The request_firmware() framework must be informed of failures in sof_probe_continue() otherwise its internal "batching" feature (different from caching) cached the firmware image forever. Attempts to correct the file in /lib/firmware/ were then silently and confusingly ignored until the next reboot. Unloading the drivers did not help because from their disconnected perspective the firmware had failed so there was nothing to release. Also leverage the new snd_sof_fw_unload() function to simplify the snd_sof_device_remove() function. Signed-off-by: Marc Herbert <marc.herbert@intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com> Link: https://lore.kernel.org/r/20210916085008.28929-1-peter.ujfalusi@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/sof/loader.c')
-rw-r--r--sound/soc/sof/loader.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/sof/loader.c b/sound/soc/sof/loader.c
index 2b38a77cd594..9c3f251a0dd0 100644
--- a/sound/soc/sof/loader.c
+++ b/sound/soc/sof/loader.c
@@ -880,5 +880,7 @@ EXPORT_SYMBOL(snd_sof_run_firmware);
void snd_sof_fw_unload(struct snd_sof_dev *sdev)
{
/* TODO: support module unloading at runtime */
+ release_firmware(sdev->pdata->fw);
+ sdev->pdata->fw = NULL;
}
EXPORT_SYMBOL(snd_sof_fw_unload);