On Thu, May 14, 2015 at 11:51:10AM -0400, Alan Stern wrote:
> On Wed, 13 May 2015, Felipe Balbi wrote:
>
> > This brings up a question, actually. What to do with devices which were
> > already runtime suspended when user initiated suspend-to-ram ? Do we
> > leave wakeups enabled, or do we revisit device_may_wakeup() and
> > conditionally runtime_resume the device, disable wakeup, and let its
> > ->suspend() callback be called ?
>
> In theory, the subsystem/device drivers already have code do this.
> They're supposed to, anyway. The USB host stack does it in
> drivers/usb/core/driver.c:choose_wakeup().

that answers the question, specifically, this comment and piece of code
do:

1395 static void choose_wakeup(struct usb_device *udev, pm_message_t msg)
1396 {

[...]

1409 /* Enable remote wakeup if it is allowed, even if no interface drivers
1410 * actually want it.
1411 */
1412 w = device_may_wakeup(&udev->dev);
1413
1414 /* If the device is autosuspended with the wrong wakeup setting,
1415 * autoresume now so the setting can be changed.
1416 */
1417 if (udev->state == USB_STATE_SUSPENDED && w != udev->do_remote_wakeup)
1418 pm_runtime_resume(&udev->dev);
1419 udev->do_remote_wakeup = w;
1420 }

so that's something that also needs to be taken into consideration.

Thanks

--
balbi

Attachments:

(No filename) (1.37 kB)
signature.asc (819.00 B)
Digital signature Download all attachments

2015-05-14 15:59:53

by Tony Lindgren

[permalink] [raw]

Subject: Re: [PATCH 2/5] PM / Wakeirq: Add automated device wake IRQ handling

* Felipe Balbi <[email protected]> [150513 19:09]:
> On Wed, May 13, 2015 at 04:36:33PM -0700, Tony Lindgren wrote:
> > --- a/arch/arm/mach-omap2/Kconfig
> > +++ b/arch/arm/mach-omap2/Kconfig
> > @@ -85,6 +85,7 @@ config ARCH_OMAP2PLUS
> > select OMAP_DM_TIMER
> > select OMAP_GPMC
> > select PINCTRL
> > + select PM_WAKEIRQ if PM_SLEEP
> > select SOC_BUS
> > select TI_PRIV_EDMA
> > select OMAP_IRQCHIP
>
> seems like enabling this for OMAP should be a patch of its own.

Sure if people prefer that.

> > --- /dev/null
> > +++ b/drivers/base/power/wakeirq.c
> > +
> > +err_unlock:
> > + spin_unlock_irqrestore(&dev->power.lock, flags);
> > +err_free_mem:
>
> minor nit, there's no memory being freed here :-)

Will fix.

