SoC: SOF: acpi: enable PM for ACPI platforms

This patch adds the platform-specific PM callbacks for
the BYT/CHT ACPI platforms. Since the Minnowboards
do not support PM, the SOF device is prevented from
entering runtime suspend by incrementing the ref count
after the topology is loaded.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>

Author: ranj063

sound/soc/sof/intel/byt.c

@@ -382,6 +382,26 @@ static int byt_reset(struct snd_sof_dev *sdev)
 	return 0;
 }
 
+static int byt_suspend(struct snd_sof_dev *sdev)
+{
+	/* put DSP into reset, set reset vector and stall */
+	snd_sof_dsp_update_bits64(sdev, BYT_DSP_BAR, SHIM_CSR,
+				  SHIM_BYT_CSR_RST | SHIM_BYT_CSR_VECTOR_SEL |
+				  SHIM_BYT_CSR_STALL,
+				  SHIM_BYT_CSR_RST | SHIM_BYT_CSR_VECTOR_SEL |
+				  SHIM_BYT_CSR_STALL);
+
+	return 0;
+}
+
+static int byt_resume(struct snd_sof_dev *sdev)
+{
+	/* enable Interrupt from both sides */
+	snd_sof_dsp_update_bits64(sdev, BYT_DSP_BAR, SHIM_IMRX, 0x3, 0x0);
+	snd_sof_dsp_update_bits64(sdev, BYT_DSP_BAR, SHIM_IMRD, 0x3, 0x0);
+	return 0;
+}
+
 /* Baytrail DAIs */
 static struct snd_soc_dai_driver byt_dai[] = {
 {
@@ -529,6 +549,10 @@ const struct snd_sof_dsp_ops sof_tng_ops = {
 	/*Firmware loading */
 	.load_firmware	= snd_sof_load_firmware_memcpy,
 
+	/* PM */
+	.suspend = byt_suspend,
+	.resume = byt_resume,
+
 	/* DAI drivers */
 	.drv = byt_dai,
 	.num_drv = 3, /* we have only 3 SSPs on byt*/
@@ -690,6 +714,10 @@ const struct snd_sof_dsp_ops sof_byt_ops = {
 	/*Firmware loading */
 	.load_firmware	= snd_sof_load_firmware_memcpy,
 
+	/* PM */
+	.suspend = byt_suspend,
+	.resume = byt_resume,
+
 	/* DAI drivers */
 	.drv = byt_dai,
 	.num_drv = 3, /* we have only 3 SSPs on byt*/
@@ -749,6 +777,10 @@ const struct snd_sof_dsp_ops sof_cht_ops = {
 	/*Firmware loading */
 	.load_firmware	= snd_sof_load_firmware_memcpy,
 
+	/* PM */
+	.suspend = byt_suspend,
+	.resume = byt_resume,
+
 	/* DAI drivers */
 	.drv = byt_dai,
 	/* all 6 SSPs may be available for cherrytrail */

sound/soc/sof/pcm.c

@@ -732,14 +732,6 @@ static int sof_pcm_probe(struct snd_soc_component *component)
 		return ret;
 	}
 
-	/*
-	 * Some platforms in SOF, ex: BYT, may not have their platform PM
-	 * callbacks set. Increment the usage count so as to
-	 * prevent the device from entering runtime suspend.
-	 */
-	if (!sof_ops(sdev)->runtime_suspend || !sof_ops(sdev)->runtime_resume)
-		pm_runtime_get_noresume(sdev->dev);
-
 	return ret;
 }
 

sound/soc/sof/pm.c

@@ -266,7 +266,10 @@ static int sof_resume(struct device *dev, bool runtime_resume)
 	int ret;
 
 	/* do nothing if dsp resume callbacks are not set */
-	if (!sof_ops(sdev)->resume || !sof_ops(sdev)->runtime_resume)
+	if (runtime_resume && !sof_ops(sdev)->runtime_resume)
+		return 0;
+
+	if (!runtime_resume && !sof_ops(sdev)->resume)
 		return 0;
 
 	/*
@@ -337,8 +340,11 @@ static int sof_suspend(struct device *dev, bool runtime_suspend)
 	struct snd_sof_dev *sdev = dev_get_drvdata(dev);
 	int ret;
 
-	/* do nothing if dsp suspend callback is not set */
-	if (!sof_ops(sdev)->suspend)
+	/* do nothing if dsp suspend callbacks are not set */
+	if (!runtime_suspend && !sof_ops(sdev)->suspend)
+		return 0;
+
+	if (runtime_suspend && !sof_ops(sdev)->runtime_suspend)
 		return 0;
 
 	/* release trace */

sound/soc/sof/sof-acpi-dev.c

@@ -12,6 +12,7 @@
 #include <linux/firmware.h>
 #include <linux/module.h>
 #include <linux/pm_runtime.h>
+#include <linux/dmi.h>
 #include <sound/soc-acpi.h>
 #include <sound/soc-acpi-intel-match.h>
 #include <sound/sof.h>
@@ -117,6 +118,39 @@ static const struct sof_dev_desc sof_acpi_cherrytrail_desc = {
 	.arch_ops = &sof_xtensa_arch_ops
 };
 
+static int minnowboard_quirk_cb(const struct dmi_system_id *id)
+{
+	struct device *dev = id->driver_data;
+
+	/*
+	 * Increment the usage count so as to prevent the device
+	 * from entering runtime suspend.
+	 */
+	pm_runtime_get_noresume(dev);
+
+	return 1;
+}
+
+static struct dmi_system_id minnowbard_quirk_table[] = {
+	{
+		/* Minnowboard Max B3 */
+		.callback = minnowboard_quirk_cb,
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Circuitco"),
+			DMI_MATCH(DMI_PRODUCT_NAME,
+				  "Minnowboard Max B3 PLATFORM"),
+		},
+	},
+	{
+		/* Minnowboard Turbot */
+		.callback = minnowboard_quirk_cb,
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "ADI"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "Minnowboard Turbot"),
+		},
+	},
+};
+
 #endif
 
 static const struct dev_pm_ops sof_acpi_pm = {
@@ -127,13 +161,27 @@ static const struct dev_pm_ops sof_acpi_pm = {
 
 static void sof_acpi_probe_complete(struct device *dev)
 {
+	int i;
+
 	if (sof_acpi_debug & SOF_ACPI_DISABLE_PM_RUNTIME)
 		return;
 
 	/* allow runtime_pm */
 	pm_runtime_set_autosuspend_delay(dev, SND_SOF_SUSPEND_DELAY_MS);
 	pm_runtime_use_autosuspend(dev);
+	pm_runtime_set_active(dev);
 	pm_runtime_enable(dev);
+	pm_runtime_mark_last_busy(dev);
+
+#if IS_ENABLED(CONFIG_SND_SOC_SOF_BAYTRAIL)
+	/* set driver data in the quirk table */
+	for (i = 0; i < ARRAY_SIZE(minnowbard_quirk_table); i++)
+		minnowbard_quirk_table[i].driver_data = dev;
+
+	/* check for Minnowboards */
+	dmi_check_system(minnowbard_quirk_table);
+#endif
+	pm_runtime_put_autosuspend(dev);
 }
 
 static int sof_acpi_probe(struct platform_device *pdev)