Skip to contentSkip to conversation

3.12.x looses serial mouse over hibernate + resume

PATCH RESEND New Manuel Krause 5 participants 15 messages Nov 26, 2013 – Dec 5, 2013

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

Since kernel 3.12.0 I have a problem with hibernate+resume not reactivating my serial mouse (trackball) with my HP notebook. Kernels 3.11.0 til 9 don't show this behaviour.

Machine:           HP Notebook with Core2Duo CPU (Penryn)
Distro:            openSUSE 12.3, 64bit, continuously updated
Desktop:           KDE 4.11.3

MESA & drm & Xorg: most recent ones from:

http://download.opensuse.org/repositories/home:/pontostroy:/X11/openSUSE_12.3/x86_64/
Current kernel: 3.12.1 vanilla from openSUSE repos, with
-ck1 and BFQ patches

The Logitech Trackman Marble FX is a PS/2 device and connected via an original Logitech PS/2-COM-port adapter and manually configured via my xorg.conf.

At first, I blamed the -ck1 patches from Con Kolivas for this behaviour that I use in addition to the BFQ patches, what has showed up as not right: This happens with the normal vanilla kernel schedulers for CPU and disk I/O, too.

By coincidence I found a weird(!) way to reactivate the serial mouse:
(1) call Hibernate (suspend-to-disk) from KDE desktop as normal
(2) resume --> the PS/2 touchpad is working, the serial trackball NOT
(3) call suspend-to-RAM (Sleep) from KDE, serial trackball still dead
(4) execute setserial -a /dev/ttyS0 in a konsole window or a tty* console
(5) ==> serial trackball is back with all configuration from xorg.conf

It's fully reproducible over multiple hibernations. This also happens when calling pm-hibernate (to-disk) and pm-suspend (to-RAM) and the setserial from a root shell in KDE or any tty*.

Please, _always_CC_me_ -- as I'm not on the kernel mailing list.

Thank you in advance and best regards,
Manuel Krause

#1 lore raw

PATCH RESEND 1/1 3.12.x looses serial mouse over hibernate + resume

If noone is feeling responsible, please, forward this to someone capable!
Please ask me later for additional information, as I won't post my full system info to lkml at first.

The module in question may be: serio_raw

Best regards, Manuel Krause

Quoted 43 lines · Manuel Krause

Since kernel 3.12.0 I have a problem with hibernate+resume not reactivating my serial mouse (trackball) with my HP notebook. Kernels 3.11.0 til 9 don't show this behaviour.

Machine:           HP Notebook with Core2Duo CPU (Penryn)
Distro:            openSUSE 12.3, 64bit, continuously updated
Desktop:           KDE 4.11.3

MESA & drm & Xorg: most recent ones from:

http://download.opensuse.org/repositories/home:/pontostroy:/X11/openSUSE_12.3/x86_64/

Current kernel: 3.12.1 vanilla from openSUSE repos, with
-ck1 and BFQ patches

The Logitech Trackman Marble FX is a PS/2 device and connected via an original Logitech PS/2-COM-port adapter and manually configured via my xorg.conf.

At first, I blamed the -ck1 patches from Con Kolivas for this behaviour that I use in addition to the BFQ patches, what has showed up as not right: This happens with the normal vanilla kernel schedulers for CPU and disk I/O, too.

By coincidence I found a weird(!) way to reactivate the serial mouse:
(1) call Hibernate (suspend-to-disk) from KDE desktop as normal
(2) resume --> the PS/2 touchpad is working, the serial trackball NOT
(3) call suspend-to-RAM (Sleep) from KDE, serial trackball still dead
(4) execute setserial -a /dev/ttyS0 in a konsole window or a tty* console
(5) ==> serial trackball is back with all configuration from xorg.conf

It's fully reproducible over multiple hibernations. This also happens when calling pm-hibernate (to-disk) and pm-suspend (to-RAM) and the setserial from a root shell in KDE or any tty*.

Please, _always_CC_me_ -- as I'm not on the kernel mailing list.

Thank you in advance and best regards,
Manuel Krause

#2 lore raw
In reply to Manuel Krause

[ +cc Dmitry Torokhov, Greg Kroah-Hartman, linux-input, linux-serial ]

Quoted 28 lines · Manuel Krause

Since kernel 3.12.0 I have a problem with hibernate+resume not reactivating my serial mouse (trackball) with my HP notebook. Kernels 3.11.0 til 9 don't show this behaviour.

Machine:           HP Notebook with Core2Duo CPU (Penryn)
Distro:            openSUSE 12.3, 64bit, continuously updated
Desktop:           KDE 4.11.3

MESA & drm & Xorg: most recent ones from:

http://download.opensuse.org/repositories/home:/pontostroy:/X11/openSUSE_12.3/x86_64/
Current kernel: 3.12.1 vanilla from openSUSE repos, with
-ck1 and BFQ patches

The Logitech Trackman Marble FX is a PS/2 device and connected via an original Logitech PS/2-COM-port adapter and manually configured via my xorg.conf.

At first, I blamed the -ck1 patches from Con Kolivas for this behaviour that I use in addition to the BFQ patches, what has showed up as not right: This happens with the normal vanilla kernel
schedulers for CPU and disk I/O, too.

By coincidence I found a weird(!) way to reactivate the serial mouse:
(1) call Hibernate (suspend-to-disk) from KDE desktop as normal
(2) resume --> the PS/2 touchpad is working, the serial trackball NOT
(3) call suspend-to-RAM (Sleep) from KDE, serial trackball still dead
(4) execute setserial -a /dev/ttyS0 in a konsole window or a tty* console
(5) ==> serial trackball is back with all configuration from xorg.conf

Quoted 5 lines

It's fully reproducible over multiple hibernations. This also happens when calling pm-hibernate (to-disk) and pm-suspend (to-RAM) and the setserial from a root shell in KDE or any tty*.

Please, _always_CC_me_ -- as I'm not on the kernel mailing list.

Manuel,

Please attach complete dmesgs (zipped, if necessary) of a suspend/resume cycle on a vanilla 3.12.x (where resume fails) _and_ a vanilla 3.11.x (where resume succeeds).

For the test configurations, please do not apply patches.

Regards,
Peter Hurley

#3 lore raw
Quoted 56 lines · Peter Hurley

[ +cc Dmitry Torokhov, Greg Kroah-Hartman, linux-input, linux-serial ]

Quoted 37 lines · Manuel Krause

Since kernel 3.12.0 I have a problem with hibernate+resume not reactivating my serial mouse (trackball) with my HP notebook. Kernels 3.11.0 til 9 don't show this behaviour.

