diff options
| author | Manish Pandey <manish.pandey2@arm.com> | 2023-04-25 10:18:34 +0200 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2023-04-25 10:18:34 +0200 |
| commit | 50e609f47c8a362a5eacea62bb55e857bddf0ce7 (patch) | |
| tree | a7dc2b8da05d77dad63d802bf058902762e9bbea /lib | |
| parent | 100f56d873591a8de61ff8826c2ed8cdd09f3338 (diff) | |
| parent | 9ec2ca2d453176179f923d7e0fbaac05341ebdc6 (diff) | |
| download | arm-trusted-firmware-50e609f47c8a362a5eacea62bb55e857bddf0ce7.tar.gz | |
Merge "fix(cpus): do not put RAS check before using esb" into integration
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/cpus/aarch64/neoverse_n1.S | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/cpus/aarch64/neoverse_n1.S b/lib/cpus/aarch64/neoverse_n1.S index 827c0b0c7..2cf94c758 100644 --- a/lib/cpus/aarch64/neoverse_n1.S +++ b/lib/cpus/aarch64/neoverse_n1.S @@ -706,7 +706,6 @@ func neoverse_n1_errata_ic_trap_handler ldp x4, x5, [sp, #CTX_GPREGS_OFFSET + CTX_GPREG_X4] ldr x30, [sp, #CTX_GPREGS_OFFSET + CTX_GPREG_LR] -#if IMAGE_BL31 && RAS_EXTENSION /* * Issue Error Synchronization Barrier to synchronize SErrors before * exiting EL3. We're running with EAs unmasked, so any synchronized @@ -714,7 +713,6 @@ func neoverse_n1_errata_ic_trap_handler * DISR_EL1 register. */ esb -#endif exception_return 1: ret |