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

[PATCH 12/12] ASoC: SOF: amd: refactor acp driver pm ops
by Vijendar Mukunda 21 Dec '23

21 Dec '23

Refactor acp driver pm ops to support SoundWire interface. When SoundWire configuration is enabled, In case of ClockStopMode, DSP soft reset should be applied and for rest of the scenarios acp init/deinit sequence should be invoked. Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda(a)amd.com> --- sound/soc/sof/amd/acp-dsp-offset.h | 3 ++ sound/soc/sof/amd/acp.c | 65 +++++++++++++++++++++++++++--- sound/soc/sof/amd/acp.h | 4 ++ 3 files changed, 67 insertions(+), 5 deletions(-) diff --git a/sound/soc/sof/amd/acp-dsp-offset.h b/sound/soc/sof/amd/acp-dsp-offset.h index c1bdc028a61a..59afbe2e0f42 100644 --- a/sound/soc/sof/amd/acp-dsp-offset.h +++ b/sound/soc/sof/amd/acp-dsp-offset.h @@ -103,4 +103,7 @@ /* Cache window registers */ #define ACP_DSP0_CACHE_OFFSET0 0x0420 #define ACP_DSP0_CACHE_SIZE0 0x0424 + +#define ACP_SW0_EN 0x3000 +#define ACP_SW1_EN 0x3C00 #endif diff --git a/sound/soc/sof/amd/acp.c b/sound/soc/sof/amd/acp.c index 7a34faae9889..920fead2d93d 100644 --- a/sound/soc/sof/amd/acp.c +++ b/sound/soc/sof/amd/acp.c @@ -482,6 +482,31 @@ static int acp_reset(struct snd_sof_dev *sdev) return ret; } +static int acp_dsp_reset(struct snd_sof_dev *sdev) +{ + unsigned int val; + int ret; + + snd_sof_dsp_write(sdev, ACP_DSP_BAR, ACP_SOFT_RESET, ACP_DSP_ASSERT_RESET); + + ret = snd_sof_dsp_read_poll_timeout(sdev, ACP_DSP_BAR, ACP_SOFT_RESET, val, + val & ACP_DSP_SOFT_RESET_DONE_MASK, + ACP_REG_POLL_INTERVAL, ACP_REG_POLL_TIMEOUT_US); + if (ret < 0) { + dev_err(sdev->dev, "timeout asserting reset\n"); + return ret; + } + + snd_sof_dsp_write(sdev, ACP_DSP_BAR, ACP_SOFT_RESET, ACP_DSP_RELEASE_RESET); + + ret = snd_sof_dsp_read_poll_timeout(sdev, ACP_DSP_BAR, ACP_SOFT_RESET, val, !val, + ACP_REG_POLL_INTERVAL, ACP_REG_POLL_TIMEOUT_US); + if (ret < 0) + dev_err(sdev->dev, "timeout in releasing reset\n"); + + return ret; +} + static int acp_init(struct snd_sof_dev *sdev) { int ret; @@ -498,10 +523,34 @@ static int acp_init(struct snd_sof_dev *sdev) return acp_reset(sdev); } +static bool check_acp_sdw_enable_status(struct snd_sof_dev *sdev) +{ + struct acp_dev_data *acp_data; + u32 sdw0_en, sdw1_en; + + acp_data = sdev->pdata->hw_pdata; + if (!acp_data->sdw) + return false; + + sdw0_en = snd_sof_dsp_read(sdev, ACP_DSP_BAR, ACP_SW0_EN); + sdw1_en = snd_sof_dsp_read(sdev, ACP_DSP_BAR, ACP_SW1_EN); + acp_data->sdw_en_stat = sdw0_en || sdw1_en; + return acp_data->sdw_en_stat; +} + int amd_sof_acp_suspend(struct snd_sof_dev *sdev, u32 target_state) { int ret; + /* When acp_reset() function is invoked, it will apply ACP SOFT reset and + * DSP reset. ACP Soft reset sequence will cause all ACP IP registers will + * be reset to default values which will break the ClockStop Mode functionality. + * Add a condition check to apply DSP reset when SoundWire ClockStop mode + * is selected. For the rest of the scenarios, apply acp reset sequence. + */ + if (check_acp_sdw_enable_status(sdev)) + return acp_dsp_reset(sdev); + ret = acp_reset(sdev); if (ret) { dev_err(sdev->dev, "ACP Reset failed\n"); @@ -517,13 +566,19 @@ EXPORT_SYMBOL_NS(amd_sof_acp_suspend, SND_SOC_SOF_AMD_COMMON); int amd_sof_acp_resume(struct snd_sof_dev *sdev) { int ret; + struct acp_dev_data *acp_data; - ret = acp_init(sdev); - if (ret) { - dev_err(sdev->dev, "ACP Init failed\n"); - return ret; + acp_data = sdev->pdata->hw_pdata; + if (!acp_data->sdw_en_stat) { + ret = acp_init(sdev); + if (ret) { + dev_err(sdev->dev, "ACP Init failed\n"); + return ret; + } + return acp_memory_init(sdev); + } else { + return acp_dsp_reset(sdev); } - return acp_memory_init(sdev); } EXPORT_SYMBOL_NS(amd_sof_acp_resume, SND_SOC_SOF_AMD_COMMON); diff --git a/sound/soc/sof/amd/acp.h b/sound/soc/sof/amd/acp.h index e94713d7ff1d..947068da39b5 100644 --- a/sound/soc/sof/amd/acp.h +++ b/sound/soc/sof/amd/acp.h @@ -31,6 +31,9 @@ #define ACP_ASSERT_RESET 0x01 #define ACP_RELEASE_RESET 0x00 #define ACP_SOFT_RESET_DONE_MASK 0x00010001 +#define ACP_DSP_ASSERT_RESET 0x04 +#define ACP_DSP_RELEASE_RESET 0x00 +#define ACP_DSP_SOFT_RESET_DONE_MASK 0x00050004 #define ACP_DSP_INTR_EN_MASK 0x00000001 #define ACP3X_SRAM_PTE_OFFSET 0x02050000 @@ -242,6 +245,7 @@ struct acp_dev_data { bool enable_fw_debug; bool is_dram_in_use; bool is_sram_in_use; + bool sdw_en_stat; }; void memcpy_to_scratch(struct snd_sof_dev *sdev, u32 offset, unsigned int *src, size_t bytes); -- 2.34.1