Machine:           HP Notebook with Core2Duo CPU (Penryn)
Distro:            openSUSE 12.3, 64bit, continuously updated
Desktop:           KDE 4.11.3

MESA & drm & Xorg: most recent ones from:

http://download.opensuse.org/repositories/home:/pontostroy:/X11/openSUSE_12.3/x86_64/

Current kernel: 3.12.1 vanilla from openSUSE repos, with
-ck1 and BFQ patches

The Logitech Trackman Marble FX is a PS/2 device and connected via an original Logitech
PS/2-COM-port adapter and manually configured via my xorg.conf.

At first, I blamed the -ck1 patches from Con Kolivas for this behaviour that I use in
addition to the BFQ patches, what has showed up as not right:
This happens with the
normal vanilla kernel
schedulers for CPU and disk I/O, too.

By coincidence I found a weird(!) way to reactivate the serial mouse:
(1) call Hibernate (suspend-to-disk) from KDE desktop as normal
(2) resume --> the PS/2 touchpad is working, the serial trackball NOT
(3) call suspend-to-RAM (Sleep) from KDE, serial trackball still dead
(4) execute setserial -a /dev/ttyS0 in a konsole window or a tty* console
(5) ==> serial trackball is back with all configuration from xorg.conf

Quoted 7 lines

It's fully reproducible over multiple hibernations. This also happens when calling
pm-hibernate (to-disk) and pm-suspend (to-RAM) and the setserial from a root shell
in KDE or any tty*.

Please, _always_CC_me_ -- as I'm not on the kernel mailing list.

Manuel,

Please attach complete dmesgs (zipped, if necessary) of a suspend/resume cycle
on a vanilla 3.12.x (where resume fails) _and_ a vanilla 3.11.x (where resume succeeds).

Quoted 5 lines

For the test configurations, please do not apply patches.

Regards,
Peter Hurley

Thank you very much for your reply!
Attached you'll find a zip file with the two edited dmesg logs of plain vanilla kernel runs.

I have to add, that the resumes _do_ succeed in both cases, only the serial mouse doesn't get activated after hibernate in 3.12.x automatically. Just scan for and compare the lines indicating "serial 00:08: disabled" or "serial 00:08: activated". In 3.12.x the activation doesn't happen after hibernate, but after suspend-to-ram (sleep). That only after STR and not before a setserial gets my mouse back... a miracle. ;-)

Best regards, and, please, tell me if you need more information,

Manuel Krause

#4 lore raw
Quoted 68 lines · Manuel Krause
Quoted 58 lines · Peter Hurley

[ +cc Dmitry Torokhov, Greg Kroah-Hartman, linux-input, linux-serial ]

Quoted 39 lines · Manuel Krause

Since kernel 3.12.0 I have a problem with hibernate+resume not reactivating my serial mouse (trackball) with my HP notebook. Kernels 3.11.0 til 9 don't show this behaviour.

Machine:           HP Notebook with Core2Duo CPU (Penryn)
Distro:            openSUSE 12.3, 64bit, continuously updated
Desktop:           KDE 4.11.3

MESA & drm & Xorg: most recent ones from:

http://download.opensuse.org/repositories/home:/pontostroy:/X11/openSUSE_
12.3/x86_64/

Current kernel: 3.12.1 vanilla from openSUSE repos, with

-ck1 and BFQ patches

The Logitech Trackman Marble FX is a PS/2 device and connected via an original Logitech
PS/2-COM-port adapter and manually configured via my xorg.conf.

At first, I blamed the -ck1 patches from Con Kolivas for this behaviour that I use in
addition to the BFQ patches, what has showed up as not right:
This happens with the
normal vanilla kernel
schedulers for CPU and disk I/O, too.

By coincidence I found a weird(!) way to reactivate the serial mouse:
(1) call Hibernate (suspend-to-disk) from KDE desktop as normal
(2) resume --> the PS/2 touchpad is working, the serial trackball NOT
(3) call suspend-to-RAM (Sleep) from KDE, serial trackball still dead
(4) execute setserial -a /dev/ttyS0 in a konsole window or a tty* console
(5) ==> serial trackball is back with all configuration from xorg.conf

Quoted 7 lines

It's fully reproducible over multiple hibernations. This also happens when calling
pm-hibernate (to-disk) and pm-suspend (to-RAM) and the setserial from a root shell
in KDE or any tty*.

Please, _always_CC_me_ -- as I'm not on the kernel mailing list.

Manuel,

Please attach complete dmesgs (zipped, if necessary) of a suspend/resume cycle
on a vanilla 3.12.x (where resume fails) _and_ a vanilla 3.11.x (where resume succeeds).

Quoted 4 lines

For the test configurations, please do not apply patches.

Regards,
Peter Hurley

Thank you very much for your reply!
Attached you'll find a zip file with the two edited dmesg logs of plain vanilla kernel runs.

Quoted 7 lines

I have to add, that the resumes _do_ succeed in both cases, only the serial mouse doesn't get activated after hibernate in 3.12.x automatically. Just scan for and compare the lines indicating "serial 00:08: disabled" or "serial 00:08: activated". In 3.12.x the activation doesn't happen after hibernate, but after suspend-to-ram (sleep). That only after STR and not before a setserial gets my mouse back... a miracle. ;-)

I do not see

Quoted 1 line
[  206.577370] serial 00:08: activated

in the restore from hibernation log of 3.12 which shoudl come from PNP layer.

[dtor@dtor-d630 work]$ git log --oneline v3.11..v3.12 -- drivers/pnp/ 729377d pnp: change pnp bus pm_ops to invoke pnp driver dev_pm_ops if specified ce63e18 Merge branch 'pnp'
8ad928d ACPI / PM: Use ACPI_STATE_D3_COLD instead of ACPI_STATE_D3 everywhere eaf140b PNP: convert PNP driver bus legacy pm_ops to dev_pm_ops

I'd start looking into these commits.

Thanks.

Signature · 1 line
Dmitry
#5 lore raw
Quoted 84 lines · Dmitry Torokhov
Quoted 68 lines · Manuel Krause
Quoted 58 lines · Peter Hurley

[ +cc Dmitry Torokhov, Greg Kroah-Hartman, linux-input, linux-serial ]

Quoted 39 lines · Manuel Krause

Since kernel 3.12.0 I have a problem with hibernate+resume not reactivating my serial mouse (trackball) with my HP notebook. Kernels 3.11.0 til 9 don't show this behaviour.

Machine:           HP Notebook with Core2Duo CPU (Penryn)
Distro:            openSUSE 12.3, 64bit, continuously updated
Desktop:           KDE 4.11.3

