Unverified Commit 2b92b98c authored by Bard Liao's avatar Bard Liao Committed by Mark Brown
Browse files

ASoC: SOF: Don't print the monolithic topology name if function topology may be used 



It may confuse people if "Topology file:" is printed but the topology
file is not really used. We keep the print if the topology file is
missing thus user can know what topology is missed in the file system.
And increase the log level to info for the actual topology that is used.
So that user can get which topology is used.

Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarSimon Trimmer <simont@opensource.cirrus.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://patch.msgid.link/20251009094023.3474895-2-yung-chuan.liao@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 3a866087

sound/soc/sof/fw-file-profile.c

+7 −1
Original line number Diff line number Diff line
@@ -266,6 +266,7 @@ static void sof_print_profile_info(struct snd_sof_dev *sdev, 
				   enum sof_ipc_type ipc_type,

				   struct sof_loadable_file_profile *profile)

{

	struct snd_sof_pdata *plat_data = sdev->pdata;

	struct device *dev = sdev->dev;



	if (ipc_type != profile->ipc_type)
@@ -282,7 +283,12 @@ static void sof_print_profile_info(struct snd_sof_dev *sdev, 


	if (profile->fw_lib_path)

		dev_info(dev, " Firmware lib path: %s\n", profile->fw_lib_path);

	dev_info(dev, " Topology file:     %s/%s\n", profile->tplg_path, profile->tplg_name);



	if (plat_data->machine->get_function_tplg_files && !plat_data->disable_function_topology)

		dev_info(dev, " Topology file:     function topologies\n");

	else

		dev_info(dev, " Topology file:     %s/%s\n",

			 profile->tplg_path, profile->tplg_name);

}



int sof_create_ipc_file_profile(struct snd_sof_dev *sdev,

sound/soc/sof/topology.c

+1 −1
Original line number Diff line number Diff line
@@ -2525,7 +2525,7 @@ int snd_sof_load_topology(struct snd_soc_component *scomp, const char *file) 
	if (!tplg_cnt) {

		tplg_files[0] = file;

		tplg_cnt = 1;

		dev_dbg(scomp->dev, "loading topology: %s\n", file);

		dev_info(scomp->dev, "loading topology: %s\n", file);

	} else {

		dev_info(scomp->dev, "Using function topologies instead %s\n", file);

	}