1 0

[PATCH 09/12] ASoC: SOF: amd: add machine select logic for soundwire based platforms
by Vijendar Mukunda 21 Dec '23

21 Dec '23

Add machine select logic for soundwire endpoints for AMD platforms. Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda(a)amd.com> --- sound/soc/sof/amd/acp-common.c | 65 +++++++++++++++++++++++++++++++--- 1 file changed, 61 insertions(+), 4 deletions(-) diff --git a/sound/soc/sof/amd/acp-common.c b/sound/soc/sof/amd/acp-common.c index 2d72c6d55dc8..0fc4e20ec673 100644 --- a/sound/soc/sof/amd/acp-common.c +++ b/sound/soc/sof/amd/acp-common.c @@ -118,16 +118,72 @@ void amd_sof_dump(struct snd_sof_dev *sdev, u32 flags) &panic_info, stack, AMD_STACK_DUMP_SIZE); } +#if IS_ENABLED(CONFIG_SND_SOC_SOF_AMD_SOUNDWIRE) +static int amd_sof_sdw_get_slave_info(struct snd_sof_dev *sdev) +{ + struct acp_dev_data *acp_data = sdev->pdata->hw_pdata; + + return sdw_amd_get_slave_info(acp_data->sdw); +} + +static struct snd_soc_acpi_mach *amd_sof_sdw_machine_select(struct snd_sof_dev *sdev) +{ + struct snd_soc_acpi_mach *mach; + const struct snd_soc_acpi_link_adr *link; + struct acp_dev_data *acp_data = sdev->pdata->hw_pdata; + int ret, i; + + if (acp_data->info.count) { + ret = amd_sof_sdw_get_slave_info(sdev); + if (ret) { + dev_info(sdev->dev, "failed to read slave information\n"); + return NULL; + } + for (mach = sdev->pdata->desc->alt_machines; mach; mach++) { + if (!mach->links) + break; + link = mach->links; + for (i = 0; i < acp_data->info.count && link->num_adr; link++, i++) { + if (!snd_soc_acpi_sdw_link_slaves_found(sdev->dev, link, + acp_data->sdw->ids, + acp_data->sdw->num_slaves)) + break; + } + if (i == acp_data->info.count || !link->num_adr) + break; + } + if (mach && mach->link_mask) { + mach->mach_params.links = mach->links; + mach->mach_params.link_mask = mach->link_mask; + mach->mach_params.platform = dev_name(sdev->dev); + return mach; + } + } + dev_info(sdev->dev, "No SoundWire machine driver found\n"); + return NULL; +} + +#else +static struct snd_soc_acpi_mach *amd_sof_sdw_machine_select(struct snd_sof_dev *sdev) +{ + return NULL; +} +#endif + struct snd_soc_acpi_mach *amd_sof_machine_select(struct snd_sof_dev *sdev) { struct snd_sof_pdata *sof_pdata = sdev->pdata; const struct sof_dev_desc *desc = sof_pdata->desc; - struct snd_soc_acpi_mach *mach; + struct snd_soc_acpi_mach *mach = NULL; - mach = snd_soc_acpi_find_machine(desc->machines); + if (desc->machines) + mach = snd_soc_acpi_find_machine(desc->machines); if (!mach) { - dev_warn(sdev->dev, "No matching ASoC machine driver found\n"); - return NULL; + mach = amd_sof_sdw_machine_select(sdev); + if (!mach) { + dev_warn(sdev->dev, "No matching ASoC machine driver found\n"); + return NULL; + } } sof_pdata->tplg_filename = mach->sof_tplg_filename; @@ -204,5 +260,6 @@ EXPORT_SYMBOL_NS(sof_acp_common_ops, SND_SOC_SOF_AMD_COMMON); MODULE_IMPORT_NS(SND_SOC_SOF_AMD_COMMON); MODULE_IMPORT_NS(SND_SOC_SOF_XTENSA); +MODULE_IMPORT_NS(SOUNDWIRE_AMD_INIT); MODULE_DESCRIPTION("ACP SOF COMMON Driver"); MODULE_LICENSE("Dual BSD/GPL"); -- 2.34.1

