diff options
| author | Radim Krčmář <rkrcmar@redhat.com> | 2018-03-28 16:09:09 +0200 |
|---|---|---|
| committer | Radim Krčmář <rkrcmar@redhat.com> | 2018-03-28 16:09:09 +0200 |
| commit | abe7a4586f0cf0ef35ed5f713ccfd4eb0770a5ac (patch) | |
| tree | c5f5bae60fdd3973b0c5d14a6405a7b66dbb5121 /arch/arm/include/uapi/asm/kvm.h | |
| parent | d32ef547fdbbeb9c4351f9d3bc84dec998a3be8c (diff) | |
| parent | dc6ed61d2f824a595033744fc1f3bf4cb98768b5 (diff) | |
| download | linux-abe7a4586f0cf0ef35ed5f713ccfd4eb0770a5ac.tar.gz | |
Merge tag 'kvm-arm-for-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm
KVM/ARM updates for v4.17
- VHE optimizations
- EL2 address space randomization
- Variant 3a mitigation for Cortex-A57 and A72
- The usual vgic fixes
- Various minor tidying-up
Diffstat (limited to 'arch/arm/include/uapi/asm/kvm.h')
| -rw-r--r-- | arch/arm/include/uapi/asm/kvm.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/include/uapi/asm/kvm.h b/arch/arm/include/uapi/asm/kvm.h index 6edd177bb1c7..2ba95d6fe852 100644 --- a/arch/arm/include/uapi/asm/kvm.h +++ b/arch/arm/include/uapi/asm/kvm.h @@ -135,6 +135,15 @@ struct kvm_arch_memory_slot { #define KVM_REG_ARM_CRM_SHIFT 7 #define KVM_REG_ARM_32_CRN_MASK 0x0000000000007800 #define KVM_REG_ARM_32_CRN_SHIFT 11 +/* + * For KVM currently all guest registers are nonsecure, but we reserve a bit + * in the encoding to distinguish secure from nonsecure for AArch32 system + * registers that are banked by security. This is 1 for the secure banked + * register, and 0 for the nonsecure banked register or if the register is + * not banked by security. + */ +#define KVM_REG_ARM_SECURE_MASK 0x0000000010000000 +#define KVM_REG_ARM_SECURE_SHIFT 28 #define ARM_CP15_REG_SHIFT_MASK(x,n) \ (((x) << KVM_REG_ARM_ ## n ## _SHIFT) & KVM_REG_ARM_ ## n ## _MASK) |