Skip to content

Update for state handling#3231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
plbossart merged 6 commits into from
Nov 5, 2021
Merged

Update for state handling #3231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a2ff547
ASoC: SOF: ipc4: use the sof_set_fw_state() helper to change fw_state
ujfalusi Oct 22, 2021
fc999fd
ASoC: SOF: ipc4: Set READY_OK state instead BOOT_COMPLETE
ujfalusi Oct 22, 2021
d91d204
ASoC: SOF: ipc: Only allow sending of an IPC in SOF_FW_BOOT_COMPLETE …
ujfalusi Oct 22, 2021
6af6d36
ASoC: SOF: Set SOF_FW_BOOT_FAILED in case we have failure during boot
ujfalusi Oct 22, 2021
8065c36
ASoC: SOF: pm: Force DSP off on suspend in BOOT_FAILED state also
ujfalusi Oct 22, 2021
257b2d9
ASoc: SOF: core: Update the FW boot state transition diagram
ujfalusi Oct 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 28 additions & 26 deletions sound/soc/sof/core.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -114,32 +114,32 @@ EXPORT_SYMBOL(snd_sof_get_status);
/*
* 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 |<---------------------+ |
* | | | |<---------------------------+
* +----------------------------------------------------------------------+
* | |
* ------------------ ------------------ |
* | | | | |
* | BOOT_FAILED |<-------| READY_FAILED | |
* | |<--+ | | ------------------ |
* ------------------ | ------------------ | | |
* ^ | ^ | CRASHED |---+ |
* | | | | | | |
* (FW Boot Timeout) | (FW_READY FAIL) ------------------ | |
* | | | ^ | |
* | | | |(DSP Panic) | |
* ------------------ | | ------------------ | |
* | | | | | | | |
* | IN_PROGRESS |---------------+------------->| COMPLETE | | |
* | | (FW Boot OK) (FW_READY OK) | | | |
* ------------------ | ------------------ | |
* ^ | | | |
* | | | | |
* (FW Loading OK) | (System Suspend/Runtime Suspend)
* | | | | |
* | (FW Loading Fail) | | |
* ------------------ | ------------------ | | |
* | | | | |<-----+ | |
* | PREPARE |---+ | NOT_STARTED |<---------------------+ |
* | | | |<--------------------------+
* ------------------ ------------------
* | ^ | ^
* | | | |
Expand DownExpand Up@@ -202,6 +202,7 @@ static int sof_probe_continue(struct snd_sof_dev *sdev)
if (ret < 0) {
Comment thread
plbossart marked this conversation as resolved.
dev_err(sdev->dev, "error: failed to load DSP firmware %d\n",
ret);
sof_set_fw_state(sdev, SOF_FW_BOOT_FAILED);
goto fw_load_err;
}

Expand All@@ -215,6 +216,7 @@ static int sof_probe_continue(struct snd_sof_dev *sdev)
if (ret < 0) {
dev_err(sdev->dev, "error: failed to boot DSP firmware %d\n",
ret);
sof_set_fw_state(sdev, SOF_FW_BOOT_FAILED);
goto fw_run_err;
}

Expand Down
2 changes: 1 addition & 1 deletion sound/soc/sof/ipc.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -290,7 +290,7 @@ static int sof_ipc_tx_message_unlocked(struct snd_sof_ipc *ipc, u32 header,
struct snd_sof_ipc_msg *msg;
int ret;

if (ipc->disable_ipc_tx || sdev->fw_state == SOF_FW_CRASHED)
if (ipc->disable_ipc_tx || sdev->fw_state != SOF_FW_BOOT_COMPLETE)
return -ENODEV;

/*
Expand Down
6 changes: 3 additions & 3 deletions sound/soc/sof/ipc4.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -124,7 +124,7 @@ static int sof_ipc4_tx_message_unlocked(struct snd_sof_ipc *ipc, u32 header,
struct snd_sof_ipc_msg *msg;
int ret;

if (ipc->disable_ipc_tx)
if (ipc->disable_ipc_tx || sdev->fw_state != SOF_FW_BOOT_COMPLETE)
return -ENODEV;

/*
Expand DownExpand Up@@ -199,9 +199,9 @@ void snd_sof_ipc4_msgs_rx(struct snd_sof_dev *sdev, u32 msg, u32 msg_ext)
if (sdev->fw_state == SOF_FW_BOOT_IN_PROGRESS) {
err = sof_ops(sdev)->fw_ready(sdev, msg);
if (err < 0)
sdev->fw_state = SOF_FW_BOOT_READY_FAILED;
sof_set_fw_state(sdev, SOF_FW_BOOT_READY_FAILED);
else
sdev->fw_state = SOF_FW_BOOT_COMPLETE;
sof_set_fw_state(sdev, SOF_FW_BOOT_READY_OK);

/* wake up firmware loader */
wake_up(&sdev->boot_wait);
Expand Down
1 change: 0 additions & 1 deletion sound/soc/sof/loader.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -838,7 +838,6 @@ int snd_sof_run_firmware(struct snd_sof_dev *sdev)
snd_sof_dsp_dbg_dump(sdev, "Firmware boot failure due to timeout",
SOF_DBG_DUMP_REGS | SOF_DBG_DUMP_MBOX |
SOF_DBG_DUMP_TEXT | SOF_DBG_DUMP_PCI);
sof_set_fw_state(sdev, SOF_FW_BOOT_FAILED);
return -EIO;
}

Expand Down
9 changes: 6 additions & 3 deletions sound/soc/sof/pm.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -130,6 +130,7 @@ static int sof_resume(struct device *dev, bool runtime_resume)
dev_err(sdev->dev,
"error: failed to load DSP firmware after resume %d\n",
ret);
sof_set_fw_state(sdev, SOF_FW_BOOT_FAILED);
return ret;
}

Expand All@@ -144,6 +145,7 @@ static int sof_resume(struct device *dev, bool runtime_resume)
dev_err(sdev->dev,
"error: failed to boot DSP firmware after resume %d\n",
ret);
sof_set_fw_state(sdev, SOF_FW_BOOT_FAILED);
return ret;
}

Expand DownExpand Up@@ -313,10 +315,11 @@ int snd_sof_prepare(struct device *dev)
sdev->system_suspend_target = SOF_SUSPEND_S3;

/*
* if the firmware is crashed then we try to aim for S3 to reboot the
* firmware
* if the firmware is crashed or boot failed then we try to aim for S3
* to reboot the firmware
*/
if (sdev->fw_state == SOF_FW_CRASHED)
if (sdev->fw_state == SOF_FW_CRASHED ||
sdev->fw_state == SOF_FW_BOOT_FAILED)

@kv2019ikv2019iOct 25, 2021

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

btw, @keyonjie , when we add the boot-from-IMR logic, we should probably have similar logic to stop using the IMR copy and do a cold boot if FW has crashed or boot failed. now the info is there, so this should be straightforward to add. Just a comment, not for this PR.

return 0;

if (!desc->use_acpi_target_states)
Expand Down