redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

ASoC: SOF: Introduce state machine for FW boot 

[ Upstream commit 6ca5cecbd1 ]

Add a state machine for FW boot to track the
different stages of FW boot and replace the boot_complete
field with fw_state field in struct snd_sof_dev.
This will be used to determine the actions to be performed
during system suspend.

One of the main motivations for adding this change is the
fact that errors during the top-level SOF device probe cannot
be propagated and therefore suspending the SOF device normally
during system suspend could potentially run into errors.
For example, with the current flow, if the FW boot failed
for some reason and the system suspends, the SOF device
suspend could fail because the CTX_SAVE IPC would be attempted
even though the FW never really booted successfully causing it
to time out. Another scenario that the state machine fixes
is when the runtime suspend for the SOF device fails and
the DSP is powered down nevertheless, the CTX_SAVE IPC during
system suspend would timeout because the DSP is already
powered down.

Reviewed-by: Curtis Malainey <cujomalainey@chromium.org>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20191218002616.7652-2-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
5.4-rM2-2.2.x-imx-squashed
Ranjani Sridharan 2019-12-17 18:26:09 -06:00 committed by Greg Kroah-Hartman
parent 0b84591fdd
commit 3145862d8f
7 changed files with 99 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
sound/soc/sof/core.c
View File

