ASoC: Intel: add I2S function topology support #5657

bardliao · 2026-01-28T02:56:49Z

Currently, function topology is only used by the SoundWire machines. Extend the support to the I2S machines.

ujfalusi

only checked the first patch

ujfalusi · 2026-01-28T07:34:45Z

sound/hda/core/intel-nhlt.c

 	}

-	dev_err(dev, "%s: No match for SSP%d in NHLT table\n", __func__,
+	dev_dbg(dev, "%s: No match for SSP%d in NHLT table\n", __func__,


I would have this as separate patch?

we are also going to look for DMIC blobs in several nhlt, so change those prints as well?

Not sure about the DMIC blobs. Maybe we can change the DMIC prints when we look for DMIC blobs in several nhlt?

but we do after the second patch...

There could be NHLT blobs w/o DMIC (SSP fragment) and we would print error/warn?

intel_nhlt_get_endpoint_blob() will be called for each NHLT blobs, but it uses dev_dbg already.

sound/soc/sof/intel/hda-dai.c

ujfalusi · 2026-01-28T07:39:51Z

sound/soc/sof/ipc4-priv.h

+struct snd_ipc4_nhlt {
+	struct list_head list;
+	void *nhlt;
+	size_t nhlt_size;


nhlt_size is not used

ujfalusi · 2026-01-28T07:40:03Z

sound/soc/sof/ipc4-priv.h

+	size_t nhlt_size;
+};
+
+


extra line break

ujfalusi · 2026-01-28T07:45:29Z

sound/soc/sof/ipc4-topology.c

+								   channel_count, sample_rate,
+								   dir, dev_type);
+				if (cfg)
+					break;


goto out; and remove the cfg check after the loop?

ujfalusi · 2026-01-28T07:46:56Z

sound/soc/sof/ipc4-topology.c

+			struct snd_ipc4_nhlt *tplg_nhlt;
+
+			/* Get the nhlt from topology manifest*/
+			tplg_nhlt = kzalloc(sizeof(*tplg_nhlt), GFP_KERNEL);


this is what is missing in hda-dai.c!

but you need devm_kzalloc() to leak memory..

changed to devm_kzalloc()

ujfalusi

@bardliao, looks really nice, I have few nitpicks and one bigger question only

ujfalusi · 2026-01-29T06:04:33Z

sound/hda/core/intel-nhlt.c

 	}

