| Message ID | 1421096249-27864-1-git-send-email-arnab_basu@rocketmail.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Albert ARIBAUD |
| Headers | show |
diff --git a/arch/arm/include/asm/macro.h b/arch/arm/include/asm/macro.h index 1c8c425..e36f043 100644 --- a/arch/arm/include/asm/macro.h +++ b/arch/arm/include/asm/macro.h @@ -106,8 +106,13 @@ lr .req x30 .endm .macro armv8_switch_to_el2_m, xreg1 +#ifdef CONFIG_ARMV8_PSCI + /* 64bit EL2 | HCE | RES1 (Bits[5:4]) | Non-secure EL0/EL1 */ + mov \xreg1, #0x531 +#else /* 64bit EL2 | HCE | SMD | RES1 (Bits[5:4]) | Non-secure EL0/EL1 */ mov \xreg1, #0x5b1 +#endif msr scr_el3, \xreg1 msr cptr_el3, xzr /* Disable coprocessor traps to EL3 */ mov \xreg1, #0x33ff
Enable the SMC instruction so that the kernel can use the psci code Signed-off-by: Arnab Basu <arnab_basu@rocketmail.com> Cc: Bhupesh Sharma <bhupesh.sharma@freescale.com> Cc: Marc Zyngier <marc.zyngier@arm.com> --- arch/arm/include/asm/macro.h | 5 +++++ 1 file changed, 5 insertions(+)