浏览代码

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>
Catalin Marinas 15 年之前
父节点
当前提交
9b229fa095
共有 1 个文件被更改,包括 4 次插入0 次删除
  1. 4 0
      arch/arm/kernel/smp_scu.c

+ 4 - 0
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);