2008-07-23 12:42:46

by Uwe Kleine-König

Subject: [PATCH] set_irq_wake: fix return code and wake status tracking

Since 15a647eba94c3da27ccc666bea72e7cca06b2d19 set_irq_wake returned -ENXIO
if another device had it already enabled. Zero is the right value to
return in this case. Moreover the change to desc->status was not reverted
if desc->chip->set_wake returned an error.

Signed-off-by: Uwe Kleine-König <[email protected]>
Cc: David Brownell <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Russell King <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: Linus Torvalds <[email protected]>
---
kernel/irq/manage.c | 39 +++++++++++++++++++++++++++------------
1 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index e01ad8e..227cd49 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -194,6 +194,17 @@ void enable_irq(unsigned int irq)
}
EXPORT_SYMBOL(enable_irq);

+int set_irq_wake_real(unsigned int irq, unsigned int on)
+{
+ struct irq_desc *desc = irq_desc + irq;
+ int ret = -ENXIO;
+
+ if (desc->chip->set_wake)
+ ret = desc->chip->set_wake(irq, on);
+
+ return ret;
+}
+
/**
* set_irq_wake - control irq power management wakeup
* @irq: interrupt to control
@@ -210,30 +221,34 @@ int set_irq_wake(unsigned int irq, unsigned int on)
{
struct irq_desc *desc = irq_desc + irq;
unsigned long flags;
- int ret = -ENXIO;
- int (*set_wake)(unsigned, unsigned) = desc->chip->set_wake;
+ int ret = 0;

/* wakeup-capable irqs can be shared between drivers that
* don't need to have the same sleep mode behaviors.
*/
spin_lock_irqsave(&desc->lock, flags);
if (on) {
- if (desc->wake_depth++ == 0)
- desc->status |= IRQ_WAKEUP;
- else
- set_wake = NULL;
+ if (desc->wake_depth++ == 0) {
+ ret = set_irq_wake_real(irq, on);
+ if (ret)
+ desc->wake_depth = 0;
+ else
+ desc->status |= IRQ_WAKEUP;
+ }
} else {
if (desc->wake_depth == 0) {
printk(KERN_WARNING "Unbalanced IRQ %d "
"wake disable\n", irq);
WARN_ON(1);
- } else if (--desc->wake_depth == 0)
- desc->status &= ~IRQ_WAKEUP;
- else
- set_wake = NULL;
+ } else if (--desc->wake_depth == 0) {
+ ret = set_irq_wake_real(irq, on);
+ if (ret)
+ desc->wake_depth = 1;
+ else
+ desc->status &= ~IRQ_WAKEUP;
+ }
}
- if (set_wake)
- ret = desc->chip->set_wake(irq, on);
+
spin_unlock_irqrestore(&desc->lock, flags);
return ret;
}
--
1.5.6.3

2008-07-23 16:13:06

by David Brownell

Subject: Re: [PATCH] set_irq_wake: fix return code and wake status tracking

On Wednesday 23 July 2008, Uwe Kleine-K?nig wrote:
> Since 15a647eba94c3da27ccc666bea72e7cca06b2d19 set_irq_wake returned -ENXIO
> if another device had it already enabled. Zero is the right value to
> return in this case. Moreover the change to desc->status was not reverted
> if desc->chip->set_wake returned an error.
>
> Signed-off-by: Uwe Kleine-K?nig <[email protected]>
> Cc: David Brownell <[email protected]>

Acked-by: David Brownell <[email protected]>


