diff options
| author | Mark Dykes <mardyk01@review.trustedfirmware.org> | 2020-03-11 15:39:32 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-03-11 15:39:32 +0000 |
| commit | f9ea3a6291b45bddda0564e8ff654a615933b173 (patch) | |
| tree | 08979d518666638e53cd16f88f9546771ef56513 /include | |
| parent | 6654d17e1a135e4dcbd1995a4d369a6314c361b5 (diff) | |
| parent | b4292bc65eafcd36ad72d4301c12461184579bb6 (diff) | |
| download | platform_external_arm-trusted-firmware-f9ea3a6291b45bddda0564e8ff654a615933b173.tar.gz platform_external_arm-trusted-firmware-f9ea3a6291b45bddda0564e8ff654a615933b173.tar.bz2 platform_external_arm-trusted-firmware-f9ea3a6291b45bddda0564e8ff654a615933b173.zip | |
Merge "Fix crash dump for lower EL" into integration
Diffstat (limited to 'include')
| -rw-r--r-- | include/arch/aarch64/arch.h | 6 | ||||
| -rw-r--r-- | include/common/debug.h | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/include/arch/aarch64/arch.h b/include/arch/aarch64/arch.h index b0c265047..2b2c11652 100644 --- a/include/arch/aarch64/arch.h +++ b/include/arch/aarch64/arch.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2019, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2013-2020, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2020, NVIDIA Corporation. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -452,6 +452,9 @@ #define SPSR_M_AARCH64 U(0x0) #define SPSR_M_AARCH32 U(0x1) +#define SPSR_EL_SHIFT U(2) +#define SPSR_EL_WIDTH U(2) + #define SPSR_SSBS_BIT_AARCH64 BIT_64(12) #define SPSR_SSBS_BIT_AARCH32 BIT_64(23) @@ -557,6 +560,7 @@ #define MODE_EL_SHIFT U(0x2) #define MODE_EL_MASK U(0x3) +#define MODE_EL_WIDTH U(0x2) #define MODE_EL3 U(0x3) #define MODE_EL2 U(0x2) #define MODE_EL1 U(0x1) diff --git a/include/common/debug.h b/include/common/debug.h index 245e69865..9aef15b51 100644 --- a/include/common/debug.h +++ b/include/common/debug.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2018, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2013-2020, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -91,6 +91,7 @@ #if ENABLE_BACKTRACE void backtrace(const char *cookie); +const char *get_el_str(unsigned int el); #else #define backtrace(x) #endif |