linux-pci.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2 0/7] ASoC/SOF/PCI/Intel: Support for Nova Lake S
@ 2025-11-04 12:16 Peter Ujfalusi
  2025-11-04 12:16 ` [PATCH v2 1/7] PCI: Add Intel Nova Lake S audio Device ID Peter Ujfalusi
                   ` (7 more replies)
  0 siblings, 8 replies; 11+ messages in thread
From: Peter Ujfalusi @ 2025-11-04 12:16 UTC (permalink / raw)
  To: lgirdwood, broonie
  Cc: linux-sound, kai.vehmanen, ranjani.sridharan, yung-chuan.liao,
	pierre-louis.bossart, bhelgaas, linux-pci, linux-kernel, kw

Hi,

Changes since v1:
- Add information for the users of the PCI ID
- Add Acked-by tag for the pci_ids.h from Bjorn
- Add Acked-by tags from Mark for the ASoC patches

This series adds initial support for NVL-S from the Nova Lake family.
NVL-S includes ACE4 audio subsystem, it has 2 DSP cores.

Regards,
Peter
---
Bard Liao (1):
  ASoC: Intel: soc-acpi-intel-nvl-match: add rt722 l3 support

Peter Ujfalusi (6):
  PCI: Add Intel Nova Lake S audio Device ID
  ALSA: hda/hdmi: intelhdmi: add HDMI codec ID for Intel NVL
  ASoC: Intel: soc-acpi: add NVL match tables
  ASoC: SOF: Intel: add initial support for NVL-S
  ALSA: hda: core: intel-dsp-config: Add support for NVL-S
  ALSA: hda: controllers: intel: add support for Nova Lake S

 include/linux/pci_ids.h                       |  1 +
 include/sound/soc-acpi-intel-match.h          |  2 +
 sound/hda/codecs/hdmi/intelhdmi.c             |  1 +
 sound/hda/controllers/intel.c                 |  2 +
 sound/hda/core/intel-dsp-config.c             |  8 ++
 sound/soc/intel/common/Makefile               |  1 +
 .../intel/common/soc-acpi-intel-nvl-match.c   | 90 +++++++++++++++++++
 sound/soc/sof/intel/Kconfig                   | 17 ++++
 sound/soc/sof/intel/Makefile                  |  2 +
 sound/soc/sof/intel/hda-dsp.c                 |  1 +
 sound/soc/sof/intel/hda.h                     |  1 +
 sound/soc/sof/intel/nvl.c                     | 55 ++++++++++++
 sound/soc/sof/intel/nvl.h                     | 14 +++
 sound/soc/sof/intel/pci-nvl.c                 | 82 +++++++++++++++++
 sound/soc/sof/intel/shim.h                    |  1 +
 15 files changed, 278 insertions(+)
 create mode 100644 sound/soc/intel/common/soc-acpi-intel-nvl-match.c
 create mode 100644 sound/soc/sof/intel/nvl.c
 create mode 100644 sound/soc/sof/intel/nvl.h
 create mode 100644 sound/soc/sof/intel/pci-nvl.c

-- 
2.51.2


^ permalink raw reply	[flat|nested] 11+ messages in thread

* [PATCH v2 1/7] PCI: Add Intel Nova Lake S audio Device ID
  2025-11-04 12:16 [PATCH v2 0/7] ASoC/SOF/PCI/Intel: Support for Nova Lake S Peter Ujfalusi
@ 2025-11-04 12:16 ` Peter Ujfalusi
  2025-11-04 12:16 ` [PATCH v2 2/7] ALSA: hda/hdmi: intelhdmi: add HDMI codec ID for Intel NVL Peter Ujfalusi
                   ` (6 subsequent siblings)
  7 siblings, 0 replies; 11+ messages in thread
From: Peter Ujfalusi @ 2025-11-04 12:16 UTC (permalink / raw)
  To: lgirdwood, broonie
  Cc: linux-sound, kai.vehmanen, ranjani.sridharan, yung-chuan.liao,
	pierre-louis.bossart, bhelgaas, linux-pci, linux-kernel, kw

Add Nova Lake S (NVL-S) 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).

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
---
 include/linux/pci_ids.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 92ffc4373f6d..a9a089566b7c 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -3075,6 +3075,7 @@
 #define PCI_DEVICE_ID_INTEL_5100_22	0x65f6
 #define PCI_DEVICE_ID_INTEL_IOAT_SCNB	0x65ff
 #define PCI_DEVICE_ID_INTEL_HDA_FCL	0x67a8
+#define PCI_DEVICE_ID_INTEL_HDA_NVL_S	0x6e50
 #define PCI_DEVICE_ID_INTEL_82371SB_0	0x7000
 #define PCI_DEVICE_ID_INTEL_82371SB_1	0x7010
 #define PCI_DEVICE_ID_INTEL_82371SB_2	0x7020
-- 
2.51.2


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH v2 2/7] ALSA: hda/hdmi: intelhdmi: add HDMI codec ID for Intel NVL
  2025-11-04 12:16 [PATCH v2 0/7] ASoC/SOF/PCI/Intel: Support for Nova Lake S Peter Ujfalusi
  2025-11-04 12:16 ` [PATCH v2 1/7] PCI: Add Intel Nova Lake S audio Device ID Peter Ujfalusi
