- Sound-open-firmware - mailman.alsa-project.org

[PATCH AUTOSEL 6.6 01/12] ASoC: SOF: Intel: hda-dsp: Skip IMR boot on ACE platforms in case of S3 suspend
by Sasha Levin 15 Apr '24

15 Apr '24

From: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> [ Upstream commit c61115b37ff964d63191dbf4a058f481daabdf57 ] SoCs with ACE architecture are tailored to use s2idle instead deep (S3) suspend state and the IMR content is lost when the system is forced to enter even to S3. When waking up from S3 state the IMR boot will fail as the content is lost. Set the skip_imr_boot flag to make sure that we don't try IMR in this case. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Rander Wang <rander.wang(a)intel.com> Reviewed-by: Liam Girdwood <liam.r.girdwood(a)intel.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Link: https://msgid.link/r/20240322112504.4192-1-peter.ujfalusi@linux.intel.com Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/sof/intel/hda-dsp.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/sound/soc/sof/intel/hda-dsp.c b/sound/soc/sof/intel/hda-dsp.c index 44f39a520bb39..e80a2a5ec56a1 100644 --- a/sound/soc/sof/intel/hda-dsp.c +++ b/sound/soc/sof/intel/hda-dsp.c @@ -681,17 +681,27 @@ static int hda_suspend(struct snd_sof_dev *sdev, bool runtime_suspend) struct sof_intel_hda_dev *hda = sdev->pdata->hw_pdata; const struct sof_intel_dsp_desc *chip = hda->desc; struct hdac_bus *bus = sof_to_bus(sdev); + bool imr_lost = false; int ret, j; /* - * The memory used for IMR boot loses its content in deeper than S3 state - * We must not try IMR boot on next power up (as it will fail). - * + * The memory used for IMR boot loses its content in deeper than S3 + * state on CAVS platforms. + * On ACE platforms due to the system architecture the IMR content is + * lost at S3 state already, they are tailored for s2idle use. + * We must not try IMR boot on next power up in these cases as it will + * fail. + */ + if (sdev->system_suspend_target > SOF_SUSPEND_S3 || + (chip->hw_ip_version >= SOF_INTEL_ACE_1_0 && + sdev->system_suspend_target == SOF_SUSPEND_S3)) + imr_lost = true; + + /* * In case of firmware crash or boot failure set the skip_imr_boot to true * as well in order to try to re-load the firmware to do a 'cold' boot. */ - if (sdev->system_suspend_target > SOF_SUSPEND_S3 || - sdev->fw_state == SOF_FW_CRASHED || + if (imr_lost || sdev->fw_state == SOF_FW_CRASHED || sdev->fw_state == SOF_FW_BOOT_FAILED) hda->skip_imr_boot = true; -- 2.43.0

1 0

[PATCH AUTOSEL 6.8 01/15] ASoC: SOF: Intel: hda-dsp: Skip IMR boot on ACE platforms in case of S3 suspend
by Sasha Levin 15 Apr '24

15 Apr '24

