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

[PATCH AUTOSEL 6.6 03/36] ASoC: SOF: Pass PCI SSID to machine driver
by Sasha Levin 07 Nov '23

07 Nov '23

From: Richard Fitzgerald <rf(a)opensource.cirrus.com> [ Upstream commit ba2de401d32625fe538d3f2c00ca73740dd2d516 ] Pass the PCI SSID of the audio interface through to the machine driver. This allows the machine driver to use the SSID to uniquely identify the specific hardware configuration and apply any platform-specific configuration. struct snd_sof_pdata is passed around inside the SOF code, but it then passes configuration information to the machine driver through struct snd_soc_acpi_mach and struct snd_soc_acpi_mach_params. So SSID information has been added to both snd_sof_pdata and snd_soc_acpi_mach_params. PCI does not define 0x0000 as an invalid value so we can't use zero to indicate that the struct member was not written. Instead a flag is included to indicate that a value has been written to the subsystem_vendor and subsystem_device members. sof_pci_probe() creates the struct snd_sof_pdata. It is passed a struct pci_dev so it can fill in the SSID value. sof_machine_check() finds the appropriate struct snd_soc_acpi_mach. It copies the SSID information across to the struct snd_soc_acpi_mach_params. This done before calling any custom set_mach_params() so that it could be used by the set_mach_params() callback to apply variant params. The machine driver receives the struct snd_soc_acpi_mach as its platform_data. Signed-off-by: Richard Fitzgerald <rf(a)opensource.cirrus.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Link: https://lore.kernel.org/r/20230912163207.3498161-3-rf@opensource.cirrus.com Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- include/sound/soc-acpi.h | 7 +++++++ include/sound/sof.h | 8 ++++++++ sound/soc/sof/sof-audio.c | 7 +++++++ sound/soc/sof/sof-pci-dev.c | 8 ++++++++ 4 files changed, 30 insertions(+) diff --git a/include/sound/soc-acpi.h b/include/sound/soc-acpi.h index 6d31d535e8f6d..23d6d6bfb0736 100644 --- a/include/sound/soc-acpi.h +++ b/include/sound/soc-acpi.h @@ -68,6 +68,10 @@ static inline struct snd_soc_acpi_mach *snd_soc_acpi_codec_list(void *arg) * @i2s_link_mask: I2S/TDM links enabled on the board * @num_dai_drivers: number of elements in @dai_drivers * @dai_drivers: pointer to dai_drivers, used e.g. in nocodec mode + * @subsystem_vendor: optional PCI SSID vendor value + * @subsystem_device: optional PCI SSID device value + * @subsystem_id_set: true if a value has been written to + * subsystem_vendor and subsystem_device. */ struct snd_soc_acpi_mach_params { u32 acpi_ipc_irq_index; @@ -80,6 +84,9 @@ struct snd_soc_acpi_mach_params { u32 i2s_link_mask; u32 num_dai_drivers; struct snd_soc_dai_driver *dai_drivers; + unsigned short subsystem_vendor; + unsigned short subsystem_device; + bool subsystem_id_set; }; /** diff --git a/include/sound/sof.h b/include/sound/sof.h index d3c41f87ac319..51294f2ba302c 100644 --- a/include/sound/sof.h +++ b/include/sound/sof.h @@ -64,6 +64,14 @@ struct snd_sof_pdata { const char *name; const char *platform; + /* + * PCI SSID. As PCI does not define 0 as invalid, the subsystem_id_set + * flag indicates that a value has been written to these members. + */ + unsigned short subsystem_vendor; + unsigned short subsystem_device; + bool subsystem_id_set; + struct device *dev; /* diff --git a/sound/soc/sof/sof-audio.c b/sound/soc/sof/sof-audio.c index e5405f854a910..563fe6f7789f7 100644 --- a/sound/soc/sof/sof-audio.c +++ b/sound/soc/sof/sof-audio.c @@ -1032,6 +1032,13 @@ int sof_machine_check(struct snd_sof_dev *sdev) mach = snd_sof_machine_select(sdev); if (mach) { sof_pdata->machine = mach; + + if (sof_pdata->subsystem_id_set) { + mach->mach_params.subsystem_vendor = sof_pdata->subsystem_vendor; + mach->mach_params.subsystem_device = sof_pdata->subsystem_device; + mach->mach_params.subsystem_id_set = true; + } + snd_sof_set_mach_params(mach, sdev); return 0; } diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c index f5ece43d0ec24..146d25983b08b 100644 --- a/sound/soc/sof/sof-pci-dev.c +++ b/sound/soc/sof/sof-pci-dev.c @@ -214,6 +214,14 @@ int sof_pci_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) return ret; sof_pdata->name = pci_name(pci); + + /* PCI defines a vendor ID of 0xFFFF as invalid. */ + if (pci->subsystem_vendor != 0xFFFF) { + sof_pdata->subsystem_vendor = pci->subsystem_vendor; + sof_pdata->subsystem_device = pci->subsystem_device; + sof_pdata->subsystem_id_set = true; + } + sof_pdata->desc = desc; sof_pdata->dev = dev; -- 2.42.0