@ 2025-11-04 12:16 ` Peter Ujfalusi
  2025-11-04 12:16 ` [PATCH v2 3/7] ASoC: Intel: soc-acpi: add NVL match tables Peter Ujfalusi
                   ` (5 subsequent siblings)
  7 siblings, 0 replies; 11+ messages in thread
From: Peter Ujfalusi @ 2025-11-04 12:16 UTC (permalink / raw)
  To: lgirdwood, broonie
  Cc: linux-sound, kai.vehmanen, ranjani.sridharan, yung-chuan.liao,
	pierre-louis.bossart, bhelgaas, linux-pci, linux-kernel, kw

Add HDMI codec ID for Intel Nova Lake platform.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
---
 sound/hda/codecs/hdmi/intelhdmi.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sound/hda/codecs/hdmi/intelhdmi.c b/sound/hda/codecs/hdmi/intelhdmi.c
index 23237d527430..9460c8db39a9 100644
--- a/sound/hda/codecs/hdmi/intelhdmi.c
+++ b/sound/hda/codecs/hdmi/intelhdmi.c
@@ -793,6 +793,7 @@ static const struct hda_device_id snd_hda_id_intelhdmi[] = {
 	HDA_CODEC_ID_MODEL(0x80862820, "Lunar Lake HDMI",	MODEL_ADLP),
 	HDA_CODEC_ID_MODEL(0x80862822, "Panther Lake HDMI",	MODEL_ADLP),
 	HDA_CODEC_ID_MODEL(0x80862823, "Wildcat Lake HDMI",	MODEL_ADLP),
+	HDA_CODEC_ID_MODEL(0x80862824, "Nova Lake HDMI",	MODEL_ADLP),
 	HDA_CODEC_ID_MODEL(0x80862882, "Valleyview2 HDMI",	MODEL_BYT),
 	HDA_CODEC_ID_MODEL(0x80862883, "Braswell HDMI",		MODEL_BYT),
 	{} /* terminator */
-- 
2.51.2


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH v2 3/7] ASoC: Intel: soc-acpi: add NVL match tables
  2025-11-04 12:16 [PATCH v2 0/7] ASoC/SOF/PCI/Intel: Support for Nova Lake S Peter Ujfalusi
  2025-11-04 12:16 ` [PATCH v2 1/7] PCI: Add Intel Nova Lake S audio Device ID Peter Ujfalusi
  2025-11-04 12:16 ` [PATCH v2 2/7] ALSA: hda/hdmi: intelhdmi: add HDMI codec ID for Intel NVL Peter Ujfalusi
@ 2025-11-04 12:16 ` Peter Ujfalusi
  2025-11-04 12:16 ` [PATCH v2 4/7] ASoC: Intel: soc-acpi-intel-nvl-match: add rt722 l3 support Peter Ujfalusi
                   ` (4 subsequent siblings)
  7 siblings, 0 replies; 11+ messages in thread
From: Peter Ujfalusi @ 2025-11-04 12:16 UTC (permalink / raw)
  To: lgirdwood, broonie
  Cc: linux-sound, kai.vehmanen, ranjani.sridharan, yung-chuan.liao,
	pierre-louis.bossart, bhelgaas, linux-pci, linux-kernel, kw

For now the tables are basic for mockup devices

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Acked-by: Mark Brown <broonie@kernel.org>
---
 include/sound/soc-acpi-intel-match.h          |  2 +
 sound/soc/intel/common/Makefile               |  1 +
 .../intel/common/soc-acpi-intel-nvl-match.c   | 41 +++++++++++++++++++
 3 files changed, 44 insertions(+)
 create mode 100644 sound/soc/intel/common/soc-acpi-intel-nvl-match.c

diff --git a/include/sound/soc-acpi-intel-match.h b/include/sound/soc-acpi-intel-match.h
index daed7123df9d..382029724e85 100644
--- a/include/sound/soc-acpi-intel-match.h
+++ b/include/sound/soc-acpi-intel-match.h
@@ -34,6 +34,7 @@ extern struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_machines[];
 extern struct snd_soc_acpi_mach snd_soc_acpi_intel_lnl_machines[];
 extern struct snd_soc_acpi_mach snd_soc_acpi_intel_arl_machines[];
 extern struct snd_soc_acpi_mach snd_soc_acpi_intel_ptl_machines[];
+extern struct snd_soc_acpi_mach snd_soc_acpi_intel_nvl_machines[];
 
 extern struct snd_soc_acpi_mach snd_soc_acpi_intel_cnl_sdw_machines[];
 extern struct snd_soc_acpi_mach snd_soc_acpi_intel_cfl_sdw_machines[];
@@ -46,6 +47,7 @@ extern struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[];
 extern struct snd_soc_acpi_mach snd_soc_acpi_intel_lnl_sdw_machines[];
 extern struct snd_soc_acpi_mach snd_soc_acpi_intel_arl_sdw_machines[];
 extern struct snd_soc_acpi_mach snd_soc_acpi_intel_ptl_sdw_machines[];
