]> git.baikalelectronics.ru Git - kernel.git/commitdiff
ASoC: SOF: core: Free the firmware trace before calling snd_sof_shutdown()
authorPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Fri, 16 Jun 2023 10:00:34 +0000 (12:00 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 23 Aug 2023 15:52:22 +0000 (17:52 +0200)
[ Upstream commit d389dcb3a48cec4f03c16434c0bf98a4c635372a ]

The shutdown is called on reboot/shutdown of the machine.
At this point the firmware tracing cannot be used anymore but in case of
IPC3 it is using and keeping a DMA channel active (dtrace).

For Tiger Lake platforms we have a quirk in place to fix rare reboot issues
when a DMA was active before rebooting the system.
If the tracing is enabled this quirk will be always used and a print
appears on the kernel log which might be misleading or not even correct.

Release the fw tracing before executing the shutdown to make sure that this
known DMA user is cleared away.

Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20230616100039.378150-4-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/soc/sof/core.c

index 625977a29d8a8c2c3510f99426671311e9d721b7..75a1e2c6539f22d617b39f5d2a9d19c03e8b24fc 100644 (file)
@@ -479,8 +479,10 @@ int snd_sof_device_shutdown(struct device *dev)
        if (IS_ENABLED(CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE))
                cancel_work_sync(&sdev->probe_work);
 
-       if (sdev->fw_state == SOF_FW_BOOT_COMPLETE)
+       if (sdev->fw_state == SOF_FW_BOOT_COMPLETE) {
+               sof_fw_trace_free(sdev);
                return snd_sof_shutdown(sdev);
+       }
 
        return 0;
 }