Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-24 05:54:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix white space errors + remove #if defined

Browse source 
Fix a few white space errors and remove #if defined in workaround
for N1 Errata 1542419.

Signed-off-by: Lauren Wehrmeister <lauren.wehrmeister@arm.com>
Change-Id: I07ac5a2fd50cd63de53c06e3d0f8262871b62fad
This commit is contained in:
laurenw-arm 2019-10-11 15:45:24 -05:00
parent a04808c16c
commit 22cab65018
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/cpus/aarch64/neoverse_n1.S
View file

@ -21,9 +21,7 @@
#error "Neoverse-N1 supports only AArch64. Compile with CTX_INCLUDE_AARCH32_REGS=0" #error "Neoverse-N1 supports only AArch64. Compile with CTX_INCLUDE_AARCH32_REGS=0"
#endif #endif
#if ERRATA_N1_IC_TRAP
.global neoverse_n1_errata_ic_trap_handler .global neoverse_n1_errata_ic_trap_handler
#endif
/* -------------------------------------------------- /* --------------------------------------------------
* Errata Workaround for Neoverse N1 Erratum 1043202. * Errata Workaround for Neoverse N1 Erratum 1043202.
@ -356,7 +354,7 @@ func errata_n1_1542419_wa
bl check_errata_1542419 bl check_errata_1542419
cbz x0, 1f cbz x0, 1f
/* Apply instruction patching sequence */ /* Apply instruction patching sequence */
ldr x0, =0x0 ldr x0, =0x0
msr CPUPSELR_EL3, x0 msr CPUPSELR_EL3, x0
ldr x0, =0xEE670D35 ldr x0, =0xEE670D35
@ -536,10 +534,10 @@ func neoverse_n1_errata_ic_trap_handler
tlbi vae3is, xzr tlbi vae3is, xzr
dsb sy dsb sy
# Skip the IC instruction itself # Skip the IC instruction itself
mrs x3, elr_el3 mrs x3, elr_el3
add x3, x3, #4 add x3, x3, #4
msr elr_el3, x3 msr elr_el3, x3
ldp x0, x1, [sp, #CTX_GPREGS_OFFSET + CTX_GPREG_X0] ldp x0, x1, [sp, #CTX_GPREGS_OFFSET + CTX_GPREG_X0]
ldp x2, x3, [sp, #CTX_GPREGS_OFFSET + CTX_GPREG_X2] ldp x2, x3, [sp, #CTX_GPREGS_OFFSET + CTX_GPREG_X2]