diff mbox series

platform/x86:intel/pmc: Disable ACPI PM Timer disabling on Sky and Kabe Lake

Message ID 20241003202614.17181-2-hdegoede@redhat.com (mailing list archive)
State New
Delegated to: Hans de Goede
Headers show
Series platform/x86:intel/pmc: Disable ACPI PM Timer disabling on Sky and Kabe Lake | expand

Commit Message

Hans de Goede Oct. 3, 2024, 8:26 p.m. UTC
There have been multiple reports that the ACPI PM Timer disabling is
causing Sky and Kabe 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 Kabe Lake to
fix the hang on suspend.

Fixes: e86c8186d03a ("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>
---
 drivers/platform/x86/intel/pmc/spt.c | 2 --
 1 file changed, 2 deletions(-)

Comments

Paul Menzel Oct. 3, 2024, 11:16 p.m. UTC | #1
Dear Hans,


Thank you for the patch.

Am 03.10.24 um 22:26 schrieb Hans de Goede:
> There have been multiple reports that the ACPI PM Timer disabling is
> causing Sky and Kabe Lake systems to hang on all suspend (s2idle, s3,

Kab*y* (also in the summary)

> 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 Kabe Lake to

Ditto.

> fix the hang on suspend.
> 
> Fixes: e86c8186d03a ("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>
> ---
>   drivers/platform/x86/intel/pmc/spt.c | 2 --
>   1 file changed, 2 deletions(-)
> 
> diff --git a/drivers/platform/x86/intel/pmc/spt.c b/drivers/platform/x86/intel/pmc/spt.c
> index 2cd2b3c68e46..ab993a69e33e 100644
> --- a/drivers/platform/x86/intel/pmc/spt.c
> +++ b/drivers/platform/x86/intel/pmc/spt.c
> @@ -130,8 +130,6 @@ const struct pmc_reg_map spt_reg_map = {
>   	.ppfear_buckets = SPT_PPFEAR_NUM_ENTRIES,
>   	.pm_cfg_offset = SPT_PMC_PM_CFG_OFFSET,
>   	.pm_read_disable_bit = SPT_PMC_READ_DISABLE_BIT,
> -	.acpi_pm_tmr_ctl_offset = SPT_PMC_ACPI_PM_TMR_CTL_OFFSET,
> -	.acpi_pm_tmr_disable_bit = SPT_PMC_BIT_ACPI_PM_TMR_DISABLE,
>   	.ltr_ignore_max = SPT_NUM_IP_IGN_ALLOWED,
>   	.pm_vric1_offset = SPT_PMC_VRIC1_OFFSET,
>   };

Tested-by: Paul Menzel <pmenzel@molgen.mpg.de> # Dell XPS 13 
9360/0596KF, BIOS 2.21.0 06/02/2022 (suspend/resume with deep and s2idle)


Kind regards,

Paul
Rafael J. Wysocki Oct. 4, 2024, 1:05 p.m. UTC | #2
On Thu, Oct 3, 2024 at 10:26 PM Hans de Goede <hdegoede@redhat.com> wrote:
>
> There have been multiple reports that the ACPI PM Timer disabling is
> causing Sky and Kabe Lake systems to hang on all suspend (s2idle, s3,
> hibernate) methods.

It's Kaby Lake as pointed out  by Paul.

Other than this

Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

> 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 Kabe Lake to
> fix the hang on suspend.
>
> Fixes: e86c8186d03a ("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>
> ---
>  drivers/platform/x86/intel/pmc/spt.c | 2 --
>  1 file changed, 2 deletions(-)
>
> diff --git a/drivers/platform/x86/intel/pmc/spt.c b/drivers/platform/x86/intel/pmc/spt.c
> index 2cd2b3c68e46..ab993a69e33e 100644
> --- a/drivers/platform/x86/intel/pmc/spt.c
> +++ b/drivers/platform/x86/intel/pmc/spt.c
> @@ -130,8 +130,6 @@ const struct pmc_reg_map spt_reg_map = {
>         .ppfear_buckets = SPT_PPFEAR_NUM_ENTRIES,
>         .pm_cfg_offset = SPT_PMC_PM_CFG_OFFSET,
>         .pm_read_disable_bit = SPT_PMC_READ_DISABLE_BIT,
> -       .acpi_pm_tmr_ctl_offset = SPT_PMC_ACPI_PM_TMR_CTL_OFFSET,
> -       .acpi_pm_tmr_disable_bit = SPT_PMC_BIT_ACPI_PM_TMR_DISABLE,
>         .ltr_ignore_max = SPT_NUM_IP_IGN_ALLOWED,
>         .pm_vric1_offset = SPT_PMC_VRIC1_OFFSET,
>  };
> --
> 2.46.2
>
>
diff mbox series

Patch

diff --git a/drivers/platform/x86/intel/pmc/spt.c b/drivers/platform/x86/intel/pmc/spt.c
index 2cd2b3c68e46..ab993a69e33e 100644
--- a/drivers/platform/x86/intel/pmc/spt.c
+++ b/drivers/platform/x86/intel/pmc/spt.c
@@ -130,8 +130,6 @@  const struct pmc_reg_map spt_reg_map = {
 	.ppfear_buckets = SPT_PPFEAR_NUM_ENTRIES,
 	.pm_cfg_offset = SPT_PMC_PM_CFG_OFFSET,
 	.pm_read_disable_bit = SPT_PMC_READ_DISABLE_BIT,
-	.acpi_pm_tmr_ctl_offset = SPT_PMC_ACPI_PM_TMR_CTL_OFFSET,
-	.acpi_pm_tmr_disable_bit = SPT_PMC_BIT_ACPI_PM_TMR_DISABLE,
 	.ltr_ignore_max = SPT_NUM_IP_IGN_ALLOWED,
 	.pm_vric1_offset = SPT_PMC_VRIC1_OFFSET,
 };