+extern struct snd_soc_acpi_mach snd_soc_acpi_intel_nvl_sdw_machines[];
 
 /*
  * generic table used for HDA codec-based platforms, possibly with
diff --git a/sound/soc/intel/common/Makefile b/sound/soc/intel/common/Makefile
index 7822bcae6c69..dbfd9e2ac015 100644
--- a/sound/soc/intel/common/Makefile
+++ b/sound/soc/intel/common/Makefile
@@ -11,6 +11,7 @@ snd-soc-acpi-intel-match-y := soc-acpi-intel-byt-match.o soc-acpi-intel-cht-matc
 	soc-acpi-intel-arl-match.o \
 	soc-acpi-intel-lnl-match.o \
 	soc-acpi-intel-ptl-match.o \
+	soc-acpi-intel-nvl-match.o \
 	soc-acpi-intel-hda-match.o \
 	soc-acpi-intel-sdw-mockup-match.o sof-function-topology-lib.o
 
diff --git a/sound/soc/intel/common/soc-acpi-intel-nvl-match.c b/sound/soc/intel/common/soc-acpi-intel-nvl-match.c
new file mode 100644
index 000000000000..b8695d47e55b
--- /dev/null
+++ b/sound/soc/intel/common/soc-acpi-intel-nvl-match.c
@@ -0,0 +1,41 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * soc-acpi-intel-nvl-match.c - tables and support for NVL ACPI enumeration.
+ *
+ * Copyright (c) 2025, Intel Corporation.
+ *
+ */
+
+#include <sound/soc-acpi.h>
+#include <sound/soc-acpi-intel-match.h>
+#include "soc-acpi-intel-sdw-mockup-match.h"
+
+struct snd_soc_acpi_mach snd_soc_acpi_intel_nvl_machines[] = {
+	{},
+};
+EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_nvl_machines);
+
+/* this table is used when there is no I2S codec present */
+struct snd_soc_acpi_mach snd_soc_acpi_intel_nvl_sdw_machines[] = {
+	/* mockup tests need to be first */
+	{
+		.link_mask = GENMASK(3, 0),
+		.links = sdw_mockup_headset_2amps_mic,
+		.drv_name = "sof_sdw",
+		.sof_tplg_filename = "sof-nvl-rt711-rt1308-rt715.tplg",
+	},
+	{
+		.link_mask = BIT(0) | BIT(1) | BIT(3),
+		.links = sdw_mockup_headset_1amp_mic,
+		.drv_name = "sof_sdw",
+		.sof_tplg_filename = "sof-nvl-rt711-rt1308-mono-rt715.tplg",
+	},
+	{
+		.link_mask = GENMASK(2, 0),
+		.links = sdw_mockup_mic_headset_1amp,
+		.drv_name = "sof_sdw",
+		.sof_tplg_filename = "sof-nvl-rt715-rt711-rt1308-mono.tplg",
+	},
+	{},
+};
+EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_nvl_sdw_machines);
-- 
2.51.2


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH v2 4/7] ASoC: Intel: soc-acpi-intel-nvl-match: add rt722 l3 support
  2025-11-04 12:16 [PATCH v2 0/7] ASoC/SOF/PCI/Intel: Support for Nova Lake S Peter Ujfalusi
                   ` (2 preceding siblings ...)
  2025-11-04 12:16 ` [PATCH v2 3/7] ASoC: Intel: soc-acpi: add NVL match tables Peter Ujfalusi
