Skip to contentSkip to conversation

ASoC/SOF/PCI/Intel: Support for Nova Lake

PATCH In review Peter Ujfalusi 2 participants 6 messages Jan 20 – Jan 22

Subsystems (4)
lore
Share & tools
lore

Peter Ujfalusi

author maintainer
#0 lore raw

v2 cover ASoC/SOF/PCI/Intel: Support for Nova Lake

Hi,

Changes since v1:
- commit message/subject fixes suggested by Bjorn
- Acked-by tags added.

this series adds audio support for the NVL variant of the Nova Lake family.
NVL also based on ACE4 audio subsystem, but with higher clock rate, more DSP memory and more DSP cores (4 vs 2) compared to NVL-S.

Regards,
Peter
---
Peter Ujfalusi (4):
PCI: Add Intel Nova Lake audio Device ID
ASoC: SOF: Intel: add support for Nova Lake NVL
ALSA: hda: core: intel-dsp-config: Add support for NVL
ALSA: hda: controllers: intel: add support for Nova Lake

 include/linux/pci_ids.h           |  1 +
 sound/hda/controllers/intel.c     |  1 +
 sound/hda/core/intel-dsp-config.c |  4 ++++
 sound/soc/sof/intel/hda.h         |  1 +
 sound/soc/sof/intel/nvl.c         | 24 ++++++++++++++++++++++++
 sound/soc/sof/intel/pci-nvl.c     | 31 +++++++++++++++++++++++++++++++
 6 files changed, 62 insertions(+)
Signature · 1 line
2.52.0
author maintainer
#1 lore raw

PATCH v2 1/4 PCI: Add Intel Nova Lake audio Device ID

Add Nova Lake (NVL) audio Device ID

The ID will be used by HDA legacy, SOF audio stack and the driver to determine which audio stack should be used (intel-dsp-config).

---
 include/linux/pci_ids.h | 1 +
 1 file changed, 1 insertion(+)
include/linux/pci_ids.h +1 -0
index 84b830036fb4..5ed7846639bf 100644
@@ -3144,6 +3144,7 @@
 #define PCI_DEVICE_ID_INTEL_HDA_CML_S	0xa3f0
 #define PCI_DEVICE_ID_INTEL_HDA_LNL_P	0xa828
 #define PCI_DEVICE_ID_INTEL_S21152BB	0xb152
+#define PCI_DEVICE_ID_INTEL_HDA_NVL	0xd328
 #define PCI_DEVICE_ID_INTEL_HDA_BMG	0xe2f7
 #define PCI_DEVICE_ID_INTEL_HDA_PTL_H	0xe328
 #define PCI_DEVICE_ID_INTEL_HDA_PTL	0xe428
Signature · 1 line
2.52.0
author maintainer
#2 lore raw

PATCH v2 2/4 ASoC: SOF: Intel: add support for Nova Lake NVL

In reply to Peter Ujfalusi

Add support for Nova Lake (NVL).
The core count for NVL is different compared to NVL-S (4 vs 2)

---
 sound/soc/sof/intel/hda.h     |  1 +
 sound/soc/sof/intel/nvl.c     | 24 ++++++++++++++++++++++++
 sound/soc/sof/intel/pci-nvl.c | 31 +++++++++++++++++++++++++++++++
 3 files changed, 56 insertions(+)
sound/soc/sof/intel/hda.h +1 -0
index 562fe8be79c1..3be39c229c9f 100644
@@ -936,6 +936,7 @@ 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;
+extern const struct sof_intel_dsp_desc nvl_chip_info;
 extern const struct sof_intel_dsp_desc nvl_s_chip_info;
 
 /* Probes support */
sound/soc/sof/intel/nvl.c +24 -0
index ff215151af2a..0d763998558f 100644
@@ -26,6 +26,30 @@ int sof_nvl_set_ops(struct snd_sof_dev *sdev, struct snd_sof_dsp_ops *dsp_ops)
 };
 EXPORT_SYMBOL_NS(sof_nvl_set_ops, "SND_SOC_SOF_INTEL_NVL");
 
+const struct sof_intel_dsp_desc nvl_chip_info = {
+	.cores_num = 4,
+	.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,
+	.sdw_process_wakeen = hda_sdw_process_wakeen_common,
+	.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_4_0,
+};
+
 const struct sof_intel_dsp_desc nvl_s_chip_info = {
 	.cores_num = 2,
 	.init_core_mask = BIT(0),
sound/soc/sof/intel/pci-nvl.c +31 -0
index f75aa996a5bd..bb3c29ef5477 100644
@@ -26,6 +26,36 @@ static int sof_nvl_ops_init(struct snd_sof_dev *sdev)
 	return sof_nvl_set_ops(sdev, &sof_nvl_ops);
 }
 