MESA & drm & Xorg: most recent ones from:

http://download.opensuse.org/repositories/home:/pontostroy:/X11/openSUSE_
12.3/x86_64/

Current kernel: 3.12.1 vanilla from openSUSE repos, with

-ck1 and BFQ patches

The Logitech Trackman Marble FX is a PS/2 device and connected via an original Logitech
PS/2-COM-port adapter and manually configured via my xorg.conf.

At first, I blamed the -ck1 patches from Con Kolivas for this behaviour that I use in
addition to the BFQ patches, what has showed up as not right:
This happens with the
normal vanilla kernel
schedulers for CPU and disk I/O, too.

By coincidence I found a weird(!) way to reactivate the serial mouse:
(1) call Hibernate (suspend-to-disk) from KDE desktop as normal
(2) resume --> the PS/2 touchpad is working, the serial trackball NOT
(3) call suspend-to-RAM (Sleep) from KDE, serial trackball still dead
(4) execute setserial -a /dev/ttyS0 in a konsole window or a tty* console
(5) ==> serial trackball is back with all configuration from xorg.conf

Quoted 7 lines

It's fully reproducible over multiple hibernations. This also happens when calling
pm-hibernate (to-disk) and pm-suspend (to-RAM) and the setserial from a root shell
in KDE or any tty*.

Please, _always_CC_me_ -- as I'm not on the kernel mailing list.

Manuel,

Please attach complete dmesgs (zipped, if necessary) of a suspend/resume cycle
on a vanilla 3.12.x (where resume fails) _and_ a vanilla 3.11.x (where resume succeeds).

Quoted 4 lines

For the test configurations, please do not apply patches.

Regards,
Peter Hurley

Thank you very much for your reply!
Attached you'll find a zip file with the two edited dmesg logs of plain vanilla kernel runs.

Quoted 7 lines

I have to add, that the resumes _do_ succeed in both cases, only the serial mouse doesn't get activated after hibernate in 3.12.x automatically. Just scan for and compare the lines indicating "serial 00:08: disabled" or "serial 00:08: activated". In 3.12.x the activation doesn't happen after hibernate, but after suspend-to-ram (sleep). That only after STR and not before a setserial gets my mouse back... a miracle. ;-)

I do not see

Quoted 1 line
[  206.577370] serial 00:08: activated

in the restore from hibernation log of 3.12 which shoudl come from PNP layer.

Quoted 8 lines

[dtor@dtor-d630 work]$ git log --oneline v3.11..v3.12 -- drivers/pnp/ 729377d pnp: change pnp bus pm_ops to invoke pnp driver dev_pm_ops if specified ce63e18 Merge branch 'pnp'
8ad928d ACPI / PM: Use ACPI_STATE_D3_COLD instead of ACPI_STATE_D3 everywhere eaf140b PNP: convert PNP driver bus legacy pm_ops to dev_pm_ops

I'd start looking into these commits.

Does the following patch fixes the issue?

Signature · 14 lines
Dmitry

PNP: fix restoring devices after hibernation

From: Dmitry Torokhov <[email protected]>

On returning from hibernation 'restore; callback is called, not 'resume'.
This fixes breakage introduced by commit
eaf140b60ec961252083ab8adaf67aef29a362dd

Signed-off-by: Dmitry Torokhov <[email protected]>
---
 drivers/pnp/driver.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/pnp/driver.c +2 -1
index a39ee38..185a24a 100644
@@ -235,8 +235,9 @@ static int pnp_bus_resume(struct device *dev)
 
 static const struct dev_pm_ops pnp_bus_dev_pm_ops = {
 	.suspend = pnp_bus_suspend,
-	.freeze = pnp_bus_freeze,
 	.resume = pnp_bus_resume,
+	.freeze = pnp_bus_freeze,
+	.restore = pnp_bus_resume,
 };
 
 struct bus_type pnp_bus_type = {
#6 lore raw
Quoted 91 lines · Dmitry Torokhov
Quoted 90 lines · Dmitry Torokhov
Quoted 68 lines · Manuel Krause
Quoted 58 lines · Peter Hurley

[ +cc Dmitry Torokhov, Greg Kroah-Hartman, linux-input, linux-serial ]

Quoted 39 lines · Manuel Krause

Since kernel 3.12.0 I have a problem with hibernate+resume not reactivating my serial mouse (trackball) with my HP notebook. Kernels 3.11.0 til 9 don't show this behaviour.

Machine:           HP Notebook with Core2Duo CPU (Penryn)
Distro:            openSUSE 12.3, 64bit, continuously updated
Desktop:           KDE 4.11.3

MESA & drm & Xorg: most recent ones from:

http://download.opensuse.org/repositories/home:/pontostroy:/X11/openSUSE_
12.3/x86_64/

Current kernel: 3.12.1 vanilla from openSUSE repos, with

-ck1 and BFQ patches

The Logitech Trackman Marble FX is a PS/2 device and connected via an original Logitech
PS/2-COM-port adapter and manually configured via my xorg.conf.

At first, I blamed the -ck1 patches from Con Kolivas for this behaviour that I use in
addition to the BFQ patches, what has showed up as not right:
This happens with the
normal vanilla kernel
schedulers for CPU and disk I/O, too.

By coincidence I found a weird(!) way to reactivate the serial mouse:
(1) call Hibernate (suspend-to-disk) from KDE desktop as normal
(2) resume --> the PS/2 touchpad is working, the serial trackball NOT
(3) call suspend-to-RAM (Sleep) from KDE, serial trackball still dead
(4) execute setserial -a /dev/ttyS0 in a konsole window or a tty* console
(5) ==> serial trackball is back with all configuration from xorg.conf

Quoted 7 lines

It's fully reproducible over multiple hibernations. This also happens when calling
pm-hibernate (to-disk) and pm-suspend (to-RAM) and the setserial from a root shell
in KDE or any tty*.

Please, _always_CC_me_ -- as I'm not on the kernel mailing list.

Manuel,

Please attach complete dmesgs (zipped, if necessary) of a suspend/resume cycle
on a vanilla 3.12.x (where resume fails) _and_ a vanilla 3.11.x (where resume succeeds).

Quoted 4 lines

For the test configurations, please do not apply patches.

Regards,
Peter Hurley

Thank you very much for your reply!
Attached you'll find a zip file with the two edited dmesg logs of plain vanilla kernel runs.

Quoted 7 lines

I have to add, that the resumes _do_ succeed in both cases, only the serial mouse doesn't get activated after hibernate in 3.12.x automatically. Just scan for and compare the lines indicating "serial 00:08: disabled" or "serial 00:08: activated". In 3.12.x the activation doesn't happen after hibernate, but after suspend-to-ram (sleep). That only after STR and not before a setserial gets my mouse back... a miracle. ;-)