@ 2025-11-04 12:16 ` Peter Ujfalusi
  2025-11-04 12:16 ` [PATCH v2 5/7] ASoC: SOF: Intel: add initial support for NVL-S Peter Ujfalusi
                   ` (3 subsequent siblings)
  7 siblings, 0 replies; 11+ messages in thread
From: Peter Ujfalusi @ 2025-11-04 12:16 UTC (permalink / raw)
  To: lgirdwood, broonie
  Cc: linux-sound, kai.vehmanen, ranjani.sridharan, yung-chuan.liao,
	pierre-louis.bossart, bhelgaas, linux-pci, linux-kernel, kw

From: Bard Liao <yung-chuan.liao@linux.intel.com>

Add rt722 on SDW link 3 support

Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Acked-by: Mark Brown <broonie@kernel.org>
---
 .../intel/common/soc-acpi-intel-nvl-match.c   | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/sound/soc/intel/common/soc-acpi-intel-nvl-match.c b/sound/soc/intel/common/soc-acpi-intel-nvl-match.c
index b8695d47e55b..2768dd10aaa0 100644
--- a/sound/soc/intel/common/soc-acpi-intel-nvl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-nvl-match.c
@@ -15,6 +15,49 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_nvl_machines[] = {
 };
 EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_nvl_machines);
 
+/*
+ * Multi-function codecs with three endpoints created for
+ * headset, amp and dmic functions.
+ */
+static const struct snd_soc_acpi_endpoint rt_mf_endpoints[] = {
+	{
+		.num = 0,
+		.aggregated = 0,
+		.group_position = 0,
+		.group_id = 0,
+	},
+	{
+		.num = 1,
+		.aggregated = 0,
+		.group_position = 0,
+		.group_id = 0,
+	},
+	{
+		.num = 2,
+		.aggregated = 0,
+		.group_position = 0,
+		.group_id = 0,
+	},
+};
+
+static const struct snd_soc_acpi_adr_device rt722_3_single_adr[] = {
+	{
+		.adr = 0x000330025d072201ull,
+		.num_endpoints = ARRAY_SIZE(rt_mf_endpoints),
+		.endpoints = rt_mf_endpoints,
+		.name_prefix = "rt722"
+	}
+};
+
+static const struct snd_soc_acpi_link_adr nvl_rt722_l3[] = {
+	{
+		.mask = BIT(3),
+		.num_adr = ARRAY_SIZE(rt722_3_single_adr),
+		.adr_d = rt722_3_single_adr,
+	},
+	{}
+};
+
 /* this table is used when there is no I2S codec present */
 struct snd_soc_acpi_mach snd_soc_acpi_intel_nvl_sdw_machines[] = {
 	/* mockup tests need to be first */
@@ -36,6 +79,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_nvl_sdw_machines[] = {
 		.drv_name = "sof_sdw",
 		.sof_tplg_filename = "sof-nvl-rt715-rt711-rt1308-mono.tplg",
 	},
+	{
+		.link_mask = BIT(3),
+		.links = nvl_rt722_l3,
+		.drv_name = "sof_sdw",
+		.sof_tplg_filename = "sof-nvl-rt722.tplg",
+	},
 	{},
 };
 EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_nvl_sdw_machines);
-- 
2.51.2


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH v2 5/7] ASoC: SOF: Intel: add initial support for NVL-S
  2025-11-04 12:16 [PATCH v2 0/7] ASoC/SOF/PCI/Intel: Support for Nova Lake S Peter Ujfalusi
                   ` (3 preceding siblings ...)
  2025-11-04 12:16 ` [PATCH v2 4/7] ASoC: Intel: soc-acpi-intel-nvl-match: add rt722 l3 support Peter Ujfalusi
@ 2025-11-04 12:16 ` Peter Ujfalusi
  2025-11-04 12:16 ` [PATCH v2 6/7] ALSA: hda: core: intel-dsp-config: Add " Peter Ujfalusi
                   ` (2 subsequent siblings)
  7 siblings, 0 replies; 11+ messages in thread
From: Peter Ujfalusi @ 2025-11-04 12:16 UTC (permalink / raw)
  To: lgirdwood, broonie
  Cc: linux-sound, kai.vehmanen, ranjani.sridharan, yung-chuan.liao,
	pierre-louis.bossart, bhelgaas, linux-pci, linux-kernel, kw

Add support for Nova Lake S (NVL-S).

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Acked-by: Mark Brown <broonie@kernel.org>
---
 sound/soc/sof/intel/Kconfig   | 17 ++++++++
 sound/soc/sof/intel/Makefile  |  2 +
 sound/soc/sof/intel/hda-dsp.c |  1 +
 sound/soc/sof/intel/hda.h     |  1 +
 sound/soc/sof/intel/nvl.c     | 55 +++++++++++++++++++++++
 sound/soc/sof/intel/nvl.h     | 14 ++++++
 sound/soc/sof/intel/pci-nvl.c | 82 +++++++++++++++++++++++++++++++++++
 sound/soc/sof/intel/shim.h    |  1 +
 8 files changed, 173 insertions(+)
 create mode 100644 sound/soc/sof/intel/nvl.c
 create mode 100644 sound/soc/sof/intel/nvl.h
 create mode 100644 sound/soc/sof/intel/pci-nvl.c

diff --git a/sound/soc/sof/intel/Kconfig b/sound/soc/sof/intel/Kconfig
index 4fca4c9458c5..54cd3807f8c6 100644
--- a/sound/soc/sof/intel/Kconfig
+++ b/sound/soc/sof/intel/Kconfig
@@ -300,6 +300,23 @@ config SND_SOC_SOF_PANTHERLAKE
 	  Say Y if you have such a device.
 	  If unsure select "N".
 
+config SND_SOC_SOF_INTEL_NVL
+	tristate
+	select SND_SOC_SOF_HDA_COMMON
+	select SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE
+	select SND_SOC_SOF_IPC4
+	select SND_SOC_SOF_INTEL_PTL
+
+config SND_SOC_SOF_NOVALAKE
+	tristate "SOF support for Novalake"
+	default SND_SOC_SOF_PCI
+	select SND_SOC_SOF_INTEL_NVL
+	help
+	  This adds support for Sound Open Firmware for Intel(R) platforms
+	  using the Novalake processors.
+	  Say Y if you have such a device.
+	  If unsure select "N".
+
 config SND_SOC_SOF_HDA_COMMON
 	tristate
 
