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 /include/kvm | |
| parent | 00e6dae00e3dcb4dd54e1d62e295fd997a0cec28 (diff) | |
| parent | ae82047e97a3014d843d4fb931922982ef625e54 (diff) | |
| download | linux-stable-1a48ce92641d19afd16eb0c23efbf408d0a76911.tar.gz linux-stable-1a48ce92641d19afd16eb0c23efbf408d0a76911.tar.bz2 linux-stable-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 'include/kvm')
| -rw-r--r-- | include/kvm/arm_psci.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/kvm/arm_psci.h b/include/kvm/arm_psci.h index 297645edcaff..68b96c3826c3 100644 --- a/include/kvm/arm_psci.h +++ b/include/kvm/arm_psci.h @@ -13,8 +13,9 @@ #define KVM_ARM_PSCI_0_1 PSCI_VERSION(0, 1) #define KVM_ARM_PSCI_0_2 PSCI_VERSION(0, 2) #define KVM_ARM_PSCI_1_0 PSCI_VERSION(1, 0) +#define KVM_ARM_PSCI_1_1 PSCI_VERSION(1, 1) -#define KVM_ARM_PSCI_LATEST KVM_ARM_PSCI_1_0 +#define KVM_ARM_PSCI_LATEST KVM_ARM_PSCI_1_1 static inline int kvm_psci_version(struct kvm_vcpu *vcpu) { |