diff options
| author |   Marc Zyngier <maz@kernel.org> | 2022-02-25 13:49:48 +0000 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2022-02-25 13:49:48 +0000 |
| commit | 1a48ce92641d19afd16eb0c23efbf408d0a76911 (patch) | |
| tree | ddb580baf979ab0499e52a1c2506f3f443ac3408 /arch/arm64/include/uapi/asm/kvm.h | |
| parent | Merge branch kvm-arm64/pmu-bl into kvmarm-master/next (diff) | |
| parent | KVM: arm64: Remove unneeded semicolons (diff) | |
| download | wireguard-linux-1a48ce92641d19afd16eb0c23efbf408d0a76911.tar.xz wireguard-linux-1a48ce92641d19afd16eb0c23efbf408d0a76911.zip | |
Merge branch kvm-arm64/psci-1.1 into kvmarm-master/next
* kvm-arm64/psci-1.1:
: .
: Limited PSCI-1.1 support from Will Deacon:
:
: This small series exposes the PSCI SYSTEM_RESET2 call to guests, which
: allows the propagation of a "reset_type" and a "cookie" back to the VMM.
: Although Linux guests only ever pass 0 for the type ("SYSTEM_WARM_RESET"),
: the vendor-defined range can be used by a bootloader to provide additional
: information about the reset, such as an error code.
: .
KVM: arm64: Remove unneeded semicolons
KVM: arm64: Indicate SYSTEM_RESET2 in kvm_run::system_event flags field
KVM: arm64: Expose PSCI SYSTEM_RESET2 call to the guest
KVM: arm64: Bump guest PSCI version to 1.1
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 | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm64/include/uapi/asm/kvm.h b/arch/arm64/include/uapi/asm/kvm.h index d49f714f48e6..47039f2a1bdd 100644 --- a/arch/arm64/include/uapi/asm/kvm.h +++ b/arch/arm64/include/uapi/asm/kvm.h @@ -414,6 +414,13 @@ struct kvm_arm_copy_mte_tags { #define KVM_PSCI_RET_INVAL PSCI_RET_INVALID_PARAMS #define KVM_PSCI_RET_DENIED PSCI_RET_DENIED +/* arm64-specific kvm_run::system_event flags */ +/* + * Reset caused by a PSCI v1.1 SYSTEM_RESET2 call. + * Valid only when the system event has a type of KVM_SYSTEM_EVENT_RESET. + */ +#define KVM_SYSTEM_EVENT_RESET_FLAG_PSCI_RESET2 (1ULL << 0) + /* run->fail_entry.hardware_entry_failure_reason codes. */ #define KVM_EXIT_FAIL_ENTRY_CPU_UNSUPPORTED (1ULL << 0) |