diff options
| author | Tom Rini <trini@konsulko.com> | 2016-12-16 12:46:36 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-12-16 12:46:36 -0500 |
| commit | b5178a1f2468d5e9b1066e7d08757c1164727e4c (patch) | |
| tree | 59ba300f55720cc86874c2ad25646ec09a9f2675 /arch/arm/include/asm/macro.h | |
| parent | be72591bcd644df7e16afdd12ec258693693422f (diff) | |
| parent | c151cb5b516e609a0846bd392d6207a77b66a7ff (diff) | |
Merge git://git.denx.de/u-boot-fsl-qoriq
Diffstat (limited to 'arch/arm/include/asm/macro.h')
| -rw-r--r-- | arch/arm/include/asm/macro.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/include/asm/macro.h b/arch/arm/include/asm/macro.h index 2553e3e349..e1916f7705 100644 --- a/arch/arm/include/asm/macro.h +++ b/arch/arm/include/asm/macro.h @@ -182,11 +182,17 @@ lr .req x30 /* * The next lower exception level is AArch64, 64bit EL2 | HCE | - * SMD | RES1 (Bits[5:4]) | Non-secure EL0/EL1. + * RES1 (Bits[5:4]) | Non-secure EL0/EL1. + * and the SMD depends on requirements. */ +#ifdef CONFIG_ARMV8_PSCI + ldr \tmp, =(SCR_EL3_RW_AARCH64 | SCR_EL3_HCE_EN |\ + SCR_EL3_RES1 | SCR_EL3_NS_EN) +#else ldr \tmp, =(SCR_EL3_RW_AARCH64 | SCR_EL3_HCE_EN |\ SCR_EL3_SMD_DIS | SCR_EL3_RES1 |\ SCR_EL3_NS_EN) +#endif msr scr_el3, \tmp /* Return to the EL2_SP2 mode from EL3 */ |