diff --git a/sound/soc/sof/intel/Makefile b/sound/soc/sof/intel/Makefile
index aab803a495b1..cc9783e933f8 100644
--- a/sound/soc/sof/intel/Makefile
+++ b/sound/soc/sof/intel/Makefile
@@ -39,6 +39,7 @@ snd-sof-pci-intel-tgl-y := pci-tgl.o tgl.o
 snd-sof-pci-intel-mtl-y := pci-mtl.o mtl.o
 snd-sof-pci-intel-lnl-y := pci-lnl.o lnl.o
 snd-sof-pci-intel-ptl-y := pci-ptl.o ptl.o
+snd-sof-pci-intel-nvl-y := pci-nvl.o nvl.o
 
 obj-$(CONFIG_SND_SOC_SOF_MERRIFIELD) += snd-sof-pci-intel-tng.o
 obj-$(CONFIG_SND_SOC_SOF_INTEL_SKL) += snd-sof-pci-intel-skl.o
@@ -49,3 +50,4 @@ obj-$(CONFIG_SND_SOC_SOF_INTEL_TGL) += snd-sof-pci-intel-tgl.o
 obj-$(CONFIG_SND_SOC_SOF_INTEL_MTL) += snd-sof-pci-intel-mtl.o
 obj-$(CONFIG_SND_SOC_SOF_INTEL_LNL) += snd-sof-pci-intel-lnl.o
 obj-$(CONFIG_SND_SOC_SOF_INTEL_PTL) += snd-sof-pci-intel-ptl.o
+obj-$(CONFIG_SND_SOC_SOF_INTEL_NVL) += snd-sof-pci-intel-nvl.o
diff --git a/sound/soc/sof/intel/hda-dsp.c b/sound/soc/sof/intel/hda-dsp.c
index 3ab6d5ce6329..e9f092f082a1 100644
--- a/sound/soc/sof/intel/hda-dsp.c
+++ b/sound/soc/sof/intel/hda-dsp.c
@@ -70,6 +70,7 @@ static void hda_get_interfaces(struct snd_sof_dev *sdev, u32 *interface_mask)
 		break;
 	case SOF_INTEL_ACE_2_0:
 	case SOF_INTEL_ACE_3_0:
+	case SOF_INTEL_ACE_4_0:
 		interface_mask[SOF_DAI_DSP_ACCESS] =
 			BIT(SOF_DAI_INTEL_SSP) | BIT(SOF_DAI_INTEL_DMIC) |
 			BIT(SOF_DAI_INTEL_HDA) | BIT(SOF_DAI_INTEL_ALH);
diff --git a/sound/soc/sof/intel/hda.h b/sound/soc/sof/intel/hda.h
index 28daf0a3b984..562fe8be79c1 100644
--- a/sound/soc/sof/intel/hda.h
+++ b/sound/soc/sof/intel/hda.h
@@ -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_s_chip_info;
 
 /* Probes support */
 #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_PROBES)
