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

Re: [PATCH] ASoc: SOF: topology: Clear SOF link platform name upon unload
by Mark Brown 28 Aug '24

28 Aug '24

On Wed, 21 Aug 2024 12:10:04 +0800, Chen-Yu Tsai wrote: > The SOF topology loading function sets the device name for the platform > component link. This should be unset when unloading the topology, > otherwise a machine driver unbind/bind or reprobe would complain about > an invalid component as having both its component name and of_node set: > > mt8186_mt6366 sound: ASoC: Both Component name/of_node are set for AFE_SOF_DL1 > mt8186_mt6366 sound: error -EINVAL: Cannot register card > mt8186_mt6366 sound: probe with driver mt8186_mt6366 failed with error -22 > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoc: SOF: topology: Clear SOF link platform name upon unload commit: e0be875c5bf03a9676a6bfed9e0f1766922a7dbd 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 v1] ASoC: SOF: topology: Use kmemdup_array instead of kmemdup for multiple allocation
by Mark Brown 26 Aug '24

26 Aug '24

On Mon, 26 Aug 2024 13:44:02 +0800, Shen Lichuan wrote: > Let the kmemdup_array() take care about multiplication > and possible overflows. > > Using kmemdup_array() is more appropriate and makes the code > easier to audit. > > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: SOF: topology: Use kmemdup_array instead of kmemdup for multiple allocation commit: 69a8d0edb9d78bb5515133b7c08f399d6eaff37a 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: mediatek: Add missing board compatible
by Mark Brown 14 Aug '24

14 Aug '24

On Fri, 09 Aug 2024 13:56:27 +0000, Albert Jakieła wrote: > Add Google Dojo compatible. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: SOF: mediatek: Add missing board compatible commit: c0196faaa927321a63e680427e075734ee656e42 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

[PATCH] ASoC: amd: acp: add legacy driver support for ACP7.1 based platforms
by Vijendar Mukunda 13 Aug '24

13 Aug '24

