ASoC/SOF/PCI/Intel: add Wildcat Lake support
Subsystems (4)
Peter Ujfalusi
maintainerv2 cover ASoC/SOF/PCI/Intel: add Wildcat Lake support
Hi,
Changes since v1:
- The PCI ID patch commit subject and message updated
- Reviewed-by, Acked-by tags added to patches
The audio IP in Wildcat Lake (WCL) is largely identical to the one in Panther Lake, the main difference is the number of DSP cores, memory and clocking.
It is based on the same ACE3 architecture.
In SOF the PTL topologies can be re-used for WCL to reduce duplication of code and topology files.
Regards,
Peter
---
Kai Vehmanen (1):
ALSA: hda: add HDMI codec ID for Intel WCL
Peter Ujfalusi (4):
PCI: Add Intel Wildcat Lake audio Device ID
ASoC: SOF: Intel: add initial support for WCL
ALSA: hda: intel-dsp-config: Add WCL support
ALSA: hda: hda-intel: add Wildcat Lake support
include/linux/pci_ids.h | 1 + sound/hda/intel-dsp-config.c | 6 +++++- sound/pci/hda/hda_intel.c | 2 ++ sound/pci/hda/patch_hdmi.c | 1 + sound/soc/sof/intel/hda.h | 1 + sound/soc/sof/intel/pci-ptl.c | 30 ++++++++++++++++++++++++++++++ sound/soc/sof/intel/ptl.c | 23 +++++++++++++++++++++++ 7 files changed, 63 insertions(+), 1 deletion(-)
Signature · 1 line
2.49.0
Peter Ujfalusi
maintainerPATCH v2 1/5 PCI: Add Intel Wildcat Lake audio Device ID
Add Wildcat Lake (WCL) audio Device ID.
--- include/linux/pci_ids.h | 1 + 1 file changed, 1 insertion(+)
include/linux/pci_ids.h +1 -0
@@ -3049,6 +3049,7 @@#define PCI_DEVICE_ID_INTEL_HDA_DG1 0x490d#define PCI_DEVICE_ID_INTEL_HDA_EHL_0 0x4b55#define PCI_DEVICE_ID_INTEL_HDA_EHL_3 0x4b58 +#define PCI_DEVICE_ID_INTEL_HDA_WCL 0x4d28#define PCI_DEVICE_ID_INTEL_HDA_JSL_N 0x4dc8#define PCI_DEVICE_ID_INTEL_HDA_DG2_0 0x4f90#define PCI_DEVICE_ID_INTEL_HDA_DG2_1 0x4f91
Signature · 1 line
2.49.0
Peter Ujfalusi
maintainerPATCH v2 2/5 ALSA: hda: add HDMI codec ID for Intel WCL
In reply to Peter UjfalusiFrom: Kai Vehmanen <[email protected]>
Add HDMI codec ID for Intel Wildcat Lake platform.
--- sound/pci/hda/patch_hdmi.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_hdmi.c +1 -0
@@ -4652,6 +4652,7 @@ HDA_CODEC_ENTRY(0x8086281e, "Battlemage HDMI", patch_i915_adlp_hdmi),HDA_CODEC_ENTRY (0x8086281f ,"Raptor Lake P HDMI" , patch_i915_adlp_hdmi),HDA_CODEC_ENTRY (0x80862820 ,"Lunar Lake HDMI" , patch_i915_adlp_hdmi),HDA_CODEC_ENTRY (0x80862822 ,"Panther Lake HDMI" , patch_i915_adlp_hdmi), +HDA_CODEC_ENTRY (0x80862823 ,"Wildcat Lake HDMI" , patch_i915_adlp_hdmi),HDA_CODEC_ENTRY (0x80862880 ,"CedarTrail HDMI" , patch_generic_hdmi),HDA_CODEC_ENTRY (0x80862882 ,"Valleyview2 HDMI" , patch_i915_byt_hdmi), HDA_CODEC_ENTRY(0x80862883, "Braswell HDMI", patch_i915_byt_hdmi),
Signature · 1 line
2.49.0
Peter Ujfalusi
maintainerPATCH v2 3/5 ASoC: SOF: Intel: add initial support for WCL
In reply to Peter UjfalusiClone PTL and adjust the number of cores from 5 to 3.
--- sound/soc/sof/intel/hda.h | 1 + sound/soc/sof/intel/pci-ptl.c | 30 ++++++++++++++++++++++++++++++ sound/soc/sof/intel/ptl.c | 23 +++++++++++++++++++++++ 3 files changed, 54 insertions(+)
sound/soc/sof/intel/hda.h +1 -0
@@ -935,6 +935,7 @@ extern const struct sof_intel_dsp_desc mtl_chip_info;extern const struct sof_intel_dsp_desc arl_s_chip_info;extern const struct sof_intel_dsp_desc lnl_chip_info;extern const struct sof_intel_dsp_desc ptl_chip_info; +extern const struct sof_intel_dsp_desc wcl_chip_info;/* Probes support */ #if IS_ENABLED (CONFIG_SND_SOC_SOF_HDA_PROBES )
sound/soc/sof/intel/pci-ptl.c +30 -0
@@ -55,10 +55,40 @@ static const struct sof_dev_desc ptl_desc = { .ops_init = sof_ptl_ops_init, }; +static const struct sof_dev_desc wcl_desc = { + .use_acpi_target_states = true, + .machines = snd_soc_acpi_intel_ptl_machines, + .alt_machines = snd_soc_acpi_intel_ptl_sdw_machines, + .resindex_lpe_base =0 , + .resindex_pcicfg_base =-1 , + .resindex_imr_base =-1 , + .irqindex_host_ipc =-1 , + .chip_info = &wcl_chip_info, + .ipc_supported_mask =BIT (SOF_IPC_TYPE_4 ), + .ipc_default =SOF_IPC_TYPE_4 , + .dspless_mode_supported = true, + .default_fw_path = { + [SOF_IPC_TYPE_4 ] ="intel/sof-ipc4/wcl" , + }, + .default_lib_path = { + [SOF_IPC_TYPE_4 ] ="intel/sof-ipc4-lib/wcl" , + }, + .default_tplg_path = { + [SOF_IPC_TYPE_4 ] ="intel/sof-ipc4-tplg" , + }, + .default_fw_filename = { + [SOF_IPC_TYPE_4 ] ="sof-wcl.ri" , + }, + .nocodec_tplg_filename ="sof-ptl-nocodec.tplg" , + .ops = &sof_ptl_ops, + .ops_init = sof_ptl_ops_init, +}; +/* PCI IDs */ static const struct pci_device_id sof_pci_ids[] = { {PCI_DEVICE_DATA (INTEL ,HDA_PTL , &ptl_desc) },/* PTL */ {PCI_DEVICE_DATA (INTEL ,HDA_PTL_H , &ptl_desc) },/* PTL-H */ + {PCI_DEVICE_DATA (INTEL ,HDA_WCL , &wcl_desc) },/* WCL */ {0 , } };MODULE_DEVICE_TABLE (pci, sof_pci_ids);
sound/soc/sof/intel/ptl.c +23 -0
@@ -126,6 +126,29 @@ const struct sof_intel_dsp_desc ptl_chip_info = { .hw_ip_version = SOF_INTEL_ACE_3_0, }; +const struct sof_intel_dsp_desc wcl_chip_info = { + .cores_num =3 , + .init_core_mask =BIT (0 ), + .host_managed_cores_mask =BIT (0 ), + .ipc_req =MTL_DSP_REG_HFIPCXIDR , + .ipc_req_mask =MTL_DSP_REG_HFIPCXIDR_BUSY , + .ipc_ack =MTL_DSP_REG_HFIPCXIDA , + .ipc_ack_mask =MTL_DSP_REG_HFIPCXIDA_DONE , + .ipc_ctl =MTL_DSP_REG_HFIPCXCTL , + .rom_status_reg =LNL_DSP_REG_HFDSC , + .rom_init_timeout =300 , + .ssp_count =MTL_SSP_COUNT , + .d0i3_offset =MTL_HDA_VS_D0I3C , + .read_sdw_lcount = hda_sdw_check_lcount_ext, + .check_sdw_irq = lnl_dsp_check_sdw_irq, + .check_sdw_wakeen_irq = lnl_sdw_check_wakeen_irq, + .check_ipc_irq = mtl_dsp_check_ipc_irq, + .cl_init = mtl_dsp_cl_init, + .power_down_dsp = mtl_power_down_dsp, + .disable_interrupts = lnl_dsp_disable_interrupts, + .hw_ip_version =SOF_INTEL_ACE_3_0 , +}; +MODULE_IMPORT_NS ("SND_SOC_SOF_INTEL_MTL" );MODULE_IMPORT_NS ("SND_SOC_SOF_INTEL_LNL" );MODULE_IMPORT_NS ("SND_SOC_SOF_HDA_MLINK" );
Signature · 1 line
2.49.0
Peter Ujfalusi
maintainerPATCH v2 4/5 ALSA: hda: intel-dsp-config: Add WCL support
In reply to Peter UjfalusiWCL uses the same receipt as PTL and PTL-H
--- sound/hda/intel-dsp-config.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
sound/hda/intel-dsp-config.c +5 -1
@@ -541,7 +541,7 @@ static const struct config_entry config_table[] = { },#endif -/* Panther Lake */ +/* Panther Lake, Wildcat Lake */ #if IS_ENABLED (CONFIG_SND_SOC_SOF_PANTHERLAKE ) { .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
@@ -551,6 +551,10 @@ static const struct config_entry config_table[] = { .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, .device = PCI_DEVICE_ID_INTEL_HDA_PTL_H, }, + { + .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, + .device = PCI_DEVICE_ID_INTEL_HDA_WCL, + },#endif
Signature · 1 line
2.49.0
Peter Ujfalusi
maintainerPATCH v2 5/5 ALSA: hda: hda-intel: add Wildcat Lake support
In reply to Peter UjfalusiOne more PCI ID.
--- sound/pci/hda/hda_intel.c | 2 ++ 1 file changed, 2 insertions(+)
sound/pci/hda/hda_intel.c +2 -0
@@ -2549,6 +2549,8 @@ static const struct pci_device_id azx_ids[] = { { PCI_DEVICE_DATA(INTEL, HDA_PTL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_LNL) },/* Panther Lake-H */ { PCI_DEVICE_DATA(INTEL, HDA_PTL_H, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_LNL) }, +/* Wildcat Lake */ + { PCI_DEVICE_DATA(INTEL, HDA_WCL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_LNL) },/* Apollolake (Broxton-P) */ { PCI_DEVICE_DATA(INTEL, HDA_APL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON) },/* Gemini-Lake */
Signature · 1 line
2.49.0
Quoted 20 lines · Peter Ujfalusi
Hi,
Changes since v1:
- The PCI ID patch commit subject and message updated
- Reviewed-by, Acked-by tags added to patchesThe audio IP in Wildcat Lake (WCL) is largely identical to the one in Panther Lake, the main difference is the number of DSP cores, memory and clocking.
It is based on the same ACE3 architecture.In SOF the PTL topologies can be re-used for WCL to reduce duplication of code and topology files.
Regards,
Peter
---
Quoted 8 lines
Kai Vehmanen (1):
ALSA: hda: add HDMI codec ID for Intel WCLPeter Ujfalusi (4):
PCI: Add Intel Wildcat Lake audio Device ID
ASoC: SOF: Intel: add initial support for WCL
ALSA: hda: intel-dsp-config: Add WCL support
ALSA: hda: hda-intel: add Wildcat Lake support
As Mark already gave his Ack, I merged all those now to sound git tree for-next branch.
thanks,
Takashi