Skip to content

Commit ab47d72

Browse files
maciejsszmigierogregkh
authored andcommitted
platform/x86/amd/pmc: Only disable IRQ1 wakeup where i8042 actually enabled it
commit dd410d784402c5775f66faf8b624e85e41c38aaf upstream. Wakeup for IRQ1 should be disabled only in cases where i8042 had actually enabled it, otherwise "wake_depth" for this IRQ will try to drop below zero and there will be an unpleasant WARN() logged: kernel: atkbd serio0: Disabling IRQ1 wakeup source to avoid platform firmware bug kernel: ------------[ cut here ]------------ kernel: Unbalanced IRQ 1 wake disable kernel: WARNING: CPU: 10 PID: 6431 at kernel/irq/manage.c:920 irq_set_irq_wake+0x147/0x1a0 The PMC driver uses DEFINE_SIMPLE_DEV_PM_OPS() to define its dev_pm_ops which sets amd_pmc_suspend_handler() to the .suspend, .freeze, and .poweroff handlers. i8042_pm_suspend(), however, is only set as the .suspend handler. Fix the issue by call PMC suspend handler only from the same set of dev_pm_ops handlers as i8042_pm_suspend(), which currently means just the .suspend handler. To reproduce this issue try hibernating (S4) the machine after a fresh boot without putting it into s2idle first. Fixes: 8e60615e8932 ("platform/x86/amd: pmc: Disable IRQ1 wakeup for RN/CZN") Reviewed-by: Mario Limonciello <[email protected]> Signed-off-by: Maciej S. Szmigiero <[email protected]> Link: https://lore.kernel.org/r/c8f28c002ca3c66fbeeb850904a1f43118e17200.1736184606.git.mail@maciej.szmigiero.name [ij: edited the commit message.] Reviewed-by: Ilpo Järvinen <[email protected]> Signed-off-by: Ilpo Järvinen <[email protected]> Signed-off-by: Zhaoyang Li <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent f642155 commit ab47d72

File tree

1 file changed

+7
-1
lines changed
  • drivers/platform/x86/amd

1 file changed

+7
-1
lines changed

drivers/platform/x86/amd/pmc.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -834,6 +834,10 @@ static int __maybe_unused amd_pmc_suspend_handler(struct device *dev)
834834
{
835835
struct amd_pmc_dev *pdev = dev_get_drvdata(dev);
836836

837+
/*
838+
* Must be called only from the same set of dev_pm_ops handlers
839+
* as i8042_pm_suspend() is called: currently just from .suspend.
840+
*/
837841
if (pdev->cpu_id == AMD_CPU_ID_CZN) {
838842
int rc = amd_pmc_czn_wa_irq1(pdev);
839843

@@ -846,7 +850,9 @@ static int __maybe_unused amd_pmc_suspend_handler(struct device *dev)
846850
return 0;
847851
}
848852

849-
static SIMPLE_DEV_PM_OPS(amd_pmc_pm, amd_pmc_suspend_handler, NULL);
853+
static const struct dev_pm_ops amd_pmc_pm = {
854+
.suspend = amd_pmc_suspend_handler,
855+
};
850856

851857
#endif
852858

0 commit comments

Comments
 (0)