Add acp pci driver and machine driver changes for ACP7.1 based platforms for legacy stack. Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda(a)amd.com> --- sound/soc/amd/acp/acp-legacy-common.c | 7 ++++--- sound/soc/amd/acp/acp-mach-common.c | 2 +- sound/soc/amd/acp/acp-mach.h | 1 + sound/soc/amd/acp/acp-pci.c | 4 ++++ sound/soc/amd/acp/acp70.c | 12 ++++++++++-- sound/soc/amd/acp/amd.h | 1 + 6 files changed, 21 insertions(+), 6 deletions(-) diff --git a/sound/soc/amd/acp/acp-legacy-common.c b/sound/soc/amd/acp/acp-legacy-common.c index 04bd605fdce3..3cc083fac837 100644 --- a/sound/soc/amd/acp/acp-legacy-common.c +++ b/sound/soc/amd/acp/acp-legacy-common.c @@ -270,6 +270,7 @@ static int acp_power_on(struct acp_chip_info *chip) acp_pgfsm_ctrl_reg = ACP63_PGFSM_CONTROL; break; case ACP70_DEV: + case ACP71_DEV: acp_pgfsm_stat_reg = ACP70_PGFSM_STATUS; acp_pgfsm_ctrl_reg = ACP70_PGFSM_CONTROL; break; @@ -336,10 +337,9 @@ int acp_deinit(struct acp_chip_info *chip) if (ret) return ret; - if (chip->acp_rev != ACP70_DEV) + if (chip->acp_rev < ACP70_DEV) writel(0, chip->base + ACP_CONTROL); - - if (chip->acp_rev >= ACP70_DEV) + else writel(0x01, chip->base + ACP_ZSC_DSP_CTRL); return 0; } @@ -461,6 +461,7 @@ void check_acp_config(struct pci_dev *pci, struct acp_chip_info *chip) check_acp6x_config(chip); break; case ACP70_DEV: + case ACP71_DEV: pdm_addr = ACP70_PDM_ADDR; check_acp70_config(chip); break; diff --git a/sound/soc/amd/acp/acp-mach-common.c b/sound/soc/amd/acp/acp-mach-common.c index a36300a4ed8a..e9ff4815c12c 100644 --- a/sound/soc/amd/acp/acp-mach-common.c +++ b/sound/soc/amd/acp/acp-mach-common.c @@ -1766,7 +1766,7 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card) } else if (drv_data->platform == ACP63) { links[i].platforms = platform_acp63_component; links[i].num_platforms = ARRAY_SIZE(platform_acp63_component); - } else if (drv_data->platform == ACP70) { + } else if ((drv_data->platform == ACP70) || (drv_data->platform == ACP71)) { links[i].platforms = platform_acp70_component; links[i].num_platforms = ARRAY_SIZE(platform_acp70_component); } else { diff --git a/sound/soc/amd/acp/acp-mach.h b/sound/soc/amd/acp/acp-mach.h index a48546d8d407..93d9e3886b7e 100644 --- a/sound/soc/amd/acp/acp-mach.h +++ b/sound/soc/amd/acp/acp-mach.h @@ -56,6 +56,7 @@ enum platform_end_point { REMBRANDT, ACP63, ACP70, + ACP71, }; struct acp_mach_ops { diff --git a/sound/soc/amd/acp/acp-pci.c b/sound/soc/amd/acp/acp-pci.c index b0304b813cad..f7450a5bd103 100644 --- a/sound/soc/amd/acp/acp-pci.c +++ b/sound/soc/amd/acp/acp-pci.c @@ -95,6 +95,10 @@ static int acp_pci_probe(struct pci_dev *pci, const struct pci_device_id *pci_id chip->name = "acp_asoc_acp70"; chip->acp_rev = ACP70_DEV; break; + case 0x71: + chip->name = "acp_asoc_acp70"; + chip->acp_rev = ACP71_DEV; + break; default: dev_err(dev, "Unsupported device revision:0x%x\n", pci->revision); ret = -EINVAL; diff --git a/sound/soc/amd/acp/acp70.c b/sound/soc/amd/acp/acp70.c index a2cbdcca4313..81636faa22cd 100644 --- a/sound/soc/amd/acp/acp70.c +++ b/sound/soc/amd/acp/acp70.c @@ -147,7 +147,11 @@ static int acp_acp70_audio_probe(struct platform_device *pdev) return -ENODEV; } - if (chip->acp_rev != ACP70_DEV) { + switch (chip->acp_rev) { + case ACP70_DEV: + case ACP71_DEV: + break; + default: dev_err(&pdev->dev, "Un-supported ACP Revision %d\n", chip->acp_rev); return -ENODEV; } @@ -178,7 +182,11 @@ static int acp_acp70_audio_probe(struct platform_device *pdev) adata->num_dai = ARRAY_SIZE(acp70_dai); adata->rsrc = &rsrc; adata->machines = snd_soc_acpi_amd_acp70_acp_machines; - adata->platform = ACP70; + if (chip->acp_rev == ACP70_DEV) + adata->platform = ACP70; + else + adata->platform = ACP71; + adata->flag = chip->flag; acp_machine_select(adata); diff --git a/sound/soc/amd/acp/amd.h b/sound/soc/amd/acp/amd.h index c095a34a7229..4f0cd7dd04e5 100644 --- a/sound/soc/amd/acp/amd.h +++ b/sound/soc/amd/acp/amd.h @@ -22,6 +22,7 @@ #define ACP6X_DEV 6 #define ACP63_DEV 0x63 #define ACP70_DEV 0x70 +#define ACP71_DEV 0x71 #define DMIC_INSTANCE 0x00 #define I2S_SP_INSTANCE 0x01 -- 2.34.1

2 1

[PATCH V2 1/2] ASoC: SOF: amd: move iram-dram fence register programming sequence
by Vijendar Mukunda 13 Aug '24

13 Aug '24

The existing code modifies IRAM and DRAM size after sha dma start for vangogh platform. The problem with this sequence is that it might cause sha dma failure when firmware code binary size is greater than the default IRAM size. To fix this issue, Move the iram-dram fence register sequence prior to sha dma start. Fixes: 094d11768f74 ("ASoC: SOF: amd: Skip IRAM/DRAM size modification for Steam Deck OLED") Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda(a)amd.com> --- changes since v1: - Rephrase commit description sound/soc/sof/amd/acp.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/sound/soc/sof/amd/acp.c b/sound/soc/sof/amd/acp.c index 7b122656efd1..b8d4f986f89d 100644 --- a/sound/soc/sof/amd/acp.c +++ b/sound/soc/sof/amd/acp.c @@ -263,6 +263,17 @@ int configure_and_run_sha_dma(struct acp_dev_data *adata, void *image_addr, snd_sof_dsp_write(sdev, ACP_DSP_BAR, ACP_SHA_DMA_STRT_ADDR, start_addr); snd_sof_dsp_write(sdev, ACP_DSP_BAR, ACP_SHA_DMA_DESTINATION_ADDR, dest_addr); snd_sof_dsp_write(sdev, ACP_DSP_BAR, ACP_SHA_MSG_LENGTH, image_length); + + /* psp_send_cmd only required for vangogh platform (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) + return ret; + ret = psp_send_cmd(adata, MBOX_ACP_IRAM_DRAM_FENCE_COMMAND | MBOX_ISREADY_FLAG); + if (ret) + return ret; + } snd_sof_dsp_write(sdev, ACP_DSP_BAR, ACP_SHA_DMA_CMD, ACP_SHA_RUN); ret = snd_sof_dsp_read_poll_timeout(sdev, ACP_DSP_BAR, ACP_SHA_TRANSFER_BYTE_CNT, @@ -280,17 +291,6 @@ int configure_and_run_sha_dma(struct acp_dev_data *adata, void *image_addr, return ret; } - /* psp_send_cmd only required for vangogh platform (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) - return ret; - ret = psp_send_cmd(adata, MBOX_ACP_IRAM_DRAM_FENCE_COMMAND | MBOX_ISREADY_FLAG); - if (ret) - return ret; - } - ret = snd_sof_dsp_read_poll_timeout(sdev, ACP_DSP_BAR, ACP_SHA_DSP_FW_QUALIFIER, fw_qualifier, fw_qualifier & DSP_FW_RUN_ENABLE, ACP_REG_POLL_INTERVAL, ACP_DMA_COMPLETE_TIMEOUT_US); -- 2.34.1

2 2

[PATCH 1/2] ASoC: SOF: amd: move iram-dram fence register programming sequence
by Vijendar Mukunda 13 Aug '24

13 Aug '24

As per design, ACP iram-dram fence register sequence should be initiated before triggering SHA dma. This ensures that IRAM size will programmed correctly before initiaing SHA dma. Fixes: 094d11768f74 ("ASoC: SOF: amd: Skip IRAM/DRAM size modification for Steam Deck OLED") Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda(a)amd.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/soc/sof/amd/acp.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/sound/soc/sof/amd/acp.c b/sound/soc/sof/amd/acp.c index 7b122656efd1..b8d4f986f89d 100644 --- a/sound/soc/sof/amd/acp.c +++ b/sound/soc/sof/amd/acp.c @@ -263,6 +263,17 @@ int configure_and_run_sha_dma(struct acp_dev_data *adata, void *image_addr, snd_sof_dsp_write(sdev, ACP_DSP_BAR, ACP_SHA_DMA_STRT_ADDR, start_addr); snd_sof_dsp_write(sdev, ACP_DSP_BAR, ACP_SHA_DMA_DESTINATION_ADDR, dest_addr); snd_sof_dsp_write(sdev, ACP_DSP_BAR, ACP_SHA_MSG_LENGTH, image_length); + + /* psp_send_cmd only required for vangogh platform (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) + return ret; + ret = psp_send_cmd(adata, MBOX_ACP_IRAM_DRAM_FENCE_COMMAND | MBOX_ISREADY_FLAG); + if (ret) + return ret; + } snd_sof_dsp_write(sdev, ACP_DSP_BAR, ACP_SHA_DMA_CMD, ACP_SHA_RUN); ret = snd_sof_dsp_read_poll_timeout(sdev, ACP_DSP_BAR, ACP_SHA_TRANSFER_BYTE_CNT, @@ -280,17 +291,6 @@ int configure_and_run_sha_dma(struct acp_dev_data *adata, void *image_addr, return ret; } - /* psp_send_cmd only required for vangogh platform (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) - return ret; - ret = psp_send_cmd(adata, MBOX_ACP_IRAM_DRAM_FENCE_COMMAND | MBOX_ISREADY_FLAG); - if (ret) - return ret; - } - ret = snd_sof_dsp_read_poll_timeout(sdev, ACP_DSP_BAR, ACP_SHA_DSP_FW_QUALIFIER, fw_qualifier, fw_qualifier & DSP_FW_RUN_ENABLE, ACP_REG_POLL_INTERVAL, ACP_DMA_COMPLETE_TIMEOUT_US); -- 2.34.1

2 2

Re: [PATCH V2 1/2] ASoC: SOF: amd: move iram-dram fence register programming sequence
by Mukunda,Vijendar 13 Aug '24

13 Aug '24

On 13/08/24 17:05, Markus Elfring wrote: >> The existing code modifies IRAM and DRAM size after sha dma start … > SHA DMA? > > > … >> sha dma failure … > SHA DMA? I think above one seems to be okay. > >> IRAM size. To fix this issue, Move the iram-dram fence register sequence > > Thus move the IRAM-DRAM …? I think above one seems to be okay. > > > How do you think about to offer cover letters for patch series? As these are individual fixes, I don't think a cover letter should be included in the patch series. > > Regards, > Markus

1 0

Re: [PATCH 1/2] ASoC: SOF: amd: move iram-dram fence register programming sequence
by Mukunda,Vijendar 13 Aug '24

13 Aug '24

On 13/08/24 13:45, Markus Elfring wrote: > … >> before triggering SHA dma. This ensures that IRAM size will programmed >> correctly before initiaing SHA dma. > Please improve such a change description with an imperative wording. > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Doc… > > Please avoid typos accordingly. Will rephrase the commit message. > > Regards, > Markus

1 0

Re: [PATCH 1/8] ASoC: SOF: amd: Fix for incorrect acp error satus register offset
by Mukunda,Vijendar 12 Aug '24

12 Aug '24

On 07/08/24 10:43, Vijendar Mukunda wrote: > Adding 'dsp_intr_base' to ACP error status register offset in irq handler > points to wrong register offset. ACP error status register offset got > changed from ACP 6.0 onwards. Add 'acp_error_stat' descriptor field and > update the value based on the ACP variant. Please ignore this patch series. Will split out fixes and refactoring patches (which has patch dependencies) and will send it separately. > > Fixes: 0e44572a28a4 ("ASoC: SOF: amd: Add helper callbacks for ACP's DMA configuration") > Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda(a)amd.com> > Reviewed-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> > Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> > --- > sound/soc/sof/amd/acp-dsp-offset.h | 3 ++- > sound/soc/sof/amd/acp.c | 5 +++-- > sound/soc/sof/amd/acp.h | 1 + > sound/soc/sof/amd/pci-acp63.c | 1 + > sound/soc/sof/amd/pci-rmb.c | 1 + > sound/soc/sof/amd/pci-rn.c | 1 + > 6 files changed, 9 insertions(+), 3 deletions(-) > > diff --git a/sound/soc/sof/amd/acp-dsp-offset.h b/sound/soc/sof/amd/acp-dsp-offset.h > index 59afbe2e0f42..66968efda869 100644 > --- a/sound/soc/sof/amd/acp-dsp-offset.h > +++ b/sound/soc/sof/amd/acp-dsp-offset.h > @@ -76,7 +76,8 @@ > #define DSP_SW_INTR_CNTL_OFFSET 0x0 > #define DSP_SW_INTR_STAT_OFFSET 0x4 > #define DSP_SW_INTR_TRIG_OFFSET 0x8 > -#define ACP_ERROR_STATUS 0x18C4 > +#define ACP3X_ERROR_STATUS 0x18C4 > +#define ACP6X_ERROR_STATUS 0x1A4C > #define ACP3X_AXI2DAGB_SEM_0 0x1880 > #define ACP5X_AXI2DAGB_SEM_0 0x1884 > #define ACP6X_AXI2DAGB_SEM_0 0x1874 > diff --git a/sound/soc/sof/amd/acp.c b/sound/soc/sof/amd/acp.c > index 7b122656efd1..d0b7d1c54248 100644 > --- a/sound/soc/sof/amd/acp.c > +++ b/sound/soc/sof/amd/acp.c > @@ -92,6 +92,7 @@ static int config_dma_channel(struct acp_dev_data *adata, unsigned int ch, > unsigned int idx, unsigned int dscr_count) > { > struct snd_sof_dev *sdev = adata->dev; > + const struct sof_amd_acp_desc *desc = get_chip_info(sdev->pdata); > unsigned int val, status; > int ret; > > @@ -102,7 +103,7 @@ static int config_dma_channel(struct acp_dev_data *adata, unsigned int ch, > val & (1 << ch), ACP_REG_POLL_INTERVAL, > ACP_REG_POLL_TIMEOUT_US); > if (ret < 0) { > - status = snd_sof_dsp_read(sdev, ACP_DSP_BAR, ACP_ERROR_STATUS); > + status = snd_sof_dsp_read(sdev, ACP_DSP_BAR, desc->acp_error_stat); > val = snd_sof_dsp_read(sdev, ACP_DSP_BAR, ACP_DMA_ERR_STS_0 + ch * sizeof(u32)); > > dev_err(sdev->dev, "ACP_DMA_ERR_STS :0x%x ACP_ERROR_STATUS :0x%x\n", val, status); > @@ -404,7 +405,7 @@ static irqreturn_t acp_irq_handler(int irq, void *dev_id) > snd_sof_dsp_write(sdev, ACP_DSP_BAR, desc->ext_intr_stat, ACP_ERROR_IRQ_MASK); > snd_sof_dsp_write(sdev, ACP_DSP_BAR, base + ACP_SW0_I2S_ERROR_REASON, 0); > snd_sof_dsp_write(sdev, ACP_DSP_BAR, base + ACP_SW1_I2S_ERROR_REASON, 0); > - snd_sof_dsp_write(sdev, ACP_DSP_BAR, base + ACP_ERROR_STATUS, 0); > + snd_sof_dsp_write(sdev, ACP_DSP_BAR, desc->acp_error_stat, 0); > irq_flag = 1; > } > > diff --git a/sound/soc/sof/amd/acp.h b/sound/soc/sof/amd/acp.h > index ec9170b3f068..6ac853ff6093 100644 > --- a/sound/soc/sof/amd/acp.h > +++ b/sound/soc/sof/amd/acp.h > @@ -203,6 +203,7 @@ struct sof_amd_acp_desc { > u32 probe_reg_offset; > u32 reg_start_addr; > u32 reg_end_addr; > + u32 acp_error_stat; > u32 sdw_max_link_count; > u64 sdw_acpi_dev_addr; > }; > diff --git a/sound/soc/sof/amd/pci-acp63.c b/sound/soc/sof/amd/pci-acp63.c > index 54d42f83ce9e..c3da70549995 100644 > --- a/sound/soc/sof/amd/pci-acp63.c > +++ b/sound/soc/sof/amd/pci-acp63.c > @@ -35,6 +35,7 @@ static const struct sof_amd_acp_desc acp63_chip_info = { > .ext_intr_cntl = ACP6X_EXTERNAL_INTR_CNTL, > .ext_intr_stat = ACP6X_EXT_INTR_STAT, > .ext_intr_stat1 = ACP6X_EXT_INTR_STAT1, > + .acp_error_stat = ACP6X_ERROR_STATUS, > .dsp_intr_base = ACP6X_DSP_SW_INTR_BASE, > .sram_pte_offset = ACP6X_SRAM_PTE_OFFSET, > .hw_semaphore_offset = ACP6X_AXI2DAGB_SEM_0, > diff --git a/sound/soc/sof/amd/pci-rmb.c b/sound/soc/sof/amd/pci-rmb.c > index 4bc30951f8b0..194b7ff37e9e 100644 > --- a/sound/soc/sof/amd/pci-rmb.c > +++ b/sound/soc/sof/amd/pci-rmb.c > @@ -33,6 +33,7 @@ static const struct sof_amd_acp_desc rembrandt_chip_info = { > .pgfsm_base = ACP6X_PGFSM_BASE, > .ext_intr_stat = ACP6X_EXT_INTR_STAT, > .dsp_intr_base = ACP6X_DSP_SW_INTR_BASE, > + .acp_error_stat = ACP6X_ERROR_STATUS, > .sram_pte_offset = ACP6X_SRAM_PTE_OFFSET, > .hw_semaphore_offset = ACP6X_AXI2DAGB_SEM_0, > .fusion_dsp_offset = ACP6X_DSP_FUSION_RUNSTALL, > diff --git a/sound/soc/sof/amd/pci-rn.c b/sound/soc/sof/amd/pci-rn.c > index e08875bdfa8b..bff2d979ea6a 100644 > --- a/sound/soc/sof/amd/pci-rn.c > +++ b/sound/soc/sof/amd/pci-rn.c > @@ -33,6 +33,7 @@ static const struct sof_amd_acp_desc renoir_chip_info = { > .pgfsm_base = ACP3X_PGFSM_BASE, > .ext_intr_stat = ACP3X_EXT_INTR_STAT, > .dsp_intr_base = ACP3X_DSP_SW_INTR_BASE, > + .acp_error_stat = ACP3X_ERROR_STATUS, > .sram_pte_offset = ACP3X_SRAM_PTE_OFFSET, > .hw_semaphore_offset = ACP3X_AXI2DAGB_SEM_0, > .acp_clkmux_sel = ACP3X_CLKMUX_SEL,

1 0

[PATCH RESEND 0/8] AMD SOF stack fixes and improvements
by Vijendar Mukunda 12 Aug '24

12 Aug '24

This patch series consists of few fixes and improvments for AMD SOF stack. Link: https://github.com/thesofproject/linux/pull/5103 Reviewed-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Vijendar Mukunda (8): ASoC: SOF: amd: Fix for incorrect acp error satus register offset ASoC: SOF: amd: fix for acp error reason registers wrong offset ASoC: SOF: amd: move iram-dram fence register programming sequence ASoC: SOF: amd: fix for acp init sequence ASoC: SOF: amd: update conditional check for cache register update ASoC: SOF: amd: modify psp send command conditional checks ASoC: SOF: amd: remove unused variable from sof_amd_acp_desc structure ASoC: amd: acp: Convert comma to semicolon sound/soc/amd/acp/acp-sdw-sof-mach.c | 6 +-- sound/soc/sof/amd/acp-dsp-offset.h | 6 ++- sound/soc/sof/amd/acp-loader.c | 2 +- sound/soc/sof/amd/acp.c | 59 ++++++++++++++++++---------- sound/soc/sof/amd/acp.h | 10 +++-- sound/soc/sof/amd/pci-acp63.c | 3 +- sound/soc/sof/amd/pci-rmb.c | 3 +- sound/soc/sof/amd/pci-rn.c | 3 +- sound/soc/sof/amd/pci-vangogh.c | 1 - 9 files changed, 60 insertions(+), 33 deletions(-) -- 2.34.1

2 9

Re: [PATCH 2/8] ASoC: SOF: amd: fix for acp error reason registers wrong offset
by Mukunda,Vijendar 12 Aug '24

12 Aug '24

On 10/08/24 04:56, Mark Brown wrote: > On Fri, Aug 09, 2024 at 01:49:37PM +0530, Mukunda,Vijendar wrote: >> On 09/08/24 13:05, Mark Brown wrote: >>> We want the resulting git tree to be bisectable, that means testing each >>> commit not just the final result. >> This patch series is prepared on top of >> 20240801111821.18076-1-Vijendar.Mukunda(a)amd.com >> which are incremental changes and also has dependency. > For the benefit of those playing at home that's "ASoC: intel/sdw_utils: > move dai id common macros" which is in -next as 8f87e292a34813e. It's > not great to base a fix for something that's in Linus' tree like this > one which has: > > Fixes: 96eb81851012 ("ASoC: SOF: amd: add interrupt handling for SoundWire manager devices") > > in it, and any such dependency really needs to get called out in the > cover letter if it exists. Agreed. Will mention the patch dependency in the cover letter and resend the patch series. > > In general you should expect bug fixes to be applied for Linus' tree by > default, especially if they're tagged as fixing a particular commit in > there. That means no dependencies on anything that's already in -next > unless explicitly called out, and if the thing in -next is just a > cleanup or refactoring then generally it's best to just do the fix for > Linus' tree and then separately merge it up to -next and integrate with > whtaever cleanup/refactoring is going on there. > > Please include human readable descriptions of things like commits and > issues being discussed in e-mail in your mails, this makes them much > easier for humans to read especially when they have no internet access. > I do frequently catch up on my mail on flights or while otherwise > travelling so this is even more pressing for me than just being about > making things a bit easier to read.

1 0

Re: [PATCH 2/8] ASoC: SOF: amd: fix for acp error reason registers wrong offset
by Mukunda,Vijendar 09 Aug '24

09 Aug '24

On 09/08/24 13:05, Mark Brown wrote: > On Fri, Aug 09, 2024 at 07:30:54AM +0530, Mukunda,Vijendar wrote: >> On 09/08/24 01:02, Mark Brown wrote: >>> /build/stage/linux/sound/soc/sof/amd/acp.c: In function ‘acp_irq_handler’: >>> /build/stage/linux/sound/soc/sof/amd/acp.c:407:26: error: ‘struct acp_dev_data’ h >>> as no member named ‘pci_rev’ >>> 407 | if (adata->pci_rev >= ACP_RMB_PCI_ID) >>> | ^~ >> This patch is part of https://github.com/thesofproject/linux/pull/5103 >> which got successfully merged into sof github without any build errors. >> This patch is dependent on >> Link: https://patch.msgid.link/20240801111821.18076-10-Vijendar.Mukunda@amd.com >> which got already merged in to ASoC tree for-next base. >> It shouldn't cause build error if the dependent patch already merged. > Are the patches it depends on actually before it in the patch series? > We want the resulting git tree to be bisectable, that means testing each > commit not just the final result. This patch series is prepared on top of 20240801111821.18076-1-Vijendar.Mukunda(a)amd.com which are incremental changes and also has dependency. As 20240801111821.18076-1-Vijendar.Mukunda(a)amd.com got merged into for-next branch, compiling this patch series,which is prepared on top of it(20240801111821.18076-1-Vijendar.Mukunda(a)amd.com), shouldn't trigger any build failures. Within this patch series (20240807051341.1616925-1-Vijendar.Mukunda(a)amd.com), few patches are dependent patches, as changes are incremental. That's why I have resent whole patch series with cover letter again (20240808165753.3414464-1-Vijendar.Mukunda(a)amd.com) so that whole patch series can be merged at one go. Each commit can be buildable sequentially.

1 0

Re: [PATCH 2/8] ASoC: SOF: amd: fix for acp error reason registers wrong offset
by Mukunda,Vijendar 09 Aug '24

09 Aug '24

On 09/08/24 01:02, Mark Brown wrote: > On Wed, Aug 07, 2024 at 10:43:14AM +0530, Vijendar Mukunda wrote: >> Fix the incorrect register offsets for acp error reason registers. >> Add 'acp_sw0_i2s_err_reason' as register field in acp descriptor structure >> and update the value based on the acp variant. >> ACP_SW1_ERROR_REASON register was added from Rembrandt platform onwards. >> Add conditional check for the same. >> >> Fixes: 96eb81851012 ("ASoC: SOF: amd: add interrupt handling for SoundWire manager devices") > This breaks an x86 allmodconfig build: > > /build/stage/linux/sound/soc/sof/amd/acp.c: In function ‘acp_irq_handler’: > /build/stage/linux/sound/soc/sof/amd/acp.c:407:26: error: ‘struct acp_dev_data’ h > as no member named ‘pci_rev’ > 407 | if (adata->pci_rev >= ACP_RMB_PCI_ID) > | ^~ This patch is part of https://github.com/thesofproject/linux/pull/5103 which got successfully merged into sof github without any build errors. This patch is dependent on Link: https://patch.msgid.link/20240801111821.18076-10-Vijendar.Mukunda@amd.com which got already merged in to ASoC tree for-next base. It shouldn't cause build error if the dependent patch already merged. > /build/stage/linux/sound/soc/sof/amd/acp.c: In function ‘acp_power_on’: > /build/stage/linux/sound/soc/sof/amd/acp.c:444:22: error: ‘struct acp_dev_data’ h > as no member named ‘pci_rev’ > 444 | switch (adata->pci_rev) { > | ^~

1 0

Re: (subset) [PATCH 1/8] ASoC: SOF: amd: Fix for incorrect acp error satus register offset
by Mark Brown 08 Aug '24

08 Aug '24

On Wed, 07 Aug 2024 10:43:13 +0530, Vijendar Mukunda wrote: > Adding 'dsp_intr_base' to ACP error status register offset in irq handler > points to wrong register offset. ACP error status register offset got > changed from ACP 6.0 onwards. Add 'acp_error_stat' descriptor field and > update the value based on the ACP variant. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [5/8] ASoC: SOF: amd: update conditional check for cache register update commit: 001f8443d480773117a013a07f774d252f369bea [6/8] ASoC: SOF: amd: modify psp send command conditional checks (no commit info) [7/8] ASoC: SOF: amd: remove unused variable from sof_amd_acp_desc structure (no commit info) [8/8] ASoC: amd: acp: Convert comma to semicolon (no commit info) 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][next] ASoC: SOF: sof-audio: Avoid -Wflex-array-member-not-at-end warnings
by Mark Brown 08 Aug '24

08 Aug '24

On Mon, 05 Aug 2024 09:28:55 -0600, Gustavo A. R. Silva wrote: > -Wflex-array-member-not-at-end was introduced in GCC-14, and we are > getting ready to enable it, globally. > > Move the conflicting declaration to the end of the structure. Notice > that `struct snd_sof_pcm` ends in a flexible-array member through > `struct snd_soc_tplg_pcm` -> `struct snd_soc_tplg_private`. > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: SOF: sof-audio: Avoid -Wflex-array-member-not-at-end warnings commit: 5dde0cd2433dc6ef7b82e04276335137cc4c3105 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] sound: sof: ioc4-topology: avoid extra dai_params copy
by Arnd Bergmann 07 Aug '24

07 Aug '24

On Wed, Aug 7, 2024, at 17:09, Mark Brown wrote: > On Wed, Aug 07, 2024 at 10:02:27AM +0200, Arnd Bergmann wrote: > >> From what I can tell, this was unintentional, as both >> sof_ipc4_prepare_dai_copier() and sof_ipc4_prepare_copier_module() make a >> copy for the same purpose, but copying it once has the exact same effect. > >> Remove the extra copy and change the direct struct assignment to >> an explicit memcpy() call to make it clearer to the reader that this >> is what happens. Note that gcc treats struct assignment as a memcpy() >> that may be inlined anyway, so the resulting object code is the same. > > The effect of the copy is to ensure that if the function fails the > argument is unmodified - did you do the analysis to check that it's OK > to modify on error? Your commit log says "the same purpose" but never > specifies what that purpose is. There is always a chance that I misunderstood the code, but yes, I did understand that the idea is to not modify the parameters inside of sof_ipc4_prepare_dai_copier. The only caller is in sof_ipc4_prepare_copier_module(), which achieves the exact same bit by doing the same: /* * Use the fe_params as a base for the copier configuration. * The ref_params might get updated to reflect what format is * supported by the copier on the DAI side. * * In case of capture the ref_params returned will be used to * find the input configuration of the copier. */ memcpy(&ref_params, fe_params, sizeof(ref_params)); ret = sof_ipc4_prepare_dai_copier(sdev, dai, &ref_params, dir); if (ret < 0) return ret; So when sof_ipc4_prepare_dai_copier() fails, the caller's local 'ref_params' structure is no longer used anywhere. Arnd

2 1

[PATCH] sound: sof: ioc4-topology: avoid extra dai_params copy
by Arnd Bergmann 07 Aug '24

07 Aug '24

From: Arnd Bergmann <arnd(a)arndb.de> The snd_pcm_hw_params structure is really too large to fit on the stack. Because of the way that clang inlines functions, it ends up twice in one function, which exceeds the 1024 byte limit for 32-bit architecutes: sound/soc/sof/ipc4-topology.c:1700:1: error: stack frame size (1304) exceeds limit (1024) in 'sof_ipc4_prepare_copier_module' [-Werror,-Wframe-larger-than] sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget, From what I can tell, this was unintentional, as both sof_ipc4_prepare_dai_copier() and sof_ipc4_prepare_copier_module() make a copy for the same purpose, but copying it once has the exact same effect. Remove the extra copy and change the direct struct assignment to an explicit memcpy() call to make it clearer to the reader that this is what happens. Note that gcc treats struct assignment as a memcpy() that may be inlined anyway, so the resulting object code is the same. Fixes: f9209644ae76 ("ASoC: SOF: ipc4-topology: Correct DAI copier config and NHLT blob request") Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- sound/soc/sof/ipc4-topology.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/sound/soc/sof/ipc4-topology.c b/sound/soc/sof/ipc4-topology.c index 87be7f16e8c2..77f6850010f6 100644 --- a/sound/soc/sof/ipc4-topology.c +++ b/sound/soc/sof/ipc4-topology.c @@ -1651,7 +1651,6 @@ sof_ipc4_prepare_dai_copier(struct snd_sof_dev *sdev, struct snd_sof_dai *dai, struct snd_pcm_hw_params *params, int dir) { struct sof_ipc4_available_audio_format *available_fmt; - struct snd_pcm_hw_params dai_params = *params; struct sof_ipc4_copier_data *copier_data; struct sof_ipc4_pin_format *pin_fmts; struct sof_ipc4_copier *ipc4_copier; @@ -1676,7 +1675,7 @@ sof_ipc4_prepare_dai_copier(struct snd_sof_dev *sdev, struct snd_sof_dai *dai, num_pin_fmts = available_fmt->num_input_formats; } - ret = sof_ipc4_adjust_params_to_dai_format(sdev, &dai_params, pin_fmts, + ret = sof_ipc4_adjust_params_to_dai_format(sdev, params, pin_fmts, num_pin_fmts); if (ret) return ret; @@ -1684,15 +1683,11 @@ sof_ipc4_prepare_dai_copier(struct snd_sof_dev *sdev, struct snd_sof_dai *dai, single_bitdepth = sof_ipc4_copier_is_single_bitdepth(sdev, pin_fmts, num_pin_fmts); ret = snd_sof_get_nhlt_endpoint_data(sdev, dai, single_bitdepth, - &dai_params, + params, ipc4_copier->dai_index, ipc4_copier->dai_type, dir, &ipc4_copier->copier_config, &copier_data->gtw_cfg.config_length); - /* Update the params to reflect the changes made in this function */ - if (!ret) - *params = dai_params; - return ret; } @@ -1784,9 +1779,9 @@ sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget, * for capture. */ if (dir == SNDRV_PCM_STREAM_PLAYBACK) - ref_params = *fe_params; + memcpy(&ref_params, fe_params, sizeof(ref_params)); else - ref_params = *pipeline_params; + memcpy(&ref_params, pipeline_params, sizeof(ref_params)); copier_data->gtw_cfg.node_id &= ~SOF_IPC4_NODE_INDEX_MASK; copier_data->gtw_cfg.node_id |= @@ -1819,7 +1814,7 @@ sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget, * In case of capture the ref_params returned will be used to * find the input configuration of the copier. */ - ref_params = *fe_params; + memcpy(&ref_params, fe_params, sizeof(ref_params)); ret = sof_ipc4_prepare_dai_copier(sdev, dai, &ref_params, dir); if (ret < 0) return ret; @@ -1829,7 +1824,7 @@ sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget, * input configuration of the copier. */ if (dir == SNDRV_PCM_STREAM_PLAYBACK) - ref_params = *pipeline_params; + memcpy(&ref_params, pipeline_params, sizeof(ref_params)); break; } @@ -1838,7 +1833,7 @@ sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget, ipc4_copier = (struct sof_ipc4_copier *)swidget->private; copier_data = &ipc4_copier->data; available_fmt = &ipc4_copier->available_fmt; - ref_params = *pipeline_params; + memcpy(&ref_params, pipeline_params, sizeof(ref_params)); break; } -- 2.39.2

3 2

[PATCH 7/8] ASoC: SOF: amd: remove unused variable from sof_amd_acp_desc structure
by Vijendar Mukunda 07 Aug '24

07 Aug '24

Remove unused structure member 'rev' from sof_amd_acp_desc structure. Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda(a)amd.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/soc/sof/amd/acp.h | 1 - sound/soc/sof/amd/pci-acp63.c | 1 - sound/soc/sof/amd/pci-rmb.c | 1 - sound/soc/sof/amd/pci-rn.c | 1 - sound/soc/sof/amd/pci-vangogh.c | 1 - 5 files changed, 5 deletions(-) diff --git a/sound/soc/sof/amd/acp.h b/sound/soc/sof/amd/acp.h index 321c40cc6d50..11def07efc0f 100644 --- a/sound/soc/sof/amd/acp.h +++ b/sound/soc/sof/amd/acp.h @@ -190,7 +190,6 @@ struct acp_dsp_stream { }; struct sof_amd_acp_desc { - unsigned int rev; const char *name; unsigned int host_bridge_id; u32 pgfsm_base; diff --git a/sound/soc/sof/amd/pci-acp63.c b/sound/soc/sof/amd/pci-acp63.c index e90658ba2bd7..b54ed61b79ed 100644 --- a/sound/soc/sof/amd/pci-acp63.c +++ b/sound/soc/sof/amd/pci-acp63.c @@ -28,7 +28,6 @@ #define ACP6x_REG_END 0x125C000 static const struct sof_amd_acp_desc acp63_chip_info = { - .rev = 6, .host_bridge_id = HOST_BRIDGE_ACP63, .pgfsm_base = ACP6X_PGFSM_BASE, .ext_intr_enb = ACP6X_EXTERNAL_INTR_ENB, diff --git a/sound/soc/sof/amd/pci-rmb.c b/sound/soc/sof/amd/pci-rmb.c index a366f904e6f3..c45256bf4fda 100644 --- a/sound/soc/sof/amd/pci-rmb.c +++ b/sound/soc/sof/amd/pci-rmb.c @@ -28,7 +28,6 @@ #define ACP6X_FUTURE_REG_ACLK_0 0x1854 static const struct sof_amd_acp_desc rembrandt_chip_info = { - .rev = 6, .host_bridge_id = HOST_BRIDGE_RMB, .pgfsm_base = ACP6X_PGFSM_BASE, .ext_intr_stat = ACP6X_EXT_INTR_STAT, diff --git a/sound/soc/sof/amd/pci-rn.c b/sound/soc/sof/amd/pci-rn.c index 2b7c53470ce8..386a0f1e7ee0 100644 --- a/sound/soc/sof/amd/pci-rn.c +++ b/sound/soc/sof/amd/pci-rn.c @@ -28,7 +28,6 @@ #define ACP3X_FUTURE_REG_ACLK_0 0x1860 static const struct sof_amd_acp_desc renoir_chip_info = { - .rev = 3, .host_bridge_id = HOST_BRIDGE_CZN, .pgfsm_base = ACP3X_PGFSM_BASE, .ext_intr_stat = ACP3X_EXT_INTR_STAT, diff --git a/sound/soc/sof/amd/pci-vangogh.c b/sound/soc/sof/amd/pci-vangogh.c index eba580840100..cb845f81795e 100644 --- a/sound/soc/sof/amd/pci-vangogh.c +++ b/sound/soc/sof/amd/pci-vangogh.c @@ -26,7 +26,6 @@ #define ACP5X_FUTURE_REG_ACLK_0 0x1864 static const struct sof_amd_acp_desc vangogh_chip_info = { - .rev = 5, .name = "vangogh", .host_bridge_id = HOST_BRIDGE_VGH, .pgfsm_base = ACP5X_PGFSM_BASE, -- 2.34.1

1 0

[PATCH 2/8] ASoC: SOF: amd: fix for acp error reason registers wrong offset
by Vijendar Mukunda 07 Aug '24

07 Aug '24

Fix the incorrect register offsets for acp error reason registers. Add 'acp_sw0_i2s_err_reason' as register field in acp descriptor structure and update the value based on the acp variant. ACP_SW1_ERROR_REASON register was added from Rembrandt platform onwards. Add conditional check for the same. Fixes: 96eb81851012 ("ASoC: SOF: amd: add interrupt handling for SoundWire manager devices") Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda(a)amd.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/soc/sof/amd/acp-dsp-offset.h | 3 ++- sound/soc/sof/amd/acp.c | 5 +++-- sound/soc/sof/amd/acp.h | 1 + sound/soc/sof/amd/pci-acp63.c | 1 + sound/soc/sof/amd/pci-rmb.c | 1 + sound/soc/sof/amd/pci-rn.c | 1 + 6 files changed, 9 insertions(+), 3 deletions(-) diff --git a/sound/soc/sof/amd/acp-dsp-offset.h b/sound/soc/sof/amd/acp-dsp-offset.h index 66968efda869..072b703f9b3f 100644 --- a/sound/soc/sof/amd/acp-dsp-offset.h +++ b/sound/soc/sof/amd/acp-dsp-offset.h @@ -83,7 +83,8 @@ #define ACP6X_AXI2DAGB_SEM_0 0x1874 /* ACP common registers to report errors related to I2S & SoundWire interfaces */ -#define ACP_SW0_I2S_ERROR_REASON 0x18B4 +#define ACP3X_SW_I2S_ERROR_REASON 0x18C8 +#define ACP6X_SW0_I2S_ERROR_REASON 0x18B4 #define ACP_SW1_I2S_ERROR_REASON 0x1A50 /* Registers from ACP_SHA block */ diff --git a/sound/soc/sof/amd/acp.c b/sound/soc/sof/amd/acp.c index d0b7d1c54248..9ce8b5ccb3d7 100644 --- a/sound/soc/sof/amd/acp.c +++ b/sound/soc/sof/amd/acp.c @@ -403,8 +403,9 @@ static irqreturn_t acp_irq_handler(int irq, void *dev_id) if (val & ACP_ERROR_IRQ_MASK) { snd_sof_dsp_write(sdev, ACP_DSP_BAR, desc->ext_intr_stat, ACP_ERROR_IRQ_MASK); - snd_sof_dsp_write(sdev, ACP_DSP_BAR, base + ACP_SW0_I2S_ERROR_REASON, 0); - snd_sof_dsp_write(sdev, ACP_DSP_BAR, base + ACP_SW1_I2S_ERROR_REASON, 0); + snd_sof_dsp_write(sdev, ACP_DSP_BAR, desc->acp_sw0_i2s_err_reason, 0); + if (adata->pci_rev >= ACP_RMB_PCI_ID) + snd_sof_dsp_write(sdev, ACP_DSP_BAR, ACP_SW1_I2S_ERROR_REASON, 0); snd_sof_dsp_write(sdev, ACP_DSP_BAR, desc->acp_error_stat, 0); irq_flag = 1; } diff --git a/sound/soc/sof/amd/acp.h b/sound/soc/sof/amd/acp.h index 6ac853ff6093..f6f0fcfeb691 100644 --- a/sound/soc/sof/amd/acp.h +++ b/sound/soc/sof/amd/acp.h @@ -204,6 +204,7 @@ struct sof_amd_acp_desc { u32 reg_start_addr; u32 reg_end_addr; u32 acp_error_stat; + u32 acp_sw0_i2s_err_reason; u32 sdw_max_link_count; u64 sdw_acpi_dev_addr; }; diff --git a/sound/soc/sof/amd/pci-acp63.c b/sound/soc/sof/amd/pci-acp63.c index c3da70549995..e90658ba2bd7 100644 --- a/sound/soc/sof/amd/pci-acp63.c +++ b/sound/soc/sof/amd/pci-acp63.c @@ -36,6 +36,7 @@ static const struct sof_amd_acp_desc acp63_chip_info = { .ext_intr_stat = ACP6X_EXT_INTR_STAT, .ext_intr_stat1 = ACP6X_EXT_INTR_STAT1, .acp_error_stat = ACP6X_ERROR_STATUS, + .acp_sw0_i2s_err_reason = ACP6X_SW0_I2S_ERROR_REASON, .dsp_intr_base = ACP6X_DSP_SW_INTR_BASE, .sram_pte_offset = ACP6X_SRAM_PTE_OFFSET, .hw_semaphore_offset = ACP6X_AXI2DAGB_SEM_0, diff --git a/sound/soc/sof/amd/pci-rmb.c b/sound/soc/sof/amd/pci-rmb.c index 194b7ff37e9e..a366f904e6f3 100644 --- a/sound/soc/sof/amd/pci-rmb.c +++ b/sound/soc/sof/amd/pci-rmb.c @@ -34,6 +34,7 @@ static const struct sof_amd_acp_desc rembrandt_chip_info = { .ext_intr_stat = ACP6X_EXT_INTR_STAT, .dsp_intr_base = ACP6X_DSP_SW_INTR_BASE, .acp_error_stat = ACP6X_ERROR_STATUS, + .acp_sw0_i2s_err_reason = ACP6X_SW0_I2S_ERROR_REASON, .sram_pte_offset = ACP6X_SRAM_PTE_OFFSET, .hw_semaphore_offset = ACP6X_AXI2DAGB_SEM_0, .fusion_dsp_offset = ACP6X_DSP_FUSION_RUNSTALL, diff --git a/sound/soc/sof/amd/pci-rn.c b/sound/soc/sof/amd/pci-rn.c index bff2d979ea6a..2b7c53470ce8 100644 --- a/sound/soc/sof/amd/pci-rn.c +++ b/sound/soc/sof/amd/pci-rn.c @@ -34,6 +34,7 @@ static const struct sof_amd_acp_desc renoir_chip_info = { .ext_intr_stat = ACP3X_EXT_INTR_STAT, .dsp_intr_base = ACP3X_DSP_SW_INTR_BASE, .acp_error_stat = ACP3X_ERROR_STATUS, + .acp_sw0_i2s_err_reason = ACP3X_SW_I2S_ERROR_REASON, .sram_pte_offset = ACP3X_SRAM_PTE_OFFSET, .hw_semaphore_offset = ACP3X_AXI2DAGB_SEM_0, .acp_clkmux_sel = ACP3X_CLKMUX_SEL, -- 2.34.1

1 0

[PATCH RESEND 28/31] ASoC: amd: acp: add soundwire machines for acp6.3 based platform
by Vijendar Mukunda 01 Aug '24

01 Aug '24

Add Soundwire machines for acp6.3 based platform. Link: https://github.com/thesofproject/linux/pull/5068 Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda(a)amd.com> Reviewed-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/soc/amd/acp/Kconfig | 4 ++ sound/soc/amd/acp/Makefile | 2 + sound/soc/amd/acp/amd-acp63-acpi-match.c | 90 ++++++++++++++++++++++++ sound/soc/amd/mach-config.h | 1 + sound/soc/sof/amd/Kconfig | 1 + 5 files changed, 98 insertions(+) create mode 100644 sound/soc/amd/acp/amd-acp63-acpi-match.c diff --git a/sound/soc/amd/acp/Kconfig b/sound/soc/amd/acp/Kconfig index 30590a23ad63..19859b1b73c5 100644 --- a/sound/soc/amd/acp/Kconfig +++ b/sound/soc/amd/acp/Kconfig @@ -13,6 +13,10 @@ config SND_SOC_AMD_ACP_COMMON This option enables common modules for Audio-Coprocessor i.e. ACP IP block on AMD platforms. +config SND_SOC_ACPI_AMD_MATCH + tristate + select SND_SOC_ACPI if ACPI + if SND_SOC_AMD_ACP_COMMON config SND_SOC_AMD_ACP_PDM diff --git a/sound/soc/amd/acp/Makefile b/sound/soc/amd/acp/Makefile index b068bf1f920e..516a44f3ffb6 100644 --- a/sound/soc/amd/acp/Makefile +++ b/sound/soc/amd/acp/Makefile @@ -22,6 +22,7 @@ snd-acp70-y := acp70.o snd-acp-mach-y := acp-mach-common.o snd-acp-legacy-mach-y := acp-legacy-mach.o acp3x-es83xx/acp3x-es83xx.o snd-acp-sof-mach-y := acp-sof-mach.o +snd-soc-acpi-amd-match-y := amd-acp63-acpi-match.o obj-$(CONFIG_SND_SOC_AMD_ACP_PCM) += snd-acp-pcm.o obj-$(CONFIG_SND_SOC_AMD_ACP_I2S) += snd-acp-i2s.o @@ -38,3 +39,4 @@ obj-$(CONFIG_SND_AMD_SOUNDWIRE_ACPI) += snd-amd-sdw-acpi.o obj-$(CONFIG_SND_SOC_AMD_MACH_COMMON) += snd-acp-mach.o obj-$(CONFIG_SND_SOC_AMD_LEGACY_MACH) += snd-acp-legacy-mach.o obj-$(CONFIG_SND_SOC_AMD_SOF_MACH) += snd-acp-sof-mach.o +obj-$(CONFIG_SND_SOC_ACPI_AMD_MATCH) += snd-soc-acpi-amd-match.o diff --git a/sound/soc/amd/acp/amd-acp63-acpi-match.c b/sound/soc/amd/acp/amd-acp63-acpi-match.c new file mode 100644 index 000000000000..be9367913073 --- /dev/null +++ b/sound/soc/amd/acp/amd-acp63-acpi-match.c @@ -0,0 +1,90 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * amd-acp63-acpi-match.c - tables and support for ACP 6.3 platform + * ACPI enumeration. + * + * Copyright 2024 Advanced Micro Devices, Inc. + */ + +#include <sound/soc-acpi.h> +#include "../mach-config.h" + +static const struct snd_soc_acpi_endpoint single_endpoint = { + .num = 0, + .aggregated = 0, + .group_position = 0, + .group_id = 0 +}; + +static const struct snd_soc_acpi_endpoint spk_l_endpoint = { + .num = 0, + .aggregated = 1, + .group_position = 0, + .group_id = 1 +}; + +static const struct snd_soc_acpi_endpoint spk_r_endpoint = { + .num = 0, + .aggregated = 1, + .group_position = 1, + .group_id = 1 +}; + +static const struct snd_soc_acpi_adr_device rt711_rt1316_group_adr[] = { + { + .adr = 0x000030025D071101ull, + .num_endpoints = 1, + .endpoints = &single_endpoint, + .name_prefix = "rt711" + }, + { + .adr = 0x000030025D131601ull, + .num_endpoints = 1, + .endpoints = &spk_l_endpoint, + .name_prefix = "rt1316-1" + }, + { + .adr = 0x000032025D131601ull, + .num_endpoints = 1, + .endpoints = &spk_r_endpoint, + .name_prefix = "rt1316-2" + }, +}; + +static const struct snd_soc_acpi_adr_device rt714_adr[] = { + { + .adr = 0x130025d071401ull, + .num_endpoints = 1, + .endpoints = &single_endpoint, + .name_prefix = "rt714" + } +}; + +static const struct snd_soc_acpi_link_adr acp63_4_in_1_sdca[] = { + { .mask = BIT(0), + .num_adr = ARRAY_SIZE(rt711_rt1316_group_adr), + .adr_d = rt711_rt1316_group_adr, + }, + { + .mask = BIT(1), + .num_adr = ARRAY_SIZE(rt714_adr), + .adr_d = rt714_adr, + }, + {} +}; + +struct snd_soc_acpi_mach snd_soc_acpi_amd_acp63_sof_sdw_machines[] = { + { + .link_mask = BIT(0) | BIT(1), + .links = acp63_4_in_1_sdca, + .drv_name = "amd_sof_sdw", + .sof_tplg_filename = "sof-acp_6_3-rt711-l0-rt1316-l0-rt714-l1.tplg", + .fw_filename = "sof-acp_6_3.ri", + }, + {}, +}; +EXPORT_SYMBOL(snd_soc_acpi_amd_acp63_sof_sdw_machines); + +MODULE_DESCRIPTION("AMD ACP6.3 tables and support for ACPI enumeration"); +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Vijendar.Mukunda(a)amd.com"); diff --git a/sound/soc/amd/mach-config.h b/sound/soc/amd/mach-config.h index 7af0f9cf3921..32aa8a6931f4 100644 --- a/sound/soc/amd/mach-config.h +++ b/sound/soc/amd/mach-config.h @@ -23,6 +23,7 @@ extern struct snd_soc_acpi_mach snd_soc_acpi_amd_sof_machines[]; extern struct snd_soc_acpi_mach snd_soc_acpi_amd_rmb_sof_machines[]; extern struct snd_soc_acpi_mach snd_soc_acpi_amd_vangogh_sof_machines[]; extern struct snd_soc_acpi_mach snd_soc_acpi_amd_acp63_sof_machines[]; +extern struct snd_soc_acpi_mach snd_soc_acpi_amd_acp63_sof_sdw_machines[]; struct config_entry { u32 flags; diff --git a/sound/soc/sof/amd/Kconfig b/sound/soc/sof/amd/Kconfig index 2729c6eb3feb..848c031ed5fb 100644 --- a/sound/soc/sof/amd/Kconfig +++ b/sound/soc/sof/amd/Kconfig @@ -23,6 +23,7 @@ config SND_SOC_SOF_AMD_COMMON select SND_AMD_ACP_CONFIG select SND_SOC_SOF_XTENSA select SND_SOC_SOF_ACP_PROBES + select SND_SOC_ACPI_AMD_MATCH select SND_SOC_ACPI if ACPI help This option is not user-selectable but automatically handled by -- 2.34.1

1 0