| Message ID | 1309338303-2086-10-git-send-email-t-kristo@ti.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Kevin Hilman |
| Headers | show |
Tero Kristo <t-kristo@ti.com> writes: > This prevents system hang while attempting to access suspended console. Please add more detail. Who is accessing console? This sounds more like it's masking a UART/console bug. > Signed-off-by: Tero Kristo <t-kristo@ti.com> > --- > arch/arm/mach-omap2/pm34xx.c | 6 ++++++ > 1 files changed, 6 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c > index e626a3d..dae0a8a 100644 > --- a/arch/arm/mach-omap2/pm34xx.c > +++ b/arch/arm/mach-omap2/pm34xx.c > @@ -418,6 +418,10 @@ void omap_sram_idle(void) > pwrdm_post_transition(); > > clkdm_allow_idle(mpu_pwrdm->pwrdm_clkdms[0]); > + if (suspend_state != PM_SUSPEND_ON) { > + disable_irq(prcm_io_irq); > + disable_irq(prcm_wkup_irq); > + } > } > > int omap3_can_sleep(void) > @@ -524,6 +528,8 @@ static void omap3_pm_end(void) > suspend_state = PM_SUSPEND_ON; > omap_uart_enable_irqs(1); > enable_hlt(); > + enable_irq(prcm_io_irq); > + enable_irq(prcm_wkup_irq); > return; > } The re-enable is in ->end(), shouldn't the disable be in ->begin() ? Kevin -- To unsubscribe from this list: send the line "unsubscribe linux-omap" 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/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index e626a3d..dae0a8a 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c @@ -418,6 +418,10 @@ void omap_sram_idle(void) pwrdm_post_transition(); clkdm_allow_idle(mpu_pwrdm->pwrdm_clkdms[0]); + if (suspend_state != PM_SUSPEND_ON) { + disable_irq(prcm_io_irq); + disable_irq(prcm_wkup_irq); + } } int omap3_can_sleep(void) @@ -524,6 +528,8 @@ static void omap3_pm_end(void) suspend_state = PM_SUSPEND_ON; omap_uart_enable_irqs(1); enable_hlt(); + enable_irq(prcm_io_irq); + enable_irq(prcm_wkup_irq); return; }
This prevents system hang while attempting to access suspended console. Signed-off-by: Tero Kristo <t-kristo@ti.com> --- arch/arm/mach-omap2/pm34xx.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)