I do not see

Quoted 1 line
[  206.577370] serial 00:08: activated

in the restore from hibernation log of 3.12 which shoudl come from PNP layer.

[dtor@dtor-d630 work]$ git log --oneline v3.11..v3.12 -- drivers/pnp/ 729377d pnp: change pnp bus pm_ops to invoke pnp driver dev_pm_ops if specified ce63e18 Merge branch 'pnp'
8ad928d ACPI / PM: Use ACPI_STATE_D3_COLD instead of ACPI_STATE_D3 everywhere eaf140b PNP: convert PNP driver bus legacy pm_ops to dev_pm_ops

Quoted 5 lines
Quoted 2 lines

I'd start looking into these commits.

Does the following patch fixes the issue?

PNP: fix restoring devices after hibernation

From: Dmitry Torokhov <[email protected]>

On returning from hibernation 'restore; callback is called, not 'resume'. This fixes breakage introduced by commit eaf140b60ec961252083ab8adaf67aef29a362dd

---
 drivers/pnp/driver.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/pnp/driver.c +2 -1
index a39ee38..185a24a 100644
@@ -235,8 +235,9 @@ static int pnp_bus_resume(struct device *dev)
 
 static const struct dev_pm_ops pnp_bus_dev_pm_ops = {
 	.suspend = pnp_bus_suspend,
-	.freeze = pnp_bus_freeze,
 	.resume = pnp_bus_resume,
+	.freeze = pnp_bus_freeze,
+	.restore = pnp_bus_resume,
 };
 
 struct bus_type pnp_bus_type = {

YES! This patch fixes the issue!!! (Even if compiled with a patched kernel.) ;-)

Many thanks for your work!

Manuel Krause

#7 lore raw
Quoted 131 lines · Manuel Krause
Quoted 94 lines · Dmitry Torokhov
Quoted 93 lines · Dmitry Torokhov
Quoted 69 lines · Manuel Krause
Quoted 59 lines · Peter Hurley

[ +cc Dmitry Torokhov, Greg Kroah-Hartman, linux-input, linux-serial ]

Quoted 40 lines · Manuel Krause

Since kernel 3.12.0 I have a problem with hibernate+resume not reactivating my serial mouse (trackball) with my HP notebook. Kernels 3.11.0 til 9 don't show this behaviour.

Machine:           HP Notebook with Core2Duo CPU (Penryn)
Distro:            openSUSE 12.3, 64bit, continuously updated
Desktop:           KDE 4.11.3

MESA & drm & Xorg: most recent ones from:

http://download.opensuse.org/repositories/home:/pontostroy:/X11/openSUSE_

12.3/x86_64/

Current kernel: 3.12.1 vanilla from openSUSE repos, with

-ck1 and BFQ patches

The Logitech Trackman Marble FX is a PS/2 device and connected via an original Logitech
PS/2-COM-port adapter and manually configured via my xorg.conf.

At first, I blamed the -ck1 patches from Con Kolivas for this behaviour that I use in
addition to the BFQ patches, what has showed up as not right:
This happens with the
normal vanilla kernel
schedulers for CPU and disk I/O, too.

By coincidence I found a weird(!) way to reactivate the serial mouse:
(1) call Hibernate (suspend-to-disk) from KDE desktop as normal
(2) resume --> the PS/2 touchpad is working, the serial trackball NOT
(3) call suspend-to-RAM (Sleep) from KDE, serial trackball still dead
(4) execute setserial -a /dev/ttyS0 in a konsole window or a tty* console
(5) ==> serial trackball is back with all configuration from xorg.conf

Quoted 7 lines

It's fully reproducible over multiple hibernations. This also happens when calling
pm-hibernate (to-disk) and pm-suspend (to-RAM) and the setserial from a root shell
in KDE or any tty*.

Please, _always_CC_me_ -- as I'm not on the kernel mailing list.

Manuel,

Please attach complete dmesgs (zipped, if necessary) of a suspend/resume cycle
on a vanilla 3.12.x (where resume fails) _and_ a vanilla 3.11.x (where resume succeeds).

Quoted 4 lines

For the test configurations, please do not apply patches.

Regards,
Peter Hurley

Thank you very much for your reply!
Attached you'll find a zip file with the two edited dmesg logs of plain vanilla kernel runs.

Quoted 7 lines

I have to add, that the resumes _do_ succeed in both cases, only the serial mouse doesn't get activated after hibernate in 3.12.x automatically. Just scan for and compare the lines indicating "serial 00:08: disabled" or "serial 00:08: activated". In 3.12.x the activation doesn't happen after hibernate, but after suspend-to-ram (sleep). That only after STR and not before a setserial gets my mouse back... a miracle. ;-)

I do not see

Quoted 1 line
[  206.577370] serial 00:08: activated

in the restore from hibernation log of 3.12 which shoudl come from PNP layer.

[dtor@dtor-d630 work]$ git log --oneline v3.11..v3.12 -- drivers/pnp/ 729377d pnp: change pnp bus pm_ops to invoke pnp driver dev_pm_ops if specified
ce63e18 Merge branch 'pnp'
8ad928d ACPI / PM: Use ACPI_STATE_D3_COLD instead of ACPI_STATE_D3 everywhere
eaf140b PNP: convert PNP driver bus legacy pm_ops to dev_pm_ops

Quoted 5 lines
Quoted 2 lines

I'd start looking into these commits.

Does the following patch fixes the issue?

PNP: fix restoring devices after hibernation

From: Dmitry Torokhov <[email protected]>

On returning from hibernation 'restore; callback is called, not 'resume'. This fixes breakage introduced by commit eaf140b60ec961252083ab8adaf67aef29a362dd

---
  drivers/pnp/driver.c |    3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
drivers/pnp/driver.c +2 -1
index a39ee38..185a24a 100644
@@ -235,8 +235,9 @@ static int pnp_bus_resume(struct device *dev)
 
  static const struct dev_pm_ops pnp_bus_dev_pm_ops = {
      .suspend = pnp_bus_suspend,
-    .freeze = pnp_bus_freeze,
      .resume = pnp_bus_resume,
+    .freeze = pnp_bus_freeze,
+    .restore = pnp_bus_resume,
  };
 
  struct bus_type pnp_bus_type = {
Quoted 7 lines

YES! This patch fixes the issue!!! (Even if compiled with a patched
kernel.) ;-)

Many thanks for your work!

Manuel Krause

