Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f18cc2ff authored by Tero Kristo's avatar Tero Kristo Committed by Kevin Hilman
Browse files

OMAP3: PM: Disable interrupt controller AUTOIDLE before WFI 



OMAP interrupt controller goes to unknown state when there is right
combination of l3,l4 sleep/wake-up transitions, l4 autoidle in
interrupt controller and some interrupt. When this happens, interrupts
are not delivered to ARM anymore and ARM will remain in WFI (wait for
interrupt) until interrupt controller is forced to wake-up
(i.e. lauterbach).

Signed-off-by: default avatarTero Kristo <tero.kristo@nokia.com>
Signed-off-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
parent b296c811

arch/arm/mach-omap2/irq.c

+12 −0
Original line number Diff line number Diff line
@@ -280,4 +280,16 @@ void omap3_intc_suspend(void) 
	/* A pending interrupt would prevent OMAP from entering suspend */

	omap_ack_irq(0);

}



void omap3_intc_prepare_idle(void)

{

	/* Disable autoidle as it can stall interrupt controller */

	intc_bank_write_reg(0, &irq_banks[0], INTC_SYSCONFIG);

}



void omap3_intc_resume_idle(void)

{

	/* Re-enable autoidle */

	intc_bank_write_reg(1, &irq_banks[0], INTC_SYSCONFIG);

}

#endif /* CONFIG_ARCH_OMAP3 */

arch/arm/mach-omap2/pm34xx.c

+2 −0
Original line number Diff line number Diff line
@@ -392,6 +392,7 @@ void omap_sram_idle(void) 
		prm_set_mod_reg_bits(OMAP3430_EN_IO, WKUP_MOD, PM_WKEN);

		omap3_enable_io_chain();

	}

	omap3_intc_prepare_idle();



	/*

	* On EMU/HS devices ROM code restores a SRDC value
@@ -438,6 +439,7 @@ void omap_sram_idle(void) 
					       OMAP3430_GR_MOD,

					       OMAP3_PRM_VOLTCTRL_OFFSET);

	}

	omap3_intc_resume_idle();



	/* PER */

	if (per_next_state < PWRDM_POWER_ON) {

arch/arm/plat-omap/include/plat/irqs.h

+2 −0
Original line number Diff line number Diff line
@@ -500,6 +500,8 @@ extern int omap_irq_pending(void); 
void omap_intc_save_context(void);

void omap_intc_restore_context(void);

void omap3_intc_suspend(void);

void omap3_intc_prepare_idle(void);

void omap3_intc_resume_idle(void);

#endif



#include <mach/hardware.h>