> Cc: Ingo Molnar <[email protected]>
> Cc: Thomas Gleixner <[email protected]>
> Cc: Russell King <[email protected]>
> Cc: Andrew Morton <[email protected]>
> Cc: Linus Torvalds <[email protected]>
> ---
> kernel/irq/manage.c | 39 +++++++++++++++++++++++++++------------
> 1 files changed, 27 insertions(+), 12 deletions(-)
>
> diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
> index e01ad8e..227cd49 100644
> --- a/kernel/irq/manage.c
> +++ b/kernel/irq/manage.c
> @@ -194,6 +194,17 @@ void enable_irq(unsigned int irq)
> }
> EXPORT_SYMBOL(enable_irq);
>
> +int set_irq_wake_real(unsigned int irq, unsigned int on)
> +{
> + struct irq_desc *desc = irq_desc + irq;
> + int ret = -ENXIO;
> +
> + if (desc->chip->set_wake)
> + ret = desc->chip->set_wake(irq, on);
> +
> + return ret;
> +}
> +
> /**
> * set_irq_wake - control irq power management wakeup
> * @irq: interrupt to control
> @@ -210,30 +221,34 @@ int set_irq_wake(unsigned int irq, unsigned int on)
> {
> struct irq_desc *desc = irq_desc + irq;
> unsigned long flags;
> - int ret = -ENXIO;
> - int (*set_wake)(unsigned, unsigned) = desc->chip->set_wake;
> + int ret = 0;
>
> /* wakeup-capable irqs can be shared between drivers that
> * don't need to have the same sleep mode behaviors.
> */
> spin_lock_irqsave(&desc->lock, flags);
> if (on) {
> - if (desc->wake_depth++ == 0)
> - desc->status |= IRQ_WAKEUP;
> - else
> - set_wake = NULL;
> + if (desc->wake_depth++ == 0) {
> + ret = set_irq_wake_real(irq, on);
> + if (ret)
> + desc->wake_depth = 0;
> + else
> + desc->status |= IRQ_WAKEUP;
> + }
> } else {
> if (desc->wake_depth == 0) {
> printk(KERN_WARNING "Unbalanced IRQ %d "
> "wake disable\n", irq);
> WARN_ON(1);
> - } else if (--desc->wake_depth == 0)
> - desc->status &= ~IRQ_WAKEUP;
> - else
> - set_wake = NULL;
> + } else if (--desc->wake_depth == 0) {
> + ret = set_irq_wake_real(irq, on);
> + if (ret)
> + desc->wake_depth = 1;
> + else
> + desc->status &= ~IRQ_WAKEUP;
> + }
> }
> - if (set_wake)
> - ret = desc->chip->set_wake(irq, on);
> +
> spin_unlock_irqrestore(&desc->lock, flags);
> return ret;
> }
> --
> 1.5.6.3
>

2008-07-23 23:20:10

by Ingo Oeser

Subject: Re: [PATCH] set_irq_wake: fix return code and wake status tracking

Hi Uwe,

you can mark the new function static.

[trimmed CC list, since this is just a minor issue]

On Wednesday 23 July 2008, Uwe Kleine-König wrote:
> diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
> index e01ad8e..227cd49 100644
> --- a/kernel/irq/manage.c
> +++ b/kernel/irq/manage.c
> @@ -194,6 +194,17 @@ void enable_irq(unsigned int irq)
> }
> EXPORT_SYMBOL(enable_irq);
>
> +int set_irq_wake_real(unsigned int irq, unsigned int on)
static int set_irq_wake_real(unsigned int irq, unsigned int on)

> +{
> + struct irq_desc *desc = irq_desc + irq;
> + int ret = -ENXIO;
> +
> + if (desc->chip->set_wake)
> + ret = desc->chip->set_wake(irq, on);
> +
> + return ret;
> +}
> +

Best Regards

Ingo Oeser

2008-07-24 05:43:04

by Uwe Kleine-König

Subject: Re: [PATCH] set_irq_wake: fix return code and wake status tracking

Hello Ingo,

Ingo Oeser wrote:
> you can mark the new function static.
Right, good catch. As this patch already hit mainline I will send a
followup.

Thanks,
Uwe

--
Uwe Kleine-K?nig, Software Engineer
Digi International GmbH Branch Breisach, K?ferstrasse 8, 79206 Breisach, Germany
Tax: 315/5781/0242 / VAT: DE153662976 / Reg. Amtsgericht Dortmund HRB 13962

2008-07-24 05:52:07

by Uwe Kleine-König

Subject: [PATCH] make set_irq_wake_real static

set_irq_wake_real was introduced in 2db873211ba47ef704c301f9ecf4a33413a0b649
and its only user is set_irq_wake.

Noticed-by: Ingo Oeser <[email protected]>
Signed-off-by: Uwe Kleine-König <[email protected]>
---
kernel/irq/manage.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 3cfc0fe..4476cd0 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -217,7 +217,7 @@ void enable_irq(unsigned int irq)
}
EXPORT_SYMBOL(enable_irq);

-int set_irq_wake_real(unsigned int irq, unsigned int on)
+static int set_irq_wake_real(unsigned int irq, unsigned int on)
{
struct irq_desc *desc = irq_desc + irq;
int ret = -ENXIO;
--
1.5.6.3