I am glad the problem is fixed. But I am puzzled. pnp_bus_resume() didn't handle restore prior to this change. state doesn't get passed in to legacy resume routines. I had to add freeze to handle PMSG_FREEZE case, sounds like restore is needed as well, however I don't see where how restore is handled prior to this change.

-- Shuah

Signature · 4 lines
Shuah Khan
Senior Linux Kernel Developer - Open Source Group
Samsung Research America(Silicon Valley)
[email protected] | (970) 672-0658
#10 lore raw
In reply to Manuel Krause
Quoted 129 lines · Manuel Krause
Quoted 91 lines · Dmitry Torokhov
Quoted 90 lines · Dmitry Torokhov
Quoted 68 lines · Manuel Krause
Quoted 58 lines · Peter Hurley

[ +cc Dmitry Torokhov, Greg Kroah-Hartman, linux-input, linux-serial ]

Quoted 39 lines · Manuel Krause

Since kernel 3.12.0 I have a problem with hibernate+resume not reactivating my serial mouse (trackball) with my HP notebook. Kernels 3.11.0 til 9 don't show this behaviour.

Machine:           HP Notebook with Core2Duo CPU (Penryn)
Distro:            openSUSE 12.3, 64bit, continuously updated
Desktop:           KDE 4.11.3

MESA & drm & Xorg: most recent ones from:

http://download.opensuse.org/repositories/home:/pontostroy:/X11/openSUSE_
12.3/x86_64/

Current kernel: 3.12.1 vanilla from openSUSE repos, with

-ck1 and BFQ patches

The Logitech Trackman Marble FX is a PS/2 device and connected via an original Logitech
PS/2-COM-port adapter and manually configured via my xorg.conf.

At first, I blamed the -ck1 patches from Con Kolivas for this behaviour that I use in
addition to the BFQ patches, what has showed up as not right:
This happens with the
normal vanilla kernel
schedulers for CPU and disk I/O, too.

By coincidence I found a weird(!) way to reactivate the serial mouse:
(1) call Hibernate (suspend-to-disk) from KDE desktop as normal
(2) resume --> the PS/2 touchpad is working, the serial trackball NOT
(3) call suspend-to-RAM (Sleep) from KDE, serial trackball still dead
(4) execute setserial -a /dev/ttyS0 in a konsole window or a tty* console
(5) ==> serial trackball is back with all configuration from xorg.conf

Quoted 7 lines

It's fully reproducible over multiple hibernations. This also happens when calling
pm-hibernate (to-disk) and pm-suspend (to-RAM) and the setserial from a root shell
in KDE or any tty*.

Please, _always_CC_me_ -- as I'm not on the kernel mailing list.

Manuel,

Please attach complete dmesgs (zipped, if necessary) of a suspend/resume cycle
on a vanilla 3.12.x (where resume fails) _and_ a vanilla 3.11.x (where resume succeeds).

Quoted 4 lines

For the test configurations, please do not apply patches.

Regards,
Peter Hurley

Thank you very much for your reply!
Attached you'll find a zip file with the two edited dmesg logs of plain vanilla kernel runs.

Quoted 7 lines

I have to add, that the resumes _do_ succeed in both cases, only the serial mouse doesn't get activated after hibernate in 3.12.x automatically. Just scan for and compare the lines indicating "serial 00:08: disabled" or "serial 00:08: activated". In 3.12.x the activation doesn't happen after hibernate, but after suspend-to-ram (sleep). That only after STR and not before a setserial gets my mouse back... a miracle. ;-)

I do not see

Quoted 1 line
[  206.577370] serial 00:08: activated

in the restore from hibernation log of 3.12 which shoudl come from PNP layer.

[dtor@dtor-d630 work]$ git log --oneline v3.11..v3.12 -- drivers/pnp/ 729377d pnp: change pnp bus pm_ops to invoke pnp driver dev_pm_ops if specified ce63e18 Merge branch 'pnp'
8ad928d ACPI / PM: Use ACPI_STATE_D3_COLD instead of ACPI_STATE_D3 everywhere eaf140b PNP: convert PNP driver bus legacy pm_ops to dev_pm_ops

Quoted 5 lines
Quoted 2 lines

I'd start looking into these commits.

Does the following patch fixes the issue?

PNP: fix restoring devices after hibernation

From: Dmitry Torokhov <[email protected]>

On returning from hibernation 'restore; callback is called, not 'resume'.
This fixes breakage introduced by commit eaf140b60ec961252083ab8adaf67aef29a362dd

---
 drivers/pnp/driver.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/pnp/driver.c +2 -1
index a39ee38..185a24a 100644
@@ -235,8 +235,9 @@ static int pnp_bus_resume(struct device *dev)
 
 static const struct dev_pm_ops pnp_bus_dev_pm_ops = {
 	.suspend = pnp_bus_suspend,
-	.freeze = pnp_bus_freeze,
 	.resume = pnp_bus_resume,
+	.freeze = pnp_bus_freeze,
+	.restore = pnp_bus_resume,
 };
 
 struct bus_type pnp_bus_type = {
Quoted 5 lines

YES! This patch fixes the issue!!! (Even if compiled with a patched
kernel.) ;-)

Many thanks for your work!

Thank you Manuel, but IO think the patch is not complete as we need to re-enable PNP devices after we make a snapshot to make sure they are working and can handle saving the data. Coudl you please try the patch below?

Signature · 15 lines
Dmitry


PNP: fix restoring devices after hibernation

From: Dmitry Torokhov <[email protected]>

On returning from hibernation 'restore; callback is called, not 'resume'.
This fixes breakage introduced by commit
eaf140b60ec961252083ab8adaf67aef29a362dd

Signed-off-by: Dmitry Torokhov <[email protected]>
---
 drivers/pnp/driver.c |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/pnp/driver.c +11 -1
index a39ee38..2bd5c5f 100644
@@ -197,6 +197,11 @@ static int pnp_bus_freeze(struct device *dev)
 	return __pnp_bus_suspend(dev, PMSG_FREEZE);
 }
 