From: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> [ Upstream commit c61115b37ff964d63191dbf4a058f481daabdf57 ] SoCs with ACE architecture are tailored to use s2idle instead deep (S3) suspend state and the IMR content is lost when the system is forced to enter even to S3. When waking up from S3 state the IMR boot will fail as the content is lost. Set the skip_imr_boot flag to make sure that we don't try IMR in this case. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Rander Wang <rander.wang(a)intel.com> Reviewed-by: Liam Girdwood <liam.r.girdwood(a)intel.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Link: https://msgid.link/r/20240322112504.4192-1-peter.ujfalusi@linux.intel.com Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/sof/intel/hda-dsp.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/sound/soc/sof/intel/hda-dsp.c b/sound/soc/sof/intel/hda-dsp.c index 2445ae7f6b2e9..1506982a56c30 100644 --- a/sound/soc/sof/intel/hda-dsp.c +++ b/sound/soc/sof/intel/hda-dsp.c @@ -681,17 +681,27 @@ static int hda_suspend(struct snd_sof_dev *sdev, bool runtime_suspend) struct sof_intel_hda_dev *hda = sdev->pdata->hw_pdata; const struct sof_intel_dsp_desc *chip = hda->desc; struct hdac_bus *bus = sof_to_bus(sdev); + bool imr_lost = false; int ret, j; /* - * The memory used for IMR boot loses its content in deeper than S3 state - * We must not try IMR boot on next power up (as it will fail). - * + * The memory used for IMR boot loses its content in deeper than S3 + * state on CAVS platforms. + * On ACE platforms due to the system architecture the IMR content is + * lost at S3 state already, they are tailored for s2idle use. + * We must not try IMR boot on next power up in these cases as it will + * fail. + */ + if (sdev->system_suspend_target > SOF_SUSPEND_S3 || + (chip->hw_ip_version >= SOF_INTEL_ACE_1_0 && + sdev->system_suspend_target == SOF_SUSPEND_S3)) + imr_lost = true; + + /* * In case of firmware crash or boot failure set the skip_imr_boot to true * as well in order to try to re-load the firmware to do a 'cold' boot. */ - if (sdev->system_suspend_target > SOF_SUSPEND_S3 || - sdev->fw_state == SOF_FW_CRASHED || + if (imr_lost || sdev->fw_state == SOF_FW_CRASHED || sdev->fw_state == SOF_FW_BOOT_FAILED) hda->skip_imr_boot = true; -- 2.43.0

1 0

Re: [PATCH] ASoC: SOF: Clean up sof_ipc_flood_dfs_write()
by Mark Brown 04 Apr '24

04 Apr '24

On Thu, 04 Apr 2024 10:34:53 +0300, Dan Carpenter wrote: > This function doesn't support partial writes so using > simple_write_to_buffer() doesn't really make sense. It's better to > just use copy_from_user(). > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: SOF: Clean up sof_ipc_flood_dfs_write() commit: 2cfa0eea2675ce569dc80d2c0d2d644a452b77b3 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark

1 0

Re: [PATCH] ASoC: SOF: Disable pointless writes to debugfs file
by Mark Brown 04 Apr '24

04 Apr '24

On Thu, 04 Apr 2024 10:38:45 +0300, Dan Carpenter wrote: > The permissions on this debugfs file are 0444 so it can't be written to. > And writing to the file hasn't done anything since commit 6e9548cdb30e > ("ASoC: SOF: Convert the generic IPC flood test into SOF client"). > Delete the write function. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: SOF: Disable pointless writes to debugfs file commit: 84ae7d9cfa5f6ec284efccedcb7baf7c075774d4 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark

1 0

Re: [PATCH] ASoC: SOF: amd: fix for false dsp interrupts
by Mark Brown 04 Apr '24

04 Apr '24

On Thu, 04 Apr 2024 09:47:13 +0530, Vijendar Mukunda wrote: > Before ACP firmware loading, DSP interrupts are not expected. > Sometimes after reboot, it's observed that before ACP firmware is loaded > false DSP interrupt is reported. > Registering the interrupt handler before acp initialization causing false > interrupts sometimes on reboot as ACP reset is not applied. > Correct the sequence by invoking acp initialization sequence prior to > registering interrupt handler. > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: SOF: amd: fix for false dsp interrupts commit: b9846a386734e73a1414950ebfd50f04919f5e24 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark

1 0

Re: [PATCH] ASoC: SOF: Clean up sof_ipc_flood_dfs_write()
by Péter Ujfalusi 04 Apr '24

04 Apr '24