1 0

Re: [PATCH] ASoC: SOF: sof-client: trivial: fix comment typo
by Mark Brown 07 Nov '23

07 Nov '23

On Tue, 31 Oct 2023 13:22:18 +0200, Eugen Hristev wrote: > Fix typo s/depndent/dependent > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: SOF: sof-client: trivial: fix comment typo commit: 45f2f28bd498fb697d07a38775d55f0f50fee5ca 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 2/3] ASoC: SOF: mediatek: mt8186: clean up unused code
by AngeloGioacchino Del Regno 07 Nov '23

07 Nov '23

Il 03/11/23 10:54, Trevor Wu ha scritto: > Since there are some variables that are no longer being used, we remove > the code that was implemented for those variables. > > Signed-off-by: Trevor Wu <trevor.wu(a)mediatek.com> > Reviewed-by: Yaochun Hung <yc.hung(a)mediatek.com> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno(a)collabora.com>

1 0

Re: [PATCH 1/3] ASoC: SOF: mediatek: mt8195: clean up unused code
by AngeloGioacchino Del Regno 07 Nov '23

07 Nov '23

Il 03/11/23 10:54, Trevor Wu ha scritto: > Since there are some variables that are no longer being used, we remove > the code that was implemented for those variables. > > Signed-off-by: Trevor Wu <trevor.wu(a)mediatek.com> > Reviewed-by: Yaochun Hung <yc.hung(a)mediatek.com> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno(a)collabora.com> On MT8195 Cherry Tomato: Tested-by: AngeloGioacchino Del Regno <angelogioacchino.delregno(a)collabora.com>

1 0

Re: [PATCH 3/3] ASoC: SOF: mediatek: remove unused variables
by AngeloGioacchino Del Regno 07 Nov '23

07 Nov '23

Il 03/11/23 10:54, Trevor Wu ha scritto: > To prevent confusion on the follow-up platform, it is necessary to > remove any unused variables within the struct mtk_adsp_chip_info. > > Signed-off-by: Trevor Wu <trevor.wu(a)mediatek.com> > Reviewed-by: Yaochun Hung <yc.hung(a)mediatek.com> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno(a)collabora.com>

1 0

Re: [PATCH] ASoC: SOF: sof-client: trivial: fix comment typo
by AngeloGioacchino Del Regno 03 Nov '23

03 Nov '23

Il 31/10/23 12:22, Eugen Hristev ha scritto: > Fix typo s/depndent/dependent > > Fixes: 6e9548cdb30e ("ASoC: SOF: Convert the generic IPC flood test into SOF client") > Signed-off-by: Eugen Hristev <eugen.hristev(a)collabora.com> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno(a)collabora.com>

1 0