* [PATCH] ASoC: SOF: amd: Skip IRAM/DRAM size modification for Steam Deck OLED
@ 2024-02-20 20:01 Cristian Ciocaltea
2024-02-20 20:01 ` [PATCH v2 0/2] " Cristian Ciocaltea
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Cristian Ciocaltea @ 2024-02-20 20:01 UTC (permalink / raw)
To: Pierre-Louis Bossart, Liam Girdwood, Peter Ujfalusi, Bard Liao,
Ranjani Sridharan, Daniel Baluta, Kai Vehmanen, Mark Brown,
Jaroslav Kysela, Takashi Iwai, Venkata Prasad Potturu
Cc: sound-open-firmware, linux-sound, linux-kernel, kernel
The recent introduction of the ACP/PSP communication for IRAM/DRAM fence
register modification breaks the audio support on Valve's Steam Deck
OLED device.
It causes IPC timeout errors when trying to load DSP topology during
probing:
1707255557.688176 kernel: snd_sof_amd_vangogh 0000:04:00.5: ipc tx timed out for 0x30100000 (msg/reply size: 48/0)
1707255557.689035 kernel: snd_sof_amd_vangogh 0000:04:00.5: ------------[ IPC dump start ]------------
1707255557.689421 kernel: snd_sof_amd_vangogh 0000:04:00.5: dsp_msg = 0x0 dsp_ack = 0x91d14f6f host_msg = 0x1 host_ack = 0xead0f1a4 irq_stat >
1707255557.689730 kernel: snd_sof_amd_vangogh 0000:04:00.5: ------------[ IPC dump end ]------------
1707255557.690074 kernel: snd_sof_amd_vangogh 0000:04:00.5: ------------[ DSP dump start ]------------
1707255557.690376 kernel: snd_sof_amd_vangogh 0000:04:00.5: IPC timeout
1707255557.690744 kernel: snd_sof_amd_vangogh 0000:04:00.5: fw_state: SOF_FW_BOOT_COMPLETE (7)
1707255557.691037 kernel: snd_sof_amd_vangogh 0000:04:00.5: invalid header size 0xdb43fe7. FW oops is bogus
1707255557.694824 kernel: snd_sof_amd_vangogh 0000:04:00.5: unexpected fault 0x6942d3b3 trace 0x6942d3b3
1707255557.695392 kernel: snd_sof_amd_vangogh 0000:04:00.5: ------------[ DSP dump end ]------------
1707255557.695755 kernel: snd_sof_amd_vangogh 0000:04:00.5: Failed to setup widget PIPELINE.6.ACPHS1.IN
1707255557.696069 kernel: snd_sof_amd_vangogh 0000:04:00.5: error: tplg component load failed -110
1707255557.696374 kernel: snd_sof_amd_vangogh 0000:04:00.5: error: failed to load DSP topology -22
1707255557.697904 kernel: snd_sof_amd_vangogh 0000:04:00.5: ASoC: error at snd_soc_component_probe on 0000:04:00.5: -22
1707255557.698405 kernel: sof_mach nau8821-max: ASoC: failed to instantiate card -22
1707255557.701061 kernel: sof_mach nau8821-max: error -EINVAL: Failed to register card(sof-nau8821-max)
1707255557.701624 kernel: sof_mach: probe of nau8821-max failed with error -22
It's worth noting this is the only Vangogh compatible device for which
signed firmware support has been enabled in AMD ACP SOF driver via
acp_sof_quirk_table.
Hence, use this information and skip IRAM/DRAM size modification for Vangogh
platforms having the signed_fw_image field set.
Fixes: 55d7bbe43346 ("ASoC: SOF: amd: Add acp-psp mailbox interface for iram-dram fence register modification")
Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
---
sound/soc/sof/amd/acp.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/sound/soc/sof/amd/acp.c b/sound/soc/sof/amd/acp.c
index 9b3c26210db3..71689d2a5b56 100644
--- a/sound/soc/sof/amd/acp.c
+++ b/sound/soc/sof/amd/acp.c
@@ -278,7 +278,14 @@ int configure_and_run_sha_dma(struct acp_dev_data *adata, void *image_addr,
}
/* psp_send_cmd only required for vangogh platform (rev - 5) */
- if (desc->rev == 5) {
+ /*
+ * FIXME: This causes IPC timeout when trying to load DSP topology
+ * on the Steam Deck OLED device matching acp_sof_quirk_table above.
+ * The quirk enables signed firmware support on this particular
+ * Vangogh compatible device, hence skip IRAM/DRAM size modification
+ * when signed_fw_image is set.
+ */
+ if (desc->rev == 5 && !adata->signed_fw_image) {
/* Modify IRAM and DRAM size */
ret = psp_send_cmd(adata, MBOX_ACP_IRAM_DRAM_FENCE_COMMAND | IRAM_DRAM_FENCE_2);
if (ret)
--
2.43.0
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH v2 0/2] ASoC: SOF: amd: Skip IRAM/DRAM size modification for Steam Deck OLED 2024-02-20 20:01 [PATCH] ASoC: SOF: amd: Skip IRAM/DRAM size modification for Steam Deck OLED Cristian Ciocaltea @ 2024-02-20 20:01 ` Cristian Ciocaltea 2024-02-20 20:01 ` [PATCH v2 1/2] ASoC: SOF: amd: Move signed_fw_image to struct acp_quirk_entry Cristian Ciocaltea ` (2 subsequent siblings) 3 siblings, 0 replies; 8+ messages in thread From: Cristian Ciocaltea @ 2024-02-20 20:01 UTC (permalink / raw) To: Pierre-Louis Bossart, Liam Girdwood, Peter Ujfalusi, Bard Liao, Ranjani Sridharan, Daniel Baluta, Kai Vehmanen, Mark Brown, Jaroslav Kysela, Takashi Iwai, Venkata Prasad Potturu Cc: sound-open-firmware, linux-sound, linux-kernel, kernel This patch series restores audio support on Valve's Steam Deck OLED model, which broke after the recent introduction of ACP/PSP communication for IRAM/DRAM fence register programming. Changes in v2: - Rebased onto next-20240219 - Added new patch introducing struct acp_quirk_entry - Reworked v1 patch to make use of a dedicated quirk - Link to v1: https://lore.kernel.org/lkml/20240209122810.2258042-1-cristian.ciocaltea@collabora.com/ Cristian Ciocaltea (2): ASoC: SOF: amd: Move signed_fw_image to struct acp_quirk_entry ASoC: SOF: amd: Skip IRAM/DRAM size modification for Steam Deck OLED sound/soc/sof/amd/acp-loader.c | 2 +- sound/soc/sof/amd/acp.c | 50 ++++++++++++++++++---------------- sound/soc/sof/amd/acp.h | 7 ++++- sound/soc/sof/amd/vangogh.c | 9 ++++-- 4 files changed, 41 insertions(+), 27 deletions(-) -- 2.43.2 ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v2 1/2] ASoC: SOF: amd: Move signed_fw_image to struct acp_quirk_entry 2024-02-20 20:01 [PATCH] ASoC: SOF: amd: Skip IRAM/DRAM size modification for Steam Deck OLED Cristian Ciocaltea 2024-02-20 20:01 ` [PATCH v2 0/2] " Cristian Ciocaltea @ 2024-02-20 20:01 ` Cristian Ciocaltea 2024-02-20 20:01 ` [PATCH v2 2/2] ASoC: SOF: amd: Skip IRAM/DRAM size modification for Steam Deck OLED Cristian Ciocaltea 2024-02-20 20:21 ` [PATCH] " Cristian Ciocaltea 3 siblings, 0 replies; 8+ messages in thread From: Cristian Ciocaltea @ 2024-02-20 20:01 UTC (permalink / raw) To: Pierre-Louis Bossart, Liam Girdwood, Peter Ujfalusi, Bard Liao, Ranjani Sridharan, Daniel Baluta, Kai Vehmanen, Mark Brown, Jaroslav Kysela, Takashi Iwai, Venkata Prasad Potturu Cc: sound-open-firmware, linux-sound, linux-kernel, kernel The signed_fw_image member of struct sof_amd_acp_desc is used to enable signed firmware support in the driver via the acp_sof_quirk_table. In preparation to support additional use cases of the quirk table (i.e. adding new flags), move signed_fw_image to a new struct acp_quirk_entry and update all references to it accordingly. No functional changes intended. Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com> --- sound/soc/sof/amd/acp-loader.c | 2 +- sound/soc/sof/amd/acp.c | 47 ++++++++++++++++++---------------- sound/soc/sof/amd/acp.h | 6 ++++- sound/soc/sof/amd/vangogh.c | 9 +++++-- 4 files changed, 38 insertions(+), 26 deletions(-) diff --git a/sound/soc/sof/amd/acp-loader.c b/sound/soc/sof/amd/acp-loader.c index d2d21478399e..aad904839b81 100644 --- a/sound/soc/sof/amd/acp-loader.c +++ b/sound/soc/sof/amd/acp-loader.c @@ -173,7 +173,7 @@ int acp_dsp_pre_fw_run(struct snd_sof_dev *sdev) adata = sdev->pdata->hw_pdata; - if (adata->signed_fw_image) + if (adata->quirks && adata->quirks->signed_fw_image) size_fw = adata->fw_bin_size - ACP_FIRMWARE_SIGNATURE; else size_fw = adata->fw_bin_size; diff --git a/sound/soc/sof/amd/acp.c b/sound/soc/sof/amd/acp.c index 9b3c26210db3..9d9197fa83ed 100644 --- a/sound/soc/sof/amd/acp.c +++ b/sound/soc/sof/amd/acp.c @@ -20,12 +20,14 @@ #include "acp.h" #include "acp-dsp-offset.h" -#define SECURED_FIRMWARE 1 - static bool enable_fw_debug; module_param(enable_fw_debug, bool, 0444); MODULE_PARM_DESC(enable_fw_debug, "Enable Firmware debug"); +static struct acp_quirk_entry quirk_valve_galileo = { + .signed_fw_image = true, +}; + const struct dmi_system_id acp_sof_quirk_table[] = { { /* Steam Deck OLED device */ @@ -33,7 +35,7 @@ const struct dmi_system_id acp_sof_quirk_table[] = { DMI_MATCH(DMI_SYS_VENDOR, "Valve"), DMI_MATCH(DMI_PRODUCT_NAME, "Galileo"), }, - .driver_data = (void *)SECURED_FIRMWARE, + .driver_data = &quirk_valve_galileo, }, {} }; @@ -254,7 +256,7 @@ int configure_and_run_sha_dma(struct acp_dev_data *adata, void *image_addr, } } - if (adata->signed_fw_image) + if (adata->quirks && adata->quirks->signed_fw_image) snd_sof_dsp_write(sdev, ACP_DSP_BAR, ACP_SHA_DMA_INCLUDE_HDR, ACP_SHA_HEADER); snd_sof_dsp_write(sdev, ACP_DSP_BAR, ACP_SHA_DMA_STRT_ADDR, start_addr); @@ -738,26 +740,27 @@ int amd_sof_acp_probe(struct snd_sof_dev *sdev) sdev->debug_box.offset = sdev->host_box.offset + sdev->host_box.size; sdev->debug_box.size = BOX_SIZE_1024; - adata->signed_fw_image = false; dmi_id = dmi_first_match(acp_sof_quirk_table); - if (dmi_id && dmi_id->driver_data) { - adata->fw_code_bin = devm_kasprintf(sdev->dev, GFP_KERNEL, - "sof-%s-code.bin", - chip->name); - if (!adata->fw_code_bin) { - ret = -ENOMEM; - goto free_ipc_irq; + if (dmi_id) { + adata->quirks = dmi_id->driver_data; + + if (adata->quirks->signed_fw_image) { + adata->fw_code_bin = devm_kasprintf(sdev->dev, GFP_KERNEL, + "sof-%s-code.bin", + chip->name); + if (!adata->fw_code_bin) { + ret = -ENOMEM; + goto free_ipc_irq; + } + + adata->fw_data_bin = devm_kasprintf(sdev->dev, GFP_KERNEL, + "sof-%s-data.bin", + chip->name); + if (!adata->fw_data_bin) { + ret = -ENOMEM; + goto free_ipc_irq; + } } - - adata->fw_data_bin = devm_kasprintf(sdev->dev, GFP_KERNEL, - "sof-%s-data.bin", - chip->name); - if (!adata->fw_data_bin) { - ret = -ENOMEM; - goto free_ipc_irq; - } - - adata->signed_fw_image = dmi_id->driver_data; } adata->enable_fw_debug = enable_fw_debug; diff --git a/sound/soc/sof/amd/acp.h b/sound/soc/sof/amd/acp.h index 947068da39b5..b648ed194b9f 100644 --- a/sound/soc/sof/amd/acp.h +++ b/sound/soc/sof/amd/acp.h @@ -207,6 +207,10 @@ struct sof_amd_acp_desc { u64 sdw_acpi_dev_addr; }; +struct acp_quirk_entry { + bool signed_fw_image; +}; + /* Common device data struct for ACP devices */ struct acp_dev_data { struct snd_sof_dev *dev; @@ -236,7 +240,7 @@ struct acp_dev_data { u8 *data_buf; dma_addr_t sram_dma_addr; u8 *sram_data_buf; - bool signed_fw_image; + struct acp_quirk_entry *quirks; struct dma_descriptor dscr_info[ACP_MAX_DESC]; struct acp_dsp_stream stream_buf[ACP_MAX_STREAM]; struct acp_dsp_stream *dtrace_stream; diff --git a/sound/soc/sof/amd/vangogh.c b/sound/soc/sof/amd/vangogh.c index de15d21aa6d9..bc6ffdb5471a 100644 --- a/sound/soc/sof/amd/vangogh.c +++ b/sound/soc/sof/amd/vangogh.c @@ -143,6 +143,7 @@ EXPORT_SYMBOL_NS(sof_vangogh_ops, SND_SOC_SOF_AMD_COMMON); int sof_vangogh_ops_init(struct snd_sof_dev *sdev) { const struct dmi_system_id *dmi_id; + struct acp_quirk_entry *quirks; /* common defaults */ memcpy(&sof_vangogh_ops, &sof_acp_common_ops, sizeof(struct snd_sof_dsp_ops)); @@ -151,8 +152,12 @@ int sof_vangogh_ops_init(struct snd_sof_dev *sdev) sof_vangogh_ops.num_drv = ARRAY_SIZE(vangogh_sof_dai); dmi_id = dmi_first_match(acp_sof_quirk_table); - if (dmi_id && dmi_id->driver_data) - sof_vangogh_ops.load_firmware = acp_sof_load_signed_firmware; + if (dmi_id) { + quirks = dmi_id->driver_data; + + if (quirks->signed_fw_image) + sof_vangogh_ops.load_firmware = acp_sof_load_signed_firmware; + } return 0; } -- 2.43.2 ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v2 2/2] ASoC: SOF: amd: Skip IRAM/DRAM size modification for Steam Deck OLED 2024-02-20 20:01 [PATCH] ASoC: SOF: amd: Skip IRAM/DRAM size modification for Steam Deck OLED Cristian Ciocaltea 2024-02-20 20:01 ` [PATCH v2 0/2] " Cristian Ciocaltea 2024-02-20 20:01 ` [PATCH v2 1/2] ASoC: SOF: amd: Move signed_fw_image to struct acp_quirk_entry Cristian Ciocaltea @ 2024-02-20 20:01 ` Cristian Ciocaltea 2024-02-20 20:21 ` [PATCH] " Cristian Ciocaltea 3 siblings, 0 replies; 8+ messages in thread From: Cristian Ciocaltea @ 2024-02-20 20:01 UTC (permalink / raw) To: Pierre-Louis Bossart, Liam Girdwood, Peter Ujfalusi, Bard Liao, Ranjani Sridharan, Daniel Baluta, Kai Vehmanen, Mark Brown, Jaroslav Kysela, Takashi Iwai, Venkata Prasad Potturu Cc: sound-open-firmware, linux-sound, linux-kernel, kernel The recent introduction of the ACP/PSP communication for IRAM/DRAM fence register modification breaks the audio support on Valve's Steam Deck OLED device. It causes IPC timeout errors when trying to load DSP topology during probing: 1707255557.688176 kernel: snd_sof_amd_vangogh 0000:04:00.5: ipc tx timed out for 0x30100000 (msg/reply size: 48/0) 1707255557.689035 kernel: snd_sof_amd_vangogh 0000:04:00.5: ------------[ IPC dump start ]------------ 1707255557.689421 kernel: snd_sof_amd_vangogh 0000:04:00.5: dsp_msg = 0x0 dsp_ack = 0x91d14f6f host_msg = 0x1 host_ack = 0xead0f1a4 irq_stat > 1707255557.689730 kernel: snd_sof_amd_vangogh 0000:04:00.5: ------------[ IPC dump end ]------------ 1707255557.690074 kernel: snd_sof_amd_vangogh 0000:04:00.5: ------------[ DSP dump start ]------------ 1707255557.690376 kernel: snd_sof_amd_vangogh 0000:04:00.5: IPC timeout 1707255557.690744 kernel: snd_sof_amd_vangogh 0000:04:00.5: fw_state: SOF_FW_BOOT_COMPLETE (7) 1707255557.691037 kernel: snd_sof_amd_vangogh 0000:04:00.5: invalid header size 0xdb43fe7. FW oops is bogus 1707255557.694824 kernel: snd_sof_amd_vangogh 0000:04:00.5: unexpected fault 0x6942d3b3 trace 0x6942d3b3 1707255557.695392 kernel: snd_sof_amd_vangogh 0000:04:00.5: ------------[ DSP dump end ]------------ 1707255557.695755 kernel: snd_sof_amd_vangogh 0000:04:00.5: Failed to setup widget PIPELINE.6.ACPHS1.IN 1707255557.696069 kernel: snd_sof_amd_vangogh 0000:04:00.5: error: tplg component load failed -110 1707255557.696374 kernel: snd_sof_amd_vangogh 0000:04:00.5: error: failed to load DSP topology -22 1707255557.697904 kernel: snd_sof_amd_vangogh 0000:04:00.5: ASoC: error at snd_soc_component_probe on 0000:04:00.5: -22 1707255557.698405 kernel: sof_mach nau8821-max: ASoC: failed to instantiate card -22 1707255557.701061 kernel: sof_mach nau8821-max: error -EINVAL: Failed to register card(sof-nau8821-max) 1707255557.701624 kernel: sof_mach: probe of nau8821-max failed with error -22 Introduce a new member skip_iram_dram_size_mod to struct acp_quirk_entry and use it to skip IRAM/DRAM size modification for Vangogh Galileo device. Fixes: 55d7bbe43346 ("ASoC: SOF: amd: Add acp-psp mailbox interface for iram-dram fence register modification") Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com> --- sound/soc/sof/amd/acp.c | 3 ++- sound/soc/sof/amd/acp.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/soc/sof/amd/acp.c b/sound/soc/sof/amd/acp.c index 9d9197fa83ed..be7dc1e02284 100644 --- a/sound/soc/sof/amd/acp.c +++ b/sound/soc/sof/amd/acp.c @@ -26,6 +26,7 @@ MODULE_PARM_DESC(enable_fw_debug, "Enable Firmware debug"); static struct acp_quirk_entry quirk_valve_galileo = { .signed_fw_image = true, + .skip_iram_dram_size_mod = true, }; const struct dmi_system_id acp_sof_quirk_table[] = { @@ -280,7 +281,7 @@ int configure_and_run_sha_dma(struct acp_dev_data *adata, void *image_addr, } /* psp_send_cmd only required for vangogh platform (rev - 5) */ - if (desc->rev == 5) { + if (desc->rev == 5 && !(adata->quirks && adata->quirks->skip_iram_dram_size_mod)) { /* Modify IRAM and DRAM size */ ret = psp_send_cmd(adata, MBOX_ACP_IRAM_DRAM_FENCE_COMMAND | IRAM_DRAM_FENCE_2); if (ret) diff --git a/sound/soc/sof/amd/acp.h b/sound/soc/sof/amd/acp.h index b648ed194b9f..e229bb6b849d 100644 --- a/sound/soc/sof/amd/acp.h +++ b/sound/soc/sof/amd/acp.h @@ -209,6 +209,7 @@ struct sof_amd_acp_desc { struct acp_quirk_entry { bool signed_fw_image; + bool skip_iram_dram_size_mod; }; /* Common device data struct for ACP devices */ -- 2.43.2 ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] ASoC: SOF: amd: Skip IRAM/DRAM size modification for Steam Deck OLED 2024-02-20 20:01 [PATCH] ASoC: SOF: amd: Skip IRAM/DRAM size modification for Steam Deck OLED Cristian Ciocaltea ` (2 preceding siblings ...) 2024-02-20 20:01 ` [PATCH v2 2/2] ASoC: SOF: amd: Skip IRAM/DRAM size modification for Steam Deck OLED Cristian Ciocaltea @ 2024-02-20 20:21 ` Cristian Ciocaltea 3 siblings, 0 replies; 8+ messages in thread From: Cristian Ciocaltea @ 2024-02-20 20:21 UTC (permalink / raw) To: Pierre-Louis Bossart, Liam Girdwood, Peter Ujfalusi, Bard Liao, Ranjani Sridharan, Daniel Baluta, Kai Vehmanen, Mark Brown, Jaroslav Kysela, Takashi Iwai, Venkata Prasad Potturu Cc: sound-open-firmware, linux-sound, linux-kernel, kernel On 2/20/24 22:01, Cristian Ciocaltea wrote: > The recent introduction of the ACP/PSP communication for IRAM/DRAM fence > register modification breaks the audio support on Valve's Steam Deck > OLED device. > > It causes IPC timeout errors when trying to load DSP topology during > probing: Please ignore this series and use v3 instead: https://lore.kernel.org/lkml/20240220201623.438944-1-cristian.ciocaltea@collabora.com/ Sorry for the noise, Cristian ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] ASoC: SOF: amd: Skip IRAM/DRAM size modification for Steam Deck OLED
@ 2024-02-09 12:28 Cristian Ciocaltea
2024-02-09 12:49 ` Venkata Prasad Potturu
0 siblings, 1 reply; 8+ messages in thread
From: Cristian Ciocaltea @ 2024-02-09 12:28 UTC (permalink / raw)
To: Pierre-Louis Bossart, Liam Girdwood, Peter Ujfalusi, Bard Liao,
Ranjani Sridharan, Daniel Baluta, Kai Vehmanen, Mark Brown,
Jaroslav Kysela, Takashi Iwai, Venkata Prasad Potturu
Cc: sound-open-firmware, linux-sound, linux-kernel, kernel
The recent introduction of the ACP/PSP communication for IRAM/DRAM fence
register modification breaks the audio support on Valve's Steam Deck
OLED device.
It causes IPC timeout errors when trying to load DSP topology during
probing:
1707255557.688176 kernel: snd_sof_amd_vangogh 0000:04:00.5: ipc tx timed out for 0x30100000 (msg/reply size: 48/0)
1707255557.689035 kernel: snd_sof_amd_vangogh 0000:04:00.5: ------------[ IPC dump start ]------------
1707255557.689421 kernel: snd_sof_amd_vangogh 0000:04:00.5: dsp_msg = 0x0 dsp_ack = 0x91d14f6f host_msg = 0x1 host_ack = 0xead0f1a4 irq_stat >
1707255557.689730 kernel: snd_sof_amd_vangogh 0000:04:00.5: ------------[ IPC dump end ]------------
1707255557.690074 kernel: snd_sof_amd_vangogh 0000:04:00.5: ------------[ DSP dump start ]------------
1707255557.690376 kernel: snd_sof_amd_vangogh 0000:04:00.5: IPC timeout
1707255557.690744 kernel: snd_sof_amd_vangogh 0000:04:00.5: fw_state: SOF_FW_BOOT_COMPLETE (7)
1707255557.691037 kernel: snd_sof_amd_vangogh 0000:04:00.5: invalid header size 0xdb43fe7. FW oops is bogus
1707255557.694824 kernel: snd_sof_amd_vangogh 0000:04:00.5: unexpected fault 0x6942d3b3 trace 0x6942d3b3
1707255557.695392 kernel: snd_sof_amd_vangogh 0000:04:00.5: ------------[ DSP dump end ]------------
1707255557.695755 kernel: snd_sof_amd_vangogh 0000:04:00.5: Failed to setup widget PIPELINE.6.ACPHS1.IN
1707255557.696069 kernel: snd_sof_amd_vangogh 0000:04:00.5: error: tplg component load failed -110
1707255557.696374 kernel: snd_sof_amd_vangogh 0000:04:00.5: error: failed to load DSP topology -22
1707255557.697904 kernel: snd_sof_amd_vangogh 0000:04:00.5: ASoC: error at snd_soc_component_probe on 0000:04:00.5: -22
1707255557.698405 kernel: sof_mach nau8821-max: ASoC: failed to instantiate card -22
1707255557.701061 kernel: sof_mach nau8821-max: error -EINVAL: Failed to register card(sof-nau8821-max)
1707255557.701624 kernel: sof_mach: probe of nau8821-max failed with error -22
It's worth noting this is the only Vangogh compatible device for which
signed firmware support has been enabled in AMD ACP SOF driver via
acp_sof_quirk_table.
Hence, use this information and skip IRAM/DRAM size modification for Vangogh
platforms having the signed_fw_image field set.
Fixes: 55d7bbe43346 ("ASoC: SOF: amd: Add acp-psp mailbox interface for iram-dram fence register modification")
Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
---
sound/soc/sof/amd/acp.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/sound/soc/sof/amd/acp.c b/sound/soc/sof/amd/acp.c
index 9b3c26210db3..71689d2a5b56 100644
--- a/sound/soc/sof/amd/acp.c
+++ b/sound/soc/sof/amd/acp.c
@@ -278,7 +278,14 @@ int configure_and_run_sha_dma(struct acp_dev_data *adata, void *image_addr,
}
/* psp_send_cmd only required for vangogh platform (rev - 5) */
- if (desc->rev == 5) {
+ /*
+ * FIXME: This causes IPC timeout when trying to load DSP topology
+ * on the Steam Deck OLED device matching acp_sof_quirk_table above.
+ * The quirk enables signed firmware support on this particular
+ * Vangogh compatible device, hence skip IRAM/DRAM size modification
+ * when signed_fw_image is set.
+ */
+ if (desc->rev == 5 && !adata->signed_fw_image) {
/* Modify IRAM and DRAM size */
ret = psp_send_cmd(adata, MBOX_ACP_IRAM_DRAM_FENCE_COMMAND | IRAM_DRAM_FENCE_2);
if (ret)
--
2.43.0
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH] ASoC: SOF: amd: Skip IRAM/DRAM size modification for Steam Deck OLED 2024-02-09 12:28 Cristian Ciocaltea @ 2024-02-09 12:49 ` Venkata Prasad Potturu 2024-02-09 20:04 ` Cristian Ciocaltea 0 siblings, 1 reply; 8+ messages in thread From: Venkata Prasad Potturu @ 2024-02-09 12:49 UTC (permalink / raw) To: Cristian Ciocaltea, Pierre-Louis Bossart, Liam Girdwood, Peter Ujfalusi, Bard Liao, Ranjani Sridharan, Daniel Baluta, Kai Vehmanen, Mark Brown, Jaroslav Kysela, Takashi Iwai, Mukunda, Vijendar Cc: sound-open-firmware, linux-sound, linux-kernel, kernel On 2/9/24 17:58, Cristian Ciocaltea wrote: > The recent introduction of the ACP/PSP communication for IRAM/DRAM fence > register modification breaks the audio support on Valve's Steam Deck > OLED device. > > It causes IPC timeout errors when trying to load DSP topology during > probing: > > 1707255557.688176 kernel: snd_sof_amd_vangogh 0000:04:00.5: ipc tx timed out for 0x30100000 (msg/reply size: 48/0) > 1707255557.689035 kernel: snd_sof_amd_vangogh 0000:04:00.5: ------------[ IPC dump start ]------------ > 1707255557.689421 kernel: snd_sof_amd_vangogh 0000:04:00.5: dsp_msg = 0x0 dsp_ack = 0x91d14f6f host_msg = 0x1 host_ack = 0xead0f1a4 irq_stat > > 1707255557.689730 kernel: snd_sof_amd_vangogh 0000:04:00.5: ------------[ IPC dump end ]------------ > 1707255557.690074 kernel: snd_sof_amd_vangogh 0000:04:00.5: ------------[ DSP dump start ]------------ > 1707255557.690376 kernel: snd_sof_amd_vangogh 0000:04:00.5: IPC timeout > 1707255557.690744 kernel: snd_sof_amd_vangogh 0000:04:00.5: fw_state: SOF_FW_BOOT_COMPLETE (7) > 1707255557.691037 kernel: snd_sof_amd_vangogh 0000:04:00.5: invalid header size 0xdb43fe7. FW oops is bogus > 1707255557.694824 kernel: snd_sof_amd_vangogh 0000:04:00.5: unexpected fault 0x6942d3b3 trace 0x6942d3b3 > 1707255557.695392 kernel: snd_sof_amd_vangogh 0000:04:00.5: ------------[ DSP dump end ]------------ > 1707255557.695755 kernel: snd_sof_amd_vangogh 0000:04:00.5: Failed to setup widget PIPELINE.6.ACPHS1.IN > 1707255557.696069 kernel: snd_sof_amd_vangogh 0000:04:00.5: error: tplg component load failed -110 > 1707255557.696374 kernel: snd_sof_amd_vangogh 0000:04:00.5: error: failed to load DSP topology -22 > 1707255557.697904 kernel: snd_sof_amd_vangogh 0000:04:00.5: ASoC: error at snd_soc_component_probe on 0000:04:00.5: -22 > 1707255557.698405 kernel: sof_mach nau8821-max: ASoC: failed to instantiate card -22 > 1707255557.701061 kernel: sof_mach nau8821-max: error -EINVAL: Failed to register card(sof-nau8821-max) > 1707255557.701624 kernel: sof_mach: probe of nau8821-max failed with error -22 > > It's worth noting this is the only Vangogh compatible device for which > signed firmware support has been enabled in AMD ACP SOF driver via > acp_sof_quirk_table. > > Hence, use this information and skip IRAM/DRAM size modification for Vangogh > platforms having the signed_fw_image field set. > > Fixes: 55d7bbe43346 ("ASoC: SOF: amd: Add acp-psp mailbox interface for iram-dram fence register modification") > Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com> > --- > sound/soc/sof/amd/acp.c | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/sound/soc/sof/amd/acp.c b/sound/soc/sof/amd/acp.c > index 9b3c26210db3..71689d2a5b56 100644 > --- a/sound/soc/sof/amd/acp.c > +++ b/sound/soc/sof/amd/acp.c > @@ -278,7 +278,14 @@ int configure_and_run_sha_dma(struct acp_dev_data *adata, void *image_addr, > } > > /* psp_send_cmd only required for vangogh platform (rev - 5) */ > - if (desc->rev == 5) { > + /* > + * FIXME: This causes IPC timeout when trying to load DSP topology > + * on the Steam Deck OLED device matching acp_sof_quirk_table above. > + * The quirk enables signed firmware support on this particular > + * Vangogh compatible device, hence skip IRAM/DRAM size modification > + * when signed_fw_image is set. > + */ > + if (desc->rev == 5 && !adata->signed_fw_image) { Programming ACP_IRAM_DRAM_FENCE register to modify the size of IRAM and DRAM and it's noting related to signed or unsigned fw_image. This ACP_IRAM_DRAM_FENCE register writing need to do before starting sha dma. > /* Modify IRAM and DRAM size */ > ret = psp_send_cmd(adata, MBOX_ACP_IRAM_DRAM_FENCE_COMMAND | IRAM_DRAM_FENCE_2); > if (ret) ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] ASoC: SOF: amd: Skip IRAM/DRAM size modification for Steam Deck OLED 2024-02-09 12:49 ` Venkata Prasad Potturu @ 2024-02-09 20:04 ` Cristian Ciocaltea 0 siblings, 0 replies; 8+ messages in thread From: Cristian Ciocaltea @ 2024-02-09 20:04 UTC (permalink / raw) To: Venkata Prasad Potturu, Pierre-Louis Bossart, Liam Girdwood, Peter Ujfalusi, Bard Liao, Ranjani Sridharan, Daniel Baluta, Kai Vehmanen, Mark Brown, Jaroslav Kysela, Takashi Iwai, Mukunda, Vijendar Cc: sound-open-firmware, linux-sound, linux-kernel, kernel On 2/9/24 14:49, Venkata Prasad Potturu wrote: > > On 2/9/24 17:58, Cristian Ciocaltea wrote: >> The recent introduction of the ACP/PSP communication for IRAM/DRAM fence >> register modification breaks the audio support on Valve's Steam Deck >> OLED device. >> >> It causes IPC timeout errors when trying to load DSP topology during >> probing: [...] > Programming ACP_IRAM_DRAM_FENCE register to modify the size of IRAM and > DRAM and it's noting related to signed or unsigned fw_image. > > This ACP_IRAM_DRAM_FENCE register writing need to do before starting sha > dma. Unfortunately it doesn't fix the issue - I tested with the psp_send_cmd() calls moved to various positions before the line snd_sof_dsp_write(sdev, ACP_DSP_BAR, ACP_SHA_DMA_CMD, ACP_SHA_RUN); and I keep getting the IPC timeouts. However, if I simply comment out the second psp_send_cmd() line psp_send_cmd(adata, MBOX_ACP_IRAM_DRAM_FENCE_COMMAND | MBOX_ISREADY_FLAG); the problem is solved, even when the first psp_send_cmd() is kept in the original position. Anything else worth trying? Otherwise I would rework the patch to add a dedicated quirk for getting this ACP_IRAM_DRAM_FENCE processing skipped for Steam Deck OLED. Thanks, Cristian ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2024-02-20 20:21 UTC | newest] Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2024-02-20 20:01 [PATCH] ASoC: SOF: amd: Skip IRAM/DRAM size modification for Steam Deck OLED Cristian Ciocaltea 2024-02-20 20:01 ` [PATCH v2 0/2] " Cristian Ciocaltea 2024-02-20 20:01 ` [PATCH v2 1/2] ASoC: SOF: amd: Move signed_fw_image to struct acp_quirk_entry Cristian Ciocaltea 2024-02-20 20:01 ` [PATCH v2 2/2] ASoC: SOF: amd: Skip IRAM/DRAM size modification for Steam Deck OLED Cristian Ciocaltea 2024-02-20 20:21 ` [PATCH] " Cristian Ciocaltea -- strict thread matches above, loose matches on Subject: below -- 2024-02-09 12:28 Cristian Ciocaltea 2024-02-09 12:49 ` Venkata Prasad Potturu 2024-02-09 20:04 ` Cristian Ciocaltea
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®