1 0

Re: [PATCH 1/5] ASoC: SOF: amd: Refactor spinlock_irq(&sdev->ipc_lock) sequence in irq_handler
by Mark Brown 19 Dec '23

19 Dec '23

On Tue, 19 Dec 2023 16:54:09 +0530, Venkata Prasad Potturu wrote: > Refactor spinlock_irq(&sdev->ipc_lock) sequence in irq_handler > to avoid race conditions for acquiring hw_semaphore. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/5] ASoC: SOF: amd: Refactor spinlock_irq(&sdev->ipc_lock) sequence in irq_handler commit: 802134c8c2c8889f7cc504ab1ba6ada9816ca969 [2/5] ASoC: SOF: Refactor sof_i2s_tokens reading to update acpbt dai commit: 3953de2dbdcd0592aa7f877b67135a51e18f006a [3/5] ASoC: SOF: Add i2s bt dai configuration support for AMD platforms commit: de111c9b521ddea4c7609155a617b5a0e93ad833 [4/5] ASoC: SOF: Rename amd_bt sof_dai_type commit: ced7151b9b0c74af1bc05ac4ad93648900709bb0 [5/5] ASoC: SOF: amd: Add acp-psp mailbox interface for iram-dram fence register modification commit: 55d7bbe433467a64ac82c41b4efd425aa24acdce 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: remove duplicated including
by Mark Brown 15 Dec '23

15 Dec '23

On Fri, 15 Dec 2023 17:20:00 +0800, Wang Jinchao wrote: > remove the second \#include "../sof-audio.h" > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: SOF: amd: remove duplicated including commit: 02842209fc29bddb2b673ceb8f681267857c4bc1 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 07/11] ASoC: SOF: core: Skip firmware test for undefined fw_name
by Péter Ujfalusi 14 Dec '23

14 Dec '23

