* [PATCH] PNPACPI: add support for remote wakeup
@ 2010-06-07 20:50 Alan Stern
2010-06-12 21:44 ` Rafael J. Wysocki
0 siblings, 1 reply; 9+ messages in thread
From: Alan Stern @ 2010-06-07 20:50 UTC (permalink / raw)
To: Len Brown; +Cc: Bjorn Helgaas, Rafael J. Wysocki, linux-acpi
This patch (as1354) adds remote-wakeup support to the pnpacpi driver.
The new can_wakeup method also allows other PNP protocol drivers
(pnpbios or iaspnp) to add wakeup support, but I don't know enough
about how they work to actually do it.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Reviewed-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
---
Len, this patch seems to have gotten lost in the shuffle, so I'm
submitting it again.
Alan Stern
Index: usb-2.6/include/linux/pnp.h
===================================================================
--- usb-2.6.orig/include/linux/pnp.h
+++ usb-2.6/include/linux/pnp.h
@@ -414,6 +414,7 @@ struct pnp_protocol {
int (*disable) (struct pnp_dev *dev);
/* protocol specific suspend/resume */
+ bool (*can_wakeup) (struct pnp_dev *dev);
int (*suspend) (struct pnp_dev * dev, pm_message_t state);
int (*resume) (struct pnp_dev * dev);
Index: usb-2.6/drivers/pnp/core.c
===================================================================
--- usb-2.6.orig/drivers/pnp/core.c
+++ usb-2.6/drivers/pnp/core.c
@@ -164,6 +164,9 @@ int __pnp_add_device(struct pnp_dev *dev
list_add_tail(&dev->global_list, &pnp_global);
list_add_tail(&dev->protocol_list, &dev->protocol->devices);
spin_unlock(&pnp_lock);
+ if (dev->protocol->can_wakeup)
+ device_set_wakeup_capable(&dev->dev,
+ dev->protocol->can_wakeup(dev));
return device_register(&dev->dev);
}
Index: usb-2.6/drivers/pnp/pnpacpi/core.c
===================================================================
--- usb-2.6.orig/drivers/pnp/pnpacpi/core.c
+++ usb-2.6/drivers/pnp/pnpacpi/core.c
@@ -121,17 +121,37 @@ static int pnpacpi_disable_resources(str
}
#ifdef CONFIG_ACPI_SLEEP
+static bool pnpacpi_can_wakeup(struct pnp_dev *dev)
+{
+ struct acpi_device *acpi_dev = dev->data;
+ acpi_handle handle = acpi_dev->handle;
+
+ return acpi_bus_can_wakeup(handle);
+}
+
static int pnpacpi_suspend(struct pnp_dev *dev, pm_message_t state)
{
struct acpi_device *acpi_dev = dev->data;
acpi_handle handle = acpi_dev->handle;
int power_state;
+ if (device_can_wakeup(&dev->dev)) {
+ int rc = acpi_pm_device_sleep_wake(&dev->dev,
+ device_may_wakeup(&dev->dev));
+
+ if (rc)
+ return rc;
+ }
power_state = acpi_pm_device_sleep_state(&dev->dev, NULL);
if (power_state < 0)
power_state = (state.event == PM_EVENT_ON) ?
ACPI_STATE_D0 : ACPI_STATE_D3;
+ /* acpi_bus_set_power() often fails (keyboard port can't be
+ * powered-down?), and in any case, our return value is ignored
+ * by pnp_bus_suspend(). Hence we don't revert the wakeup
+ * setting if the set_power fails.
+ */
return acpi_bus_set_power(handle, power_state);
}
@@ -140,6 +160,8 @@ static int pnpacpi_resume(struct pnp_dev
struct acpi_device *acpi_dev = dev->data;
acpi_handle handle = acpi_dev->handle;
+ if (device_may_wakeup(&dev->dev))
+ acpi_pm_device_sleep_wake(&dev->dev, false);
return acpi_bus_set_power(handle, ACPI_STATE_D0);
}
#endif
@@ -150,6 +172,7 @@ struct pnp_protocol pnpacpi_protocol = {
.set = pnpacpi_set_resources,
.disable = pnpacpi_disable_resources,
#ifdef CONFIG_ACPI_SLEEP
+ .can_wakeup = pnpacpi_can_wakeup,
.suspend = pnpacpi_suspend,
.resume = pnpacpi_resume,
#endif
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] PNPACPI: add support for remote wakeup
2010-06-07 20:50 [PATCH] PNPACPI: add support for remote wakeup Alan Stern
@ 2010-06-12 21:44 ` Rafael J. Wysocki
2010-06-14 15:02 ` Matthew Garrett
0 siblings, 1 reply; 9+ messages in thread
From: Rafael J. Wysocki @ 2010-06-12 21:44 UTC (permalink / raw)
To: Len Brown, Matthew Garrett
Cc: Alan Stern, Bjorn Helgaas, linux-acpi, Andrew Morton
On Monday, June 07, 2010, Alan Stern wrote:
> This patch (as1354) adds remote-wakeup support to the pnpacpi driver.
> The new can_wakeup method also allows other PNP protocol drivers
> (pnpbios or iaspnp) to add wakeup support, but I don't know enough
> about how they work to actually do it.
>
> Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
> Reviewed-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
> Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
Len, Matthew, is anyone going to merge this patch? It looks entirely correct
and useful.
Or should I take it?
Rafael
> ---
>
> Len, this patch seems to have gotten lost in the shuffle, so I'm
> submitting it again.
>
> Alan Stern
>
>
>
> Index: usb-2.6/include/linux/pnp.h
> ===================================================================
> --- usb-2.6.orig/include/linux/pnp.h
> +++ usb-2.6/include/linux/pnp.h
> @@ -414,6 +414,7 @@ struct pnp_protocol {
> int (*disable) (struct pnp_dev *dev);
>
> /* protocol specific suspend/resume */
> + bool (*can_wakeup) (struct pnp_dev *dev);
> int (*suspend) (struct pnp_dev * dev, pm_message_t state);
> int (*resume) (struct pnp_dev * dev);
>
> Index: usb-2.6/drivers/pnp/core.c
> ===================================================================
> --- usb-2.6.orig/drivers/pnp/core.c
> +++ usb-2.6/drivers/pnp/core.c
> @@ -164,6 +164,9 @@ int __pnp_add_device(struct pnp_dev *dev
> list_add_tail(&dev->global_list, &pnp_global);
> list_add_tail(&dev->protocol_list, &dev->protocol->devices);
> spin_unlock(&pnp_lock);
> + if (dev->protocol->can_wakeup)
> + device_set_wakeup_capable(&dev->dev,
> + dev->protocol->can_wakeup(dev));
> return device_register(&dev->dev);
> }
>
> Index: usb-2.6/drivers/pnp/pnpacpi/core.c
> ===================================================================
> --- usb-2.6.orig/drivers/pnp/pnpacpi/core.c
> +++ usb-2.6/drivers/pnp/pnpacpi/core.c
> @@ -121,17 +121,37 @@ static int pnpacpi_disable_resources(str
> }
>
> #ifdef CONFIG_ACPI_SLEEP
> +static bool pnpacpi_can_wakeup(struct pnp_dev *dev)
> +{
> + struct acpi_device *acpi_dev = dev->data;
> + acpi_handle handle = acpi_dev->handle;
> +
> + return acpi_bus_can_wakeup(handle);
> +}
> +
> static int pnpacpi_suspend(struct pnp_dev *dev, pm_message_t state)
> {
> struct acpi_device *acpi_dev = dev->data;
> acpi_handle handle = acpi_dev->handle;
> int power_state;
>
> + if (device_can_wakeup(&dev->dev)) {
> + int rc = acpi_pm_device_sleep_wake(&dev->dev,
> + device_may_wakeup(&dev->dev));
> +
> + if (rc)
> + return rc;
> + }
> power_state = acpi_pm_device_sleep_state(&dev->dev, NULL);
> if (power_state < 0)
> power_state = (state.event == PM_EVENT_ON) ?
> ACPI_STATE_D0 : ACPI_STATE_D3;
>
> + /* acpi_bus_set_power() often fails (keyboard port can't be
> + * powered-down?), and in any case, our return value is ignored
> + * by pnp_bus_suspend(). Hence we don't revert the wakeup
> + * setting if the set_power fails.
> + */
> return acpi_bus_set_power(handle, power_state);
> }
>
> @@ -140,6 +160,8 @@ static int pnpacpi_resume(struct pnp_dev
> struct acpi_device *acpi_dev = dev->data;
> acpi_handle handle = acpi_dev->handle;
>
> + if (device_may_wakeup(&dev->dev))
> + acpi_pm_device_sleep_wake(&dev->dev, false);
> return acpi_bus_set_power(handle, ACPI_STATE_D0);
> }
> #endif
> @@ -150,6 +172,7 @@ struct pnp_protocol pnpacpi_protocol = {
> .set = pnpacpi_set_resources,
> .disable = pnpacpi_disable_resources,
> #ifdef CONFIG_ACPI_SLEEP
> + .can_wakeup = pnpacpi_can_wakeup,
> .suspend = pnpacpi_suspend,
> .resume = pnpacpi_resume,
> #endif
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] PNPACPI: add support for remote wakeup
2010-06-12 21:44 ` Rafael J. Wysocki
@ 2010-06-14 15:02 ` Matthew Garrett
2010-06-14 15:05 ` Bjorn Helgaas
0 siblings, 1 reply; 9+ messages in thread
From: Matthew Garrett @ 2010-06-14 15:02 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Len Brown, Alan Stern, Bjorn Helgaas, linux-acpi, Andrew Morton
On Sat, Jun 12, 2010 at 11:44:00PM +0200, Rafael J. Wysocki wrote:
> Len, Matthew, is anyone going to merge this patch? It looks entirely correct
> and useful.
>
> Or should I take it?
Either Len, you or Bjorn would be my guesses.
--
Matthew Garrett | mjg59@srcf.ucam.org
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] PNPACPI: add support for remote wakeup
2010-06-14 15:02 ` Matthew Garrett
@ 2010-06-14 15:05 ` Bjorn Helgaas
2010-06-14 19:06 ` Rafael J. Wysocki
2010-06-28 21:28 ` Rafael J. Wysocki
0 siblings, 2 replies; 9+ messages in thread
From: Bjorn Helgaas @ 2010-06-14 15:05 UTC (permalink / raw)
To: Matthew Garrett
Cc: Rafael J. Wysocki, Len Brown, Alan Stern, linux-acpi, Andrew Morton
On Monday, June 14, 2010 09:02:36 am Matthew Garrett wrote:
> On Sat, Jun 12, 2010 at 11:44:00PM +0200, Rafael J. Wysocki wrote:
>
> > Len, Matthew, is anyone going to merge this patch? It looks entirely correct
> > and useful.
> >
> > Or should I take it?
>
> Either Len, you or Bjorn would be my guesses.
I don't have a tree to merge anything myself. I send PNP stuff through
Len (and I'm OK with this particular patch).
Bjorn
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] PNPACPI: add support for remote wakeup
2010-06-14 15:05 ` Bjorn Helgaas
@ 2010-06-14 19:06 ` Rafael J. Wysocki
2010-06-28 21:28 ` Rafael J. Wysocki
1 sibling, 0 replies; 9+ messages in thread
From: Rafael J. Wysocki @ 2010-06-14 19:06 UTC (permalink / raw)
To: Bjorn Helgaas, Len Brown
Cc: Matthew Garrett, Alan Stern, linux-acpi, Andrew Morton
On Monday, June 14, 2010, Bjorn Helgaas wrote:
> On Monday, June 14, 2010 09:02:36 am Matthew Garrett wrote:
> > On Sat, Jun 12, 2010 at 11:44:00PM +0200, Rafael J. Wysocki wrote:
> >
> > > Len, Matthew, is anyone going to merge this patch? It looks entirely correct
> > > and useful.
> > >
> > > Or should I take it?
> >
> > Either Len, you or Bjorn would be my guesses.
>
> I don't have a tree to merge anything myself. I send PNP stuff through
> Len (and I'm OK with this particular patch).
OK, I can take it.
Len, would you mind if I took this patch?
Rafael
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] PNPACPI: add support for remote wakeup
2010-06-14 15:05 ` Bjorn Helgaas
2010-06-14 19:06 ` Rafael J. Wysocki
@ 2010-06-28 21:28 ` Rafael J. Wysocki
1 sibling, 0 replies; 9+ messages in thread
From: Rafael J. Wysocki @ 2010-06-28 21:28 UTC (permalink / raw)
To: Bjorn Helgaas
Cc: Matthew Garrett, Len Brown, Alan Stern, linux-acpi, Andrew Morton
On Monday, June 14, 2010, Bjorn Helgaas wrote:
> On Monday, June 14, 2010 09:02:36 am Matthew Garrett wrote:
> > On Sat, Jun 12, 2010 at 11:44:00PM +0200, Rafael J. Wysocki wrote:
> >
> > > Len, Matthew, is anyone going to merge this patch? It looks entirely correct
> > > and useful.
> > >
> > > Or should I take it?
> >
> > Either Len, you or Bjorn would be my guesses.
>
> I don't have a tree to merge anything myself. I send PNP stuff through
> Len (and I'm OK with this particular patch).
I'm going to take it, then.
Rafael
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH] PNPACPI: add support for remote wakeup
@ 2010-03-08 21:50 Alan Stern
2010-03-08 22:21 ` Bjorn Helgaas
0 siblings, 1 reply; 9+ messages in thread
From: Alan Stern @ 2010-03-08 21:50 UTC (permalink / raw)
To: Bjorn Helgaas; +Cc: Kernel development list
This patch (as1354) adds remote-wakeup support to the pnpacpi driver.
The new can_wakeup method also allows other PNP protocol drivers
(pnpbios or iaspnp) to add wakeup support, but I don't know enough
about how they work to actually do it.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
---
Index: usb-2.6/include/linux/pnp.h
===================================================================
--- usb-2.6.orig/include/linux/pnp.h
+++ usb-2.6/include/linux/pnp.h
@@ -414,6 +414,7 @@ struct pnp_protocol {
int (*disable) (struct pnp_dev *dev);
/* protocol specific suspend/resume */
+ bool (*can_wakeup) (struct pnp_dev *dev);
int (*suspend) (struct pnp_dev * dev, pm_message_t state);
int (*resume) (struct pnp_dev * dev);
Index: usb-2.6/drivers/pnp/core.c
===================================================================
--- usb-2.6.orig/drivers/pnp/core.c
+++ usb-2.6/drivers/pnp/core.c
@@ -164,6 +164,9 @@ int __pnp_add_device(struct pnp_dev *dev
list_add_tail(&dev->global_list, &pnp_global);
list_add_tail(&dev->protocol_list, &dev->protocol->devices);
spin_unlock(&pnp_lock);
+ if (dev->protocol->can_wakeup)
+ device_set_wakeup_capable(&dev->dev,
+ dev->protocol->can_wakeup(dev));
return device_register(&dev->dev);
}
Index: usb-2.6/drivers/pnp/pnpacpi/core.c
===================================================================
--- usb-2.6.orig/drivers/pnp/pnpacpi/core.c
+++ usb-2.6/drivers/pnp/pnpacpi/core.c
@@ -121,17 +121,37 @@ static int pnpacpi_disable_resources(str
}
#ifdef CONFIG_ACPI_SLEEP
+static bool pnpacpi_can_wakeup(struct pnp_dev *dev)
+{
+ struct acpi_device *acpi_dev = dev->data;
+ acpi_handle handle = acpi_dev->handle;
+
+ return acpi_bus_can_wakeup(handle);
+}
+
static int pnpacpi_suspend(struct pnp_dev *dev, pm_message_t state)
{
struct acpi_device *acpi_dev = dev->data;
acpi_handle handle = acpi_dev->handle;
int power_state;
+ if (device_can_wakeup(&dev->dev)) {
+ int rc = acpi_pm_device_sleep_wake(&dev->dev,
+ device_may_wakeup(&dev->dev));
+
+ if (rc)
+ return rc;
+ }
power_state = acpi_pm_device_sleep_state(&dev->dev, NULL);
if (power_state < 0)
power_state = (state.event == PM_EVENT_ON) ?
ACPI_STATE_D0 : ACPI_STATE_D3;
+ /* acpi_bus_set_power() often fails (keyboard port can't be
+ * powered-down?), and in any case, our return value is ignored
+ * by pnp_bus_suspend(). Hence we don't revert the wakeup
+ * setting if the set_power fails.
+ */
return acpi_bus_set_power(handle, power_state);
}
@@ -140,6 +160,8 @@ static int pnpacpi_resume(struct pnp_dev
struct acpi_device *acpi_dev = dev->data;
acpi_handle handle = acpi_dev->handle;
+ if (device_may_wakeup(&dev->dev))
+ acpi_pm_device_sleep_wake(&dev->dev, false);
return acpi_bus_set_power(handle, ACPI_STATE_D0);
}
#endif
@@ -150,6 +172,7 @@ struct pnp_protocol pnpacpi_protocol = {
.set = pnpacpi_set_resources,
.disable = pnpacpi_disable_resources,
#ifdef CONFIG_ACPI_SLEEP
+ .can_wakeup = pnpacpi_can_wakeup,
.suspend = pnpacpi_suspend,
.resume = pnpacpi_resume,
#endif
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] PNPACPI: add support for remote wakeup
2010-03-08 21:50 Alan Stern
@ 2010-03-08 22:21 ` Bjorn Helgaas
2010-03-08 22:42 ` Rafael J. Wysocki
0 siblings, 1 reply; 9+ messages in thread
From: Bjorn Helgaas @ 2010-03-08 22:21 UTC (permalink / raw)
To: Alan Stern; +Cc: Kernel development list, linux-acpi, Rafael J. Wysocki
On Monday 08 March 2010 02:50:50 pm Alan Stern wrote:
> This patch (as1354) adds remote-wakeup support to the pnpacpi driver.
> The new can_wakeup method also allows other PNP protocol drivers
> (pnpbios or iaspnp) to add wakeup support, but I don't know enough
> about how they work to actually do it.
>
> Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
We usually send PNP patches through the ACPI tree, so I added a CC
to linux-acpi.
> --- usb-2.6.orig/drivers/pnp/core.c
> +++ usb-2.6/drivers/pnp/core.c
> @@ -164,6 +164,9 @@ int __pnp_add_device(struct pnp_dev *dev
> list_add_tail(&dev->global_list, &pnp_global);
> list_add_tail(&dev->protocol_list, &dev->protocol->devices);
> spin_unlock(&pnp_lock);
> + if (dev->protocol->can_wakeup)
> + device_set_wakeup_capable(&dev->dev,
> + dev->protocol->can_wakeup(dev));
I also added Rafael because he added code in acpi_bind_one() that
does the same thing. I think the struct dev there will be the same
one as &dev->dev here: we build both an acpi_device and a pnp_dev,
and they refer to the same struct device.
However, I think we still need your patch because acpi_bind_one()
is only used for PCI devices, so it looks like there's currently
no way to use acpi_pm_device_sleep_wake() for non-PCI devices.
Reviewed-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
> return device_register(&dev->dev);
> }
>
> Index: usb-2.6/drivers/pnp/pnpacpi/core.c
> ===================================================================
> --- usb-2.6.orig/drivers/pnp/pnpacpi/core.c
> +++ usb-2.6/drivers/pnp/pnpacpi/core.c
> @@ -121,17 +121,37 @@ static int pnpacpi_disable_resources(str
> }
>
> #ifdef CONFIG_ACPI_SLEEP
> +static bool pnpacpi_can_wakeup(struct pnp_dev *dev)
> +{
> + struct acpi_device *acpi_dev = dev->data;
> + acpi_handle handle = acpi_dev->handle;
> +
> + return acpi_bus_can_wakeup(handle);
> +}
> +
> static int pnpacpi_suspend(struct pnp_dev *dev, pm_message_t state)
> {
> struct acpi_device *acpi_dev = dev->data;
> acpi_handle handle = acpi_dev->handle;
> int power_state;
>
> + if (device_can_wakeup(&dev->dev)) {
> + int rc = acpi_pm_device_sleep_wake(&dev->dev,
> + device_may_wakeup(&dev->dev));
> +
> + if (rc)
> + return rc;
> + }
> power_state = acpi_pm_device_sleep_state(&dev->dev, NULL);
> if (power_state < 0)
> power_state = (state.event == PM_EVENT_ON) ?
> ACPI_STATE_D0 : ACPI_STATE_D3;
>
> + /* acpi_bus_set_power() often fails (keyboard port can't be
> + * powered-down?), and in any case, our return value is ignored
> + * by pnp_bus_suspend(). Hence we don't revert the wakeup
> + * setting if the set_power fails.
> + */
> return acpi_bus_set_power(handle, power_state);
> }
>
> @@ -140,6 +160,8 @@ static int pnpacpi_resume(struct pnp_dev
> struct acpi_device *acpi_dev = dev->data;
> acpi_handle handle = acpi_dev->handle;
>
> + if (device_may_wakeup(&dev->dev))
> + acpi_pm_device_sleep_wake(&dev->dev, false);
> return acpi_bus_set_power(handle, ACPI_STATE_D0);
> }
> #endif
> @@ -150,6 +172,7 @@ struct pnp_protocol pnpacpi_protocol = {
> .set = pnpacpi_set_resources,
> .disable = pnpacpi_disable_resources,
> #ifdef CONFIG_ACPI_SLEEP
> + .can_wakeup = pnpacpi_can_wakeup,
> .suspend = pnpacpi_suspend,
> .resume = pnpacpi_resume,
> #endif
>
>
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] PNPACPI: add support for remote wakeup
2010-03-08 22:21 ` Bjorn Helgaas
@ 2010-03-08 22:42 ` Rafael J. Wysocki
0 siblings, 0 replies; 9+ messages in thread
From: Rafael J. Wysocki @ 2010-03-08 22:42 UTC (permalink / raw)
To: Bjorn Helgaas; +Cc: Alan Stern, Kernel development list, linux-acpi
On Monday 08 March 2010, Bjorn Helgaas wrote:
> On Monday 08 March 2010 02:50:50 pm Alan Stern wrote:
> > This patch (as1354) adds remote-wakeup support to the pnpacpi driver.
> > The new can_wakeup method also allows other PNP protocol drivers
> > (pnpbios or iaspnp) to add wakeup support, but I don't know enough
> > about how they work to actually do it.
> >
> > Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
>
> We usually send PNP patches through the ACPI tree, so I added a CC
> to linux-acpi.
>
> > --- usb-2.6.orig/drivers/pnp/core.c
> > +++ usb-2.6/drivers/pnp/core.c
> > @@ -164,6 +164,9 @@ int __pnp_add_device(struct pnp_dev *dev
> > list_add_tail(&dev->global_list, &pnp_global);
> > list_add_tail(&dev->protocol_list, &dev->protocol->devices);
> > spin_unlock(&pnp_lock);
> > + if (dev->protocol->can_wakeup)
> > + device_set_wakeup_capable(&dev->dev,
> > + dev->protocol->can_wakeup(dev));
>
> I also added Rafael because he added code in acpi_bind_one() that
> does the same thing. I think the struct dev there will be the same
> one as &dev->dev here: we build both an acpi_device and a pnp_dev,
> and they refer to the same struct device.
>
> However, I think we still need your patch because acpi_bind_one()
> is only used for PCI devices, so it looks like there's currently
> no way to use acpi_pm_device_sleep_wake() for non-PCI devices.
That's correct AFAICS.
> Reviewed-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
> > return device_register(&dev->dev);
> > }
> >
> > Index: usb-2.6/drivers/pnp/pnpacpi/core.c
> > ===================================================================
> > --- usb-2.6.orig/drivers/pnp/pnpacpi/core.c
> > +++ usb-2.6/drivers/pnp/pnpacpi/core.c
> > @@ -121,17 +121,37 @@ static int pnpacpi_disable_resources(str
> > }
> >
> > #ifdef CONFIG_ACPI_SLEEP
> > +static bool pnpacpi_can_wakeup(struct pnp_dev *dev)
> > +{
> > + struct acpi_device *acpi_dev = dev->data;
> > + acpi_handle handle = acpi_dev->handle;
> > +
> > + return acpi_bus_can_wakeup(handle);
> > +}
> > +
> > static int pnpacpi_suspend(struct pnp_dev *dev, pm_message_t state)
> > {
> > struct acpi_device *acpi_dev = dev->data;
> > acpi_handle handle = acpi_dev->handle;
> > int power_state;
> >
> > + if (device_can_wakeup(&dev->dev)) {
> > + int rc = acpi_pm_device_sleep_wake(&dev->dev,
> > + device_may_wakeup(&dev->dev));
> > +
> > + if (rc)
> > + return rc;
> > + }
> > power_state = acpi_pm_device_sleep_state(&dev->dev, NULL);
> > if (power_state < 0)
> > power_state = (state.event == PM_EVENT_ON) ?
> > ACPI_STATE_D0 : ACPI_STATE_D3;
> >
> > + /* acpi_bus_set_power() often fails (keyboard port can't be
> > + * powered-down?), and in any case, our return value is ignored
> > + * by pnp_bus_suspend(). Hence we don't revert the wakeup
> > + * setting if the set_power fails.
> > + */
> > return acpi_bus_set_power(handle, power_state);
> > }
> >
> > @@ -140,6 +160,8 @@ static int pnpacpi_resume(struct pnp_dev
> > struct acpi_device *acpi_dev = dev->data;
> > acpi_handle handle = acpi_dev->handle;
> >
> > + if (device_may_wakeup(&dev->dev))
> > + acpi_pm_device_sleep_wake(&dev->dev, false);
> > return acpi_bus_set_power(handle, ACPI_STATE_D0);
> > }
> > #endif
> > @@ -150,6 +172,7 @@ struct pnp_protocol pnpacpi_protocol = {
> > .set = pnpacpi_set_resources,
> > .disable = pnpacpi_disable_resources,
> > #ifdef CONFIG_ACPI_SLEEP
> > + .can_wakeup = pnpacpi_can_wakeup,
> > .suspend = pnpacpi_suspend,
> > .resume = pnpacpi_resume,
> > #endif
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2010-06-28 21:30 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-06-07 20:50 [PATCH] PNPACPI: add support for remote wakeup Alan Stern
2010-06-12 21:44 ` Rafael J. Wysocki
2010-06-14 15:02 ` Matthew Garrett
2010-06-14 15:05 ` Bjorn Helgaas
2010-06-14 19:06 ` Rafael J. Wysocki
2010-06-28 21:28 ` Rafael J. Wysocki
-- strict thread matches above, loose matches on Subject: below --
2010-03-08 21:50 Alan Stern
2010-03-08 22:21 ` Bjorn Helgaas
2010-03-08 22:42 ` Rafael J. Wysocki
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.