> > +void dev_pm_clear_wake_irq(struct device *dev)
> > +{
> > + struct wake_irq *wirq = dev->power.wakeirq;
> > + unsigned long flags;
> > +
> > + if (!wirq)
>
> WARN() to catch bad users ? Maybe with unlikely() around to give
> compiler a hint that this is likely not going to happen ?

Sure.

> > +static irqreturn_t handle_threaded_wakeirq(int wakeirq, void *_wirq)
> > +{
> > + struct wake_irq *wirq = _wirq;
> > + irqreturn_t ret = IRQ_NONE;
> > +
> > + if (!pm_runtime_suspended(wirq->dev))
>
> should you WARN() here ? Why would this IRQ fire if we're not
> pm_runtime_suspended() ?

Hmm or we could just leave it out. I had it initially to test
things with the wake-up interrupt enabled during runtime also.

> > +int dev_pm_request_wake_irq(struct device *dev,
> > + int irq,
> > + irq_handler_t handler,
> > + unsigned long irqflags,
> > + void *data)
> > +{
> > + struct wake_irq *wirq;
> > + int err;
> > +
> > + wirq = devm_kzalloc(dev, sizeof(*wirq), GFP_KERNEL);
> > + if (!wirq)
> > + return -ENOMEM;
> > +
> > + wirq->dev = dev;
> > + wirq->irq = irq;
> > + wirq->handler = handler;
>
> you need to make sure that IRQF_ONESHOT is set in cases where handler is
> NULL. Either set it by default:
>
> if (!handler)
> irqflags |= IRQF_ONESHOT;
>
> or WARN() about it:
>
> WARN_ON((!handler && !(irqflags & IRQF_ONESHOT));
>
> Actually, after reading more of the code, you have some weird circular
> call chain going on here. If handler is a valid function pointer, you
> use as primary handler, so IRQ core will call it from hardirq context.
> But you also save that pointer as wirq->handler, and call that from
> within handle_threaded_wakeirq(). Essentially, handler() is called
> twice, once with IRQs disabled, one with IRQs (potentially) enabled.
>
> What did you have in mind for handler() anyway, it seems completely
> unnecessary.

Yeah.. Let's just leave it out. You already mentioned it earlier and
there's no use for it.

The device driver can deal with the situation anyways in runtime resume.

And like you said, it must be IRQF_ONESHOT, now there's a chance of
consumer drivers passing other flags too.

The the IO wake-up interrupt vs dedicated wake-up interrupt functions
can be just something like:

int dev_pm_request_wake_irq(struct device *dev, int irq);
int dev_pm_request_wake_irq_managed(struct device *dev, int irq);

> > +void dev_pm_free_wake_irq(struct device *dev)
> > +{
> > + struct wake_irq *wirq = dev->power.wakeirq;
> > + unsigned long flags;
> > +
> > + if (!wirq)
> > + return;
> > +
> > + spin_lock_irqsave(&dev->power.lock, flags);
> > + wirq->manage_irq = false;
> > + spin_unlock_irqrestore(&dev->power.lock, flags);
> > + devm_free_irq(wirq->dev, wirq->irq, wirq);
>
> this seems unnecessary, the IRQ will be freed anyway when the device
> kobj is destroyed, dev_pm_clear_wake_irq() seems important, however.
>
> > + dev_pm_clear_wake_irq(dev);
> > +}

The life cycle of the request and free of the wake irq is not the
same as the life cycle of the device driver. For example, serial
drivers can request interrupts on startup and free them on shutdown.

> > +void dev_pm_enable_wake_irq(struct device *dev)
> > +{
> > + struct wake_irq *wirq = dev->power.wakeirq;
> > +
> > + if (wirq && wirq->manage_irq)
> > + enable_irq(wirq->irq);
> > +}
> > +EXPORT_SYMBOL_GPL(dev_pm_enable_wake_irq);
>
> you probably want to enable dev_pm_enable_wake_irq() automatically for
> from rpm_suspend(). According to runtime_pm documentation, wakeup should
> always be enabled for runtime suspended devices. I didn't really look
> through the whole thing yet to know if you did call it or not.

Yes I think we can also automate that part, I've been playing with an
additional patch doing that for pm runtime. Been still thinking if
there's any need to manage that in the consomer driver, I guess not.

> > +void dev_pm_disable_wake_irq(struct device *dev)
> > +{
> > + struct wake_irq *wirq = dev->power.wakeirq;
> > +
> > + if (wirq && wirq->manage_irq)
> > + disable_irq_nosync(wirq->irq);
> > +}
> > +EXPORT_SYMBOL_GPL(dev_pm_disable_wake_irq);
>
> likewise, call this automatically from rpm_resume().

Right.

> This brings up a question, actually. What to do with devices which were
> already runtime suspended when user initiated suspend-to-ram ? Do we
> leave wakeups enabled, or do we revisit device_may_wakeup() and
> conditionally runtime_resume the device, disable wakeup, and let its
> ->suspend() callback be called ?

I believe that's already handled properly, but implemented in each
consumer driver with the if device_may_wakeup enabled_irq_wake.

Regards,

Tony

2015-05-14 16:11:18

Hi,

On Thu, May 14, 2015 at 02:15:01PM -0700, Tony Lindgren wrote:
> * Tony Lindgren <[email protected]> [150514 09:01]:
> > * Felipe Balbi <[email protected]> [150513 19:09]:
> > > > +void dev_pm_enable_wake_irq(struct device *dev)
> > > > +{
> > > > + struct wake_irq *wirq = dev->power.wakeirq;
> > > > +
> > > > + if (wirq && wirq->manage_irq)
> > > > + enable_irq(wirq->irq);
> > > > +}
> > > > +EXPORT_SYMBOL_GPL(dev_pm_enable_wake_irq);
> > >
> > > you probably want to enable dev_pm_enable_wake_irq() automatically for
> > > from rpm_suspend(). According to runtime_pm documentation, wakeup should
> > > always be enabled for runtime suspended devices. I didn't really look
> > > through the whole thing yet to know if you did call it or not.
> >
> > Yes I think we can also automate that part, I've been playing with an
> > additional patch doing that for pm runtime. Been still thinking if
> > there's any need to manage that in the consomer driver, I guess not.
>
> Here's what that would roughly look and now I also remember why
> I did not include it. It adds currently extra checks also for
> devices not using dedicated wakeirqs. But basically this would
> allow leaving out the enable/disable PM runtime calls from drivers.

hey cool, the only requirement now is that drivers attach and detach
wakeirq :-)

--
balbi

Attachments:

(No filename) (1.30 kB)
signature.asc (819.00 B)
Digital signature Download all attachments

2015-05-14 21:59:29

by Tony Lindgren

[permalink] [raw]

Subject: Re: [PATCH 2/5] PM / Wakeirq: Add automated device wake IRQ handling

* Rafael J. Wysocki <[email protected]> [150514 14:36]:
> On Thursday, May 14, 2015 02:15:01 PM Tony Lindgren wrote:
> > * Tony Lindgren <[email protected]> [150514 09:01]:
> > > * Felipe Balbi <[email protected]> [150513 19:09]:
> > > > > +void dev_pm_enable_wake_irq(struct device *dev)
> > > > > +{
> > > > > + struct wake_irq *wirq = dev->power.wakeirq;
> > > > > +
> > > > > + if (wirq && wirq->manage_irq)
> > > > > + enable_irq(wirq->irq);
> > > > > +}
> > > > > +EXPORT_SYMBOL_GPL(dev_pm_enable_wake_irq);
> > > >
> > > > you probably want to enable dev_pm_enable_wake_irq() automatically for
> > > > from rpm_suspend(). According to runtime_pm documentation, wakeup should
> > > > always be enabled for runtime suspended devices. I didn't really look
> > > > through the whole thing yet to know if you did call it or not.
> > >
> > > Yes I think we can also automate that part, I've been playing with an
> > > additional patch doing that for pm runtime. Been still thinking if
> > > there's any need to manage that in the consomer driver, I guess not.
> >
> > Here's what that would roughly look and now I also remember why
> > I did not include it. It adds currently extra checks also for
> > devices not using dedicated wakeirqs. But basically this would
> > allow leaving out the enable/disable PM runtime calls from drivers.
...

> > @@ -1427,6 +1432,7 @@ int pm_runtime_force_suspend(struct device *dev)
> > goto err;
> > }
> >
> > + dev_pm_enable_wake_irq(dev);
>
> Why here? This is for system suspend.
>
> > ret = callback(dev);
> > if (ret)
> > goto err;
> > @@ -1434,6 +1440,7 @@ int pm_runtime_force_suspend(struct device *dev)
> > pm_runtime_set_suspended(dev);
> > return 0;
> > err:
> > + dev_pm_disable_wake_irq(dev);
> > pm_runtime_enable(dev);
> > return ret;
> > }
> > @@ -1463,6 +1470,7 @@ int pm_runtime_force_resume(struct device *dev)
> > goto out;
> > }
> >
> > + dev_pm_disable_wake_irq(dev);
>
> This one too.

Oh you're right, seems to work fine for me without those. So it would
be the following additional patch then (only quickly tested).

Regards,

Tony

8< ----------------
--- a/drivers/base/power/runtime.c
+++ b/drivers/base/power/runtime.c
@@ -10,6 +10,7 @@
#include <linux/sched.h>
#include <linux/export.h>
#include <linux/pm_runtime.h>
+#include <linux/pm_wakeirq.h>
#include <trace/events/rpm.h>
#include "power.h"

@@ -514,6 +515,7 @@ static int rpm_suspend(struct device *dev, int rpmflags)

callback = RPM_GET_CALLBACK(dev, runtime_suspend);

+ dev_pm_enable_wake_irq(dev);
retval = rpm_callback(callback, dev);
if (retval)
goto fail;
@@ -552,6 +554,7 @@ static int rpm_suspend(struct device *dev, int rpmflags)
return retval;

fail:
+ dev_pm_disable_wake_irq(dev);
__update_runtime_status(dev, RPM_ACTIVE);
dev->power.deferred_resume = false;
wake_up_all(&dev->power.wait_queue);
@@ -734,10 +737,12 @@ static int rpm_resume(struct device *dev, int rpmflags)

callback = RPM_GET_CALLBACK(dev, runtime_resume);

