lkml.org 
[lkml]   [2021]   [Oct]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 10/30] ASoC: SOF: loader: release_firmware() on load failure to avoid batching
    Date
    From: Marc Herbert <marc.herbert@intel.com>

    [ Upstream commit 8a8e1813ffc35111fc0b6db49968ceb0e1615ced ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/sof/core.c | 4 +---
    sound/soc/sof/loader.c | 2 ++
    2 files changed, 3 insertions(+), 3 deletions(-)

    diff --git a/sound/soc/sof/core.c b/sound/soc/sof/core.c
    index 3e4dd4a86363..59d0d7b2b55c 100644
    --- a/sound/soc/sof/core.c
    +++ b/sound/soc/sof/core.c
    @@ -371,7 +371,6 @@ int snd_sof_device_remove(struct device *dev)
    dev_warn(dev, "error: %d failed to prepare DSP for device removal",
    ret);

    - snd_sof_fw_unload(sdev);
    snd_sof_ipc_free(sdev);
    snd_sof_free_debug(sdev);
    snd_sof_free_trace(sdev);
    @@ -394,8 +393,7 @@ int snd_sof_device_remove(struct device *dev)
    snd_sof_remove(sdev);

    /* release firmware */
    - release_firmware(pdata->fw);
    - pdata->fw = NULL;
    + snd_sof_fw_unload(sdev);

    return 0;
    }
    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);
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-10-14 17:05    [W:2.611 / U:0.576 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site