On 04/04/2024 10:34, Dan Carpenter wrote: > This function doesn't support partial writes so using > simple_write_to_buffer() doesn't really make sense. It's better to > just use copy_from_user(). > > Signed-off-by: Dan Carpenter <dan.carpenter(a)linaro.org> Thanks, it makes sense. Acked-by: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> > --- > sound/soc/sof/sof-client-ipc-flood-test.c | 17 +++++++++++------ > 1 file changed, 11 insertions(+), 6 deletions(-) > > diff --git a/sound/soc/sof/sof-client-ipc-flood-test.c b/sound/soc/sof/sof-client-ipc-flood-test.c > index c0d6723aed59..1b2e9e25a836 100644 > --- a/sound/soc/sof/sof-client-ipc-flood-test.c > +++ b/sound/soc/sof/sof-client-ipc-flood-test.c > @@ -160,15 +160,20 @@ static ssize_t sof_ipc_flood_dfs_write(struct file *file, const char __user *buf > unsigned long ipc_count = 0; > struct dentry *dentry; > int err; > - size_t size; > char *string; > int ret; > > + if (*ppos != 0) > + return -EINVAL; > + > string = kzalloc(count + 1, GFP_KERNEL); > if (!string) > return -ENOMEM; > > - size = simple_write_to_buffer(string, count, ppos, buffer, count); > + if (copy_from_user(string, buffer, count)) { > + ret = -EFAULT; > + goto out; > + } > > /* > * write op is only supported for ipc_flood_count or > @@ -198,7 +203,7 @@ static ssize_t sof_ipc_flood_dfs_write(struct file *file, const char __user *buf > /* limit max duration/ipc count for flood test */ > if (flood_duration_test) { > if (!ipc_duration_ms) { > - ret = size; > + ret = count; > goto out; > } > > @@ -207,7 +212,7 @@ static ssize_t sof_ipc_flood_dfs_write(struct file *file, const char __user *buf > ipc_duration_ms = MAX_IPC_FLOOD_DURATION_MS; > } else { > if (!ipc_count) { > - ret = size; > + ret = count; > goto out; > } > > @@ -231,9 +236,9 @@ static ssize_t sof_ipc_flood_dfs_write(struct file *file, const char __user *buf > if (err < 0) > dev_err_ratelimited(dev, "debugfs write failed to idle %d\n", err); > > - /* return size if test is successful */ > + /* return count if test is successful */ > if (ret >= 0) > - ret = size; > + ret = count; > out: > kfree(string); > return ret; -- Péter

1 0

Re: [PATCH] ASoC: SOF: Disable pointless writes to debugfs file
by Péter Ujfalusi 04 Apr '24

04 Apr '24

On 04/04/2024 10:38, Dan Carpenter wrote: > The permissions on this debugfs file are 0444 so it can't be written to. > And writing to the file hasn't done anything since commit 6e9548cdb30e > ("ASoC: SOF: Convert the generic IPC flood test into SOF client"). > Delete the write function. I agree, it is not used anymore and ... > > Signed-off-by: Dan Carpenter <dan.carpenter(a)linaro.org> Acked-by: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> > --- > I haven't tested this patch and there is a risk that it breaks some of > the test scripts. Another option would be to just make it a dummy > function that does { return count; }. But I thought I would try the > better option first. > > Please review this extra carefully. > > sound/soc/sof/debug.c | 19 ------------------- > 1 file changed, 19 deletions(-) > > diff --git a/sound/soc/sof/debug.c b/sound/soc/sof/debug.c > index 7c8aafca8fde..937e51b02a24 100644 > --- a/sound/soc/sof/debug.c > +++ b/sound/soc/sof/debug.c > @@ -19,24 +19,6 @@ > #include "sof-priv.h" > #include "ops.h" > > -static ssize_t sof_dfsentry_write(struct file *file, const char __user *buffer, > - size_t count, loff_t *ppos) > -{ > - size_t size; > - char *string; > - int ret; > - > - string = kzalloc(count+1, GFP_KERNEL); > - if (!string) > - return -ENOMEM; > - > - size = simple_write_to_buffer(string, count, ppos, buffer, count); > - ret = size; > - > - kfree(string); This was not too constructive ;) > - return ret; > -} > - > static ssize_t sof_dfsentry_read(struct file *file, char __user *buffer, > size_t count, loff_t *ppos) > { > @@ -126,7 +108,6 @@ static const struct file_operations sof_dfs_fops = { > .open = simple_open, > .read = sof_dfsentry_read, > .llseek = default_llseek, > - .write = sof_dfsentry_write, > }; > > /* create FS entry for debug files that can expose DSP memories, registers */ -- Péter