-	dev_err(dev, "%s: No match for SSP%d in NHLT table\n", __func__,
+	dev_dbg(dev, "%s: No match for SSP%d in NHLT table\n", __func__,


but we do after the second patch...

There could be NHLT blobs w/o DMIC (SSP fragment) and we would print error/warn?

ujfalusi · 2026-01-29T06:16:23Z

sound/soc/sof/ipc4-topology.c

-						      dai_index);
-		if (dev_type < 0)
+		list_for_each_entry(nhlt, &ipc4_data->nhlt_list, list) {
+			dev_type = intel_nhlt_ssp_device_type(sdev->dev, nhlt->nhlt,


nitpick: nhlt->nhlt, can we do entry->nhlt instead? the outer nhlt is not nhlt as such.

ujfalusi · 2026-01-29T06:17:52Z

sound/soc/sof/ipc4-topology.c

+			cfg = intel_nhlt_get_endpoint_blob(sdev->dev, nhlt->nhlt, dai_index,
+							   nhlt_type, bit_depth, bit_depth,
+							   channel_count, sample_rate, dir,
+							   dev_type);


Here, this will run for DMIC also?

Yes, and it uses dev_dbg() already.

ujfalusi · 2026-01-29T06:24:06Z

sound/soc/intel/common/sof-function-topology-lib.c

 EXPORT_SYMBOL_GPL(sof_sdw_get_tplg_files);
+
+int sof_i2s_get_tplg_files(struct snd_soc_card *card, const struct snd_soc_acpi_mach *mach,
+			   const char *prefix, const char ***tplg_files, bool best_effort)


do you plan to support the best_effort with SSP machines?

ujfalusi · 2026-01-29T06:26:00Z

sound/soc/intel/common/sof-function-topology-lib.c

 			tplg_dev = TPLG_DEVICE_HDMI;
 			tplg_dev_name = "hdmi-pcm5";

+		} else if (strstr(dai_link->name, "SSP")) {


you can remove the extra line on front

ujfalusi · 2026-01-29T06:30:01Z

sound/soc/intel/common/sof-function-topology-lib.c

+		if (!(*tplg_files)[tplg_num])
+			return -ENOMEM;
+		tplg_num++;
+	}


To my untrained eyes this looks like identical to what sof_sdw_get_tplg_files() would do, just that this lacks the SDW part, no?
Why not rename that function ad use it for all types as universal tool?

Yeah, I thought about it. And yes, they look quite similar, but the existing topologies may use different PCM IDs for different machines. I think it would be better to use separated function to keep the flexibility to have different function topology names for different machines.

Each function topology has its own NHLT blob sections. And we need to look for the matching blob from all the NHLT blobs. Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>

intel_nhlt_ssp_device_type() is called multiple times with different nhlt. We will find the SSP device type from one of the nhlt. It is not an error if one of the nhlt doesn't contain the SSP endpoint. Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>

The existing code supports get_function_tplg_files callback for SoundWire machine driver only. Some common sections can be used to extend the support to other machines. Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>

…et_tplg_files The Intel SOF SDW machine drive also supports I2S interface. Add related supports for the sof_sdw_get_tplg_files() callback. Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>

… I2S machines Add sof_i2s_get_tplg_files() callback for Intel SOF I2S machines. Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>

Use sof_i2s_get_tplg_files() for SOF es83x6 machines. Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>

ranj063 · 2026-01-29T16:06:40Z

sound/soc/sof/ipc4-topology.c

-			ipc4_data->nhlt = devm_kmemdup(sdev->dev, manifest_tlv->data,
-						       le32_to_cpu(manifest_tlv->size), GFP_KERNEL);
-			if (!ipc4_data->nhlt)
+			struct snd_ipc4_nhlt *tplg_nhlt;


@bardliao this is a slight departure from what we do currently right? If there's a BIOS NHLT, we never bother with the topology NHLT even if it exists. But now we parse it add it to the list but after the BIOS NHLT? Will this change the expected behaviour on ac device with both NHLTs present?

bardliao requested review from CBala21, ranj063 and ujfalusi January 28, 2026 02:56

bardliao requested review from dbaluta, kv2019i, lgirdwood and plbossart as code owners January 28, 2026 02:56

ujfalusi reviewed Jan 28, 2026

View reviewed changes

bardliao force-pushed the get-i2s-tplg branch 2 times, most recently from a0fd522 to 8d4c0c3 Compare January 29, 2026 03:30

ujfalusi reviewed Jan 29, 2026

View reviewed changes

bardliao added 6 commits January 29, 2026 21:57

ASoC: SOF: get nhlt from all topologies

77371f2

Each function topology has its own NHLT blob sections. And we need to look for the matching blob from all the NHLT blobs. Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>

ASoC: Intel: sof-function-topology-lib: add I2S support for sof_sdw_g…

0cd2c08

…et_tplg_files The Intel SOF SDW machine drive also supports I2S interface. Add related supports for the sof_sdw_get_tplg_files() callback. Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>

ASoC: Intel: sof-function-topology-lib: add get_function_topology for…

0637a33

… I2S machines Add sof_i2s_get_tplg_files() callback for Intel SOF I2S machines. Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>

ASoC: soc-acpi-intel-ptl-match: I2S machines: use function topology

1af3d92

Use sof_i2s_get_tplg_files() for SOF es83x6 machines. Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>

bardliao force-pushed the get-i2s-tplg branch from 8d4c0c3 to 1af3d92 Compare January 29, 2026 14:19

ranj063 reviewed Jan 29, 2026

View reviewed changes

ASoC: Intel: add I2S function topology support #5657

Are you sure you want to change the base?

ASoC: Intel: add I2S function topology support #5657

Uh oh!

Conversation

bardliao commented Jan 28, 2026

Uh oh!

ujfalusi left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ujfalusi Jan 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ujfalusi left a comment

Choose a reason for hiding this comment

Uh oh!

ujfalusi Jan 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

ujfalusi Jan 29, 2026 •

edited

Loading

ujfalusi Jan 29, 2026 •

edited

Loading