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.

you need to call out that in preparation for supporting multiple topology fragments per function which could end up calling this function multiple types with NHLT blobs from different fragments, downgrade the error message to debug level.

Commit message updated. But do you mean to move the commit to before the ASoC: SOF: get nhlt from all topologies commit?

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

sound/soc/sof/ipc4-priv.h

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?

sound/soc/sof/ipc4-topology.c

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.

@bardliao this patch needs a bit more detailed description of what you're trying to do in the commit message. You need to say that you're adding a list of NHLTs and that for each device type, you want to search for the blob in all NHLTs in the list. Otherwise, its unclear why we need to search multiple NHLTs for DMIC? Or alternatively, if this was just a side effect, you need to move the iterative check for the SSP blob into the SSP case in the switch above and skip it here.

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?

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

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.

sound/soc/sof/ipc4-topology.c

CBala21 · 2026-01-30T12:05:50Z

Tested HDMI in capture and I2S functional. observed the expected behavior.

ranj063 · 2026-01-30T16:40:25Z

sound/soc/sof/ipc4-topology.c

 {
 	struct sof_ipc4_fw_data *ipc4_data = sdev->private;
 	struct nhlt_specific_cfg *cfg;
+	struct snd_ipc4_nhlt *entry;


dont you need to init this to NULL?

ranj063 · 2026-01-30T16:43:36Z

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);


@bardliao this patch needs a bit more detailed description of what you're trying to do in the commit message. You need to say that you're adding a list of NHLTs and that for each device type, you want to search for the blob in all NHLTs in the list. Otherwise, its unclear why we need to search multiple NHLTs for DMIC? Or alternatively, if this was just a side effect, you need to move the iterative check for the SSP blob into the SSP case in the switch above and skip it here.

ranj063 · 2026-01-30T16:54:36Z

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__,


you need to call out that in preparation for supporting multiple topology fragments per function which could end up calling this function multiple types with NHLT blobs from different fragments, downgrade the error message to debug level.

ranj063 · 2026-01-30T16:56:28Z

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

+			       int dai_link_id, int tplg_dev)
+{
+	char *filename = NULL;
+	/*


missing line?

ranj063 · 2026-01-30T16:57:30Z

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

+			if (strstr(dai_link->name, "Codec")) {
+				/*
+				 * Assume DAI link 0 is jack which is true in all existing
+				 * machine driver


typo: machine drivers

ranj063 · 2026-01-30T16:58:42Z

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

 		} else if (strstr(dai_link->name, "iDisp")) {
 			tplg_dev = TPLG_DEVICE_HDMI;
 			tplg_dev_name = "hdmi-pcm5";
+		} else if (strstr(dai_link->name, "SSP")) {


can you split this into seaprate function based on DAI type?

Not sure how to do it. It seems the only way we can tell the DAI type is from the DAI link name. And the SSP DAI link name could be SSP%d-Codec, SSP%d-BT, SSP%d-HDMI for different types.

ranj063 · 2026-01-30T17:03:02Z

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

 	case TPLG_DEVICE_SSP_JACK:
 	case TPLG_DEVICE_SSP_AMP:
 	case TPLG_DEVICE_SSP_BT:
+	case TPLG_DEVICE_SSP_HDMI_IN:


why is this in this patch and not the previous one?

Yeah, it should be in the previous patch.

The existing code assumes there is only one NHLT blob either from BIOS or topology. As function topologies are used and each function topology contains a NHLT blob section, we need to search the matching NHLT blob from all the NHLT blobs. The commit suggests adding a list of NHLTs and search the NHLTs from the list. Signed-off-by: Bard Liao <[email protected]>

To support multiple topology fragments per function, this function could be called multiple types with different NHLT blobs from different fragments. Downgrade the error message to debug level since the SSP device type could be found from one of the nhlt. Signed-off-by: Bard Liao <[email protected]>

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 <[email protected]>

…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 <[email protected]>

… I2S machines Add sof_i2s_get_tplg_files() callback for Intel SOF I2S machines. Signed-off-by: Bard Liao <[email protected]>

Use sof_i2s_get_tplg_files() for SOF es83x6 machines. Signed-off-by: Bard Liao <[email protected]>

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 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

sound/soc/sof/ipc4-topology.c Show resolved Hide resolved

ranj063 reviewed Jan 30, 2026

View reviewed changes

bardliao added 6 commits February 2, 2026 11:34

ASoC: Intel: sof-function-topology-lib: create common helpers

64417a6

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 <[email protected]>

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

34e06c9

…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 <[email protected]>

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

e359f89

… I2S machines Add sof_i2s_get_tplg_files() callback for Intel SOF I2S machines. Signed-off-by: Bard Liao <[email protected]>

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

9fdc58f

Use sof_i2s_get_tplg_files() for SOF es83x6 machines. Signed-off-by: Bard Liao <[email protected]>

bardliao force-pushed the get-i2s-tplg branch from 1af3d92 to 9fdc58f Compare February 2, 2026 05:30

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!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

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!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

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

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!

Choose a reason for hiding this comment

ujfalusi Jan 29, 2026 •

edited

Loading

ujfalusi Jan 29, 2026 •

edited

Loading

CBala21 commented Jan 30, 2026 •

edited

Loading