arm64: Replace CONFIG_* variables with {read/write}_current
Instead of relying on config variables to determine the current el, use
{read/write}_current macros for accessing registers.
BUG=chrome-os-partner:30785
BRANCH=None
TEST=Compiles successfully and boots to kernel login prompt
Change-Id: I6c27571fa65e06e28b71fee3e21d6ca93542e66b
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: 96aed53b2879310f6f979d5aa78b8d1df7f04564
Original-Change-Id: If4a5d1e9aa50ab180c8012862e2a6c37384f7f91
Original-Signed-off-by: Furquan Shaikh <furquan@google.com>
Original-Reviewed-on: https://chromium-review.googlesource.com/217148
Original-Tested-by: Furquan Shaikh <furquan@chromium.org>
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Original-Commit-Queue: Furquan Shaikh <furquan@chromium.org>
Reviewed-on: http://review.coreboot.org/9065
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
diff --git a/src/arch/arm64/stage_entry.S b/src/arch/arm64/stage_entry.S
index e323de5..301711e 100644
--- a/src/arch/arm64/stage_entry.S
+++ b/src/arch/arm64/stage_entry.S
@@ -19,16 +19,8 @@
#include <arch/asm.h>
-
-#if CONFIG_ARM64_CPUS_START_IN_EL3
-#define SCTLR_ELx sctlr_el3
-#elif CONFIG_ARM64_CPUS_START_IN_EL2
-#define SCTLR_ELx sctlr_el2
-#elif CONFIG_ARM64_CPUS_START_IN_EL1
-#define SCTLR_ELx sctlr_el1
-#else
-#error Need to know what ELx processor starts up in.
-#endif
+#define __ASSEMBLY__
+#include <arch/lib_helpers.h>
#define STACK_SZ CONFIG_STACK_SIZE
#define EXCEPTION_STACK_SZ CONFIG_STACK_SIZE
@@ -109,12 +101,12 @@
ENDPROC(arm64_c_environment)
CPU_RESET_ENTRY(arm64_cpu_startup)
- mrs x0, SCTLR_ELx
+ read_current x0, sctlr
bic x0, x0, #(1 << 25) /* Little Endian */
bic x0, x0, #(1 << 19) /* XN not enforced */
bic x0, x0, #(1 << 12) /* Disable Instruction Cache */
bic x0, x0, #0xf /* Clear SA, C, A, and M */
- msr SCTLR_ELx, x0
+ write_current sctlr, x0, x1
isb
b arm64_c_environment
ENDPROC(arm64_cpu_startup)