On 14/12/2023 12:58, Venkata Prasad Potturu wrote: > > On 12/14/23 16:18, Péter Ujfalusi wrote: > Thanks for your time Peter! >> >> On 09/12/2023 22:53, Cristian Ciocaltea wrote: >>> Some SOF drivers like AMD ACP do not always rely on a single static >>> firmware file, but may require multiple files having their names >>> dynamically computed on probe time, e.g. based on chip name. >> I see, AMD vangogh needs two binary files to be loaded sometimes, it >> is not using the default name as it hints via the sof_dev_desc >> ("sof-vangogh.ri"). >> >> The constructed names for the two files are just using different pattern: >> sof-%PLAT%.ri >> vs >> sof-%PLAT%-code.bin >> sof-%PLAT%-data.bin >> >> iow, instead of the combined .ri file which includes the code and data >> segment it has 'raw' bin files and cannot use the core for loading the >> firmware. >> >> What is the reason for this? an .ri file can have two 'modules' one to >> be written to IRAM the other to DRAM. >> sof_ipc3_load_fw_to_dsp() > > For AMD Vangogh platform devices signed firmware image is required, so > split .ri image into code and data images. > > Only Code.bin will be signed and loaded into corresponding IRAM location. This is not different than what the Intel .ri files are made of. The module which is to be loaded to IRAM is signed code the module which goes to DRAM is not signed. The loader itself is not looking into the sections of the .ri image, it just parses the header and copies them where they belong. if the issue is name collision then you could try to put the signed firmware file under 'signed' folder (fw_path_postfix) of the platform like Intel does with the community signed ones? It would be great if somehow we can handle all of these in core, have shared code and familiar prints among vendors, platforms.. Fwiw, I'm planning the path, filename creation to be moved to core for the current platforms, but it implies that they do use single firmware file. struct sof_dev_desc would only have two strings: vendor - AMD / iMX / Intel / Mediatek platform - tgl, vaggogh, etc I need to adjust it based on what I have learned today about vangogh. -- Péter

1 0

Re: [PATCH 07/11] ASoC: SOF: core: Skip firmware test for undefined fw_name
by Péter Ujfalusi 14 Dec '23

14 Dec '23

On 14/12/2023 13:40, Cristian Ciocaltea wrote: > On 12/14/23 13:35, Péter Ujfalusi wrote: >> >> >> On 14/12/2023 13:29, Cristian Ciocaltea wrote: >>>> diff --git a/sound/soc/sof/fw-file-profile.c b/sound/soc/sof/fw-file-profile.c >>>> index 138a1ca2c4a8..7b91c9551ada 100644 >>>> --- a/sound/soc/sof/fw-file-profile.c >>>> +++ b/sound/soc/sof/fw-file-profile.c >>>> @@ -89,6 +89,15 @@ static int sof_test_topology_file(struct device *dev, >>>> return ret; >>>> } >>>> >>>> +static bool sof_platform_uses_generic_loader(struct snd_sof_dev *sdev) >>>> +{ >>>> + if (sdev->pdata->desc->ops->load_firmware == snd_sof_load_firmware_raw || >>>> + sdev->pdata->desc->ops->load_firmware == snd_sof_load_firmware_memcpy) >>>> + return true; >>>> + >>>> + return false; >>>> +} >>> >>> I would drop the conditional and simply return. >> >> What do you mean? We need to check if the platform is using either type >> of the generic load_firmware helper (the _memcpy is calling the _raw to >> load the file). > > I mean to simply replace the if statement with: > > static bool sof_platform_uses_generic_loader(struct snd_sof_dev *sdev) > { > return (sdev->pdata->desc->ops->load_firmware == snd_sof_load_firmware_raw || > sdev->pdata->desc->ops->load_firmware == snd_sof_load_firmware_memcpy); > } ah, OK. -- Péter

1 0

[PATCH 00/11] Improve SOF support for Steam Deck OLED
by Cristian Ciocaltea 14 Dec '23

14 Dec '23

This patch series is a continuation of [1] to provide fixes and improvements to SOF drivers targeting the Vangogh platform, as found on the Valve's Steam Deck OLED. The previous series only handled the legacy ACP drivers. [1]: https://lore.kernel.org/all/20231209203229.878730-1-cristian.ciocaltea@coll… Cristian Ciocaltea (11): ASoC: amd: acp: Drop redundant initialization of machine driver data ASoC: amd: acp: Make use of existing *_CODEC_DAI macros ASoC: amd: acp: Add missing error handling in sof-mach ASoC: amd: acp: Update MODULE_DESCRIPTION for sof-mach ASoC: SOF: amd: Fix memory leak in amd_sof_acp_probe() ASoC: SOF: amd: Optimize quirk for Valve Galileo ASoC: SOF: core: Skip firmware test for undefined fw_name ASoC: SOF: amd: Override default fw name for Valve Galileo ASoC: SOF: amd: Compute file paths on firmware load ASoC: amd: acp: Use correct DAI link ID for BT codec ASoC: SOF: topology: Add new DAI type entry for SOF_DAI_AMD_BT sound/soc/amd/acp/acp-mach-common.c | 6 +++--- sound/soc/amd/acp/acp-mach.h | 2 +- sound/soc/amd/acp/acp-sof-mach.c | 26 +++++++---------------- sound/soc/sof/amd/acp-loader.c | 32 +++++++++++++++++++++++------ sound/soc/sof/amd/acp.c | 30 ++++++++++++++++----------- sound/soc/sof/amd/vangogh.c | 8 +++++++- sound/soc/sof/fw-file-profile.c | 3 +++ sound/soc/sof/topology.c | 1 + 8 files changed, 66 insertions(+), 42 deletions(-) -- 2.43.0