@ -288,6 +288,46 @@ static int sof_machine_check(struct snd_sof_dev *sdev)
#endif
}
/*
* FW Boot State Transition Diagram
*
* +-----------------------------------------------------------------------+
* | |
* ------------------ ------------------ |
* | | | | |
* | BOOT_FAILED | | READY_FAILED |-------------------------+ |
* | | | | | |
* ------------------ ------------------ | |
* ^ ^ | |
* | | | |
* (FW Boot Timeout) (FW_READY FAIL) | |
* | | | |
* | | | |
* ------------------ | ------------------ | |
* | | | | | | |
* | IN_PROGRESS |---------------+------------->| COMPLETE | | |
* | | (FW Boot OK) (FW_READY OK) | | | |
* ------------------ ------------------ | |
* ^ | | |
* | | | |
* (FW Loading OK) (System Suspend/Runtime Suspend)
* | | | |
* | | | |
* ------------------ ------------------ | | |
* | | | |<-----+ | |
* | PREPARE | | NOT_STARTED |<---------------------+ |
* | | | |<---------------------------+
* ------------------ ------------------
* | ^ | ^
* | | | |
* | +-----------------------+ |
* | (DSP Probe OK) |
* | |
* | |
* +------------------------------------+
* (System Suspend/Runtime Suspend)
*/
static int sof_probe_continue(struct snd_sof_dev *sdev)
{
struct snd_sof_pdata *plat_data = sdev->pdata;
@ -303,6 +343,8 @@ static int sof_probe_continue(struct snd_sof_dev *sdev)
return ret;
}
sdev->fw_state = SOF_FW_BOOT_PREPARE;
/* check machine info */
ret = sof_machine_check(sdev);
if (ret < 0) {
@ -342,7 +384,12 @@ static int sof_probe_continue(struct snd_sof_dev *sdev)
goto fw_load_err;
}
/* boot the firmware */
sdev->fw_state = SOF_FW_BOOT_IN_PROGRESS;
/*
* Boot the firmware. The FW boot status will be modified
* in snd_sof_run_firmware() depending on the outcome.
*/
ret = snd_sof_run_firmware(sdev);
if (ret < 0) {
dev_err(sdev->dev, "error: failed to boot DSP firmware %d\n",
@ -450,6 +497,7 @@ int snd_sof_device_probe(struct device *dev, struct snd_sof_pdata *plat_data)
sdev->pdata = plat_data;
sdev->first_boot = true;
sdev->fw_state = SOF_FW_BOOT_NOT_STARTED;
dev_set_drvdata(dev, sdev);
/* check all mandatory ops */

1
sound/soc/sof/intel/hda-loader.c
View File

@ -278,7 +278,6 @@ int hda_dsp_cl_boot_firmware(struct snd_sof_dev *sdev)
/* init for booting wait */
init_waitqueue_head(&sdev->boot_wait);
sdev->boot_complete = false;
/* prepare DMA for code loader stream */
tag = cl_stream_prepare(sdev, 0x40, stripped_firmware.size,

4
sound/soc/sof/intel/hda.c
View File

@ -166,7 +166,7 @@ void hda_dsp_dump_skl(struct snd_sof_dev *sdev, u32 flags)
panic = snd_sof_dsp_read(sdev, HDA_DSP_BAR,
HDA_ADSP_ERROR_CODE_SKL + 0x4);
if (sdev->boot_complete) {
if (sdev->fw_state == SOF_FW_BOOT_COMPLETE) {
hda_dsp_get_registers(sdev, &xoops, &panic_info, stack,
HDA_DSP_STACK_DUMP_SIZE);
snd_sof_get_status(sdev, status, panic, &xoops, &panic_info,
@ -193,7 +193,7 @@ void hda_dsp_dump(struct snd_sof_dev *sdev, u32 flags)
HDA_DSP_SRAM_REG_FW_STATUS);
panic = snd_sof_dsp_read(sdev, HDA_DSP_BAR, HDA_DSP_SRAM_REG_FW_TRACEP);
if (sdev->boot_complete) {
if (sdev->fw_state == SOF_FW_BOOT_COMPLETE) {
hda_dsp_get_registers(sdev, &xoops, &panic_info, stack,
HDA_DSP_STACK_DUMP_SIZE);
snd_sof_get_status(sdev, status, panic, &xoops, &panic_info,

17
sound/soc/sof/ipc.c
View File

@ -348,19 +348,12 @@ void snd_sof_ipc_msgs_rx(struct snd_sof_dev *sdev)
break;
case SOF_IPC_FW_READY:
/* check for FW boot completion */
if (!sdev->boot_complete) {
if (sdev->fw_state == SOF_FW_BOOT_IN_PROGRESS) {
err = sof_ops(sdev)->fw_ready(sdev, cmd);
if (err < 0) {
/*
* this indicates a mismatch in ABI
* between the driver and fw
*/
dev_err(sdev->dev, "error: ABI mismatch %d\n",
err);
} else {
/* firmware boot completed OK */
sdev->boot_complete = true;
}
if (err < 0)
sdev->fw_state = SOF_FW_BOOT_READY_FAILED;
else
sdev->fw_state = SOF_FW_BOOT_COMPLETE;
/* wake up firmware loader */
wake_up(&sdev->boot_wait);

19
sound/soc/sof/loader.c
View File

@ -511,7 +511,6 @@ int snd_sof_run_firmware(struct snd_sof_dev *sdev)
int init_core_mask;
init_waitqueue_head(&sdev->boot_wait);
sdev->boot_complete = false;
/* create read-only fw_version debugfs to store boot version info */
if (sdev->first_boot) {
@ -543,19 +542,27 @@ int snd_sof_run_firmware(struct snd_sof_dev *sdev)
init_core_mask = ret;
/* now wait for the DSP to boot */
ret = wait_event_timeout(sdev->boot_wait, sdev->boot_complete,
/*
* now wait for the DSP to boot. There are 3 possible outcomes:
* 1. Boot wait times out indicating FW boot failure.
* 2. FW boots successfully and fw_ready op succeeds.
* 3. FW boots but fw_ready op fails.
*/
ret = wait_event_timeout(sdev->boot_wait,
sdev->fw_state > SOF_FW_BOOT_IN_PROGRESS,
msecs_to_jiffies(sdev->boot_timeout));
if (ret == 0) {
dev_err(sdev->dev, "error: firmware boot failure\n");
snd_sof_dsp_dbg_dump(sdev, SOF_DBG_REGS | SOF_DBG_MBOX |
SOF_DBG_TEXT | SOF_DBG_PCI);
/* after this point FW_READY msg should be ignored */
sdev->boot_complete = true;
sdev->fw_state = SOF_FW_BOOT_FAILED;
return -EIO;
}
dev_info(sdev->dev, "firmware boot complete\n");
if (sdev->fw_state == SOF_FW_BOOT_COMPLETE)
dev_info(sdev->dev, "firmware boot complete\n");
else
return -EIO; /* FW boots but fw_ready op failed */
/* perform post fw run operations */
ret = snd_sof_dsp_post_fw_run(sdev);

21
sound/soc/sof/pm.c
View File

@ -283,6 +283,8 @@ static int sof_resume(struct device *dev, bool runtime_resume)
return ret;
}
sdev->fw_state = SOF_FW_BOOT_PREPARE;
/* load the firmware */
ret = snd_sof_load_firmware(sdev);
if (ret < 0) {
@ -292,7 +294,12 @@ static int sof_resume(struct device *dev, bool runtime_resume)
return ret;
}
/* boot the firmware */
sdev->fw_state = SOF_FW_BOOT_IN_PROGRESS;
/*
* Boot the firmware. The FW boot status will be modified
* in snd_sof_run_firmware() depending on the outcome.
*/
ret = snd_sof_run_firmware(sdev);
if (ret < 0) {
dev_err(sdev->dev,
@ -338,6 +345,9 @@ static int sof_suspend(struct device *dev, bool runtime_suspend)
if (!sof_ops(sdev)->suspend)
return 0;
if (sdev->fw_state != SOF_FW_BOOT_COMPLETE)
goto power_down;
/* release trace */
snd_sof_release_trace(sdev);
@ -375,6 +385,12 @@ static int sof_suspend(struct device *dev, bool runtime_suspend)
ret);
}
power_down:
/* return if the DSP was not probed successfully */
if (sdev->fw_state == SOF_FW_BOOT_NOT_STARTED)
return 0;
/* power down all DSP cores */
if (runtime_suspend)
ret = snd_sof_dsp_runtime_suspend(sdev);
@ -385,6 +401,9 @@ static int sof_suspend(struct device *dev, bool runtime_suspend)
"error: failed to power down DSP during suspend %d\n",
ret);
/* reset FW state */
sdev->fw_state = SOF_FW_BOOT_NOT_STARTED;
return ret;
}

11
sound/soc/sof/sof-priv.h
View File

@ -356,6 +356,15 @@ struct snd_sof_dai {
struct list_head list; /* list in sdev dai list */
};
enum snd_sof_fw_state {
SOF_FW_BOOT_NOT_STARTED = 0,
SOF_FW_BOOT_PREPARE,
SOF_FW_BOOT_IN_PROGRESS,
SOF_FW_BOOT_FAILED,
SOF_FW_BOOT_READY_FAILED, /* firmware booted but fw_ready op failed */
SOF_FW_BOOT_COMPLETE,
};
/*
* SOF Device Level.
*/
@ -372,7 +381,7 @@ struct snd_sof_dev {
/* DSP firmware boot */
wait_queue_head_t boot_wait;
u32 boot_complete;
enum snd_sof_fw_state fw_state;
u32 first_boot;
/* work queue in case the probe is implemented in two steps */