+static int pnp_bus_poweroff(struct device *dev)
+{
+	return __pnp_bus_suspend(dev, PMSG_HIBERNATE);
+}
+
 static int pnp_bus_resume(struct device *dev)
 {
 	struct pnp_dev *pnp_dev = to_pnp_dev(dev);
@@ -234,9 +239,14 @@ static int pnp_bus_resume(struct device *dev)
 }
 
 static const struct dev_pm_ops pnp_bus_dev_pm_ops = {
+	/* Suspend callbacks */
 	.suspend = pnp_bus_suspend,
-	.freeze = pnp_bus_freeze,
 	.resume = pnp_bus_resume,
+	/* Hibernate callbacks */
+	.freeze = pnp_bus_freeze,
+	.thaw = pnp_bus_resume,
+	.poweroff = pnp_bus_poweroff,
+	.restore = pnp_bus_resume,
 };
 
 struct bus_type pnp_bus_type = {
#8 lore raw
In reply to Shuah Khan
Quoted 137 lines · Shuah Khan
Quoted 136 lines · Manuel Krause
Quoted 94 lines · Dmitry Torokhov
Quoted 93 lines · Dmitry Torokhov
Quoted 69 lines · Manuel Krause
Quoted 59 lines · Peter Hurley

[ +cc Dmitry Torokhov, Greg Kroah-Hartman, linux-input, linux-serial ]

Quoted 40 lines · Manuel Krause

Since kernel 3.12.0 I have a problem with hibernate+resume not reactivating my serial mouse (trackball) with my HP notebook. Kernels 3.11.0 til 9 don't show this behaviour.

Machine:           HP Notebook with Core2Duo CPU (Penryn)
Distro:            openSUSE 12.3, 64bit, continuously updated
Desktop:           KDE 4.11.3

MESA & drm & Xorg: most recent ones from:

http://download.opensuse.org/repositories/home:/pontostroy:/X11/openSUSE_

12.3/x86_64/

Current kernel: 3.12.1 vanilla from openSUSE repos, with

-ck1 and BFQ patches

The Logitech Trackman Marble FX is a PS/2 device and connected via an original Logitech
PS/2-COM-port adapter and manually configured via my xorg.conf.

At first, I blamed the -ck1 patches from Con Kolivas for this behaviour that I use in
addition to the BFQ patches, what has showed up as not right:
This happens with the
normal vanilla kernel
schedulers for CPU and disk I/O, too.

By coincidence I found a weird(!) way to reactivate the serial mouse:
(1) call Hibernate (suspend-to-disk) from KDE desktop as normal
(2) resume --> the PS/2 touchpad is working, the serial trackball NOT
(3) call suspend-to-RAM (Sleep) from KDE, serial trackball still dead
(4) execute setserial -a /dev/ttyS0 in a konsole window or a tty* console
(5) ==> serial trackball is back with all configuration from xorg.conf

Quoted 7 lines

It's fully reproducible over multiple hibernations. This also happens when calling
pm-hibernate (to-disk) and pm-suspend (to-RAM) and the setserial from a root shell
in KDE or any tty*.

Please, _always_CC_me_ -- as I'm not on the kernel mailing list.

Manuel,

Please attach complete dmesgs (zipped, if necessary) of a suspend/resume cycle
on a vanilla 3.12.x (where resume fails) _and_ a vanilla 3.11.x (where resume succeeds).

Quoted 4 lines

For the test configurations, please do not apply patches.

Regards,
Peter Hurley

Thank you very much for your reply!
Attached you'll find a zip file with the two edited dmesg logs of plain vanilla kernel runs.

Quoted 7 lines

I have to add, that the resumes _do_ succeed in both cases, only the serial mouse doesn't get activated after hibernate in 3.12.x automatically. Just scan for and compare the lines indicating "serial 00:08: disabled" or "serial 00:08: activated". In 3.12.x the activation doesn't happen after hibernate, but after suspend-to-ram (sleep). That only after STR and not before a setserial gets my mouse back... a miracle. ;-)

I do not see

Quoted 1 line
[  206.577370] serial 00:08: activated

in the restore from hibernation log of 3.12 which shoudl come from PNP layer.

[dtor@dtor-d630 work]$ git log --oneline v3.11..v3.12 -- drivers/pnp/ 729377d pnp: change pnp bus pm_ops to invoke pnp driver dev_pm_ops if specified
ce63e18 Merge branch 'pnp'
8ad928d ACPI / PM: Use ACPI_STATE_D3_COLD instead of ACPI_STATE_D3 everywhere
eaf140b PNP: convert PNP driver bus legacy pm_ops to dev_pm_ops

Quoted 5 lines
Quoted 2 lines

I'd start looking into these commits.

Does the following patch fixes the issue?

PNP: fix restoring devices after hibernation

From: Dmitry Torokhov <[email protected]>

On returning from hibernation 'restore; callback is called, not 'resume'. This fixes breakage introduced by commit eaf140b60ec961252083ab8adaf67aef29a362dd

---
 drivers/pnp/driver.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/pnp/driver.c +2 -1
index a39ee38..185a24a 100644
@@ -235,8 +235,9 @@ static int pnp_bus_resume(struct device *dev)
 
 static const struct dev_pm_ops pnp_bus_dev_pm_ops = {
     .suspend = pnp_bus_suspend,
-    .freeze = pnp_bus_freeze,
     .resume = pnp_bus_resume,
+    .freeze = pnp_bus_freeze,
+    .restore = pnp_bus_resume,
 };
 
 struct bus_type pnp_bus_type = {

YES! This patch fixes the issue!!! (Even if compiled with a patched
kernel.) ;-)

Many thanks for your work!

Quoted 8 lines
Quoted 2 lines

Manuel Krause

I am glad the problem is fixed. But I am puzzled. pnp_bus_resume() didn't handle restore prior to this change. state doesn't get passed in to legacy resume routines. I had to add freeze to handle PMSG_FREEZE case, sounds like restore is needed as well, however I don't see where how restore is handled prior to this change.

Take a look at drivers/base/platform.c::platform_pm_restore()

Thanks.

Signature · 1 line
Dmitry
#9 lore raw
Quoted 10 lines · Dmitry Torokhov
Quoted 7 lines · Shuah Khan
Quoted 1 line

I am glad the problem is fixed. But I am puzzled. pnp_bus_resume() didn't handle restore prior to this change. state doesn't get passed in to legacy resume routines. I had to add freeze to handle PMSG_FREEZE case, sounds like restore is needed as well, however I don't see where how restore is handled prior to this change.

Quoted 4 lines

Take a look at drivers/base/platform.c::platform_pm_restore()

Thanks.

Yes I see it now. Before the conversion, platform_legacy_resume() path is taken since pnp didn't have pm.

       if (drv->pm) {
                if (drv->pm->restore)
                        ret = drv->pm->restore(dev);
       } else {
                ret = platform_legacy_resume(dev);
        }

Thanks for fixing the problem.

-- Shuah

