Skip to content

Commit dd410d7

Browse files
maciejsszmigieroij-intel
authored andcommitted
platform/x86/amd/pmc: Only disable IRQ1 wakeup where i8042 actually enabled it
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: 8e60615 ("platform/x86/amd: pmc: Disable IRQ1 wakeup for RN/CZN") Reviewed-by: Mario Limonciello <mario.limonciello@amd.com> Signed-off-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name> Link: https://lore.kernel.org/r/c8f28c002ca3c66fbeeb850904a1f43118e17200.1736184606.git.mail@maciej.szmigiero.name [ij: edited the commit message.] Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
1 parent 7e16ae5 commit dd410d7

File tree

1 file changed

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

1 file changed

+7
-1
lines changed

drivers/platform/x86/amd/pmc/pmc.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -947,6 +947,10 @@ static int amd_pmc_suspend_handler(struct device *dev)
947947
{
948948
struct amd_pmc_dev *pdev = dev_get_drvdata(dev);
949949

950+
/*
951+
* Must be called only from the same set of dev_pm_ops handlers
952+
* as i8042_pm_suspend() is called: currently just from .suspend.
953+
*/
950954
if (pdev->disable_8042_wakeup && !disable_workarounds) {
951955
int rc = amd_pmc_wa_irq1(pdev);
952956

@@ -959,7 +963,9 @@ static int amd_pmc_suspend_handler(struct device *dev)
959963
return 0;
960964
}
961965

962-
static DEFINE_SIMPLE_DEV_PM_OPS(amd_pmc_pm, amd_pmc_suspend_handler, NULL);
966+
static const struct dev_pm_ops amd_pmc_pm = {
967+
.suspend = amd_pmc_suspend_handler,
968+
};
963969

964970
static const struct pci_device_id pmc_pci_ids[] = {
965971
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, AMD_CPU_ID_PS) },

0 commit comments

Comments
 (0)