platform/x86/intel/pmc/mtl: Put devices in D3 during resume

An earlier commit placed some driverless devices in D3 during boot so that
they don't block package cstate entry on Meteor Lake. Also place these
devices in D3 after resume from suspend.

Fixes: 336ba968d3e3 ("platform/x86/intel/pmc/mtl: Put GNA/IPU/VPU devices in D3")
Signed-off-by: David E. Box <david.e.box@linux.intel.com>
Link: https://lore.kernel.org/r/20230607233849.239047-2-david.e.box@linux.intel.com
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/drivers/platform/x86/intel/pmc/mtl.c b/drivers/platform/x86/intel/pmc/mtl.c
index e8cc156412ce56a758d9f2e14cb87a68138b276e..2b00ad9da621bf7604d17ee0024a296bc8ba9147 100644 (file)
--- a/drivers/platform/x86/intel/pmc/mtl.c
+++ b/drivers/platform/x86/intel/pmc/mtl.c
@@ -68,16 +68,29 @@ static void mtl_set_device_d3(unsigned int device)
        }
 }
 
+/*
+ * Set power state of select devices that do not have drivers to D3
+ * so that they do not block Package C entry.
+ */
+static void mtl_d3_fixup(void)
+{
+       mtl_set_device_d3(MTL_GNA_PCI_DEV);
+       mtl_set_device_d3(MTL_IPU_PCI_DEV);
+       mtl_set_device_d3(MTL_VPU_PCI_DEV);
+}
+
+static int mtl_resume(struct pmc_dev *pmcdev)
+{
+       mtl_d3_fixup();
+       return pmc_core_resume_common(pmcdev);
+}
+
 void mtl_core_init(struct pmc_dev *pmcdev)
 {
        pmcdev->map = &mtl_reg_map;
        pmcdev->core_configure = mtl_core_configure;
 
-       /*
-        * Set power state of select devices that do not have drivers to D3
-        * so that they do not block Package C entry.
-        */
-       mtl_set_device_d3(MTL_GNA_PCI_DEV);
-       mtl_set_device_d3(MTL_IPU_PCI_DEV);
-       mtl_set_device_d3(MTL_VPU_PCI_DEV);
+       mtl_d3_fixup();
+
+       pmcdev->resume = mtl_resume;
 }