Signature · 4 lines
Shuah Khan
Senior Linux Kernel Developer - Open Source Group
Samsung Research America(Silicon Valley)
[email protected] | (970) 672-0658
#11 lore raw
In reply to Dmitry Torokhov
Quoted 133 lines · Dmitry Torokhov
Quoted 132 lines · Manuel Krause
Quoted 91 lines · Dmitry Torokhov
Quoted 90 lines · Dmitry Torokhov
Quoted 68 lines · Manuel Krause
Quoted 58 lines · Peter Hurley

[ +cc Dmitry Torokhov, Greg Kroah-Hartman, linux-input, linux-serial ]

Quoted 39 lines · Manuel Krause

Since kernel 3.12.0 I have a problem with hibernate+resume not reactivating my serial mouse (trackball) with my HP notebook. Kernels 3.11.0 til 9 don't show this behaviour.

Machine:           HP Notebook with Core2Duo CPU (Penryn)
Distro:            openSUSE 12.3, 64bit, continuously updated
Desktop:           KDE 4.11.3

MESA & drm & Xorg: most recent ones from:

http://download.opensuse.org/repositories/home:/pontostroy:/X11/openSUSE_
12.3/x86_64/

Current kernel: 3.12.1 vanilla from openSUSE repos, with

-ck1 and BFQ patches

The Logitech Trackman Marble FX is a PS/2 device and connected via an original Logitech
PS/2-COM-port adapter and manually configured via my xorg.conf.

At first, I blamed the -ck1 patches from Con Kolivas for this behaviour that I use in
addition to the BFQ patches, what has showed up as not right:
This happens with the
normal vanilla kernel
schedulers for CPU and disk I/O, too.

By coincidence I found a weird(!) way to reactivate the serial mouse:
(1) call Hibernate (suspend-to-disk) from KDE desktop as normal
(2) resume --> the PS/2 touchpad is working, the serial trackball NOT
(3) call suspend-to-RAM (Sleep) from KDE, serial trackball still dead
(4) execute setserial -a /dev/ttyS0 in a konsole window or a tty* console
(5) ==> serial trackball is back with all configuration from xorg.conf

Quoted 7 lines

It's fully reproducible over multiple hibernations. This also happens when calling
pm-hibernate (to-disk) and pm-suspend (to-RAM) and the setserial from a root shell
in KDE or any tty*.

Please, _always_CC_me_ -- as I'm not on the kernel mailing list.

Manuel,

Please attach complete dmesgs (zipped, if necessary) of a suspend/resume cycle
on a vanilla 3.12.x (where resume fails) _and_ a vanilla 3.11.x (where resume succeeds).

Quoted 4 lines

For the test configurations, please do not apply patches.

Regards,
Peter Hurley

Thank you very much for your reply!
Attached you'll find a zip file with the two edited dmesg logs of plain vanilla kernel runs.

Quoted 7 lines

I have to add, that the resumes _do_ succeed in both cases, only the serial mouse doesn't get activated after hibernate in 3.12.x automatically. Just scan for and compare the lines indicating "serial 00:08: disabled" or "serial 00:08: activated". In 3.12.x the activation doesn't happen after hibernate, but after suspend-to-ram (sleep). That only after STR and not before a setserial gets my mouse back... a miracle. ;-)

I do not see

Quoted 1 line
[  206.577370] serial 00:08: activated

in the restore from hibernation log of 3.12 which shoudl come from PNP layer.

[dtor@dtor-d630 work]$ git log --oneline v3.11..v3.12 -- drivers/pnp/ 729377d pnp: change pnp bus pm_ops to invoke pnp driver dev_pm_ops if specified ce63e18 Merge branch 'pnp'
8ad928d ACPI / PM: Use ACPI_STATE_D3_COLD instead of ACPI_STATE_D3 everywhere eaf140b PNP: convert PNP driver bus legacy pm_ops to dev_pm_ops

Quoted 5 lines
Quoted 2 lines

I'd start looking into these commits.

Does the following patch fixes the issue?

PNP: fix restoring devices after hibernation

From: Dmitry Torokhov <[email protected]>

On returning from hibernation 'restore; callback is called, not 'resume'.
This fixes breakage introduced by commit eaf140b60ec961252083ab8adaf67aef29a362dd

---
  drivers/pnp/driver.c |    3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
drivers/pnp/driver.c +2 -1
index a39ee38..185a24a 100644
@@ -235,8 +235,9 @@ static int pnp_bus_resume(struct device *dev)
 
  static const struct dev_pm_ops pnp_bus_dev_pm_ops = {
  	.suspend = pnp_bus_suspend,
-	.freeze = pnp_bus_freeze,
  	.resume = pnp_bus_resume,
+	.freeze = pnp_bus_freeze,
+	.restore = pnp_bus_resume,
  };
 
  struct bus_type pnp_bus_type = {

YES! This patch fixes the issue!!! (Even if compiled with a patched
kernel.) ;-)

Quoted 8 lines
Quoted 2 lines

Many thanks for your work!

Thank you Manuel, but IO think the patch is not complete as we need to re-enable PNP devices after we make a snapshot to make sure they are working and can handle saving the data. Coudl you please try the patch below?

PNP: fix restoring devices after hibernation

From: Dmitry Torokhov <[email protected]>

On returning from hibernation 'restore; callback is called, not 'resume'. This fixes breakage introduced by commit eaf140b60ec961252083ab8adaf67aef29a362dd

---
 drivers/pnp/driver.c |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/pnp/driver.c +11 -1
index a39ee38..2bd5c5f 100644
@@ -197,6 +197,11 @@ static int pnp_bus_freeze(struct device *dev)
 	return __pnp_bus_suspend(dev, PMSG_FREEZE);
 }
 
+static int pnp_bus_poweroff(struct device *dev)
+{
+	return __pnp_bus_suspend(dev, PMSG_HIBERNATE);
+}
+
 static int pnp_bus_resume(struct device *dev)
 {
 	struct pnp_dev *pnp_dev = to_pnp_dev(dev);
@@ -234,9 +239,14 @@ static int pnp_bus_resume(struct device *dev)
 }
 
 static const struct dev_pm_ops pnp_bus_dev_pm_ops = {
+	/* Suspend callbacks */
 	.suspend = pnp_bus_suspend,
-	.freeze = pnp_bus_freeze,
 	.resume = pnp_bus_resume,
+	/* Hibernate callbacks */
+	.freeze = pnp_bus_freeze,
+	.thaw = pnp_bus_resume,
+	.poweroff = pnp_bus_poweroff,
+	.restore = pnp_bus_resume,
 };
 
 struct bus_type pnp_bus_type = {

ALSO, YES, this second patch version does cure the issue, on here, too.

Best regards, Manuel Krause

#12 lore raw
Quoted 55 lines · Manuel Krause
Quoted 6 lines · Dmitry Torokhov

Thank you Manuel, but IO think the patch is not complete as we need to re-enable PNP devices after we make a snapshot to make sure they are working and can handle saving the data. Coudl you please try the patch below?

PNP: fix restoring devices after hibernation

From: Dmitry Torokhov <[email protected]>

On returning from hibernation 'restore; callback is called, not 'resume'.
This fixes breakage introduced by commit eaf140b60ec961252083ab8adaf67aef29a362dd

---
 drivers/pnp/driver.c |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/pnp/driver.c +11 -1
index a39ee38..2bd5c5f 100644
@@ -197,6 +197,11 @@ static int pnp_bus_freeze(struct device *dev)
 	return __pnp_bus_suspend(dev, PMSG_FREEZE);
 }
 
