summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMarc Zyngier <marc.zyngier@arm.com>2012-08-09 11:43:29 +0200
committerMarc Zyngier <marc.zyngier@arm.com>2012-09-19 09:32:49 +0200
commitb9a348cb12f3925a27fcf0a38a146b40978588d0 (patch)
tree1ae816b746be4d80b199660f7a26289857a09a82 /arch
parentARM: 7511/1: opcodes: Opcode definitions for the Virtualization Extensions (diff)
downloadlinux-b9a348cb12f3925a27fcf0a38a146b40978588d0.tar.xz
linux-b9a348cb12f3925a27fcf0a38a146b40978588d0.zip
ARM: opcodes: add __ERET/__MSR_ELR_HYP instruction encoding
Enabling boot from HYP mode requires the use of some more virt-specific instructions ("eret" and "msr elr_hyp, reg"). Add the necessary encoding to asm/opcode-virt.h. Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/include/asm/opcodes-virt.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/include/asm/opcodes-virt.h b/arch/arm/include/asm/opcodes-virt.h
index b85665a96f8e..efcfdf92d9d5 100644
--- a/arch/arm/include/asm/opcodes-virt.h
+++ b/arch/arm/include/asm/opcodes-virt.h
@@ -26,4 +26,14 @@
0xF7E08000 | (((imm16) & 0xF000) << 4) | ((imm16) & 0x0FFF) \
)
+#define __ERET __inst_arm_thumb32( \
+ 0xE160006E, \
+ 0xF3DE8F00 \
+)
+
+#define __MSR_ELR_HYP(regnum) __inst_arm_thumb32( \
+ 0xE12EF300 | regnum, \
+ 0xF3808E30 | (regnum << 16) \
+)
+
#endif /* ! __ASM_ARM_OPCODES_VIRT_H */