linux-kernel - Re: Wakeup from suspend via keyboard and mouse doesn't work anymore with 2.6.27-rc

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <200809260035.09052.rjw@sisk.pl>
Date:	Fri, 26 Sep 2008 00:35:08 +0200
From:	"Rafael J. Wysocki" <rjw@...k.pl>
To:	Tino Keitel <tino.keitel@....de>
Cc:	linux-kernel@...r.kernel.org
Subject: Re: Wakeup from suspend via keyboard and mouse doesn't work anymore with 2.6.27-rc

On Monday, 22 of September 2008, Tino Keitel wrote:
> On Mon, Sep 22, 2008 at 23:09:34 +0200, Rafael J. Wysocki wrote:
> > On Monday, 22 of September 2008, Tino Keitel wrote:
> > > Hi,
> > 
> > Hi,
> > 
> > > my Mac mini core duo used to wake up from suspend to RAM when a key or
> > > mouse button is pressed. This doesn't work anymore with 2.6.27-rc, the
> > > current version that I tried is 2.6.27-rc7. I checked /proc/acpi/wakeup
> > > for differences, with 2.6.26 and 2.6.27-rc, but both were identical:
> > 
> > Did you test that with any 2.6.27-rc before -rc7?
> 
> Only -rc6 IIRC.
> 
> > > Any hints if there are some commits that I should try to revert, before
> > > I start bisecting?
> > 
> > I don't think you need to revert anything. :-)
> > 
> > Please check if the /sys/devices/.../power/wakeup file contains 'enabled' for
> > the USB controller pci:0000:00:1d.7 (I assume this is the one the keyboard &
> > mouse are attached to).  If it doesn't, please try to write 'enabled' to this
> > file and retest.
> 
> Yes, this works. Thanks.

This actually is a regression for which I'm sorry.

Can you please check if the appended patch restores the previous behavior?

Thanks,
Rafael

---
From: Rafael J. Wysocki <rjw@...k.pl>

ACPI: Make /proc/acpi/wakeup interface handle PCI devices

Make the ACPI /proc/acpi/wakeup interface set the appropriate
wake-up bits of physical devices corresponding to the ACPI
devices and make those bits be set initially for devices that are
enabled to wake up by default.  This is needed to restore the
previous behavior for the PCI devices that were previously handled
correctly with the help of the /proc/acpi/wakeup interface.

Signed-off-by: Rafael J. Wysocki <rjw@...k.pl>
---
 drivers/acpi/glue.c       |    5 ++++-
 drivers/acpi/sleep/proc.c |   10 ++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

Index: linux-2.6/drivers/acpi/sleep/proc.c
===================================================================
--- linux-2.6.orig/drivers/acpi/sleep/proc.c
+++ linux-2.6/drivers/acpi/sleep/proc.c
@@ -377,6 +377,14 @@ acpi_system_wakeup_device_seq_show(struc
 	return 0;
 }
 
+static void physical_device_enable_wakeup(struct acpi_device *adev)
+{
+	struct device *dev = acpi_get_physical_device(adev->handle);
+
+	if (dev && device_can_wakeup(dev))
+		device_set_wakeup_enable(dev, adev->wakeup.state.enabled);
+}
+
 static ssize_t
 acpi_system_write_wakeup_device(struct file *file,
 				const char __user * buffer,
@@ -411,6 +419,7 @@ acpi_system_write_wakeup_device(struct f
 		}
 	}
 	if (found_dev) {
+		physical_device_enable_wakeup(found_dev);
 		list_for_each_safe(node, next, &acpi_wakeup_device_list) {
 			struct acpi_device *dev = container_of(node,
 							       struct
@@ -428,6 +437,7 @@ acpi_system_write_wakeup_device(struct f
 				       dev->pnp.bus_id, found_dev->pnp.bus_id);
 				dev->wakeup.state.enabled =
 				    found_dev->wakeup.state.enabled;
+				physical_device_enable_wakeup(dev);
 			}
 		}
 	}
Index: linux-2.6/drivers/acpi/glue.c
===================================================================
--- linux-2.6.orig/drivers/acpi/glue.c
+++ linux-2.6/drivers/acpi/glue.c
@@ -165,8 +165,11 @@ static int acpi_bind_one(struct device *
 				"firmware_node");
 		ret = sysfs_create_link(&acpi_dev->dev.kobj, &dev->kobj,
 				"physical_node");
-		if (acpi_dev->wakeup.flags.valid)
+		if (acpi_dev->wakeup.flags.valid) {
 			device_set_wakeup_capable(dev, true);
+			device_set_wakeup_enable(dev,
+						acpi_dev->wakeup.state.enabled);
+		}
 	}
 
 	return 0;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/