ASoC: amd: ps: Propagate the PCI subsystem Vendor and Device IDs
Subsystems (3)
cover ASoC: amd: ps: Propagate the PCI subsystem Vendor and Device IDs
This chain of two patches propagates the PCI subsystem Vendor and Device IDs so that they can be used by component drivers to differentiate firmware loads.
Simon Trimmer (2):
ASoC: amd: ps: Propagate the PCI subsystem Vendor and Device IDs
ASoC: amd: amd_sdw: Propagate the PCI subsystem Vendor and Device IDs
sound/soc/amd/acp/acp-sdw-legacy-mach.c | 4 ++++ sound/soc/amd/ps/acp63.h | 2 ++ sound/soc/amd/ps/pci-ps.c | 9 +++++++++ 3 files changed, 15 insertions(+)
Signature · 1 line
2.43.0
PATCH 1/2 ASoC: amd: ps: Propagate the PCI subsystem Vendor and Device IDs
Extend the ACP machine driver to propagate the PCI subsystem Vendor and Device IDs so that they may be subsequently used as an SSID.
--- sound/soc/amd/ps/acp63.h | 2 ++ sound/soc/amd/ps/pci-ps.c | 9 +++++++++ 2 files changed, 11 insertions(+)
sound/soc/amd/ps/acp63.h +2 -0
@@ -370,6 +370,8 @@ struct acp63_dev_data {u32 addr;u32 reg_range;u32 acp_rev; +u32 subsystem_vendor; +u32 subsystem_device;u32 acp_sw_pad_keeper_en;u32 acp_pad_pulldown_ctrl;u16 acp63_sdw0_dma_intr_stat[ACP63_SDW0_DMA_MAX_STREAMS ];
sound/soc/amd/ps/pci-ps.c +9 -0
@@ -335,6 +335,12 @@ static struct snd_soc_acpi_mach *acp63_sdw_machine_select(struct device *dev) mach->mach_params.links = mach->links; mach->mach_params.link_mask = mach->link_mask; mach->mach_params.subsystem_rev = acp_data->acp_rev; + mach->mach_params.subsystem_vendor = acp_data->subsystem_vendor; + mach->mach_params.subsystem_device = acp_data->subsystem_device; + mach->mach_params.subsystem_id_set = true; + +dev_dbg (dev,"SSID %x%x\n" , mach->mach_params.subsystem_vendor, + mach->mach_params.subsystem_device);return mach; } }
@@ -617,6 +623,9 @@ static int snd_acp63_probe(struct pci_dev *pci, adata->addr = addr; adata->reg_range =ACP63_REG_END -ACP63_REG_START ; adata->acp_rev = pci->revision; + adata->subsystem_vendor = pci->subsystem_vendor; + adata->subsystem_device = pci->subsystem_device; +pci_set_master (pci);pci_set_drvdata (pci, adata);mutex_init (&adata->acp_lock);
Signature · 1 line
2.43.0
PATCH 2/2 ASoC: amd: amd_sdw: Propagate the PCI subsystem Vendor and Device IDs
In reply to Simon TrimmerExtend the ACP SoundWire legacy machine driver to propagate the PCI subsystem Vendor and Device IDs so that they may be used by component drivers for SKU specific variation.
--- sound/soc/amd/acp/acp-sdw-legacy-mach.c | 4 ++++ 1 file changed, 4 insertions(+)
sound/soc/amd/acp/acp-sdw-legacy-mach.c +4 -0
@@ -463,6 +463,10 @@ static int mc_probe(struct platform_device *pdev) card->late_probe = asoc_sdw_card_late_probe;snd_soc_card_set_drvdata (card, ctx); +if (mach->mach_params.subsystem_id_set) +snd_soc_card_set_pci_ssid (card, + mach->mach_params.subsystem_vendor, + mach->mach_params.subsystem_device);dmi_check_system (soc_sdw_quirk_table);
Signature · 1 line
2.43.0
Mark Brown
maintainerQuoted 3 lines · Simon Trimmer
This chain of two patches propagates the PCI subsystem Vendor and Device IDs so that they can be used by component drivers to differentiate firmware loads.
They're called patch serieses.
Quoted 4 lines · Simon Trimmer
This chain of two patches propagates the PCI subsystem Vendor and Device IDs so that they can be used by component drivers to differentiate firmware loads.
Quoted 9 lines
Simon Trimmer (2):
ASoC: amd: ps: Propagate the PCI subsystem Vendor and Device IDs
ASoC: amd:amd_sdw: Propagate the PCI subsystem Vendor and Device IDssound/soc/amd/acp/acp-sdw-legacy-mach.c | 4 ++++ sound/soc/amd/ps/acp63.h | 2 ++ sound/soc/amd/ps/pci-ps.c | 9 +++++++++ 3 files changed, 15 insertions(+)
Mark Brown
maintainerQuoted 9 lines · Simon Trimmer
This chain of two patches propagates the PCI subsystem Vendor and Device IDs so that they can be used by component drivers to differentiate firmware loads.
Simon Trimmer (2):
ASoC: amd: ps: Propagate the PCI subsystem Vendor and Device IDs
ASoC: amd:amd_sdw: Propagate the PCI subsystem Vendor and Device IDs[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/2] ASoC: amd: ps: Propagate the PCI subsystem Vendor and Device IDs
commit: aab1301cfde344f966bbc442a4e655867ab56768
[2/2] ASoC: amd: amd_sdw: Propagate the PCI subsystem Vendor and Device IDs
commit: 6658472a3e2de08197acfe099ba71ee0e2505ecfAll 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