Skip to content

ASoC: Intel: add I2S function topology support #5657

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bardliao wants to merge 6 commits into
base: topic/sof-dev
Choose a base branch
from
Open

ASoC: Intel: add I2S function topology support #5657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dfb1052
ASoC: SOF: get nhlt from all topologies
bardliao Dec 22, 2025
feffa9f
ALSA: intel-nhlt: lower intel_nhlt_ssp_device_type log level
bardliao Jan 29, 2026
1102cd5
ASoC: Intel: sof-function-topology-lib: create common helpers
bardliao May 5, 2026
6cb23c2
ASoC: Intel: sof-function-topology-lib: add I2S support for sof_sdw_g…
bardliao May 5, 2026
56c212a
ASoC: Intel: sof-function-topology-lib: add get_function_topology for…
bardliao Nov 10, 2025
1ba0b97
ASoC: soc-acpi-intel-ptl-match: I2S machines: use function topology
bardliao Dec 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions sound/hda/core/intel-nhlt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ int intel_nhlt_ssp_device_type(struct device *dev, struct nhlt_acpi_table *nhlt,
int i;

if (!nhlt) {
dev_err(dev, "%s: NHLT table is missing (query for SSP%d)\n",
dev_dbg(dev, "%s: NHLT table is missing (query for SSP%d)\n",
__func__, virtual_bus_id);
return -EINVAL;
}
Expand All @@ -369,7 +369,7 @@ int intel_nhlt_ssp_device_type(struct device *dev, struct nhlt_acpi_table *nhlt,
epnt = (struct nhlt_endpoint *)((u8 *)epnt + epnt->length);
}

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__,
virtual_bus_id);

dev_dbg(dev, "Available endpoints:\n");
Expand Down
2 changes: 2 additions & 0 deletions sound/soc/intel/common/soc-acpi-intel-ptl-match.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,14 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_ptl_machines[] = {
.drv_name = "ptl_es83x6_c1_h02",
.machine_quirk = snd_soc_acpi_codec_list,
.quirk_data = &ptl_lt6911_hdmi,
.get_function_tplg_files = sof_i2s_get_tplg_files,
.sof_tplg_filename = "sof-ptl-es83x6-ssp1-hdmi-ssp02.tplg",
},
{
.comp_ids = &ptl_essx_83x6,
.drv_name = "sof-essx8336",
.sof_tplg_filename = "sof-ptl-es8336", /* the tplg suffix is added at run time */
.get_function_tplg_files = sof_i2s_get_tplg_files,
Comment thread
ujfalusi marked this conversation as resolved.
.tplg_quirk_mask = SND_SOC_ACPI_TPLG_INTEL_SSP_NUMBER |
SND_SOC_ACPI_TPLG_INTEL_SSP_MSB |
SND_SOC_ACPI_TPLG_INTEL_DMIC_NUMBER,
Expand Down
269 changes: 219 additions & 50 deletions sound/soc/intel/common/sof-function-topology-lib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ enum tplg_device_id {
TPLG_DEVICE_SDCA_MIC,
TPLG_DEVICE_INTEL_PCH_DMIC,
TPLG_DEVICE_HDMI,
TPLG_DEVICE_SSP_JACK,
TPLG_DEVICE_SSP_AMP,
TPLG_DEVICE_SSP_BT,
TPLG_DEVICE_SSP_HDMI_IN,
TPLG_DEVICE_LOOPBACK_VIRTUAL,
TPLG_DEVICE_MAX
};
Expand All @@ -28,6 +32,141 @@ enum tplg_device_id {

#define SOF_INTEL_PLATFORM_NAME_MAX 4

static int get_platform_name(struct snd_soc_card *card,
const struct snd_soc_acpi_mach *mach, char *platform)
{
int ret;

ret = sscanf(mach->sof_tplg_filename, "sof-%3s-*.tplg", platform);
if (ret != 1) {
dev_err(card->dev, "Invalid platform name of tplg %s\n",
mach->sof_tplg_filename);
return -EINVAL;
}
Comment thread
bardliao marked this conversation as resolved.
Comment thread
bardliao marked this conversation as resolved.

return 0;
}

static bool all_tplg_files_exist(struct device *dev, const char ***tplg_files, int tplg_num)
{
const struct firmware *fw;
int ret;
int i;

for (i = 0; i < tplg_num; i++) {
ret = firmware_request_nowarn(&fw, (*tplg_files)[i], dev);
if (!ret) {
release_firmware(fw);
} else {
dev_warn(dev,
"Failed to open topology file: %s, you might need to\n",
(*tplg_files)[i]);
dev_warn(dev,
"download it from https://github.com/thesofproject/sof-bin/\n");
return false;
}
}

return true;
}

static char *get_tplg_filename(struct device *dev, const char *prefix,
const char *platform, const char *tplg_dev_name,
int dai_link_id, int tplg_dev)
{
char *filename = NULL;

/*
Comment thread
ranj063 marked this conversation as resolved.
* The tplg file naming rule is sof-<platform>-<function>-id<BE id number>.tplg
* where <platform> is only required for the devices that need NHLT blob like DMIC
* as the nhlt blob is platform dependent.
*/
switch (tplg_dev) {
case TPLG_DEVICE_INTEL_PCH_DMIC:
case TPLG_DEVICE_SSP_JACK:
case TPLG_DEVICE_SSP_AMP:
case TPLG_DEVICE_SSP_BT:
case TPLG_DEVICE_SSP_HDMI_IN:
Comment thread
ranj063 marked this conversation as resolved.
filename = devm_kasprintf(dev, GFP_KERNEL, "%s/sof-%s-%s-id%d.tplg",
prefix, platform, tplg_dev_name, dai_link_id);
break;
default:
filename = devm_kasprintf(dev, GFP_KERNEL, "%s/sof-%s-id%d.tplg",
prefix, tplg_dev_name, dai_link_id);
break;
}

return filename;
}

static int get_dmic_tplg_dev(struct device *dev, int dmic_num,
int *tplg_dev, char **tplg_dev_name)
{
switch (dmic_num) {
case 2:
*tplg_dev_name = "dmic-2ch";
break;
case 4:
*tplg_dev_name = "dmic-4ch";
break;
default:
dev_warn(dev,
"unsupported number of dmics: %d\n",
dmic_num);
return -EINVAL;
}
*tplg_dev = TPLG_DEVICE_INTEL_PCH_DMIC;

return 0;
}

static int get_ssp_tplg_dev(struct device *dev, struct snd_soc_dai_link *dai_link,
u16 *hdmi_in_mask, int *tplg_dev, char **tplg_dev_name)
{
unsigned int ssp_port;

if (sscanf(dai_link->name, "SSP%d", &ssp_port) != 1) {
dev_err(dev, "Can't get SSP port from dai_link->name %s\n", dai_link->name);
return -EINVAL;
}
if (strstr(dai_link->name, "Codec")) {
/*
* Assume DAI link 0 is jack which is true in all existing
* machine drivers
*/
if (dai_link->id == 0) {
*tplg_dev = TPLG_DEVICE_SSP_JACK;
*tplg_dev_name = devm_kasprintf(dev, GFP_KERNEL,
"ssp%d-jack", ssp_port);
} else {
*tplg_dev = TPLG_DEVICE_SSP_AMP;
*tplg_dev_name = devm_kasprintf(dev, GFP_KERNEL,
"ssp%d-amp", ssp_port);
}
} else if (strstr(dai_link->name, "BT")) {
*tplg_dev = TPLG_DEVICE_SSP_BT;
*tplg_dev_name = devm_kasprintf(dev, GFP_KERNEL,
"ssp%d-bt", ssp_port);
} else if (strstr(dai_link->name, "HDMI")) {
Comment thread
bardliao marked this conversation as resolved.
*hdmi_in_mask |= BIT(ssp_port);
/* The number of HDMI in dai link is always 2 right now */
if (hweight16(*hdmi_in_mask) != 2)
return -EINVAL;

*tplg_dev = TPLG_DEVICE_SSP_HDMI_IN;
*tplg_dev_name = devm_kasprintf(dev, GFP_KERNEL,
"ssp%x-hdmiin", *hdmi_in_mask);
} else {
dev_warn(dev,
"unsupported SSP link %s\n", dai_link->name);
return -EINVAL;
}
Comment thread
bardliao marked this conversation as resolved.
if (!*tplg_dev_name)
return -ENOMEM;

return 0;
}

int sof_sdw_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)
{
Expand All @@ -38,20 +177,17 @@ int sof_sdw_get_tplg_files(struct snd_soc_card *card, const struct snd_soc_acpi_
*/
struct snd_soc_acpi_mach_params mach_params = card_mach->mach_params;
struct snd_soc_dai_link *dai_link;
const struct firmware *fw;
char platform[SOF_INTEL_PLATFORM_NAME_MAX];
unsigned long tplg_mask = 0;
u16 hdmi_in_mask = 0;
int tplg_num = 0;
int tplg_dev;
int ret;
int i;

ret = sscanf(mach->sof_tplg_filename, "sof-%3s-*.tplg", platform);
if (ret != 1) {
dev_err(card->dev, "Invalid platform name %s of tplg %s\n",
platform, mach->sof_tplg_filename);
return -EINVAL;
}
ret = get_platform_name(card, mach, platform);
if (ret < 0)
return ret;

for_each_card_prelinks(card, i, dai_link) {
char *tplg_dev_name;
Expand All @@ -70,23 +206,16 @@ int sof_sdw_get_tplg_files(struct snd_soc_card *card, const struct snd_soc_acpi_
tplg_dev = TPLG_DEVICE_SDCA_MIC;
tplg_dev_name = "sdca-mic";
} else if (strstr(dai_link->name, "dmic")) {
switch (mach_params.dmic_num) {
case 2:
tplg_dev_name = "dmic-2ch";
break;
case 4:
tplg_dev_name = "dmic-4ch";
break;
default:
dev_warn(card->dev,
"unsupported number of dmics: %d\n",
mach_params.dmic_num);
if (get_dmic_tplg_dev(card->dev, mach_params.dmic_num,
&tplg_dev, &tplg_dev_name) < 0)
continue;
}
tplg_dev = TPLG_DEVICE_INTEL_PCH_DMIC;
} else if (strstr(dai_link->name, "iDisp")) {
tplg_dev = TPLG_DEVICE_HDMI;
tplg_dev_name = "hdmi-pcm5";
} else if (strstr(dai_link->name, "SSP")) {
Comment thread
ranj063 marked this conversation as resolved.
Comment thread
ranj063 marked this conversation as resolved.
if (get_ssp_tplg_dev(card->dev, dai_link, &hdmi_in_mask,
&tplg_dev, &tplg_dev_name) < 0)
continue;
} else if (strstr(dai_link->name, "Loopback_Virtual")) {
tplg_dev = TPLG_DEVICE_LOOPBACK_VIRTUAL;
/*
Expand All @@ -111,25 +240,9 @@ int sof_sdw_get_tplg_files(struct snd_soc_card *card, const struct snd_soc_acpi_

tplg_mask |= BIT(tplg_dev);

/*
* The tplg file naming rule is sof-<platform>-<function>-id<BE id number>.tplg
* where <platform> is only required for the DMIC function as the nhlt blob
* is platform dependent.
*/
switch (tplg_dev) {
case TPLG_DEVICE_INTEL_PCH_DMIC:
(*tplg_files)[tplg_num] = devm_kasprintf(card->dev, GFP_KERNEL,
"%s/sof-%s-%s-id%d.tplg",
prefix, platform,
tplg_dev_name, dai_link->id);
break;
default:
(*tplg_files)[tplg_num] = devm_kasprintf(card->dev, GFP_KERNEL,
"%s/sof-%s-id%d.tplg",
prefix, tplg_dev_name,
dai_link->id);
break;
}
(*tplg_files)[tplg_num] = get_tplg_filename(card->dev, prefix, platform,
tplg_dev_name, dai_link->id,
tplg_dev);
if (!(*tplg_files)[tplg_num])
return -ENOMEM;
tplg_num++;
Expand All @@ -138,20 +251,76 @@ int sof_sdw_get_tplg_files(struct snd_soc_card *card, const struct snd_soc_acpi_
dev_dbg(card->dev, "tplg_mask %#lx tplg_num %d\n", tplg_mask, tplg_num);

/* Check presence of sub-topologies */
for (i = 0; i < tplg_num; i++) {
ret = firmware_request_nowarn(&fw, (*tplg_files)[i], card->dev);
if (!ret) {
release_firmware(fw);
if (all_tplg_files_exist(card->dev, tplg_files, tplg_num))
return tplg_num;

/* return 0 to use monolithic topology */
return 0;
Comment on lines 253 to +258
Copy link
Copy Markdown
Collaborator Author

@bardliao bardliao May 21, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We already handle this and return -EINVAL when the get_function_tplg_files() callback return 0 and the tplg file is dummy. Besides, that should belong to a different commit if there is any logic issue.

}
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)
Comment thread
ujfalusi marked this conversation as resolved.
{
struct snd_soc_acpi_mach_params mach_params = mach->mach_params;
struct snd_soc_dai_link *dai_link;
Comment on lines +262 to +266
Copy link
Copy Markdown
Collaborator Author

@bardliao bardliao May 21, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sof_sdw_get_tplg_files() get the mach params from the card because it will modify in the machine driver. But the sof_es8336 machine driver doesn't do the same thing.

char platform[SOF_INTEL_PLATFORM_NAME_MAX];
unsigned long tplg_mask = 0;
u16 hdmi_in_mask = 0;
int tplg_num = 0;
int tplg_dev;
int ret;
int i;

ret = get_platform_name(card, mach, platform);
if (ret < 0)
return ret;

for_each_card_prelinks(card, i, dai_link) {
char *tplg_dev_name;

dev_dbg(card->dev, "dai_link %s id %d\n", dai_link->name, dai_link->id);
if (strstr(dai_link->name, "SSP")) {
if (get_ssp_tplg_dev(card->dev, dai_link, &hdmi_in_mask,
&tplg_dev, &tplg_dev_name) < 0)
continue;
} else if (strstr(dai_link->name, "dmic")) {
if (get_dmic_tplg_dev(card->dev, mach_params.dmic_num,
&tplg_dev, &tplg_dev_name) < 0)
continue;
} else if (strstr(dai_link->name, "iDisp")) {
tplg_dev = TPLG_DEVICE_HDMI;
tplg_dev_name = "hdmi-pcm5";
} else {
dev_warn(card->dev,
"Failed to open topology file: %s, you might need to\n",
(*tplg_files)[i]);
dev_warn(card->dev,
"download it from https://github.com/thesofproject/sof-bin/\n");
/* The dai link is not supported by separated tplg yet */
dev_dbg(card->dev,
"dai_link %s is not supported by separated tplg yet\n",
dai_link->name);
if (best_effort)
continue;

return 0;
}
if (tplg_mask & BIT(tplg_dev))
continue;

tplg_mask |= BIT(tplg_dev);

(*tplg_files)[tplg_num] = get_tplg_filename(card->dev, prefix, platform,
tplg_dev_name, dai_link->id,
tplg_dev);
if (!(*tplg_files)[tplg_num])
return -ENOMEM;
tplg_num++;
}

return tplg_num;
dev_dbg(card->dev, "tplg_mask %#lx tplg_num %d\n", tplg_mask, tplg_num);

/* Check presence of sub-topologies */
if (all_tplg_files_exist(card->dev, tplg_files, tplg_num))
return tplg_num;

/* return 0 to use monolithic topology */
return 0;
}
EXPORT_SYMBOL_GPL(sof_sdw_get_tplg_files);
EXPORT_SYMBOL_GPL(sof_i2s_get_tplg_files);
3 changes: 3 additions & 0 deletions sound/soc/intel/common/sof-function-topology-lib.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,7 @@
int sof_sdw_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);

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

#endif
1 change: 1 addition & 0 deletions sound/soc/sof/intel/apl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ int sof_apl_ops_init(struct snd_sof_dev *sdev)
return -ENOMEM;

ipc4_data = sdev->private;
INIT_LIST_HEAD(&ipc4_data->nhlt_list);
ipc4_data->manifest_fw_hdr_offset = SOF_MAN4_FW_HDR_OFFSET;

ipc4_data->mtrace_type = SOF_IPC4_MTRACE_INTEL_CAVS_1_5;
Expand Down
1 change: 1 addition & 0 deletions sound/soc/sof/intel/cnl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,7 @@ int sof_cnl_ops_init(struct snd_sof_dev *sdev)
return -ENOMEM;

ipc4_data = sdev->private;
INIT_LIST_HEAD(&ipc4_data->nhlt_list);
ipc4_data->manifest_fw_hdr_offset = SOF_MAN4_FW_HDR_OFFSET;

ipc4_data->mtrace_type = SOF_IPC4_MTRACE_INTEL_CAVS_1_8;
Expand Down
Loading
Loading