Re: Suspend-resume failure on Intel Eagle Lake Core2Duo

[Thomas Gleixner]

On Fri, 28 Jul 2017, Tomi Sarvela wrote:
> On 28/07/17 00:08, Thomas Gleixner wrote:
> The patch didn't apply cleanly: can you tell exact commit or tag it has been
> created against?

Linus head

> I tried to hand-wrangle the changes in, but then I got compilation
> errors:

Sorry, forgot to refresh the patch. Working version below.

> Also, the usage of /sys/power/pm_test was not intuitive to me. Can you explain
> which kind of combinations do you want to test?

# echo freezer >/sys/power/pm_test
# echo mem >/sys/power/state

# echo devices >/sys/power/pm_test
# echo mem >/sys/power/state

# echo platform >/sys/power/pm_test
# echo mem >/sys/power/state

To reset the test stuff do:
# echo none >/sys/power/pm_test

Please try that before applying the debug patch.

Thanks,

        tglx

8<-----------

--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -304,7 +304,10 @@ void irq_shutdown(struct irq_desc *desc)
 
 void irq_enable(struct irq_desc *desc)
 {
-       if (!irqd_irq_disabled(&desc->irq_data)) {
+       if (irq_suspend_resume)
+               irq_trace_state("preenable", desc);
+
+       if (!irqd_irq_disabled(&desc->irq_data) && !irq_suspend_resume) {
                unmask_irq(desc);
        } else {
                irq_state_clr_disabled(desc);
@@ -315,10 +318,16 @@ void irq_enable(struct irq_desc *desc)
                        unmask_irq(desc);
                }
        }
+
+       if (irq_suspend_resume)
+               irq_trace_state("postenable", desc);
 }
 
 static void __irq_disable(struct irq_desc *desc, bool mask)
 {
+       if (irq_suspend_resume)
+               irq_trace_state("predisable", desc);
+
        if (irqd_irq_disabled(&desc->irq_data)) {
                if (mask)
                        mask_irq(desc);
@@ -331,6 +340,9 @@ static void __irq_disable(struct irq_des
                        mask_irq(desc);
                }
        }
+
+       if (irq_suspend_resume)
+               irq_trace_state("postdisable", desc);
 }
 
 /**
@@ -390,6 +402,9 @@ static inline void mask_ack_irq(struct i
 
 void mask_irq(struct irq_desc *desc)
 {
+       if (irq_suspend_resume)
+               irq_trace_state("premask", desc);
+
        if (irqd_irq_masked(&desc->irq_data))
                return;
 
@@ -397,17 +412,26 @@ void mask_irq(struct irq_desc *desc)
                desc->irq_data.chip->irq_mask(&desc->irq_data);
                irq_state_set_masked(desc);
        }
+
+       if (irq_suspend_resume)
+               irq_trace_state("postmask", desc);
 }
 
 void unmask_irq(struct irq_desc *desc)
 {
-       if (!irqd_irq_masked(&desc->irq_data))
+       if (irq_suspend_resume)
+               irq_trace_state("preunmask", desc);
+
+       if (!irqd_irq_masked(&desc->irq_data) && !irq_suspend_resume)
                return;
 
        if (desc->irq_data.chip->irq_unmask) {
                desc->irq_data.chip->irq_unmask(&desc->irq_data);
                irq_state_clr_masked(desc);
        }
+
+       if (irq_suspend_resume)
+               irq_trace_state("postunmask", desc);
 }
 
 void unmask_threaded_irq(struct irq_desc *desc)
--- a/kernel/irq/internals.h
+++ b/kernel/irq/internals.h
@@ -459,3 +459,11 @@ static inline void irq_remove_debugfs_en
 {
 }
 #endif /* CONFIG_GENERIC_IRQ_DEBUGFS */
+
+bool irq_suspend_resume;
+
+static inline void irq_trace_state(const char *what, struct irq_desc *desc)
+{
+       trace_printk("%s %d state %08x\n", what, irq_desc_get_irq(desc),
+                    irqd_get(&desc->irq_data));
+}
--- a/kernel/irq/pm.c
+++ b/kernel/irq/pm.c
@@ -14,6 +14,8 @@
 
 #include "internals.h"
 
+extern bool irq_suspend_resume;
+
 bool irq_pm_check_wakeup(struct irq_desc *desc)
 {
        if (irqd_is_wakeup_armed(&desc->irq_data)) {
@@ -120,6 +122,7 @@ void suspend_device_irqs(void)
        struct irq_desc *desc;
        int irq;
 
+       irq_suspend_resume = true;
        for_each_irq_desc(irq, desc) {
                unsigned long flags;
                bool sync;
@@ -127,7 +130,9 @@ void suspend_device_irqs(void)
                if (irq_settings_is_nested_thread(desc))
                        continue;
                raw_spin_lock_irqsave(&desc->lock, flags);
+               irq_trace_state("presuspend", desc);
                sync = suspend_device_irq(desc);
+               irq_trace_state("postsuspend", desc);
                raw_spin_unlock_irqrestore(&desc->lock, flags);
 
                if (sync)
@@ -172,9 +177,14 @@ static void resume_irqs(bool want_early)
                        continue;
 
                raw_spin_lock_irqsave(&desc->lock, flags);
+               irq_trace_state("preresume", desc);
                resume_irq(desc);
+               irq_trace_state("postresume", desc);
                raw_spin_unlock_irqrestore(&desc->lock, flags);
        }
+
+       if (!want_early)
+               irq_suspend_resume = false;
 }
 
 /**