+static int pnp_bus_poweroff(struct device *dev)
+{
+	return __pnp_bus_suspend(dev, PMSG_HIBERNATE);
+}
+
 static int pnp_bus_resume(struct device *dev)
 {
 	struct pnp_dev *pnp_dev = to_pnp_dev(dev);
@@ -234,9 +239,14 @@ static int pnp_bus_resume(struct device *dev)
 }
 
 static const struct dev_pm_ops pnp_bus_dev_pm_ops = {
+	/* Suspend callbacks */
 	.suspend = pnp_bus_suspend,
-	.freeze = pnp_bus_freeze,
 	.resume = pnp_bus_resume,
+	/* Hibernate callbacks */
+	.freeze = pnp_bus_freeze,
+	.thaw = pnp_bus_resume,
+	.poweroff = pnp_bus_poweroff,
+	.restore = pnp_bus_resume,
 };
 
 struct bus_type pnp_bus_type = {
Quoted 2 lines

ALSO, YES, this second patch version does cure the issue, on here, too.

Rafael,

Will you please take this patch in? It would also make sense to add it to stable I think.

Thanks.

Signature · 1 line
Dmitry
#13 lore raw
Quoted 61 lines · Dmitry Torokhov
Quoted 55 lines · Manuel Krause
Quoted 6 lines · Dmitry Torokhov

Thank you Manuel, but IO think the patch is not complete as we need to re-enable PNP devices after we make a snapshot to make sure they are working and can handle saving the data. Coudl you please try the patch below?

PNP: fix restoring devices after hibernation

From: Dmitry Torokhov <[email protected]>

On returning from hibernation 'restore; callback is called, not 'resume'.
This fixes breakage introduced by commit eaf140b60ec961252083ab8adaf67aef29a362dd

---
  drivers/pnp/driver.c |   12 +++++++++++-
  1 file changed, 11 insertions(+), 1 deletion(-)
drivers/pnp/driver.c +11 -1
index a39ee38..2bd5c5f 100644
@@ -197,6 +197,11 @@ static int pnp_bus_freeze(struct device *dev)
  	return __pnp_bus_suspend(dev, PMSG_FREEZE);
  }
 
+static int pnp_bus_poweroff(struct device *dev)
+{
+	return __pnp_bus_suspend(dev, PMSG_HIBERNATE);
+}
+
  static int pnp_bus_resume(struct device *dev)
  {
  	struct pnp_dev *pnp_dev = to_pnp_dev(dev);
@@ -234,9 +239,14 @@ static int pnp_bus_resume(struct device *dev)
  }
 
  static const struct dev_pm_ops pnp_bus_dev_pm_ops = {
+	/* Suspend callbacks */
  	.suspend = pnp_bus_suspend,
-	.freeze = pnp_bus_freeze,
  	.resume = pnp_bus_resume,
+	/* Hibernate callbacks */
+	.freeze = pnp_bus_freeze,
+	.thaw = pnp_bus_resume,
+	.poweroff = pnp_bus_poweroff,
+	.restore = pnp_bus_resume,
  };
 
  struct bus_type pnp_bus_type = {
Quoted 2 lines

ALSO, YES, this second patch version does cure the issue, on here, too.

Rafael,

Quoted 5 lines

Will you please take this patch in? It would also make sense to add it to stable I think.

Thanks.

This patch works very well for many following hibernate/resume cyles, now, since the patch is applied. And it doesn't show any side-effects for me. Thank you for "taking it in".

Best regards, Manuel Krause

#14 lore raw
In reply to Dmitry Torokhov
Quoted 52 lines · Dmitry Torokhov
Quoted 51 lines · Manuel Krause
Quoted 5 lines · Dmitry Torokhov

Thank you Manuel, but IO think the patch is not complete as we need to re-enable PNP devices after we make a snapshot to make sure they are working and can handle saving the data. Coudl you please try the patch below?

PNP: fix restoring devices after hibernation

From: Dmitry Torokhov <[email protected]>

On returning from hibernation 'restore; callback is called, not 'resume'.
This fixes breakage introduced by commit eaf140b60ec961252083ab8adaf67aef29a362dd

---
  drivers/pnp/driver.c |   12 +++++++++++-
  1 file changed, 11 insertions(+), 1 deletion(-)
drivers/pnp/driver.c +11 -1
index a39ee38..2bd5c5f 100644
@@ -197,6 +197,11 @@ static int pnp_bus_freeze(struct device *dev)
  	return __pnp_bus_suspend(dev, PMSG_FREEZE);
  }
 
+static int pnp_bus_poweroff(struct device *dev)
+{
+	return __pnp_bus_suspend(dev, PMSG_HIBERNATE);
+}
+
  static int pnp_bus_resume(struct device *dev)
  {
  	struct pnp_dev *pnp_dev = to_pnp_dev(dev);
@@ -234,9 +239,14 @@ static int pnp_bus_resume(struct device *dev)
  }
 
  static const struct dev_pm_ops pnp_bus_dev_pm_ops = {
+	/* Suspend callbacks */
  	.suspend = pnp_bus_suspend,
-	.freeze = pnp_bus_freeze,
  	.resume = pnp_bus_resume,
+	/* Hibernate callbacks */
+	.freeze = pnp_bus_freeze,
+	.thaw = pnp_bus_resume,
+	.poweroff = pnp_bus_poweroff,
+	.restore = pnp_bus_resume,
  };
 
Quoted 8 lines
Quoted 4 lines
drivers/pnp/driver.c +0 -0
  struct bus_type pnp_bus_type = {

ALSO, YES, this second patch version does cure the issue, on here, too.

Rafael,

Will you please take this patch in? It would also make sense to add it to stable I think.

Well, it conveniently hasn't been sent to linux-pm.

OK, I'll try to find it in the linux-kernel archives.

Thanks,
Rafael