diff options
| author | Marc Zyngier <maz@kernel.org> | 2020-09-30 16:05:35 +0300 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2020-09-30 16:05:35 +0300 |
| commit | 14ef9d04928b61d699fd0dd858b14b5d8150113e (patch) | |
| tree | 267d772b7068f7d0da04cf421286c65f2599f472 /arch/arm64/include/uapi/asm/kvm.h | |
| parent | 2e02cbb236d6ac12e04629f94b7032a94f968165 (diff) | |
| parent | 816c347f3a48fb15370b23664760ea61286fea05 (diff) | |
| download | linux-14ef9d04928b61d699fd0dd858b14b5d8150113e.tar.xz | |
Merge branch 'kvm-arm64/hyp-pcpu' into kvmarm-master/next
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm64/include/uapi/asm/kvm.h')
| -rw-r--r-- | arch/arm64/include/uapi/asm/kvm.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm64/include/uapi/asm/kvm.h b/arch/arm64/include/uapi/asm/kvm.h index 7b1511d6ce44..1c17c3a24411 100644 --- a/arch/arm64/include/uapi/asm/kvm.h +++ b/arch/arm64/include/uapi/asm/kvm.h @@ -257,6 +257,15 @@ struct kvm_vcpu_events { #define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_1_NOT_AVAIL 0 #define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_1_AVAIL 1 #define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_1_NOT_REQUIRED 2 + +/* + * Only two states can be presented by the host kernel: + * - NOT_REQUIRED: the guest doesn't need to do anything + * - NOT_AVAIL: the guest isn't mitigated (it can still use SSBS if available) + * + * All the other values are deprecated. The host still accepts all + * values (they are ABI), but will narrow them to the above two. + */ #define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_2 KVM_REG_ARM_FW_REG(2) #define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_2_NOT_AVAIL 0 #define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_2_UNKNOWN 1 |