From db63f2b7a7298da3a4ad42d21de76dd4aa843bbb Mon Sep 17 00:00:00 2001 From: Santosh Shilimkar Date: Mon, 11 Feb 2013 19:29:45 +0530 Subject: [PATCH] ARM: OMAP2+: PM: Remove bogus fiq_[enable/disable] tuple On OMAP platform, FIQ is reserved for secure environment only. If at all the FIQ needs to be disabled, it involves going through security API call. Hence the local_fiq_[enable/disable]() in the OMAP code is bogus. On GP devices too, the fiq is disabled for non-secure software. So just get rid of it. [notasas@gmail.com: 3.2 backport] Signed-off-by: Santosh Shilimkar Conflicts: arch/arm/mach-omap2/cpuidle34xx.c arch/arm/mach-omap2/cpuidle44xx.c arch/arm/mach-omap2/pm24xx.c arch/arm/mach-omap2/pm34xx.c arch/arm/mach-omap2/pm44xx.c --- arch/arm/mach-omap2/cpuidle34xx.c | 2 -- arch/arm/mach-omap2/pm24xx.c | 2 -- arch/arm/mach-omap2/pm34xx.c | 4 ---- 3 files changed, 8 deletions(-) diff --git a/arch/arm/mach-omap2/cpuidle34xx.c b/arch/arm/mach-omap2/cpuidle34xx.c index f4ba354dbe1e..67b0381257f1 100644 --- a/arch/arm/mach-omap2/cpuidle34xx.c +++ b/arch/arm/mach-omap2/cpuidle34xx.c @@ -109,7 +109,6 @@ static int omap3_enter_idle(struct cpuidle_device *dev, getnstimeofday(&ts_preidle); local_irq_disable(); - local_fiq_disable(); pwrdm_set_next_pwrst(mpu_pd, mpu_state); pwrdm_set_next_pwrst(core_pd, core_state); @@ -137,7 +136,6 @@ return_sleep_time: ts_idle = timespec_sub(ts_postidle, ts_preidle); local_irq_enable(); - local_fiq_enable(); idle_time = ts_idle.tv_nsec / NSEC_PER_USEC + ts_idle.tv_sec * \ USEC_PER_SEC; diff --git a/arch/arm/mach-omap2/pm24xx.c b/arch/arm/mach-omap2/pm24xx.c index cf0c216132ab..4797c11bb28a 100644 --- a/arch/arm/mach-omap2/pm24xx.c +++ b/arch/arm/mach-omap2/pm24xx.c @@ -251,7 +251,6 @@ static int omap2_can_sleep(void) static void omap2_pm_idle(void) { local_irq_disable(); - local_fiq_disable(); if (!omap2_can_sleep()) { if (omap_irq_pending()) @@ -266,7 +265,6 @@ static void omap2_pm_idle(void) omap2_enter_full_retention(); out: - local_fiq_enable(); local_irq_enable(); } diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index f11825ff0861..16b2afeccf03 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c @@ -485,7 +485,6 @@ console_still_active: static void omap3_pm_idle(void) { local_irq_disable(); - local_fiq_disable(); if (omap_irq_pending() || need_resched()) goto out; @@ -499,7 +498,6 @@ static void omap3_pm_idle(void) trace_cpu_idle(PWR_EVENT_EXIT, smp_processor_id()); out: - local_fiq_enable(); local_irq_enable(); } @@ -924,14 +922,12 @@ static int __init omap3_pm_init(void) "allocating for secure sram context\n"); local_irq_disable(); - local_fiq_disable(); omap_dma_global_context_save(); omap3_save_secure_ram_context(); omap_dma_global_context_restore(); local_irq_enable(); - local_fiq_enable(); } omap3_save_scratchpad_contents(); -- 2.30.2