Hi, There seems to be still one issue with this patch. It fails to protect against pr_warning from omap_device.c in some cases, console_trylock() console_unlock() hacks inside UART clock enable / disable are not enough to protect against this. This bug can be prevented by removing the pr_warning() calls from omap_device.c.
-Tero On Wed, 2011-06-22 at 18:42 +0200, Kristo, Tero wrote: > Signed-off-by: Tero Kristo <[email protected]> > --- > arch/arm/mach-omap2/pm34xx.c | 19 ------------------- > arch/arm/mach-omap2/serial.c | 40 +++++++++++++++++++++------------------- > 2 files changed, 21 insertions(+), 38 deletions(-) > > diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c > index ff0811a..6fff894 100644 > --- a/arch/arm/mach-omap2/pm34xx.c > +++ b/arch/arm/mach-omap2/pm34xx.c > @@ -340,18 +340,9 @@ void omap_sram_idle(void) > omap3_enable_io_chain(); > } > > - /* Block console output in case it is on one of the OMAP UARTs */ > - if (!is_suspending()) > - if (per_next_state < PWRDM_POWER_ON || > - core_next_state < PWRDM_POWER_ON) > - if (!console_trylock()) > - goto console_still_active; > - > /* PER */ > if (per_next_state < PWRDM_POWER_ON) { > per_going_off = (per_next_state == PWRDM_POWER_OFF) ? 1 : 0; > - omap_uart_prepare_idle(2); > - omap_uart_prepare_idle(3); > omap2_gpio_prepare_for_idle(per_going_off); > if (per_next_state == PWRDM_POWER_OFF) > omap3_per_save_context(); > @@ -359,8 +350,6 @@ void omap_sram_idle(void) > > /* CORE */ > if (core_next_state < PWRDM_POWER_ON) { > - omap_uart_prepare_idle(0); > - omap_uart_prepare_idle(1); > if (core_next_state == PWRDM_POWER_OFF) { > omap3_core_save_context(); > omap3_cm_save_context(); > @@ -407,8 +396,6 @@ void omap_sram_idle(void) > omap3_sram_restore_context(); > omap2_sms_restore_context(); > } > - omap_uart_resume_idle(0); > - omap_uart_resume_idle(1); > if (core_next_state == PWRDM_POWER_OFF) > omap2_prm_clear_mod_reg_bits(OMAP3430_AUTO_OFF_MASK, > OMAP3430_GR_MOD, > @@ -422,14 +409,8 @@ void omap_sram_idle(void) > omap2_gpio_resume_after_idle(); > if (per_prev_state == PWRDM_POWER_OFF) > omap3_per_restore_context(); > - omap_uart_resume_idle(2); > - omap_uart_resume_idle(3); > } > > - if (!is_suspending()) > - console_unlock(); > - > -console_still_active: > /* Disable IO-PAD and IO-CHAIN wakeup */ > if (omap3_has_io_wakeup() && > (per_next_state < PWRDM_POWER_ON || > diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c > index 1ac361b..e4a5a8c 100644 > --- a/arch/arm/mach-omap2/serial.c > +++ b/arch/arm/mach-omap2/serial.c > @@ -39,6 +39,7 @@ > #include <plat/dma.h> > #include <plat/omap_hwmod.h> > #include <plat/omap_device.h> > +#include <plat/prcm.h> > > #include "prm2xxx_3xxx.h" > #include "pm.h" > @@ -280,24 +281,34 @@ static inline void omap_uart_restore_context(struct > omap_uart_state *uart) {} > > static inline void omap_uart_enable_clocks(struct omap_uart_state *uart) > { > + int locked; > + > if (uart->clocked) > return; > > + locked = console_trylock(); > omap_device_enable(uart->pdev); > uart->clocked = 1; > omap_uart_restore_context(uart); > + if (locked) > + console_unlock(); > } > > #ifdef CONFIG_PM > > static inline void omap_uart_disable_clocks(struct omap_uart_state *uart) > { > + int locked; > + > if (!uart->clocked) > return; > > + locked = console_trylock(); > omap_uart_save_context(uart); > uart->clocked = 0; > omap_device_idle(uart->pdev); > + if (locked) > + console_unlock(); > } > > static void omap_uart_enable_wakeup(struct omap_uart_state *uart) > @@ -380,6 +391,7 @@ static void omap_uart_allow_sleep(struct omap_uart_state > *uart) > omap_uart_smart_idle_enable(uart, 1); > uart->can_sleep = 1; > del_timer(&uart->timer); > + omap_uart_disable_clocks(uart); > } > > static void omap_uart_idle_timer(unsigned long data) > @@ -391,35 +403,23 @@ static void omap_uart_idle_timer(unsigned long data) > > void omap_uart_prepare_idle(int num) > { > - struct omap_uart_state *uart; > - > - list_for_each_entry(uart, &uart_list, node) { > - if (num == uart->num && uart->can_sleep) { > - omap_uart_disable_clocks(uart); > - return; > - } > - } > } > > void omap_uart_resume_idle(int num) > { > struct omap_uart_state *uart; > + u32 wkst; > > list_for_each_entry(uart, &uart_list, node) { > if (num == uart->num && uart->can_sleep) { > - omap_uart_enable_clocks(uart); > + omap_uart_block_sleep(uart); > > - /* Check for IO pad wakeup */ > - if (cpu_is_omap34xx() && uart->padconf) { > - u16 p = omap_ctrl_readw(uart->padconf); > - > - if (p & OMAP3_PADCONF_WAKEUPEVENT0) > - omap_uart_block_sleep(uart); > + /* Check for normal UART wakeup (and clear it) */ > + if (uart->wk_st && uart->wk_mask) { > + wkst = __raw_readl(uart->wk_st) & uart->wk_mask; > + if (wkst) > + __raw_writel(wkst, uart->wk_st); > } > - > - /* Check for normal UART wakeup */ > - if (__raw_readl(uart->wk_st) & uart->wk_mask) > - omap_uart_block_sleep(uart); > return; > } > } > @@ -550,6 +550,8 @@ static void omap_uart_idle_init(struct omap_uart_state > *uart) > ret = request_threaded_irq(uart->irq, NULL, omap_uart_interrupt, > IRQF_SHARED, "serial idle", (void *)uart); > WARN_ON(ret); > + ret = omap_prcm_register_pad_irq(uart->padconf, uart->irq); > + WARN_ON(ret); > } > > void omap_uart_enable_irqs(int enable) Texas Instruments Oy, Tekniikantie 12, 02150 Espoo. Y-tunnus: 0115040-6. Kotipaikka: Helsinki -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