+ dev_pm_disable_wake_irq(dev);
retval = rpm_callback(callback, dev);
if (retval) {
__update_runtime_status(dev, RPM_SUSPENDED);
pm_runtime_cancel_pending(dev);
+ dev_pm_enable_wake_irq(dev);
} else {
no_callback:
__update_runtime_status(dev, RPM_ACTIVE);

2015-05-14 21:35:29

by Rafael J. Wysocki

[permalink] [raw]

Subject: Re: [PATCH 2/5] PM / Wakeirq: Add automated device wake IRQ handling

On Thursday, May 14, 2015 02:15:01 PM Tony Lindgren wrote:
> * Tony Lindgren <[email protected]> [150514 09:01]:
> > * Felipe Balbi <[email protected]> [150513 19:09]:
> > > > +void dev_pm_enable_wake_irq(struct device *dev)
> > > > +{
> > > > + struct wake_irq *wirq = dev->power.wakeirq;
> > > > +
> > > > + if (wirq && wirq->manage_irq)
> > > > + enable_irq(wirq->irq);
> > > > +}
> > > > +EXPORT_SYMBOL_GPL(dev_pm_enable_wake_irq);
> > >
> > > you probably want to enable dev_pm_enable_wake_irq() automatically for
> > > from rpm_suspend(). According to runtime_pm documentation, wakeup should
> > > always be enabled for runtime suspended devices. I didn't really look
> > > through the whole thing yet to know if you did call it or not.
> >
> > Yes I think we can also automate that part, I've been playing with an
> > additional patch doing that for pm runtime. Been still thinking if
> > there's any need to manage that in the consomer driver, I guess not.
>
> Here's what that would roughly look and now I also remember why
> I did not include it. It adds currently extra checks also for
> devices not using dedicated wakeirqs. But basically this would
> allow leaving out the enable/disable PM runtime calls from drivers.
>
> Regards,
>
> Tony
>
> 8< -------------------
> --- a/drivers/base/power/runtime.c
> +++ b/drivers/base/power/runtime.c
> @@ -10,6 +10,7 @@
> #include <linux/sched.h>
> #include <linux/export.h>
> #include <linux/pm_runtime.h>
> +#include <linux/pm_wakeirq.h>
> #include <trace/events/rpm.h>
> #include "power.h"
>
> @@ -514,6 +515,7 @@ static int rpm_suspend(struct device *dev, int rpmflags)
>
> callback = RPM_GET_CALLBACK(dev, runtime_suspend);
>
> + dev_pm_enable_wake_irq(dev);
> retval = rpm_callback(callback, dev);
> if (retval)
> goto fail;
> @@ -552,6 +554,7 @@ static int rpm_suspend(struct device *dev, int rpmflags)
> return retval;
>
> fail:
> + dev_pm_disable_wake_irq(dev);
> __update_runtime_status(dev, RPM_ACTIVE);
> dev->power.deferred_resume = false;
> wake_up_all(&dev->power.wait_queue);
> @@ -734,10 +737,12 @@ static int rpm_resume(struct device *dev, int rpmflags)
>
> callback = RPM_GET_CALLBACK(dev, runtime_resume);
>
> + dev_pm_disable_wake_irq(dev);
> retval = rpm_callback(callback, dev);
> if (retval) {
> __update_runtime_status(dev, RPM_SUSPENDED);
> pm_runtime_cancel_pending(dev);
> + dev_pm_enable_wake_irq(dev);
> } else {
> no_callback:
> __update_runtime_status(dev, RPM_ACTIVE);
> @@ -1427,6 +1432,7 @@ int pm_runtime_force_suspend(struct device *dev)
> goto err;
> }
>
> + dev_pm_enable_wake_irq(dev);

Why here? This is for system suspend.

> ret = callback(dev);
> if (ret)
> goto err;
> @@ -1434,6 +1440,7 @@ int pm_runtime_force_suspend(struct device *dev)
> pm_runtime_set_suspended(dev);
> return 0;
> err:
> + dev_pm_disable_wake_irq(dev);
> pm_runtime_enable(dev);
> return ret;
> }
> @@ -1463,6 +1470,7 @@ int pm_runtime_force_resume(struct device *dev)
> goto out;
> }
>
> + dev_pm_disable_wake_irq(dev);

This one too.

> ret = callback(dev);
> if (ret)
> goto out;
> @@ -1470,6 +1478,7 @@ int pm_runtime_force_resume(struct device *dev)
> pm_runtime_set_active(dev);
> pm_runtime_mark_last_busy(dev);
> out:
> + dev_pm_enable_wake_irq(dev);
> pm_runtime_enable(dev);
> return ret;
> }
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pm" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html

--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.

2015-05-15 22:25:20

by Tony Lindgren

[permalink] [raw]

Subject: Re: [PATCH 2/5] PM / Wakeirq: Add automated device wake IRQ handling

* Tony Lindgren <[email protected]> [150514 15:00]:
> * Rafael J. Wysocki <[email protected]> [150514 14:36]:
> > On Thursday, May 14, 2015 02:15:01 PM Tony Lindgren wrote:
> > > * Tony Lindgren <[email protected]> [150514 09:01]:
> > > > * Felipe Balbi <[email protected]> [150513 19:09]:
> > > > > > +void dev_pm_enable_wake_irq(struct device *dev)
> > > > > > +{
> > > > > > + struct wake_irq *wirq = dev->power.wakeirq;
> > > > > > +
> > > > > > + if (wirq && wirq->manage_irq)
> > > > > > + enable_irq(wirq->irq);
> > > > > > +}
> > > > > > +EXPORT_SYMBOL_GPL(dev_pm_enable_wake_irq);
> > > > >
> > > > > you probably want to enable dev_pm_enable_wake_irq() automatically for
> > > > > from rpm_suspend(). According to runtime_pm documentation, wakeup should
> > > > > always be enabled for runtime suspended devices. I didn't really look
> > > > > through the whole thing yet to know if you did call it or not.
> > > >
> > > > Yes I think we can also automate that part, I've been playing with an
> > > > additional patch doing that for pm runtime. Been still thinking if
> > > > there's any need to manage that in the consomer driver, I guess not.
> > >
> > > Here's what that would roughly look and now I also remember why
> > > I did not include it. It adds currently extra checks also for
> > > devices not using dedicated wakeirqs. But basically this would
> > > allow leaving out the enable/disable PM runtime calls from drivers.
> ...
>
> > > @@ -1427,6 +1432,7 @@ int pm_runtime_force_suspend(struct device *dev)
> > > goto err;
> > > }
> > >
> > > + dev_pm_enable_wake_irq(dev);
> >
> > Why here? This is for system suspend.
> >
> > > ret = callback(dev);
> > > if (ret)
> > > goto err;
> > > @@ -1434,6 +1440,7 @@ int pm_runtime_force_suspend(struct device *dev)
> > > pm_runtime_set_suspended(dev);
> > > return 0;
> > > err:
> > > + dev_pm_disable_wake_irq(dev);
> > > pm_runtime_enable(dev);
> > > return ret;
> > > }
> > > @@ -1463,6 +1470,7 @@ int pm_runtime_force_resume(struct device *dev)
> > > goto out;
> > > }
> > >
> > > + dev_pm_disable_wake_irq(dev);
> >
> > This one too.
>
> Oh you're right, seems to work fine for me without those. So it would
> be the following additional patch then (only quickly tested).