4 28

Re: [PATCH 07/11] ASoC: SOF: core: Skip firmware test for undefined fw_name
by Péter Ujfalusi 14 Dec '23

14 Dec '23

On 14/12/2023 13:29, Cristian Ciocaltea wrote: >> diff --git a/sound/soc/sof/fw-file-profile.c b/sound/soc/sof/fw-file-profile.c >> index 138a1ca2c4a8..7b91c9551ada 100644 >> --- a/sound/soc/sof/fw-file-profile.c >> +++ b/sound/soc/sof/fw-file-profile.c >> @@ -89,6 +89,15 @@ static int sof_test_topology_file(struct device *dev, >> return ret; >> } >> >> +static bool sof_platform_uses_generic_loader(struct snd_sof_dev *sdev) >> +{ >> + if (sdev->pdata->desc->ops->load_firmware == snd_sof_load_firmware_raw || >> + sdev->pdata->desc->ops->load_firmware == snd_sof_load_firmware_memcpy) >> + return true; >> + >> + return false; >> +} > > I would drop the conditional and simply return. What do you mean? We need to check if the platform is using either type of the generic load_firmware helper (the _memcpy is calling the _raw to load the file). -- Péter

1 0

Re: [PATCH 11/11] ASoC: SOF: topology: Add new DAI type entry for SOF_DAI_AMD_BT
by Mukunda,Vijendar 12 Dec '23

12 Dec '23

On 10/12/23 19:31, Mark Brown wrote: > On Sun, Dec 10, 2023 at 12:12:53PM +0200, Cristian Ciocaltea wrote: >> On 12/10/23 11:51, Venkata Prasad Potturu wrote: >>> This should send to SOF git repo for rewiew, once SOF reviewers approved >>> this, again need to send to broonie git. >>> All the changes in sound/soc/sof/ path should go to SOF git. >> Unfortunately I'm not familiar with the SOF dev workflow. So it's not >> enough to have this patch cc-ed to sound-open-firmware(a)alsa-project.org? > The SOF people basically do their own thing in github at > > https://github.com/thesofproject/linux > > with a github workflow and submit their patches upstream in batches a > few times a release, however my understanding is that their workflow can > cope with things going in directly upstream as well. If patches are directly pushed to alsa devel list instead of creating pull request for SOF patches It will break SOF github work flow. Validation across all the platforms is a potential challenge, and it will also create an overhead to pull the patches which got merged in to for-next branch, before the all the patches pulled in to SOF GitHub.

1 0

[PATCH AUTOSEL 6.1 11/29] ASoC: SOF: mediatek: mt8186: Add Google Steelix topology compatible
by Sasha Levin 11 Dec '23

11 Dec '23

From: AngeloGioacchino Del Regno <angelogioacchino.delregno(a)collabora.com> [ Upstream commit 505c83212da5bfca95109421b8f5d9f8c6cdfef2 ] Add the machine compatible and topology filename for the Google Steelix MT8186 Chromebook to load the correct SOF topology file. Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno(a)collabora.com> Link: https://lore.kernel.org/r/20231123084454.20471-1-angelogioacchino.delregno@… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/sof/mediatek/mt8186/mt8186.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/sof/mediatek/mt8186/mt8186.c b/sound/soc/sof/mediatek/mt8186/mt8186.c index 181189e00e020..76ce90e1f1030 100644 --- a/sound/soc/sof/mediatek/mt8186/mt8186.c +++ b/sound/soc/sof/mediatek/mt8186/mt8186.c @@ -596,6 +596,9 @@ static struct snd_sof_dsp_ops sof_mt8186_ops = { static struct snd_sof_of_mach sof_mt8186_machs[] = { { + .compatible = "google,steelix", + .sof_tplg_filename = "sof-mt8186-google-steelix.tplg" + }, { .compatible = "mediatek,mt8186", .sof_tplg_filename = "sof-mt8186.tplg", }, -- 2.42.0

1 0