From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Rafael J. Wysocki" Subject: Re: ACPI: Make /proc/acpi/wakeup interface handle PCI devices (again) Date: Fri, 3 Oct 2008 17:10:12 +0200 Message-ID: <200810031710.13446.rjw@sisk.pl> References: <200809262221.48040.rjw@sisk.pl> <20081003055123.bda469ce.akpm@linux-foundation.org> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Return-path: Received: from ogre.sisk.pl ([217.79.144.158]:39981 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752235AbYJCPFw (ORCPT ); Fri, 3 Oct 2008 11:05:52 -0400 In-Reply-To: <20081003055123.bda469ce.akpm@linux-foundation.org> Content-Disposition: inline Sender: linux-acpi-owner@vger.kernel.org List-Id: linux-acpi@vger.kernel.org To: Andrew Morton Cc: Len Brown , Jesse Barnes , ACPI Devel Maling List , pm list , Tino Keitel On Friday, 3 of October 2008, Andrew Morton wrote: > On Fri, 26 Sep 2008 22:21:47 +0200 "Rafael J. Wysocki" wrote: > > > Len, > > > > I think we should do this in .27. > > Is Len not there? Can some other acpi person please review this for > 2.6.27 inclusion? > > > > From: Rafael J. Wysocki > > > > ACPI: Make /proc/acpi/wakeup interface handle PCI devices (again) > > > > 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. > > hm, if you say so. It's a bit hard to judge the impact of not fixing this? There are people for whom /proc/acpi/wakeup worked, but since Tino Keitel was the only person reporting this problem, I think it's not widespread. > When is "previous"? Was 2.6.26 similarly busted? Well, "previous" means "as in 2.6.26 and earlier", so this is a recent regression. /proc/acpi/ is going to go away at one point, but I think we shouldn't break working setups given that the fix is not very intrusive. > > Signed-off-by: Rafael J. Wysocki > > --- > > 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; > > >