And here's the whole $subject patch with the above folded in and with
Felipe's comments addressed. I'll repost the whole series within few days
after waiting for some more comments.

Regards,

Tony

8< ------------------------
From: Tony Lindgren <[email protected]>
Date: Wed, 13 May 2015 11:43:02 -0700
Subject: [PATCH] PM / Wakeirq: Add automated device wake IRQ handling

Turns out we can automate the handling for the device_may_wakeup()
quite a bit by using the kernel wakeup source list.

And as some hardware has separate dedicated wake-up interrupt
in addition to the IO interrupt, we can automate the handling by
adding a generic threaded interrupt handler that just calls the
device PM runtime to wake up the device.

This allows dropping code from device drivers as we currently
are doing it in multiple ways, and often wrong.

For most drivers, we should be able to drop the following
boilerplate code from runtime_suspend and runtime_resume
functions:

...
if (device_may_wakeup(dev)
enable_irq_wake(irq);
...
if (device_may_wakeup(dev)
enable_irq_wake(irq);
...

We can replace it with just the following init and exit
time code:

...
device_init_wakeup(dev, true);
dev_pm_set_wake_irq(dev, irq);
...
dev_pm_clear_wake_irq(dev);
device_init_wakeup(dev, false);
...

And for hardware with dedicated wake-up interrupts:

...
device_init_wakeup(dev, true);
dev_pm_set_dedicated_wake_irq(dev, wakeirq);
...
dev_pm_clear_wake_irq(dev);
device_init_wakeup(dev, false);
...

For now, let's only enable it for select PM_WAKEIRQ.

Signed-off-by: Tony Lindgren <[email protected]>

diff --git a/drivers/base/power/Makefile b/drivers/base/power/Makefile
index 1cb8544..527546e 100644
--- a/drivers/base/power/Makefile
+++ b/drivers/base/power/Makefile
@@ -4,5 +4,6 @@ obj-$(CONFIG_PM_TRACE_RTC) += trace.o
obj-$(CONFIG_PM_OPP) += opp.o
obj-$(CONFIG_PM_GENERIC_DOMAINS) += domain.o domain_governor.o
obj-$(CONFIG_HAVE_CLK) += clock_ops.o
+obj-$(CONFIG_PM_WAKEIRQ) += wakeirq.o

ccflags-$(CONFIG_DEBUG_DRIVER) := -DDEBUG
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 3d874ec..2748268 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -24,6 +24,7 @@
#include <linux/pm.h>
#include <linux/pm_runtime.h>
#include <linux/pm-trace.h>
+#include <linux/pm_wakeirq.h>
#include <linux/interrupt.h>
#include <linux/sched.h>
#include <linux/async.h>
@@ -587,6 +588,7 @@ void dpm_resume_noirq(pm_message_t state)
async_synchronize_full();
dpm_show_time(starttime, state, "noirq");
resume_device_irqs();
+ device_wakeup_disarm_wakeirqs();
cpuidle_resume();
trace_suspend_resume(TPS("dpm_resume_noirq"), state.event, false);
}
@@ -1104,6 +1106,7 @@ int dpm_suspend_noirq(pm_message_t state)

trace_suspend_resume(TPS("dpm_suspend_noirq"), state.event, true);
cpuidle_pause();
+ device_wakeup_arm_wakeirqs();
suspend_device_irqs();
mutex_lock(&dpm_list_mtx);
pm_transition = state;
diff --git a/drivers/base/power/power.h b/drivers/base/power/power.h
index b6b8a27..7ee5402 100644
--- a/drivers/base/power/power.h
+++ b/drivers/base/power/power.h
@@ -20,6 +20,54 @@ static inline void pm_runtime_early_init(struct device *dev)
extern void pm_runtime_init(struct device *dev);
extern void pm_runtime_remove(struct device *dev);

+#ifdef CONFIG_PM_WAKEIRQ
+
+struct wake_irq {
+ struct device *dev;
+ int irq;
+ bool manage_irq:1;
+};
+
+extern int device_wakeup_attach_irq(struct device *dev,
+ struct wake_irq *wakeirq);
+extern void device_wakeup_detach_irq(struct device *dev);
+extern void device_wakeup_arm_wakeirqs(void);
+extern void device_wakeup_disarm_wakeirqs(void);
+
+extern void dev_pm_arm_wake_irq(struct wake_irq *wirq);
+extern void dev_pm_disarm_wake_irq(struct wake_irq *wirq);
+
+#else
+
+static inline int
+device_wakeup_attach_irq(struct device *dev,
+ struct wake_irq *wakeirq)
+{
+ return 0;
+}
+
+static inline void device_wakeup_detach_irq(struct device *dev)
+{
+}
+
+static inline void device_wakeup_arm_wakeirqs(void)
+{
+}
+
+static inline void device_wakeup_disarm_wakeirqs(void)
+{
+}
+
+static inline void dev_pm_arm_wake_irq(struct wake_irq *wirq)
+{
+}
+
+static inline void dev_pm_disarm_wake_irq(struct wake_irq *wirq)
+{
+}
+
+#endif /* CONFIG_PM_WAKEIRQ */
+
/*
* sysfs.c
*/
diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
index 4ffe4a2..e1a10a0 100644
--- a/drivers/base/power/runtime.c
+++ b/drivers/base/power/runtime.c
@@ -10,6 +10,7 @@
#include <linux/sched.h>
#include <linux/export.h>
#include <linux/pm_runtime.h>
+#include <linux/pm_wakeirq.h>
#include <trace/events/rpm.h>
#include "power.h"

@@ -514,6 +515,7 @@ static int rpm_suspend(struct device *dev, int rpmflags)

callback = RPM_GET_CALLBACK(dev, runtime_suspend);

+ dev_pm_enable_wake_irq(dev);
retval = rpm_callback(callback, dev);
if (retval)
goto fail;
@@ -552,6 +554,7 @@ static int rpm_suspend(struct device *dev, int rpmflags)
return retval;

fail:
+ dev_pm_disable_wake_irq(dev);
__update_runtime_status(dev, RPM_ACTIVE);
dev->power.deferred_resume = false;
wake_up_all(&dev->power.wait_queue);
@@ -734,10 +737,12 @@ static int rpm_resume(struct device *dev, int rpmflags)

callback = RPM_GET_CALLBACK(dev, runtime_resume);

+ dev_pm_disable_wake_irq(dev);
retval = rpm_callback(callback, dev);
if (retval) {
__update_runtime_status(dev, RPM_SUSPENDED);
pm_runtime_cancel_pending(dev);
+ dev_pm_enable_wake_irq(dev);
} else {
no_callback:
__update_runtime_status(dev, RPM_ACTIVE);
diff --git a/drivers/base/power/wakeirq.c b/drivers/base/power/wakeirq.c
new file mode 100644
index 0000000..1125481
--- /dev/null
+++ b/drivers/base/power/wakeirq.c
@@ -0,0 +1,276 @@
+/*
+ * wakeirq.c - Device wakeirq helper functions
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/device.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/slab.h>
+#include <linux/pm_runtime.h>
+#include <linux/pm_wakeirq.h>
+
+#include "power.h"
+
+/**
+ * dev_pm_attach_wake_irq - Attach device interrupt as a wake IRQ
+ * @dev: Device entry
+ * @irq: Device wake-up capable interrupt
+ * @wirq: Wake irq specific data
+ *
+ * Internal function to attach either a device IO interrupt or a
+ * dedicated wake-up interrupt as a wake IRQ.
+ */
+static int dev_pm_attach_wake_irq(struct device *dev, int irq,
+ struct wake_irq *wirq)
+{
+ unsigned long flags;
+ int err;
+
+ if (!dev || !wirq)
+ return -EINVAL;
+
+ if (!dev->power.wakeup) {
+ dev_err(dev, "forgot to call call device_init_wakeup?\n");
+ return -EINVAL;
+ }
+
+ spin_lock_irqsave(&dev->power.lock, flags);
+ if (WARN_ON(dev->power.wakeirq)) {
+ dev_err(dev, "wake irq already initialized\n");
+ spin_unlock_irqrestore(&dev->power.lock, flags);
+ return -EEXIST;
+ }
+
+ dev->power.wakeirq = wirq;
+ spin_unlock_irqrestore(&dev->power.lock, flags);
+
+ err = device_wakeup_attach_irq(dev, wirq);
+ if (err)
+ return err;
+
+ return 0;
+}
+
+/**
+ * dev_pm_set_wake_irq - Attach device IO interrupt as wake IRQ
+ * @dev: Device entry
+ * @irq: Device IO interrupt
+ *
+ * Attach a device IO interrupt as a wake IRQ. The wake IRQ gets
+ * automatically configured for wake-up from suspend based
+ * on the device specific sysfs wakeup entry. Typically called
+ * during driver probe after calling device_init_wakeup().
+ */
+int dev_pm_set_wake_irq(struct device *dev, int irq)
+{
+ struct wake_irq *wirq;
+ int err;
+
+ wirq = kzalloc(sizeof(*wirq), GFP_KERNEL);
+ if (!wirq)
+ return -ENOMEM;
+
+ wirq->dev = dev;
+ wirq->irq = irq;
+
+ err = dev_pm_attach_wake_irq(dev, irq, wirq);
+ if (err)
+ kfree(wirq);
+
+ return err;
+}
+EXPORT_SYMBOL_GPL(dev_pm_set_wake_irq);
+
+/**
+ * dev_pm_clear_wake_irq - Detach a device IO interrupt wake IRQ
+ * @dev: Device entry
+ *
+ * Detach a device IO interrupt wake IRQ and free resources.
+ *
+ * Note that it's OK for drivers to call this without calling
+ * dev_pm_set_wake_irq() first as all the driver instances may
+ * not have the wakeirq configured. This avoid adding wake IRQ
+ * checks into the drivers.
+ */
+void dev_pm_clear_wake_irq(struct device *dev)
+{
+ struct wake_irq *wirq = dev->power.wakeirq;
+ unsigned long flags;
+
+ if (!wirq)
+ return;
+
+ device_wakeup_detach_irq(dev);
+
+ spin_lock_irqsave(&dev->power.lock, flags);
+ if (wirq->manage_irq) {
+ free_irq(wirq->irq, wirq);
+ wirq->manage_irq = false;
+ }
+ dev->power.wakeirq = NULL;
+ spin_unlock_irqrestore(&dev->power.lock, flags);
+
+ wirq->irq = -EINVAL;
+ kfree(wirq);
+}
+EXPORT_SYMBOL_GPL(dev_pm_clear_wake_irq);
+
+/**
+ * handle_threaded_wakeirq - Handler for dedicated wake-up interrupts
+ * @irq: Device dedicated wake-up interrupt
+ * @_wirq: Wake IRQ data
+ *
+ * Some devices have a separate wake-up interrupt in addition to the
+ * device IO interrupt. The wake-up interrupts signal that the device
+ * should be woken up from a idle state. This handler uses device
+ * specific pm_runtime functions to wake the device and then it's
+ * up to the device to do whatever it needs to. Note as the device
+ * may need to restore context and start up regulators, we use a
+ * threaded IRQ.
+ *
+ * Also note that we are not resending the lost device interrupts.
+ * We assume that the wake-up interrupt just needs to wake-up the
+ * device, and the device pm_runtime_resume() can deal with the
+ * situation.
+ */
+static irqreturn_t handle_threaded_wakeirq(int wakeirq, void *_wirq)
+{
+ struct wake_irq *wirq = _wirq;
+
+ /* We don't want RPM_ASYNC or RPM_NOWAIT here */
+ return pm_runtime_resume(wirq->dev) ? IRQ_NONE : IRQ_HANDLED;
+}
+
+/**
+ * dev_pm_set_dedicated_wake_irq - Request a dedicated wake-up interrupt
+ * @dev: Device entry
+ * @irq: Device wake-up interrupt
+ *
+ * Unless your hardware has separate wake-up interrupts in addition
+ * to the device IO interrupts, you don't need this.
+ *
+ * Sets up a threaded interrupt handler for a device that has
+ * a dedicated wake-up interrupt in addition to the device IO
+ * interrupt.
+ *
+ * The interrupt starts disabled, and needs to be managed for
+ * the device by the bus code or the device driver using
+ * dev_pm_enable_wake_irq() and dev_pm_disable_wake_irq()
+ * functions.
+ */
+int dev_pm_set_dedicated_wake_irq(struct device *dev, int irq)
+{
+ struct wake_irq *wirq;
+ int err;
+
+ wirq = kzalloc(sizeof(*wirq), GFP_KERNEL);
+ if (!wirq)
+ return -ENOMEM;
+
+ wirq->dev = dev;
+ wirq->irq = irq;
+ wirq->manage_irq = true;
+ irq_set_status_flags(irq, IRQ_NOAUTOEN);
+
+ /*
+ * Consumer device may need to power up and restore state
+ * so we use a threaded irq.
+ */
+ err = request_threaded_irq(irq, NULL, handle_threaded_wakeirq,
+ IRQF_ONESHOT, dev_name(dev), wirq);
+ if (err)
+ goto err_free;
+
+ err = dev_pm_attach_wake_irq(dev, irq, wirq);
+ if (err)
+ goto err_free_irq;
+
+ return err;
+
+err_free_irq:
+ free_irq(irq, wirq);
+err_free:
+ kfree(wirq);
+
+ return err;
+}
+EXPORT_SYMBOL_GPL(dev_pm_set_dedicated_wake_irq);
+
+/**
+ * dev_pm_enable_wake_irq - Enable device wake-up interrupt
+ * @dev: Device
+ *
+ * Called from the bus code or the device driver for
+ * runtime_suspend() to enable the wake-up interrupt while
+ * the device is running.
+ *
+ * Note that for runtime_suspend()) the wake-up interrupts
+ * should be unconditionally enabled unlike for suspend()
+ * that is conditional.
+ */
+void dev_pm_enable_wake_irq(struct device *dev)
+{
+ struct wake_irq *wirq = dev->power.wakeirq;
+
+ if (wirq && wirq->manage_irq)
+ enable_irq(wirq->irq);
+}
+EXPORT_SYMBOL_GPL(dev_pm_enable_wake_irq);
+
+/**
+ * dev_pm_disable_wake_irq - Disable device wake-up interrupt
+ * @dev: Device
+ *
+ * Called from the bus code or the device driver for
+ * runtime_resume() to disable the wake-up interrupt while
+ * the device is running.
+ */
+void dev_pm_disable_wake_irq(struct device *dev)
+{
+ struct wake_irq *wirq = dev->power.wakeirq;
+
+ if (wirq && wirq->manage_irq)
+ disable_irq_nosync(wirq->irq);
+}
+EXPORT_SYMBOL_GPL(dev_pm_disable_wake_irq);
+
+/**
+ * dev_pm_arm_wake_irq - Arm device wake-up
+ * @wirq: Device wake-up interrupt
+ *
+ * Sets up the wake-up event conditionally based on the
+ * device_may_wake().
+ */
+void dev_pm_arm_wake_irq(struct wake_irq *wirq)
+{
+ if (!wirq)
+ return;
+
+ if (device_may_wakeup(wirq->dev))
+ enable_irq_wake(wirq->irq);
+}
+
+/**
+ * dev_pm_disarm_wake_irq - Disarm device wake-up
+ * @wirq: Device wake-up interrupt
+ *
+ * Clears up the wake-up event conditionally based on the
+ * device_may_wake().
+ */
+void dev_pm_disarm_wake_irq(struct wake_irq *wirq)
+{
+ if (!wirq)
+ return;
+
+ if (device_may_wakeup(wirq->dev))
+ disable_irq_wake(wirq->irq);
+}
diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
index 7726200..7191519 100644
--- a/drivers/base/power/wakeup.c
+++ b/drivers/base/power/wakeup.c
@@ -14,6 +14,7 @@
#include <linux/suspend.h>
#include <linux/seq_file.h>
#include <linux/debugfs.h>
+#include <linux/pm_wakeirq.h>
#include <trace/events/power.h>

#include "power.h"
@@ -238,6 +239,100 @@ int device_wakeup_enable(struct device *dev)
}
EXPORT_SYMBOL_GPL(device_wakeup_enable);

+#ifdef CONFIG_PM_WAKEIRQ
+
+/**
+ * device_wakeup_attach_irq - Attach a wakeirq to a wakeup source
+ * @dev: Device to handle
+ * @irq: Device specific wakeirq entry
+ *
+ * Attach a device specific wakeirq to the device specific
+ * wakeup source so the device wakeirq can be configured
+ * automatically for suspend and resume.
+ */
+int device_wakeup_attach_irq(struct device *dev,
+ struct wake_irq *wakeirq)
+{
+ struct wakeup_source *ws;
+ int ret = 0;
+
+ spin_lock_irq(&dev->power.lock);
+ ws = dev->power.wakeup;
+ if (!ws) {
+ ret = -EINVAL;
+ goto unlock;
+ }
+
+ if (ws->wakeirq) {
+ ret = -EEXIST;
+ goto unlock;
+ }
+
+ ws->wakeirq = wakeirq;
+
+unlock:
+ spin_unlock_irq(&dev->power.lock);
+
+ return ret;
+}
+
+/**
+ * device_wakeup_detach_irq - Detach a wakeirq from a wakeup source
+ * @dev: Device to handle
+ *
+ * Removes the wakeirq from a wakeup source.
+ */
+void device_wakeup_detach_irq(struct device *dev)
+{
+ struct wakeup_source *ws;
+
+ spin_lock_irq(&dev->power.lock);
+ ws = dev->power.wakeup;
+ if (!ws)
+ goto unlock;
+
+ ws->wakeirq = NULL;
+
+unlock:
+ spin_unlock_irq(&dev->power.lock);
+}
+
+/**
+ * device_wakeup_arm_wakeirqs(void)
+ *
+ * Itereates over the list of wakeirqs to arm them.
+ */
+void device_wakeup_arm_wakeirqs(void)
+{
+ struct wakeup_source *ws;
+
+ rcu_read_lock();
+ list_for_each_entry_rcu(ws, &wakeup_sources, entry) {
+ if (ws->wakeirq)
+ dev_pm_arm_wake_irq(ws->wakeirq);
+ }
+ rcu_read_unlock();
+}
+
+/**
+ * device_wakeup_disarm_wakeirqs(void)
+ *
+ * Itereates over the list of wakeirqs to disarm them.
+ */
+void device_wakeup_disarm_wakeirqs(void)
+{
+ struct wakeup_source *ws;
+
+ rcu_read_lock();
+ list_for_each_entry_rcu(ws, &wakeup_sources, entry) {
+ if (ws->wakeirq)
+ dev_pm_disarm_wake_irq(ws->wakeirq);
+ }
+ rcu_read_unlock();
+}
+
+#endif /* CONFIG_PM_WAKEIRQ */
+
/**
* device_wakeup_detach - Detach a device's wakeup source object from it.
* @dev: Device to detach the wakeup source object from.
diff --git a/include/linux/pm.h b/include/linux/pm.h
index 2d29c64..d1130d5 100644
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -529,6 +529,7 @@ enum rpm_request {
};

struct wakeup_source;
+struct wake_irq;
struct pm_domain_data;

struct pm_subsys_data {
@@ -558,6 +559,7 @@ struct dev_pm_info {
struct list_head entry;
struct completion completion;
struct wakeup_source *wakeup;
+ struct wake_irq *wakeirq;
bool wakeup_path:1;
bool syscore:1;
#else
diff --git a/include/linux/pm_wakeirq.h b/include/linux/pm_wakeirq.h
new file mode 100644
index 0000000..b92df630b
--- /dev/null
+++ b/include/linux/pm_wakeirq.h
@@ -0,0 +1,52 @@
+/*
+ * pm_wakeirq.h - Device wakeirq helper functions
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef _LINUX_PM_WAKEIRQ_H
+#define _LINUX_PM_WAKEIRQ_H
+
+#ifdef CONFIG_PM_WAKEIRQ
+
+extern int dev_pm_set_wake_irq(struct device *dev, int irq);
+extern int dev_pm_set_dedicated_wake_irq(struct device *dev,
+ int wakeirq);
+extern void dev_pm_clear_wake_irq(struct device *dev);
+extern void dev_pm_enable_wake_irq(struct device *dev);
+extern void dev_pm_disable_wake_irq(struct device *dev);
+
+#else /* !CONFIG_PM_WAKEIRQ */
+
+static inline int dev_pm_set_wake_irq(struct device *dev, int irq)
+{
+ return 0;
+}
+
+static inline int dev_pm_set_managed__wake_irq(struct device *dev,
+ int wakeirq)
+{
+ return 0;
+}
+
+static inline void dev_pm_clear_wake_irq(struct device *dev)
+{
+}
+
+static inline void dev_pm_enable_wake_irq(struct device *dev)
+{
+}
+
+static inline void dev_pm_disable_wake_irq(struct device *dev)
+{
+}
+
+#endif /* CONFIG_PM_WAKEIRQ */
+#endif /* _LINUX_PM_WAKEIRQ_H */
diff --git a/include/linux/pm_wakeup.h b/include/linux/pm_wakeup.h
index a0f7080..86d1cbe 100644
--- a/include/linux/pm_wakeup.h
+++ b/include/linux/pm_wakeup.h
@@ -28,9 +28,15 @@

#include <linux/types.h>

+struct wake_irq;
+
/**
* struct wakeup_source - Representation of wakeup sources
*
+ * @name: Name of the wakeup source
+ * @entry: Wakeup source list entry
+ * @lock: Wakeup source lock
+ * @wakeirq: Optional device specific wakeirq
* @total_time: Total time this wakeup source has been active.
* @max_time: Maximum time this wakeup source has been continuously active.
* @last_time: Monotonic clock when the wakeup source's was touched last time.
@@ -47,6 +53,7 @@ struct wakeup_source {
const char *name;
struct list_head entry;
spinlock_t lock;
+ struct wake_irq *wakeirq;
struct timer_list timer;
unsigned long timer_expires;
ktime_t total_time;
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index 7e01f78..d3735bd 100644
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -267,6 +267,10 @@ config PM_CLK
def_bool y
depends on PM && HAVE_CLK

+config PM_WAKEIRQ
+ bool
+ depends on PM_SLEEP
+
config PM_GENERIC_DOMAINS
bool
depends on PM

2015-05-16 01:59:20

On Thu, May 21, 2015 at 02:54:14AM +0200, Rafael J. Wysocki wrote:
> On Tuesday, May 19, 2015 07:10:57 PM Tony Lindgren wrote:
> > * Rafael J. Wysocki <[email protected]> [150519 17:01]:
> > > On Tuesday, May 19, 2015 04:27:56 PM Tony Lindgren wrote:
> > > > * Rafael J. Wysocki <[email protected]> [150519 16:07]:
> > > > > On Wednesday, May 20, 2015 12:41:06 AM Thomas Gleixner wrote:
> > > > > > On Wed, 20 May 2015, Rafael J. Wysocki wrote:
> > > > > > > This one looks really good. :-)
> > > > > > >
> > > > > > > If it doesn't depend on anything, I can apply it right away, so please let me
> > > > > > > know.
> > > >
> > > > Sure works for me, it just has a dependency to patch #1 in this
> > > > series ("[PATCH 1/5] PM / Runtime: Update last_busy in rpm_resume").
> > >
> > > OK, I'll queue them both up for 4.2, then.
> > >
> > > Please let me know if you need a special branch with them.
> >
> > A separate branch would be nice so I can merge that in too.
>
> OK
>
> I added a new pm-wakeirq branch to linux-pm.git with these two patches and
> one other commit related to runtime PM (all based on 4.1-rc4). This branch
> will not be rebased going forward.

Hopefully it's not too late to get my

Reviewed-by: Felipe Balbi <[email protected]>

in the patch. If it is, no problem :-)

cheers

--
balbi

Attachments:

(No filename) (1.29 kB)
signature.asc (819.00 B)
Digital signature Download all attachments

2015-05-25 08:38:44

by Ulf Hansson

[permalink] [raw]

Subject: Re: [PATCH 5/5] mmc: omap_hsmmc: Change wake-up interrupt to use generic wakeirq

On 14 May 2015 at 01:36, Tony Lindgren <[email protected]> wrote:
> We can now use generic wakeirq handling and remove the custom handling
> for the wake-up interrupts.
>
> Signed-off-by: Tony Lindgren <[email protected]>

Rafael, if you are fine with it, please take this one through your
linux-pm tree.

Acked-by: Ulf Hansson <[email protected]>

Kind regards
Uffe

> ---
> drivers/mmc/host/omap_hsmmc.c | 51 +++++++------------------------------------
> 1 file changed, 8 insertions(+), 43 deletions(-)
>
> diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
> index 9df2b68..5fbf4d8 100644
> --- a/drivers/mmc/host/omap_hsmmc.c
> +++ b/drivers/mmc/host/omap_hsmmc.c
> @@ -43,6 +43,7 @@
> #include <linux/regulator/consumer.h>
> #include <linux/pinctrl/consumer.h>
> #include <linux/pm_runtime.h>
> +#include <linux/pm_wakeirq.h>
> #include <linux/platform_data/hsmmc-omap.h>
>
> /* OMAP HSMMC Host Controller Registers */
> @@ -218,7 +219,6 @@ struct omap_hsmmc_host {
> unsigned int flags;
> #define AUTO_CMD23 (1 << 0) /* Auto CMD23 support */
> #define HSMMC_SDIO_IRQ_ENABLED (1 << 1) /* SDIO irq enabled */
> -#define HSMMC_WAKE_IRQ_ENABLED (1 << 2)
> struct omap_hsmmc_next next_data;
> struct omap_hsmmc_platform_data *pdata;
>
> @@ -1117,22 +1117,6 @@ static irqreturn_t omap_hsmmc_irq(int irq, void *dev_id)
> return IRQ_HANDLED;
> }
>
> -static irqreturn_t omap_hsmmc_wake_irq(int irq, void *dev_id)
> -{
> - struct omap_hsmmc_host *host = dev_id;
> -
> - /* cirq is level triggered, disable to avoid infinite loop */
> - spin_lock(&host->irq_lock);
> - if (host->flags & HSMMC_WAKE_IRQ_ENABLED) {
> - disable_irq_nosync(host->wake_irq);
> - host->flags &= ~HSMMC_WAKE_IRQ_ENABLED;
> - }
> - spin_unlock(&host->irq_lock);
> - pm_request_resume(host->dev); /* no use counter */
> -
> - return IRQ_HANDLED;
> -}
> -
> static void set_sd_bus_power(struct omap_hsmmc_host *host)
> {
> unsigned long i;
> @@ -1665,7 +1649,6 @@ static void omap_hsmmc_enable_sdio_irq(struct mmc_host *mmc, int enable)
>
> static int omap_hsmmc_configure_wake_irq(struct omap_hsmmc_host *host)
> {
> - struct mmc_host *mmc = host->mmc;
> int ret;
>
> /*
> @@ -1677,11 +1660,7 @@ static int omap_hsmmc_configure_wake_irq(struct omap_hsmmc_host *host)
> if (!host->dev->of_node || !host->wake_irq)
> return -ENODEV;
>
> - /* Prevent auto-enabling of IRQ */
> - irq_set_status_flags(host->wake_irq, IRQ_NOAUTOEN);
> - ret = devm_request_irq(host->dev, host->wake_irq, omap_hsmmc_wake_irq,
> - IRQF_TRIGGER_LOW | IRQF_ONESHOT,
> - mmc_hostname(mmc), host);
> + ret = dev_pm_request_wake_irq(host->dev, host->wake_irq, NULL, 0, NULL);
> if (ret) {
> dev_err(mmc_dev(host->mmc), "Unable to request wake IRQ\n");
> goto err;
> @@ -1718,7 +1697,7 @@ static int omap_hsmmc_configure_wake_irq(struct omap_hsmmc_host *host)
> return 0;
>
> err_free_irq:
> - devm_free_irq(host->dev, host->wake_irq, host);
> + dev_pm_free_wake_irq(host->dev);
> err:
> dev_warn(host->dev, "no SDIO IRQ support, falling back to polling\n");
> host->wake_irq = 0;
> @@ -2007,6 +1986,7 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
> omap_hsmmc_ops.multi_io_quirk = omap_hsmmc_multi_io_quirk;
> }
>
> + device_init_wakeup(&pdev->dev, true);
> pm_runtime_enable(host->dev);
> pm_runtime_get_sync(host->dev);
> pm_runtime_set_autosuspend_delay(host->dev, MMC_AUTOSUSPEND_DELAY);
> @@ -2147,6 +2127,7 @@ err_slot_name:
> if (host->use_reg)
> omap_hsmmc_reg_put(host);
> err_irq:
> + device_init_wakeup(&pdev->dev, false);
> if (host->tx_chan)
> dma_release_channel(host->tx_chan);
> if (host->rx_chan)
> @@ -2178,6 +2159,7 @@ static int omap_hsmmc_remove(struct platform_device *pdev)
>
> pm_runtime_put_sync(host->dev);
> pm_runtime_disable(host->dev);
> + device_init_wakeup(&pdev->dev, false);
> if (host->dbclk)
> clk_disable_unprepare(host->dbclk);
>
> @@ -2204,11 +2186,6 @@ static int omap_hsmmc_suspend(struct device *dev)
> OMAP_HSMMC_READ(host->base, HCTL) & ~SDBP);
> }
>
> - /* do not wake up due to sdio irq */
> - if ((host->mmc->caps & MMC_CAP_SDIO_IRQ) &&
> - !(host->mmc->pm_flags & MMC_PM_WAKE_SDIO_IRQ))
> - disable_irq(host->wake_irq);
> -
> if (host->dbclk)
> clk_disable_unprepare(host->dbclk);
>
> @@ -2233,11 +2210,6 @@ static int omap_hsmmc_resume(struct device *dev)
> omap_hsmmc_conf_bus_power(host);
>
> omap_hsmmc_protect_card(host);
> -
> - if ((host->mmc->caps & MMC_CAP_SDIO_IRQ) &&
> - !(host->mmc->pm_flags & MMC_PM_WAKE_SDIO_IRQ))
> - enable_irq(host->wake_irq);
> -
> pm_runtime_mark_last_busy(host->dev);
> pm_runtime_put_autosuspend(host->dev);
> return 0;
> @@ -2277,10 +2249,7 @@ static int omap_hsmmc_runtime_suspend(struct device *dev)
> }
>
> pinctrl_pm_select_idle_state(dev);
> -
> - WARN_ON(host->flags & HSMMC_WAKE_IRQ_ENABLED);
> - enable_irq(host->wake_irq);
> - host->flags |= HSMMC_WAKE_IRQ_ENABLED;
> + dev_pm_enable_wake_irq(host->dev);
> } else {
> pinctrl_pm_select_idle_state(dev);
> }
> @@ -2302,11 +2271,7 @@ static int omap_hsmmc_runtime_resume(struct device *dev)
> spin_lock_irqsave(&host->irq_lock, flags);
> if ((host->mmc->caps & MMC_CAP_SDIO_IRQ) &&
> (host->flags & HSMMC_SDIO_IRQ_ENABLED)) {
> - /* sdio irq flag can't change while in runtime suspend */
> - if (host->flags & HSMMC_WAKE_IRQ_ENABLED) {
> - disable_irq_nosync(host->wake_irq);
> - host->flags &= ~HSMMC_WAKE_IRQ_ENABLED;
> - }
> + dev_pm_disable_wake_irq(host->dev);
>
> pinctrl_pm_select_default_state(host->dev);
>
> --
> 2.1.4
>

2015-06-01 22:06:04

by Tony Lindgren

[permalink] [raw]

Subject: Re: [PATCH 3/5] serial: omap: Switch wake-up interrupt to generic wakeirq

* Greg Kroah-Hartman <[email protected]> [150531 00:24]:
> On Thu, May 28, 2015 at 07:56:16AM -0700, Tony Lindgren wrote:
> > Hi Greg,
> >
> > * Tony Lindgren <[email protected]> [150513 16:38]:
> > > We can now use generic wakeirq handling and remove the custom handling
> > > for the wake-up interrupts.
> >
> > How do you prefer to handle the two omap specific serial driver
> > changes in this series?
> >
> > There's a dependency to Rafael's pm-wakeirq branch that contains:
> >
> > 4990d4fe327b ("PM / Wakeirq: Add automated device wake IRQ handling")
> > 56f487c78015 ("PM / Runtime: Update last_busy in rpm_resume")
> > f6a2fbb903d5 ("PM / runtime: add note about re-calling in during
> > device probe()")
> >
> > The 8250_omap.c driver change also needs to be merged with:
> >
> > 9e91597f2423 ("serial: 8250_omap: provide complete custom startup &
> > shutdown callbacks")
> >
> > Not sure if 9e91597f2423 is immutable, but if so then I could:
> >
> > a) Send you a pull request for the two serial driver patches
> > based on Rafael's pm-wakeirq branch merged with 9e91597f2423 to
> > avoid the merge conflict.
> >
> > b) Apply both serial driver patches into omap-for-v4.2/wakeirq
> > based on Rafael's pm-wakeirq branch merged with 9e91597f2423.
>
> That one sounds good to me, feel free to do so and add:
>
> Acked-by: Greg Kroah-Hartman <[email protected]>
>
> It's the easiest for everyone involved, right?

OK thanks, looks like there's a new commit for the fix as
9809889c708e, I'll base on that and wait that the commit gets
merged before sending out any pull request.

Regards,

Tony