diff --git a/sound/soc/sof/amd/acp.c b/sound/soc/sof/amd/acp.c index 86e2402b8ffd26..e81eafcafe25e6 100644 --- a/sound/soc/sof/amd/acp.c +++ b/sound/soc/sof/amd/acp.c @@ -1639,6 +1639,15 @@ int amd_sof_acp7x_resume(struct snd_sof_dev *sdev) return ret; } + /* + * S4 powers down the carveout, invalidating its cached firmware. Clear + * fw_code_carveout_addr to force a full reload via VALIDATE_IMAGE on + * resume instead of a SHA-DMA from the stale carveout. + */ + if (acp_data->asp_carveout_base && + sdev->system_suspend_target == SOF_SUSPEND_S4) + acp_data->fw_code_carveout_addr = 0; + return 0; } EXPORT_SYMBOL_NS(amd_sof_acp7x_resume, "SND_SOC_SOF_AMD_COMMON"); diff --git a/sound/soc/sof/amd/pci-acp7x.c b/sound/soc/sof/amd/pci-acp7x.c index 5a21ab8ebb4b9b..b27798f2007bcf 100644 --- a/sound/soc/sof/amd/pci-acp7x.c +++ b/sound/soc/sof/amd/pci-acp7x.c @@ -66,6 +66,7 @@ static const struct sof_dev_desc acp7b_desc = { .nocodec_tplg_filename = "sof-acp.tplg", .ops = &sof_acp7x_ops, .ops_init = sof_acp7x_ops_init, + .use_acpi_target_states = true, }; static const struct sof_amd_acp_desc acp7f_chip_info = { @@ -108,6 +109,7 @@ static const struct sof_dev_desc acp7f_desc = { .nocodec_tplg_filename = "sof-acp.tplg", .ops = &sof_acp7x_ops, .ops_init = sof_acp7x_ops_init, + .use_acpi_target_states = true, }; static const struct pci_device_id acp7b_pci_id = {