ASoC: SOF: set up memory windows only at first boot

This will also prevent the debugfs entry creation errors seen every time the device resumes from runtime suspend or system suspend. Signed-off-by: Ranjani Sridharan <[email protected]>
thesofproject · Oct 15, 2018 · 856bb51 · 856bb51
1 parent 2a28aca
commit 856bb51
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/sound/soc/sof/intel/hda-ipc.c b/sound/soc/sof/intel/hda-ipc.c
@@ -389,7 +389,8 @@ int hda_dsp_ipc_fw_ready(struct snd_sof_dev *sdev, u32 msg_id)
 	snd_sof_fw_parse_ext_data(sdev, HDA_DSP_MBOX_UPLINK_OFFSET +
 				  sizeof(struct sof_ipc_fw_ready));
 
-	ipc_get_windows(sdev);
+	if (sdev->first_boot)
+		ipc_get_windows(sdev);
 
 	return 0;
 }
diff --git a/sound/soc/sof/loader.c b/sound/soc/sof/loader.c
@@ -269,6 +269,8 @@ int snd_sof_load_firmware(struct snd_sof_dev *sdev,
 {
 	dev_dbg(sdev->dev, "loading firmware\n");
 
+	sdev->first_boot = first_boot;
+
 	if (sdev->ops->load_firmware)
 		return sdev->ops->load_firmware(sdev, first_boot);
 	return 0;

diff --git a/sound/soc/sof/sof-priv.h b/sound/soc/sof/sof-priv.h
@@ -369,6 +369,7 @@ struct snd_sof_dev {
 
 	/* PM */
 	bool restore_kcontrols; /* restore kcontrols upon resume */
+	bool first_boot;
 
 	void *private;			/* core does not touch this */
 };