+static const struct sof_dev_desc nvl_desc = {
+	.use_acpi_target_states	= true,
+	.machines               = snd_soc_acpi_intel_nvl_machines,
+	.alt_machines		= snd_soc_acpi_intel_nvl_sdw_machines,
+	.resindex_lpe_base      = 0,
+	.resindex_pcicfg_base   = -1,
+	.resindex_imr_base      = -1,
+	.irqindex_host_ipc      = -1,
+	.chip_info		= &nvl_chip_info,
+	.ipc_supported_mask	= BIT(SOF_IPC_TYPE_4),
+	.ipc_default		= SOF_IPC_TYPE_4,
+	.dspless_mode_supported	= true,
+	.on_demand_dsp_boot	= true,
+	.default_fw_path = {
+		[SOF_IPC_TYPE_4] = "intel/sof-ipc4/nvl",
+	},
+	.default_lib_path = {
+		[SOF_IPC_TYPE_4] = "intel/sof-ipc4-lib/nvl",
+	},
+	.default_tplg_path = {
+		[SOF_IPC_TYPE_4] = "intel/sof-ipc4-tplg",
+	},
+	.default_fw_filename = {
+		[SOF_IPC_TYPE_4] = "sof-nvl.ri",
+	},
+	.nocodec_tplg_filename = "sof-nvl-nocodec.tplg",
+	.ops = &sof_nvl_ops,
+	.ops_init = sof_nvl_ops_init,
+};
+
 static const struct sof_dev_desc nvl_s_desc = {
 	.use_acpi_target_states	= true,
 	.machines               = snd_soc_acpi_intel_nvl_machines,
@@ -58,6 +88,7 @@ static const struct sof_dev_desc nvl_s_desc = {
 
 /* PCI IDs */
 static const struct pci_device_id sof_pci_ids[] = {
+	{ PCI_DEVICE_DATA(INTEL, HDA_NVL, &nvl_desc) }, /* NVL */
 	{ PCI_DEVICE_DATA(INTEL, HDA_NVL_S, &nvl_s_desc) }, /* NVL-S */
 	{ 0, }
 };
Signature · 1 line
2.52.0
author maintainer
#3 lore raw

PATCH v2 3/4 ALSA: hda: core: intel-dsp-config: Add support for NVL

In reply to Peter Ujfalusi

Add entry for NVL variant of Nova Lake family.

---
 sound/hda/core/intel-dsp-config.c | 4 ++++
 1 file changed, 4 insertions(+)
sound/hda/core/intel-dsp-config.c +4 -0
index ddb8db3e8e39..f0a44fd111f3 100644
@@ -580,6 +580,10 @@ static const struct config_entry config_table[] = {
 
 	/* Nova Lake */
 #if IS_ENABLED(CONFIG_SND_SOC_SOF_NOVALAKE)
+	{
+		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
+		.device = PCI_DEVICE_ID_INTEL_HDA_NVL,
+	},
 	{
 		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
 		.device = PCI_DEVICE_ID_INTEL_HDA_NVL_S,
Signature · 1 line
2.52.0
author maintainer
#4 lore raw

PATCH v2 4/4 ALSA: hda: controllers: intel: add support for Nova Lake

In reply to Peter Ujfalusi

Add NVL to the PCI-ID list.

---
 sound/hda/controllers/intel.c | 1 +
 1 file changed, 1 insertion(+)
sound/hda/controllers/intel.c +1 -0
index bb9a64d41580..85324c7c796d 100644
@@ -2551,6 +2551,7 @@ static const struct pci_device_id azx_ids[] = {
 	/* Wildcat Lake */
 	{ PCI_DEVICE_DATA(INTEL, HDA_WCL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_LNL) },
 	/* Nova Lake */
+	{ PCI_DEVICE_DATA(INTEL, HDA_NVL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_LNL) },
 	{ PCI_DEVICE_DATA(INTEL, HDA_NVL_S, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_LNL) },
 	/* Apollolake (Broxton-P) */
 	{ PCI_DEVICE_DATA(INTEL, HDA_APL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON) },
Signature · 1 line
2.52.0
maintainer
#5 lore raw
In reply to Peter Ujfalusi
Quoted 11 lines · Peter Ujfalusi

Changes since v1:
- commit message/subject fixes suggested by Bjorn
- Acked-by tags added.

this series adds audio support for the NVL variant of the Nova Lake family.
NVL also based on ACE4 audio subsystem, but with higher clock rate, more DSP memory and more DSP cores (4 vs 2) compared to NVL-S.

[...]

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/4] PCI: Add Intel Nova Lake audio Device ID

      commit: b190870e0e0cfb375c0d4da02761c32083f3644d
[2/4] ASoC: SOF: Intel: add support for Nova Lake NVL
      commit: 1800bcdc68ead7209451085431d80aa95ea7cd03
[3/4] ALSA: hda: core: intel-dsp-config: Add support for NVL
      commit: a094d8a50679356fbf045af274ccab85c9a644fb
[4/4] ALSA: hda: controllers: intel: add support for Nova Lake
      commit: 7f428282fde34f06f3ab898b8a9081bf93a41f22

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