Hi Kai
Thanks for the patch. Just tested it on Alderlake-P
On Fri, 9 Dec 2022 at 12:46, Kai Vehmanen <kai.vehmanen@xxxxxxxxxxxxxxx> wrote:
>
> The unregister machine drivers call is not safe to do when
> kexec is used. Kexec-lite gets blocked with following backtrace:
>
> [ 84.943749] Freezing user space processes ... (elapsed 0.111 seconds) done.
> [ 246.784446] INFO: task kexec-lite:5123 blocked for more than 122 seconds.
> [ 246.819035] Call Trace:
> [ 246.821782] <TASK>
> [ 246.824186] __schedule+0x5f9/0x1263
> [ 246.828231] schedule+0x87/0xc5
> [ 246.831779] snd_card_disconnect_sync+0xb5/0x127
> ...
> [ 246.889249] snd_sof_device_shutdown+0xb4/0x150
> [ 246.899317] pci_device_shutdown+0x37/0x61
> [ 246.903990] device_shutdown+0x14c/0x1d6
> [ 246.908391] kernel_kexec+0x45/0xb9
>
> This reverts commit 83bfc7e793b555291785136c3ae86abcdc046887.
>
> Reported-by: Ricardo Ribalda <ribalda@xxxxxxxxxxxx>
> Cc: Ricardo Ribalda <ribalda@xxxxxxxxxxxx>
> Signed-off-by: Kai Vehmanen <kai.vehmanen@xxxxxxxxxxxxxxx>
Tested-by: Ricardo Ribalda <ribalda@xxxxxxxxxxxx>
> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@xxxxxxxxxxxxxxx>
> Reviewed-by: Péter Ujfalusi <peter.ujfalusi@xxxxxxxxxxxxxxx>
> Reviewed-by: Ranjani Sridharan <ranjani.sridharan@xxxxxxxxxxxxxxx>
> ---
> sound/soc/sof/core.c | 9 ---------
> 1 file changed, 9 deletions(-)
>
> diff --git a/sound/soc/sof/core.c b/sound/soc/sof/core.c
> index 3e6141d03770..625977a29d8a 100644
> --- a/sound/soc/sof/core.c
> +++ b/sound/soc/sof/core.c
> @@ -475,19 +475,10 @@ EXPORT_SYMBOL(snd_sof_device_remove);
> int snd_sof_device_shutdown(struct device *dev)
> {
> struct snd_sof_dev *sdev = dev_get_drvdata(dev);
> - struct snd_sof_pdata *pdata = sdev->pdata;
>
> if (IS_ENABLED(CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE))
> cancel_work_sync(&sdev->probe_work);
>
> - /*
> - * make sure clients and machine driver(s) are unregistered to force
> - * all userspace devices to be closed prior to the DSP shutdown sequence
> - */
> - sof_unregister_clients(sdev);
> -
> - snd_sof_machine_unregister(sdev, pdata);
> -
> if (sdev->fw_state == SOF_FW_BOOT_COMPLETE)
> return snd_sof_shutdown(sdev);
>
> --
> 2.38.1
>
--
Ricardo Ribalda
