From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sebastian Capella Subject: [PATCH RFC v1 1/3] ARM: Add irq disabled version of soft_restart. Date: Tue, 18 Feb 2014 17:52:07 -0800 Message-ID: <1392774729-3235-2-git-send-email-sebastian.capella@linaro.org> References: <1392774729-3235-1-git-send-email-sebastian.capella@linaro.org> Return-path: In-Reply-To: <1392774729-3235-1-git-send-email-sebastian.capella@linaro.org> Sender: linux-kernel-owner@vger.kernel.org To: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, linaro-kernel@lists.linaro.org, linux-arm-kernel@lists.infradead.org Cc: Russ Dill , Sebastian Capella , Russell King , Andrew Morton , Thomas Gleixner , Will Deacon , Robin Holt List-Id: linux-pm@vger.kernel.org From: Russ Dill This adds the ability to run soft_restart with local_irq/fiq_disable already called. This is helpful for the hibernation code paths. Signed-off-by: Russ Dill Signed-off-by: Sebastian Capella Cc: Russell King Cc: Andrew Morton Cc: Thomas Gleixner Cc: Will Deacon Cc: Robin Holt --- arch/arm/include/asm/system_misc.h | 1 + arch/arm/kernel/process.c | 15 ++++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/arch/arm/include/asm/system_misc.h b/arch/arm/include/asm/system_misc.h index a3d61ad..eca8dd4 100644 --- a/arch/arm/include/asm/system_misc.h +++ b/arch/arm/include/asm/system_misc.h @@ -10,6 +10,7 @@ extern void cpu_init(void); +void soft_restart_noirq(unsigned long); void soft_restart(unsigned long); extern void (*arm_pm_restart)(enum reboot_mode reboot_mode, const char *cmd); extern void (*arm_pm_idle)(void); diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c index 92f7b15..685bc4a 100644 --- a/arch/arm/kernel/process.c +++ b/arch/arm/kernel/process.c @@ -95,14 +95,10 @@ static void __soft_restart(void *addr) BUG(); } -void soft_restart(unsigned long addr) +void soft_restart_noirq(unsigned long addr) { u64 *stack = soft_restart_stack + ARRAY_SIZE(soft_restart_stack); - /* Disable interrupts first */ - local_irq_disable(); - local_fiq_disable(); - /* Disable the L2 if we're the last man standing. */ if (num_online_cpus() == 1) outer_disable(); @@ -114,6 +110,15 @@ void soft_restart(unsigned long addr) BUG(); } +void soft_restart(unsigned long addr) +{ + /* Disable interrupts first */ + local_irq_disable(); + local_fiq_disable(); + + soft_restart_noirq(addr); +} + static void null_restart(enum reboot_mode reboot_mode, const char *cmd) { } -- 1.7.9.5