ASoC: SOF: Intel: pci-tgl: fix ADL-N descriptor
Subsystems (3)
PATCH 1/1 ASoC: SOF: Intel: pci-tgl: fix ADL-N descriptor
ADL-N uses a different signing key, which means we can't reuse the regular ADL descriptor used for ADL-P/M/S.
--- sound/soc/sof/intel/pci-tgl.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-)
sound/soc/sof/intel/pci-tgl.c +32 -1
@@ -159,6 +159,37 @@ static const struct sof_dev_desc adl_desc = { .ops_init = sof_tgl_ops_init, }; +static const struct sof_dev_desc adl_n_desc = { + .machines = snd_soc_acpi_intel_adl_machines, + .alt_machines = snd_soc_acpi_intel_adl_sdw_machines, + .use_acpi_target_states = true, + .resindex_lpe_base =0 , + .resindex_pcicfg_base =-1 , + .resindex_imr_base =-1 , + .irqindex_host_ipc =-1 , + .chip_info = &tgl_chip_info, + .ipc_supported_mask =BIT (SOF_IPC ) |BIT (SOF_INTEL_IPC4 ), + .ipc_default =SOF_IPC , + .default_fw_path = { + [SOF_IPC ] ="intel/sof" , + [SOF_INTEL_IPC4 ] ="intel/avs/adl-n" , + }, + .default_lib_path = { + [SOF_INTEL_IPC4 ] ="intel/avs-lib/adl-n" , + }, + .default_tplg_path = { + [SOF_IPC ] ="intel/sof-tplg" , + [SOF_INTEL_IPC4 ] ="intel/avs-tplg" , + }, + .default_fw_filename = { + [SOF_IPC ] ="sof-adl-n.ri" , + [SOF_INTEL_IPC4 ] ="dsp_basefw.bin" , + }, + .nocodec_tplg_filename ="sof-adl-nocodec.tplg" , + .ops = &sof_tgl_ops, + .ops_init = sof_tgl_ops_init, +}; +static const struct sof_dev_desc rpls_desc = { .machines = snd_soc_acpi_intel_rpl_machines, .alt_machines = snd_soc_acpi_intel_rpl_sdw_machines,
@@ -246,7 +277,7 @@ static const struct pci_device_id sof_pci_ids[] = { { PCI_DEVICE(0x8086, 0x51cf), /* RPL-PX */ .driver_data = (unsigned long)&rpl_desc}, { PCI_DEVICE(0x8086, 0x54c8), /* ADL-N */ - .driver_data = (unsigned long)&adl_desc}, + .driver_data = (unsigned long)&adl_n_desc}, { 0, } };MODULE_DEVICE_TABLE (pci, sof_pci_ids);
Signature · 1 line
2.34.1
Mark Brown
maintainerQuoted 2 lines · Pierre-Louis Bossart
ADL-N uses a different signing key, which means we can't reuse the regular ADL descriptor used for ADL-P/M/S.
This breaks an x86 allmodconfig build:
/build/stage/linux/sound/soc/sof/intel/pci-tgl.c:177:10: error: ‘const struct sof_dev_desc’ has no member named ‘default_lib_path’; did you mean ‘default_fw_path’?
177 | .default_lib_path = {
| ^~~~~~~~~~~~~~~~
| default_fw_pathQuoted 10 lines · Mark Brown
Quoted 2 lines · Pierre-Louis Bossart
ADL-N uses a different signing key, which means we can't reuse the regular ADL descriptor used for ADL-P/M/S.
This breaks an x86 allmodconfig build:
/build/stage/linux/sound/soc/sof/intel/pci-tgl.c:177:10: error: ‘const struct sof_dev_desc’ has no member named ‘default_lib_path’; did you mean ‘default_fw_path’?
177 | .default_lib_path = { | ^~~~~~~~~~~~~~~~ | default_fw_path
My bad, this version depends on Peter's series, but it should be simplified to be applied on stable.
Mark Brown
maintainerQuoted 4 lines · Pierre-Louis Bossart
ADL-N uses a different signing key, which means we can't reuse the regular ADL descriptor used for ADL-P/M/S.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: SOF: Intel: pci-tgl: fix ADL-N descriptor
commit: 05de5cf6fb7d73d2bf0a0c882433f31db5c93f63
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