ASoC: SOF: topology: add state variable to check topology load state

plbossart · plbossart · commit 81eb5c635582 · 2018-11-30T10:26:36.000-06:00
With the complicated error flow, we don't have a record of whether the
topology was loaded or not. Having a dmesg trace would help indicate
an unintended path in error handling.

Add a boolean to only load the topology if it's not already loaded,
and free the topology if it's loaded, and log errors as needed.

Note that the topology_free should itself never result in any
crashes. If it does it's a separate issue from identifying bad error
handling.

Signed-off-by: Pierre-Louis Bossart &lt;pierre-louis.bossart@linux.intel.com&gt;
diff --git a/sound/soc/sof/sof-priv.h b/sound/soc/sof/sof-priv.h
@@ -357,6 +357,7 @@ struct snd_sof_dev {
 	struct list_head dai_list;
 	struct list_head route_list;
 	struct snd_soc_component *component;
+	int tplg_loaded; /* keep track of topology load success */
 
 	/* FW configuration */
 	struct sof_ipc_dma_buffer_data *info_buffer;
diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c
@@ -2620,6 +2620,11 @@ int snd_sof_load_topology(struct snd_sof_dev *sdev, const char *file)
 	struct snd_soc_tplg_hdr *hdr;
 	int ret;
 
+	if (sdev->tplg_loaded) {
+		dev_err(sdev->dev, "topology already loaded ?\n");
+		return -EINVAL;
+	}
+
 	dev_dbg(sdev->dev, "loading topology:%s\n", file);
 
 	ret = request_firmware(&fw, file, sdev->dev);
@@ -2639,6 +2644,8 @@ int snd_sof_load_topology(struct snd_sof_dev *sdev, const char *file)
 		ret = -EINVAL;
 	}
 
+	sdev->tplg_loaded = true;
+
 	release_firmware(fw);
 	return ret;
 }
@@ -2650,6 +2657,10 @@ void snd_sof_free_topology(struct snd_sof_dev *sdev)
 	int ret;
 
 	dev_dbg(sdev->dev, "free topology...\n");
+	if (!sdev->tplg_loaded) {
+		dev_dbg(sdev->dev, "No topology loaded, nothing to free ...\n");
+		return;
+	}
 
 	/* remove routes */
 	list_for_each_entry_safe(sroute, temp, &sdev->route_list, list) {
@@ -2665,5 +2676,7 @@ void snd_sof_free_topology(struct snd_sof_dev *sdev)
 	if (ret < 0)
 		dev_err(sdev->dev,
 			"error: tplg component free failed %d\n", ret);
+
+	sdev->tplg_loaded = false;
 }
 EXPORT_SYMBOL(snd_sof_free_topology);
