GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Furquan Shaikh 2014-09-09 09:43:08 -07:00 committed by Patrick Georgi
parent 33dbfd434e
commit 136657cfe9
3 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/arch/arm64/armv8/Kconfig
View File

@ -13,15 +13,3 @@ config ARCH_ROMSTAGE_ARMV8_64
config ARCH_RAMSTAGE_ARMV8_64 config ARCH_RAMSTAGE_ARMV8_64
def_bool n def_bool n
select ARCH_RAMSTAGE_ARM64 select ARCH_RAMSTAGE_ARM64
config ARM64_CPUS_START_IN_EL3
def_bool n
depends on ARCH_BOOTBLOCK_ARM_V8_64 || ARCH_ROMSTAGE_ARM_V8_64 || ARCH_RAMSTAGE_ARM_V8_64
config ARM64_CPUS_START_IN_EL2
def_bool n
depends on ARCH_BOOTBLOCK_ARM_V8_64 || ARCH_ROMSTAGE_ARM_V8_64 || ARCH_RAMSTAGE_ARM_V8_64
config ARM64_CPUS_START_IN_EL1
def_bool n
depends on ARCH_BOOTBLOCK_ARM_V8_64 || ARCH_ROMSTAGE_ARM_V8_64 || ARCH_RAMSTAGE_ARM_V8_64

16
src/arch/arm64/stage_entry.S
View File

@ -19,16 +19,8 @@
#include <arch/asm.h> #include <arch/asm.h>
#define __ASSEMBLY__
#if CONFIG_ARM64_CPUS_START_IN_EL3 #include <arch/lib_helpers.h>
#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 STACK_SZ CONFIG_STACK_SIZE #define STACK_SZ CONFIG_STACK_SIZE
#define EXCEPTION_STACK_SZ CONFIG_STACK_SIZE #define EXCEPTION_STACK_SZ CONFIG_STACK_SIZE
@ -109,12 +101,12 @@ ENTRY(arm64_c_environment)
ENDPROC(arm64_c_environment) ENDPROC(arm64_c_environment)
CPU_RESET_ENTRY(arm64_cpu_startup) 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 << 25) /* Little Endian */
bic x0, x0, #(1 << 19) /* XN not enforced */ bic x0, x0, #(1 << 19) /* XN not enforced */
bic x0, x0, #(1 << 12) /* Disable Instruction Cache */ bic x0, x0, #(1 << 12) /* Disable Instruction Cache */
bic x0, x0, #0xf /* Clear SA, C, A, and M */ bic x0, x0, #0xf /* Clear SA, C, A, and M */
msr SCTLR_ELx, x0 write_current sctlr, x0, x1
isb isb
b arm64_c_environment b arm64_c_environment
ENDPROC(arm64_cpu_startup) ENDPROC(arm64_cpu_startup)

1
src/soc/nvidia/tegra132/Kconfig
View File

@ -5,7 +5,6 @@ config SOC_NVIDIA_TEGRA132
select ARCH_VERSTAGE_ARMV4 select ARCH_VERSTAGE_ARMV4
select ARCH_ROMSTAGE_ARMV4 select ARCH_ROMSTAGE_ARMV4
select ARCH_RAMSTAGE_ARMV8_64 select ARCH_RAMSTAGE_ARMV8_64
select ARM64_CPUS_START_IN_EL3
select BOOTBLOCK_CONSOLE select BOOTBLOCK_CONSOLE
select HAVE_MONOTONIC_TIMER select HAVE_MONOTONIC_TIMER
select HAVE_HARD_RESET select HAVE_HARD_RESET