diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2012-08-09 10:43:29 +0100 |
|---|---|---|
| committer | Marc Zyngier <marc.zyngier@arm.com> | 2012-09-19 08:32:49 +0100 |
| commit | b9a348cb12f3925a27fcf0a38a146b40978588d0 (patch) | |
| tree | 1ae816b746be4d80b199660f7a26289857a09a82 /arch/arm/include | |
| parent | 508514ed25315dd28340000831b17535d6f772da (diff) | |
| download | linux-3.10-b9a348cb12f3925a27fcf0a38a146b40978588d0.tar.gz linux-3.10-b9a348cb12f3925a27fcf0a38a146b40978588d0.tar.bz2 linux-3.10-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/arm/include')
| -rw-r--r-- | arch/arm/include/asm/opcodes-virt.h | 10 |
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 b85665a96f8..efcfdf92d9d 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 */ |