Skip to contentSkip to conversation

platform/x86/intel: disable wakeup_mode during hibernation

PATCH Superseded David McFarland 2 participants 6 messages Jan 20 – Mar 17

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 platform/x86/intel: disable wakeup_mode during hibernation

Without this change I get the problem described in the linked bug:

Quoted 1 line

Wakeup event detected during hibernation, rolling back

The docs for the 'freeze' event say:

Quoted 2 lines

Analogous to @suspend(), but it should not enable the device to signal wakeup events or change its power state.

I've been running with this change for several months on my Dell Precision 3680. I haven't tested on any other systems.

---
 drivers/platform/x86/intel/hid.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/platform/x86/intel/hid.c +9 -1
index 560cc063198e..3a9561665b9b 100644
@@ -419,6 +419,14 @@ static int intel_hid_pl_suspend_handler(struct device *device)
 	return 0;
 }
 
+static int intel_hid_pl_freeze_handler(struct device *device)
+{
+	struct intel_hid_priv *priv = dev_get_drvdata(device);
+
+	priv->wakeup_mode = false;
+	return intel_hid_pl_suspend_handler(device);
+}
+
 static int intel_hid_pl_resume_handler(struct device *device)
 {
 	intel_hid_pm_complete(device);
@@ -433,7 +441,7 @@ static int intel_hid_pl_resume_handler(struct device *device)
 static const struct dev_pm_ops intel_hid_pl_pm_ops = {
 	.prepare = intel_hid_pm_prepare,
 	.complete = intel_hid_pm_complete,
-	.freeze  = intel_hid_pl_suspend_handler,
+	.freeze  = intel_hid_pl_freeze_handler,
 	.thaw  = intel_hid_pl_resume_handler,
 	.restore  = intel_hid_pl_resume_handler,
 	.suspend  = intel_hid_pl_suspend_handler,
Signature · 1 line
2.52.0
#1 lore raw

PATCH v2 1/1 platform/x86/intel: disable wakeup_mode during hibernation

Without this change I get the problem described in the linked bug:

Quoted 1 line

Wakeup event detected during hibernation, rolling back

The docs for the 'freeze' event say:

Quoted 2 lines

Analogous to @suspend(), but it should not enable the device to signal wakeup events or change its power state.

I've been running with this change for several months on my Dell Precision 3680. I haven't tested on any other systems.

---
v1 -> v2: fixed bugzilla link

 drivers/platform/x86/intel/hid.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/platform/x86/intel/hid.c +9 -1
index 560cc063198e..3a9561665b9b 100644
@@ -419,6 +419,14 @@ static int intel_hid_pl_suspend_handler(struct device *device)
 	return 0;
 }
 
+static int intel_hid_pl_freeze_handler(struct device *device)
+{
+	struct intel_hid_priv *priv = dev_get_drvdata(device);
+
+	priv->wakeup_mode = false;
+	return intel_hid_pl_suspend_handler(device);
+}
+
 static int intel_hid_pl_resume_handler(struct device *device)
 {
 	intel_hid_pm_complete(device);
@@ -433,7 +441,7 @@ static int intel_hid_pl_resume_handler(struct device *device)
 static const struct dev_pm_ops intel_hid_pl_pm_ops = {
 	.prepare = intel_hid_pm_prepare,
 	.complete = intel_hid_pm_complete,
-	.freeze  = intel_hid_pl_suspend_handler,
+	.freeze  = intel_hid_pl_freeze_handler,
 	.thaw  = intel_hid_pl_resume_handler,
 	.restore  = intel_hid_pl_resume_handler,
 	.suspend  = intel_hid_pl_suspend_handler,
Signature · 1 line
2.52.0
#2 lore raw

Sorry, I should have sent to maintainers originally.

I'm especially looking for feedback on the implementation. Calling the suspend handler from the freeze handler could potentially be confusing.

maintainer
#3 lore raw
In reply to David McFarland

On Tue, 20 Jan 2026, David McFarland wrote:

+ Rafael who introduced priv->wakeup_mode (and happens to be PM maintainer).

+ Alex (that scripts/get_maintainer.pl shows as the maintainer).

Hi David,

Thanks for the patch.

Please make v3 submission with all the relevant people as receipients (once you've addresses the feedback).

Quoted 3 lines

Without this change I get the problem described in the linked bug:

Quoted 1 line

Wakeup event detected during hibernation, rolling back

Please rephrase this such that you explain the problem first without referring to the bugzilla. The Closes tag should still remain in place but this changelog should describe to problem too without requiring other sources to understand the problem.

Please avoid phrases like "This change" or "This patch" or "I"; use imperative tone.

The quoted warning probably doesn't have "> " so it can be removed, just indent it by a few spaces.

Quoted 4 lines

The docs for the 'freeze' event say:

Quoted 2 lines

Analogous to @suspend(), but it should not enable the device to signal wakeup events or change its power state.

Here, describe to solution. Something along the lines of:

Add a freeze handler ...

Quoted 4 lines

I've been running with this change for several months on my Dell Precision 3680. I haven't tested on any other systems.

This is missing Signed-off-by tag. We can only apply patches that are signed off by the submitter (please see Documentation/process/submitting-patches.rst).

You probably should also add a Fixes tag as well.

Quoted 34 lines

---
v1 -> v2: fixed bugzilla link

 drivers/platform/x86/intel/hid.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/platform/x86/intel/hid.c +9 -1
index 560cc063198e..3a9561665b9b 100644
@@ -419,6 +419,14 @@ static int intel_hid_pl_suspend_handler(struct device *device)
 	return 0;
 }
 
+static int intel_hid_pl_freeze_handler(struct device *device)
+{
+	struct intel_hid_priv *priv = dev_get_drvdata(device);
+
+	priv->wakeup_mode = false;
+	return intel_hid_pl_suspend_handler(device);
+}
+
 static int intel_hid_pl_resume_handler(struct device *device)
 {
 	intel_hid_pm_complete(device);
@@ -433,7 +441,7 @@ static int intel_hid_pl_resume_handler(struct device *device)
 static const struct dev_pm_ops intel_hid_pl_pm_ops = {
 	.prepare = intel_hid_pm_prepare,
 	.complete = intel_hid_pm_complete,
-	.freeze  = intel_hid_pl_suspend_handler,
+	.freeze  = intel_hid_pl_freeze_handler,
 	.thaw  = intel_hid_pl_resume_handler,
 	.restore  = intel_hid_pl_resume_handler,
 	.suspend  = intel_hid_pl_suspend_handler,
Signature · 1 line
 i.
#4 lore raw

PATCH v3 1/1 platform/x86/intel: disable wakeup_mode during hibernation

Add a freeze handler which clears wakeup_mode. This fixes aborted hibernation on Dell Precision 3880.

Wakeup event detected during hibernation, rolling back

This system sends power button events during hibernation, even when triggered by software.

Fixes 0c4cae1bc00d ("PM: hibernate: Avoid missing wakeup events during hibernation")
---
 drivers/platform/x86/intel/hid.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

v1 -> v2: fixed bugzilla link
v2 -> v3: changes suggested by Ilpo

Thanks Ilpo for the suggestions.

drivers/platform/x86/intel/hid.c +9 -1
index f25a427cccda..6ed85d48ee93 100644
@@ -406,6 +406,14 @@ static int intel_hid_pl_suspend_handler(struct device *device)
 	return 0;
 }
 
+static int intel_hid_pl_freeze_handler(struct device *device)
+{
+	struct intel_hid_priv *priv = dev_get_drvdata(device);
+
+	priv->wakeup_mode = false;
+	return intel_hid_pl_suspend_handler(device);
+}
+
 static int intel_hid_pl_resume_handler(struct device *device)
 {
 	intel_hid_pm_complete(device);
@@ -420,7 +428,7 @@ static int intel_hid_pl_resume_handler(struct device *device)
 static const struct dev_pm_ops intel_hid_pl_pm_ops = {
 	.prepare = intel_hid_pm_prepare,
 	.complete = intel_hid_pm_complete,
-	.freeze  = intel_hid_pl_suspend_handler,
+	.freeze  = intel_hid_pl_freeze_handler,
 	.thaw  = intel_hid_pl_resume_handler,
 	.restore  = intel_hid_pl_resume_handler,
 	.suspend  = intel_hid_pl_suspend_handler,
Signature · 1 line
2.52.0
maintainer
#5 lore raw
Quoted 9 lines · David McFarland

Add a freeze handler which clears wakeup_mode. This fixes aborted hibernation on Dell Precision 3880.

Wakeup event detected during hibernation, rolling back

This system sends power button events during hibernation, even when triggered by software.

[...]

Thank you for your contribution, it has been applied to my local review-ilpo-fixes branch. Note it will show up in the public platform-drivers-x86/review-ilpo-fixes branch only once I've pushed my local branch there, which might take a while.

The list of commits applied:
[1/1] platform/x86/intel: disable wakeup_mode during hibernation

      commit: 3dd92e37adc7052ba67926438012fe6f4a71ff37

--
i.