diff --git a/sound/soc/sof/intel/nvl.c b/sound/soc/sof/intel/nvl.c
new file mode 100644
index 000000000000..ff215151af2a
--- /dev/null
+++ b/sound/soc/sof/intel/nvl.c
@@ -0,0 +1,55 @@
+// SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause)
+//
+// Copyright(c) 2025 Intel Corporation
+
+/*
+ * Hardware interface for audio DSP on NovaLake.
+ */
+
+#include <sound/hda_register.h>
+#include <sound/hda-mlink.h>
+#include <sound/sof/ipc4/header.h>
+#include "../ipc4-priv.h"
+#include "../ops.h"
+#include "hda.h"
+#include "hda-ipc.h"
+#include "../sof-audio.h"
+#include "mtl.h"
+#include "lnl.h"
+#include "ptl.h"
+#include "nvl.h"
+
+int sof_nvl_set_ops(struct snd_sof_dev *sdev, struct snd_sof_dsp_ops *dsp_ops)
+{
+	/* Use PTL ops for NVL */
+	return sof_ptl_set_ops(sdev, dsp_ops);
+};
+EXPORT_SYMBOL_NS(sof_nvl_set_ops, "SND_SOC_SOF_INTEL_NVL");
+
+const struct sof_intel_dsp_desc nvl_s_chip_info = {
+	.cores_num = 2,
+	.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,
+};
+
+MODULE_IMPORT_NS("SND_SOC_SOF_INTEL_MTL");
+MODULE_IMPORT_NS("SND_SOC_SOF_INTEL_LNL");
+MODULE_IMPORT_NS("SND_SOC_SOF_INTEL_PTL");
diff --git a/sound/soc/sof/intel/nvl.h b/sound/soc/sof/intel/nvl.h
new file mode 100644
index 000000000000..0be3fdfbbd48
--- /dev/null
+++ b/sound/soc/sof/intel/nvl.h
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) */
+/*
+ * This file is provided under a dual BSD/GPLv2 license.  When using or
+ * redistributing this file, you may do so under either license.
+ *
+ * Copyright(c) 2025 Intel Corporation
+ */
+
+#ifndef __SOF_INTEL_NVL_H
+#define __SOF_INTEL_NVL_H
+
+int sof_nvl_set_ops(struct snd_sof_dev *sdev, struct snd_sof_dsp_ops *dsp_ops);
+
+#endif /* __SOF_INTEL_NVL_H */
diff --git a/sound/soc/sof/intel/pci-nvl.c b/sound/soc/sof/intel/pci-nvl.c
new file mode 100644
index 000000000000..c499c14b93d5
--- /dev/null
+++ b/sound/soc/sof/intel/pci-nvl.c
@@ -0,0 +1,82 @@
+// SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause)
+//
+// This file is provided under a dual BSD/GPLv2 license.  When using or
+// redistributing this file, you may do so under either license.
+//
+// Copyright(c) 2025 Intel Corporation.
+//
+
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <sound/soc-acpi.h>
+#include <sound/soc-acpi-intel-match.h>
+#include <sound/sof.h>
+#include "../ops.h"
+#include "../sof-pci-dev.h"
+
+/* platform specific devices */
+#include "hda.h"
+#include "nvl.h"
+
+/* PantherLake ops */
+static struct snd_sof_dsp_ops sof_nvl_ops;
+
+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_s_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_s_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/nvl-s",
+	},
+	.default_lib_path = {
+		[SOF_IPC_TYPE_4] = "intel/sof-ipc4-lib/nvl-s",
+	},
+	.default_tplg_path = {
+		[SOF_IPC_TYPE_4] = "intel/sof-ipc4-tplg",
+	},
+	.default_fw_filename = {
+		[SOF_IPC_TYPE_4] = "sof-nvl-s.ri",
+	},
+	.nocodec_tplg_filename = "sof-nvl-nocodec.tplg",
+	.ops = &sof_nvl_ops,
+	.ops_init = sof_nvl_ops_init,
+};
+
+/* PCI IDs */
+static const struct pci_device_id sof_pci_ids[] = {
+	{ PCI_DEVICE_DATA(INTEL, HDA_NVL_S, &nvl_s_desc) }, /* NVL-S */
+	{ 0, }
+};
+MODULE_DEVICE_TABLE(pci, sof_pci_ids);
+
+/* pci_driver definition */
+static struct pci_driver snd_sof_pci_intel_nvl_driver = {
+	.name = "sof-audio-pci-intel-nvl",
+	.id_table = sof_pci_ids,
+	.probe = hda_pci_intel_probe,
+	.remove = sof_pci_remove,
+	.shutdown = sof_pci_shutdown,
+	.driver = {
+		.pm = pm_ptr(&sof_pci_pm),
+	},
+};
+module_pci_driver(snd_sof_pci_intel_nvl_driver);
+
+MODULE_LICENSE("Dual BSD/GPL");
+MODULE_DESCRIPTION("SOF support for NovaLake platforms");
+MODULE_IMPORT_NS("SND_SOC_SOF_INTEL_HDA_GENERIC");
+MODULE_IMPORT_NS("SND_SOC_SOF_INTEL_HDA_COMMON");
+MODULE_IMPORT_NS("SND_SOC_SOF_PCI_DEV");
diff --git a/sound/soc/sof/intel/shim.h b/sound/soc/sof/intel/shim.h
index dc6a93d05bfe..33d27cb5f1d7 100644
--- a/sound/soc/sof/intel/shim.h
+++ b/sound/soc/sof/intel/shim.h
@@ -23,6 +23,7 @@ enum sof_intel_hw_ip_version {
 	SOF_INTEL_ACE_1_0,	/* MeteorLake */
 	SOF_INTEL_ACE_2_0,	/* LunarLake */
 	SOF_INTEL_ACE_3_0,	/* PantherLake */
+	SOF_INTEL_ACE_4_0,	/* NovaLake */
 };
 
 /*
-- 
2.51.2


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH v2 6/7] ALSA: hda: core: intel-dsp-config: Add support for NVL-S
  2025-11-04 12:16 [PATCH v2 0/7] ASoC/SOF/PCI/Intel: Support for Nova Lake S Peter Ujfalusi
                   ` (4 preceding siblings ...)
  2025-11-04 12:16 ` [PATCH v2 5/7] ASoC: SOF: Intel: add initial support for NVL-S Peter Ujfalusi
@ 2025-11-04 12:16 ` Peter Ujfalusi
  2025-11-04 12:16 ` [PATCH v2 7/7] ALSA: hda: controllers: intel: add support for Nova Lake S Peter Ujfalusi
  2025-11-17 10:11 ` [PATCH v2 0/7] ASoC/SOF/PCI/Intel: Support " Péter Ujfalusi
  7 siblings, 0 replies; 11+ messages in thread
From: Peter Ujfalusi @ 2025-11-04 12:16 UTC (permalink / raw)
  To: lgirdwood, broonie
  Cc: linux-sound, kai.vehmanen, ranjani.sridharan, yung-chuan.liao,
	pierre-louis.bossart, bhelgaas, linux-pci, linux-kernel, kw

Same recipes as PTL for NVL-S from the Nova Lake family.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
---
 sound/hda/core/intel-dsp-config.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/sound/hda/core/intel-dsp-config.c b/sound/hda/core/intel-dsp-config.c
index 2a9e35cddcf7..c401c0658421 100644
--- a/sound/hda/core/intel-dsp-config.c
+++ b/sound/hda/core/intel-dsp-config.c
@@ -578,6 +578,14 @@ static const struct config_entry config_table[] = {
 
 #endif
 
+	/* 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_S,
+	},
+#endif
+
 };
 
 static const struct config_entry *snd_intel_dsp_find_config
-- 
2.51.2


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH v2 7/7] ALSA: hda: controllers: intel: add support for Nova Lake S
  2025-11-04 12:16 [PATCH v2 0/7] ASoC/SOF/PCI/Intel: Support for Nova Lake S Peter Ujfalusi
                   ` (5 preceding siblings ...)
  2025-11-04 12:16 ` [PATCH v2 6/7] ALSA: hda: core: intel-dsp-config: Add " Peter Ujfalusi
@ 2025-11-04 12:16 ` Peter Ujfalusi
  2025-11-17 10:11 ` [PATCH v2 0/7] ASoC/SOF/PCI/Intel: Support " Péter Ujfalusi
  7 siblings, 0 replies; 11+ messages in thread
From: Peter Ujfalusi @ 2025-11-04 12:16 UTC (permalink / raw)
  To: lgirdwood, broonie
  Cc: linux-sound, kai.vehmanen, ranjani.sridharan, yung-chuan.liao,
	pierre-louis.bossart, bhelgaas, linux-pci, linux-kernel, kw

Add NVL-S to the PCI-ID list.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
---
 sound/hda/controllers/intel.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sound/hda/controllers/intel.c b/sound/hda/controllers/intel.c
index a19258c95886..1e8e3d61291a 100644
--- a/sound/hda/controllers/intel.c
+++ b/sound/hda/controllers/intel.c
@@ -2550,6 +2550,8 @@ static const struct pci_device_id azx_ids[] = {
 	{ 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) },
+	/* Nova Lake */
+	{ 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) },
 	/* Gemini-Lake */
