| Message ID | 1444056332-30246-5-git-send-email-tomeu.vizoso@collabora.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
On Mon, Oct 05, 2015 at 04:45:32PM +0200, Tomeu Vizoso wrote: > Have dev_pm_ops.prepare return 1 for USB devices and ports so that USB > devices can remain runtime-suspended when the system goes to a sleep > state, if their wakeup state is correct and they have runtime PM enabled. > > Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com> > --- > > > drivers/usb/core/port.c | 6 ++++++ > drivers/usb/core/usb.c | 11 ++++++++++- > 2 files changed, 16 insertions(+), 1 deletion(-) > > diff --git a/drivers/usb/core/port.c b/drivers/usb/core/port.c > index 210618319f10..f49707d73b5a 100644 > --- a/drivers/usb/core/port.c > +++ b/drivers/usb/core/port.c > @@ -168,12 +168,18 @@ static int usb_port_runtime_suspend(struct device *dev) > > return retval; > } > + > +static int usb_port_prepare(struct device *dev) > +{ > + return 1; > +} > #endif > > static const struct dev_pm_ops usb_port_pm_ops = { > #ifdef CONFIG_PM > .runtime_suspend = usb_port_runtime_suspend, > .runtime_resume = usb_port_runtime_resume, > + .prepare = usb_port_prepare, > #endif > }; > > diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c > index 8d5b2f4113cd..cf4dde11db1c 100644 > --- a/drivers/usb/core/usb.c > +++ b/drivers/usb/core/usb.c > @@ -316,7 +316,16 @@ static int usb_dev_uevent(struct device *dev, struct kobj_uevent_env *env) > > static int usb_dev_prepare(struct device *dev) > { > - return 0; /* Implement eventually? */ > + struct usb_device *udev = to_usb_device(dev); > + > + if (!pm_runtime_enabled(dev)) > + return 0; > + > + /* Return 0 if the current wakeup setting is wrong, otherwise 1 */ > + if (udev->do_remote_wakeup != device_may_wakeup(dev)) > + return 0; > + > + return 1; > } > > static void usb_dev_complete(struct device *dev) I'll defer to Alan if this is correct or not. Alan? -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, 16 Oct 2015, Greg Kroah-Hartman wrote: > On Mon, Oct 05, 2015 at 04:45:32PM +0200, Tomeu Vizoso wrote: > > Have dev_pm_ops.prepare return 1 for USB devices and ports so that USB > > devices can remain runtime-suspended when the system goes to a sleep > > state, if their wakeup state is correct and they have runtime PM enabled. > > > > Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com> > > --- > > > > > > drivers/usb/core/port.c | 6 ++++++ > > drivers/usb/core/usb.c | 11 ++++++++++- > > 2 files changed, 16 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/usb/core/port.c b/drivers/usb/core/port.c > > index 210618319f10..f49707d73b5a 100644 > > --- a/drivers/usb/core/port.c > > +++ b/drivers/usb/core/port.c > > @@ -168,12 +168,18 @@ static int usb_port_runtime_suspend(struct device *dev) > > > > return retval; > > } > > + > > +static int usb_port_prepare(struct device *dev) > > +{ > > + return 1; > > +} > > #endif > > > > static const struct dev_pm_ops usb_port_pm_ops = { > > #ifdef CONFIG_PM > > .runtime_suspend = usb_port_runtime_suspend, > > .runtime_resume = usb_port_runtime_resume, > > + .prepare = usb_port_prepare, > > #endif > > }; > > > > diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c > > index 8d5b2f4113cd..cf4dde11db1c 100644 > > --- a/drivers/usb/core/usb.c > > +++ b/drivers/usb/core/usb.c > > @@ -316,7 +316,16 @@ static int usb_dev_uevent(struct device *dev, struct kobj_uevent_env *env) > > > > static int usb_dev_prepare(struct device *dev) > > { > > - return 0; /* Implement eventually? */ > > + struct usb_device *udev = to_usb_device(dev); > > + > > + if (!pm_runtime_enabled(dev)) > > + return 0; > > + > > + /* Return 0 if the current wakeup setting is wrong, otherwise 1 */ > > + if (udev->do_remote_wakeup != device_may_wakeup(dev)) > > + return 0; > > + > > + return 1; > > } > > > > static void usb_dev_complete(struct device *dev) > > I'll defer to Alan if this is correct or not. > > Alan? It's okay with me. However, I believe the pm_runtime_enabled() test isn't really needed. USB devices are always enabled for runtime PM once they are initialized. Furthermore, if the test really were needed then it should go in the PM core, not here. Alan Stern -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/usb/core/port.c b/drivers/usb/core/port.c index 210618319f10..f49707d73b5a 100644 --- a/drivers/usb/core/port.c +++ b/drivers/usb/core/port.c @@ -168,12 +168,18 @@ static int usb_port_runtime_suspend(struct device *dev) return retval; } + +static int usb_port_prepare(struct device *dev) +{ + return 1; +} #endif static const struct dev_pm_ops usb_port_pm_ops = { #ifdef CONFIG_PM .runtime_suspend = usb_port_runtime_suspend, .runtime_resume = usb_port_runtime_resume, + .prepare = usb_port_prepare, #endif }; diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c index 8d5b2f4113cd..cf4dde11db1c 100644 --- a/drivers/usb/core/usb.c +++ b/drivers/usb/core/usb.c @@ -316,7 +316,16 @@ static int usb_dev_uevent(struct device *dev, struct kobj_uevent_env *env) static int usb_dev_prepare(struct device *dev) { - return 0; /* Implement eventually? */ + struct usb_device *udev = to_usb_device(dev); + + if (!pm_runtime_enabled(dev)) + return 0; + + /* Return 0 if the current wakeup setting is wrong, otherwise 1 */ + if (udev->do_remote_wakeup != device_may_wakeup(dev)) + return 0; + + return 1; } static void usb_dev_complete(struct device *dev)
Have dev_pm_ops.prepare return 1 for USB devices and ports so that USB devices can remain runtime-suspended when the system goes to a sleep state, if their wakeup state is correct and they have runtime PM enabled. Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com> --- drivers/usb/core/port.c | 6 ++++++ drivers/usb/core/usb.c | 11 ++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-)