Skip to content

Commit 0bdb4e5

Browse files
committed
platform/x86:intel/pmc: Disable ACPI PM Timer disabling on Sky and Kaby Lake
There have been multiple reports that the ACPI PM Timer disabling is causing Sky and Kaby Lake systems to hang on all suspend (s2idle, s3, hibernate) methods. Remove the acpi_pm_tmr_ctl_offset and acpi_pm_tmr_disable_bit settings from spt_reg_map to disable the ACPI PM Timer disabling on Sky and Kaby Lake to fix the hang on suspend. Fixes: e86c818 ("platform/x86:intel/pmc: Enable the ACPI PM Timer to be turned off when suspended") Reported-by: Paul Menzel <pmenzel@molgen.mpg.de> Closes: https://lore.kernel.org/linux-pm/18784f62-91ff-4d88-9621-6c88eb0af2b5@molgen.mpg.de/ Reported-by: Todd Brandt <todd.e.brandt@intel.com> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=219346 Cc: Marek Maslanka <mmaslanka@google.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com> Tested-by: Todd Brandt <todd.e.brandt@intel.com> Tested-by: Paul Menzel <pmenzel@molgen.mpg.de> # Dell XPS 13 9360/0596KF Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Link: https://lore.kernel.org/r/20241003202614.17181-2-hdegoede@redhat.com
1 parent b6c57b7 commit 0bdb4e5

File tree

1 file changed

+0
-2
lines changed
  • drivers/platform/x86/intel/pmc

1 file changed

+0
-2
lines changed

drivers/platform/x86/intel/pmc/spt.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,6 @@ const struct pmc_reg_map spt_reg_map = {
130130
.ppfear_buckets = SPT_PPFEAR_NUM_ENTRIES,
131131
.pm_cfg_offset = SPT_PMC_PM_CFG_OFFSET,
132132
.pm_read_disable_bit = SPT_PMC_READ_DISABLE_BIT,
133-
.acpi_pm_tmr_ctl_offset = SPT_PMC_ACPI_PM_TMR_CTL_OFFSET,
134-
.acpi_pm_tmr_disable_bit = SPT_PMC_BIT_ACPI_PM_TMR_DISABLE,
135133
.ltr_ignore_max = SPT_NUM_IP_IGN_ALLOWED,
136134
.pm_vric1_offset = SPT_PMC_VRIC1_OFFSET,
137135
};

0 commit comments

Comments
 (0)