-- 
2.51.2


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* Re: [PATCH v2 0/7] ASoC/SOF/PCI/Intel: Support for Nova Lake S
  2025-11-04 12:16 [PATCH v2 0/7] ASoC/SOF/PCI/Intel: Support for Nova Lake S Peter Ujfalusi
                   ` (6 preceding siblings ...)
  2025-11-04 12:16 ` [PATCH v2 7/7] ALSA: hda: controllers: intel: add support for Nova Lake S Peter Ujfalusi
@ 2025-11-17 10:11 ` Péter Ujfalusi
  2025-11-17 11:05   ` Takashi Iwai
  7 siblings, 1 reply; 11+ messages in thread
From: Péter Ujfalusi @ 2025-11-17 10:11 UTC (permalink / raw)
  To: lgirdwood, broonie
  Cc: linux-sound, kai.vehmanen, ranjani.sridharan, yung-chuan.liao,
	pierre-louis.bossart, bhelgaas, linux-pci, linux-kernel, kw

Hi Takashi,

On 04/11/2025 14:16, Peter Ujfalusi wrote:
> Hi,
> 
> Changes since v1:
> - Add information for the users of the PCI ID
> - Add Acked-by tag for the pci_ids.h from Bjorn
> - Add Acked-by tags from Mark for the ASoC patches
> 
> This series adds initial support for NVL-S from the Nova Lake family.
> NVL-S includes ACE4 audio subsystem, it has 2 DSP cores.

Would you consider to pick up this series for 6.19?

> 
> Regards,
> Peter
> ---
> Bard Liao (1):
>   ASoC: Intel: soc-acpi-intel-nvl-match: add rt722 l3 support
> 
> Peter Ujfalusi (6):
>   PCI: Add Intel Nova Lake S audio Device ID
>   ALSA: hda/hdmi: intelhdmi: add HDMI codec ID for Intel NVL
>   ASoC: Intel: soc-acpi: add NVL match tables
>   ASoC: SOF: Intel: add initial support for NVL-S
>   ALSA: hda: core: intel-dsp-config: Add support for NVL-S
>   ALSA: hda: controllers: intel: add support for Nova Lake S
> 
>  include/linux/pci_ids.h                       |  1 +
>  include/sound/soc-acpi-intel-match.h          |  2 +
>  sound/hda/codecs/hdmi/intelhdmi.c             |  1 +
>  sound/hda/controllers/intel.c                 |  2 +
>  sound/hda/core/intel-dsp-config.c             |  8 ++
>  sound/soc/intel/common/Makefile               |  1 +
>  .../intel/common/soc-acpi-intel-nvl-match.c   | 90 +++++++++++++++++++
>  sound/soc/sof/intel/Kconfig                   | 17 ++++
>  sound/soc/sof/intel/Makefile                  |  2 +
>  sound/soc/sof/intel/hda-dsp.c                 |  1 +
>  sound/soc/sof/intel/hda.h                     |  1 +
>  sound/soc/sof/intel/nvl.c                     | 55 ++++++++++++
>  sound/soc/sof/intel/nvl.h                     | 14 +++
>  sound/soc/sof/intel/pci-nvl.c                 | 82 +++++++++++++++++
>  sound/soc/sof/intel/shim.h                    |  1 +
>  15 files changed, 278 insertions(+)
>  create mode 100644 sound/soc/intel/common/soc-acpi-intel-nvl-match.c
>  create mode 100644 sound/soc/sof/intel/nvl.c
>  create mode 100644 sound/soc/sof/intel/nvl.h
>  create mode 100644 sound/soc/sof/intel/pci-nvl.c
> 

