diff options
| author | Tony Lin <tony.lin@freescale.com> | 2011-09-09 11:45:11 +0800 |
|---|---|---|
| committer | Jason Liu <r64343@freescale.com> | 2012-01-09 20:23:43 +0800 |
| commit | d2b492a7ec1f29db82ee90684cd6ca8b070a0e52 (patch) | |
| tree | 20c694afd7f2387cea3fb595bbc903a3a3656e9f /arch/arm/mach-mx6/pm.c | |
| parent | 80882747cd55ecd987337ed6d4c839d7400d2b0a (diff) | |
ENGR00156314-3 [mx6q]gic: save/restore mode for suspend/resume
save gic registers before suspend and restore these registers after resuming
Signed-off-by: Tony Lin <tony.lin@freescale.com>
Diffstat (limited to 'arch/arm/mach-mx6/pm.c')
| -rw-r--r-- | arch/arm/mach-mx6/pm.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/arch/arm/mach-mx6/pm.c b/arch/arm/mach-mx6/pm.c index 00b70447b085..bbde0f97c8a6 100644 --- a/arch/arm/mach-mx6/pm.c +++ b/arch/arm/mach-mx6/pm.c @@ -84,7 +84,10 @@ static unsigned long iram_paddr, cpaddr; static u32 ccm_clpcr, scu_ctrl; static u32 gpc_imr[4], gpc_cpu_pup, gpc_cpu_pdn, gpc_cpu; + +#ifdef CONFIG_LOCAL_TIMERS static u32 local_timer[4]; +#endif static void mx6_suspend_store(void) { @@ -129,6 +132,8 @@ static void mx6_suspend_restore(void) static int mx6_suspend_enter(suspend_state_t state) { unsigned int wake_irq_isr[4]; + struct gic_dist_state gds; + struct gic_cpu_state gcs; wake_irq_isr[0] = __raw_readl(gpc_base + GPC_ISR1_OFFSET) & gpc_wake_irq[0]; @@ -167,24 +172,19 @@ static int mx6_suspend_enter(suspend_state_t state) local_flush_tlb_all(); flush_cache_all(); + if (state == PM_SUSPEND_MEM) { + /* preserve gic state */ + save_gic_dist_state(0, &gds); + save_gic_cpu_state(0, &gcs); + } + suspend_in_iram(state, (unsigned long)iram_paddr, (unsigned long)suspend_iram_base); if (state == PM_SUSPEND_MEM) { - /* need to re-init irq */ - mx6_init_irq(); - -#ifdef CONFIG_LOCAL_TIMERS - gic_enable_ppi(IRQ_LOCALTIMER); -#endif - /* if we use gpt as system timer, we need to - * enable gpt timer here, and even LOCAL_TIMERS - * defined, but if we only boot up a core, then - * kernel will still use GPT as timer */ - __raw_writel(1 << (MXC_INT_GPT % 32), - gic_dist_base + GIC_DIST_ENABLE_SET + - (MXC_INT_GPT / 32) * 4); - + /* restore gic registers */ + restore_gic_dist_state(0, &gds); + restore_gic_cpu_state(0, &gcs); } mx6_suspend_restore(); |