1 0

[PATCH AUTOSEL 6.6 04/75] ASoC: SOF: amd: Optimize quirk for Valve Galileo
by Sasha Levin 29 Mar '24

29 Mar '24

From: Cristian Ciocaltea <cristian.ciocaltea(a)collabora.com> [ Upstream commit a13f0c3c0e8fb3e61fbfd99c6b350cf9be0c4660 ] Valve's Steam Deck OLED is uniquely identified by vendor and product name (Galileo) DMI fields. Simplify the quirk by removing the unnecessary match on product family. Additionally, fix the related comment as it points to the old product variant. Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea(a)collabora.com> Reviewed-by: Emil Velikov <emil.velikov(a)collabora.com> Link: https://msgid.link/r/20231219030728.2431640-7-cristian.ciocaltea@collabora.… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/sof/amd/acp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/sof/amd/acp.c b/sound/soc/sof/amd/acp.c index 19a801908b56d..f3768651d6fd8 100644 --- a/sound/soc/sof/amd/acp.c +++ b/sound/soc/sof/amd/acp.c @@ -28,11 +28,10 @@ MODULE_PARM_DESC(enable_fw_debug, "Enable Firmware debug"); const struct dmi_system_id acp_sof_quirk_table[] = { { - /* Valve Jupiter device */ + /* Steam Deck OLED device */ .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Valve"), DMI_MATCH(DMI_PRODUCT_NAME, "Galileo"), - DMI_MATCH(DMI_PRODUCT_FAMILY, "Sephiroth"), }, .driver_data = (void *)SECURED_FIRMWARE, }, -- 2.43.0

1 0

[PATCH AUTOSEL 6.8 06/98] ASoC: SOF: amd: Optimize quirk for Valve Galileo
by Sasha Levin 29 Mar '24

29 Mar '24

From: Cristian Ciocaltea <cristian.ciocaltea(a)collabora.com> [ Upstream commit a13f0c3c0e8fb3e61fbfd99c6b350cf9be0c4660 ] Valve's Steam Deck OLED is uniquely identified by vendor and product name (Galileo) DMI fields. Simplify the quirk by removing the unnecessary match on product family. Additionally, fix the related comment as it points to the old product variant. Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea(a)collabora.com> Reviewed-by: Emil Velikov <emil.velikov(a)collabora.com> Link: https://msgid.link/r/20231219030728.2431640-7-cristian.ciocaltea@collabora.… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/sof/amd/acp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/sof/amd/acp.c b/sound/soc/sof/amd/acp.c index 07632ae6ccf5e..7bf5a12da1cea 100644 --- a/sound/soc/sof/amd/acp.c +++ b/sound/soc/sof/amd/acp.c @@ -28,11 +28,10 @@ MODULE_PARM_DESC(enable_fw_debug, "Enable Firmware debug"); const struct dmi_system_id acp_sof_quirk_table[] = { { - /* Valve Jupiter device */ + /* Steam Deck OLED device */ .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Valve"), DMI_MATCH(DMI_PRODUCT_NAME, "Galileo"), - DMI_MATCH(DMI_PRODUCT_FAMILY, "Sephiroth"), }, .driver_data = (void *)SECURED_FIRMWARE, }, -- 2.43.0

1 0

Re: [PATCH v3 0/2] ASoC: SOF: amd: Skip IRAM/DRAM size modification for Steam Deck OLED
by Mark Brown 15 Mar '24

15 Mar '24

On Tue, 20 Feb 2024 22:16:02 +0200, Cristian Ciocaltea wrote: > 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 v3: > - Drop a patch file that was sent by mistake in v2 > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/2] ASoC: SOF: amd: Move signed_fw_image to struct acp_quirk_entry commit: 33c3d813330718c403a60d220f03fbece0f4fb5c [2/2] ASoC: SOF: amd: Skip IRAM/DRAM size modification for Steam Deck OLED commit: 094d11768f740f11483dad4efcd9bbcffa4ce146 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark

1 0