-- 
Péter


^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH v2 0/7] ASoC/SOF/PCI/Intel: Support for Nova Lake S
  2025-11-17 10:11 ` [PATCH v2 0/7] ASoC/SOF/PCI/Intel: Support " Péter Ujfalusi
@ 2025-11-17 11:05   ` Takashi Iwai
  2025-11-17 11:07     ` Péter Ujfalusi
  0 siblings, 1 reply; 11+ messages in thread
From: Takashi Iwai @ 2025-11-17 11:05 UTC (permalink / raw)
  To: Péter Ujfalusi
  Cc: lgirdwood, broonie, linux-sound, kai.vehmanen, ranjani.sridharan,
	yung-chuan.liao, pierre-louis.bossart, bhelgaas, linux-pci,
	linux-kernel, kw

On Mon, 17 Nov 2025 11:11:21 +0100,
Péter Ujfalusi wrote:
> 
> Hi Takashi,
> 
> On 04/11/2025 14:16, Peter Ujfalusi wrote:
> > Hi,
> > 
> > Changes since v1:
> > - Add information for the users of the PCI ID
> > - Add Acked-by tag for the pci_ids.h from Bjorn
> > - Add Acked-by tags from Mark for the ASoC patches
> > 
> > This series adds initial support for NVL-S from the Nova Lake family.
> > NVL-S includes ACE4 audio subsystem, it has 2 DSP cores.
> 
> Would you consider to pick up this series for 6.19?

I wasn't in Cc and it was ASoC subject prefix, so I overlooked this
series.  Now pull to for-next branch.


thanks,

Takashi

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH v2 0/7] ASoC/SOF/PCI/Intel: Support for Nova Lake S
  2025-11-17 11:05   ` Takashi Iwai
@ 2025-11-17 11:07     ` Péter Ujfalusi
  0 siblings, 0 replies; 11+ messages in thread
From: Péter Ujfalusi @ 2025-11-17 11:07 UTC (permalink / raw)
  To: Takashi Iwai
  Cc: lgirdwood, broonie, linux-sound, kai.vehmanen, ranjani.sridharan,
	yung-chuan.liao, pierre-louis.bossart, bhelgaas, linux-pci,
	linux-kernel, kw



On 17/11/2025 13:05, Takashi Iwai wrote:
> On Mon, 17 Nov 2025 11:11:21 +0100,
> Péter Ujfalusi wrote:
>>
>> Hi Takashi,
>>
>> On 04/11/2025 14:16, Peter Ujfalusi wrote:
>>> Hi,
>>>
>>> Changes since v1:
>>> - Add information for the users of the PCI ID
>>> - Add Acked-by tag for the pci_ids.h from Bjorn
>>> - Add Acked-by tags from Mark for the ASoC patches
>>>
>>> This series adds initial support for NVL-S from the Nova Lake family.
>>> NVL-S includes ACE4 audio subsystem, it has 2 DSP cores.
>>
>> Would you consider to pick up this series for 6.19?
> 
> I wasn't in Cc and it was ASoC subject prefix, so I overlooked this
> series.  Now pull to for-next branch.

Oh, I'm sorry, it really appears to be the case, thank you and sorry for
the mistake.

-- 
Péter


^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2025-11-17 11:07 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-11-04 12:16 [PATCH v2 0/7] ASoC/SOF/PCI/Intel: Support for Nova Lake S Peter Ujfalusi
2025-11-04 12:16 ` [PATCH v2 1/7] PCI: Add Intel Nova Lake S audio Device ID Peter Ujfalusi
2025-11-04 12:16 ` [PATCH v2 2/7] ALSA: hda/hdmi: intelhdmi: add HDMI codec ID for Intel NVL Peter Ujfalusi
2025-11-04 12:16 ` [PATCH v2 3/7] ASoC: Intel: soc-acpi: add NVL match tables Peter Ujfalusi
2025-11-04 12:16 ` [PATCH v2 4/7] ASoC: Intel: soc-acpi-intel-nvl-match: add rt722 l3 support Peter Ujfalusi
2025-11-04 12:16 ` [PATCH v2 5/7] ASoC: SOF: Intel: add initial support for NVL-S Peter Ujfalusi
2025-11-04 12:16 ` [PATCH v2 6/7] ALSA: hda: core: intel-dsp-config: Add " Peter Ujfalusi
2025-11-04 12:16 ` [PATCH v2 7/7] ALSA: hda: controllers: intel: add support for Nova Lake S Peter Ujfalusi
2025-11-17 10:11 ` [PATCH v2 0/7] ASoC/SOF/PCI/Intel: Support " Péter Ujfalusi
2025-11-17 11:05   ` Takashi Iwai
2025-11-17 11:07     ` Péter Ujfalusi

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).