On 01/27/2014 07:08 AM, Nicolas Pitre wrote:
ARM and ARM64 are the only two architectures implementing
arch_cpu_idle_prepare() simply to call local_fiq_enable().

We have secondary_start_kernel() already calling local_fiq_enable() and
this is done a second time in arch_cpu_idle_prepare() in that case. And
enabling FIQs has nothing to do with idling the CPU to start with.

So let's introduce init_fiq_boot_cpu() to take care of FIQs on the boot
CPU and remove arch_cpu_idle_prepare(). This is now done a bit earlier
at late_initcall time but this shouldn't make a difference in practice
i.e. when FIQs are actually used.

Signed-off-by: Nicolas Pitre <n...@linaro.org>

Reviewed-by: Daniel Lezcano <daniel.lezc...@linaro.org>

---
  arch/arm/kernel/process.c | 5 -----
  arch/arm/kernel/setup.c   | 7 +++++++
  2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index 92f7b15dd2..725b8c95e0 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -142,11 +142,6 @@ static void default_idle(void)
        local_irq_enable();
  }

-void arch_cpu_idle_prepare(void)
-{
-       local_fiq_enable();
-}
-
  void arch_cpu_idle_enter(void)
  {
        ledtrig_cpu(CPU_LED_IDLE_START);
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 987a7f5bce..d027b1a6fe 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -789,6 +789,13 @@ static int __init init_machine_late(void)
  }
  late_initcall(init_machine_late);

+static int __init init_fiq_boot_cpu(void)
+{
+       local_fiq_enable();
+       return 0;
+}
+late_initcall(init_fiq_boot_cpu);
+
  #ifdef CONFIG_KEXEC
  static inline unsigned long long get_total_mem(void)
  {



--
 <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev

Reply via email to