diff options
| author | Catalin Marinas | 2009-11-04 13:16:38 +0100 |
|---|---|---|
| committer | Catalin Marinas | 2009-11-05 11:10:36 +0100 |
| commit | 9b229fa0951fb47cbc178be4bd8e9ef185b38802 (patch) | |
| tree | 97a517a6c8c7788b799a8350a976c2a0556de144 | |
| parent | ARMv7: Check whether the SMP/nAMP mode was already enabled (diff) | |
| download | kernel-qcow2-linux-9b229fa0951fb47cbc178be4bd8e9ef185b38802.tar.gz kernel-qcow2-linux-9b229fa0951fb47cbc178be4bd8e9ef185b38802.tar.xz kernel-qcow2-linux-9b229fa0951fb47cbc178be4bd8e9ef185b38802.zip | |
Check whether the SCU was already initialised
If Linux is running in non-secure mode, this register may have been
already initialised and writing to the control register not allowed.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
| -rw-r--r-- | arch/arm/kernel/smp_scu.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/kernel/smp_scu.c b/arch/arm/kernel/smp_scu.c index d3831f616ee9..9ab4149bd983 100644 --- a/arch/arm/kernel/smp_scu.c +++ b/arch/arm/kernel/smp_scu.c @@ -37,6 +37,10 @@ void __init scu_enable(void __iomem *scu_base) u32 scu_ctrl; scu_ctrl = __raw_readl(scu_base + SCU_CTRL); + /* already enabled? */ + if (scu_ctrl & 1) + return; + scu_ctrl |= 1; __raw_writel(scu_ctrl, scu_base + SCU_CTRL); |