diff options
| author | Radim Krčmář <rkrcmar@redhat.com> | 2018-04-25 14:16:50 +0200 |
|---|---|---|
| committer | Radim Krčmář <rkrcmar@redhat.com> | 2018-04-25 14:16:50 +0200 |
| commit | 06e22bb6fa5bd2d7d6cdd4d886aef90c3ef8f9c7 (patch) | |
| tree | 600ef54eb192cfd401fa7b266cfe5bc8c0b0dbd7 /include | |
| parent | 6d08b06e67cd117f6992c46611dfb4ce267cd71e (diff) | |
| parent | 85bd0ba1ff9875798fad94218b627ea9f768f3c3 (diff) | |
| download | linux-06e22bb6fa5bd2d7d6cdd4d886aef90c3ef8f9c7.tar.gz linux-06e22bb6fa5bd2d7d6cdd4d886aef90c3ef8f9c7.tar.bz2 linux-06e22bb6fa5bd2d7d6cdd4d886aef90c3ef8f9c7.zip | |
Merge tag 'kvmarm-fixes-for-4.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm
KVM/arm fixes for 4.17, take #1
- PSCI selection API, a leftover from 4.16
- Kick vcpu on active interrupt affinity change
- Plug a VMID allocation race on oversubscribed systems
- Silence debug messages
- Update Christoffer's email address
Diffstat (limited to 'include')
| -rw-r--r-- | include/kvm/arm_psci.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/include/kvm/arm_psci.h b/include/kvm/arm_psci.h index e518e4e3dfb5..4b1548129fa2 100644 --- a/include/kvm/arm_psci.h +++ b/include/kvm/arm_psci.h @@ -37,10 +37,15 @@ static inline int kvm_psci_version(struct kvm_vcpu *vcpu, struct kvm *kvm) * Our PSCI implementation stays the same across versions from * v0.2 onward, only adding the few mandatory functions (such * as FEATURES with 1.0) that are required by newer - * revisions. It is thus safe to return the latest. + * revisions. It is thus safe to return the latest, unless + * userspace has instructed us otherwise. */ - if (test_bit(KVM_ARM_VCPU_PSCI_0_2, vcpu->arch.features)) + if (test_bit(KVM_ARM_VCPU_PSCI_0_2, vcpu->arch.features)) { + if (vcpu->kvm->arch.psci_version) + return vcpu->kvm->arch.psci_version; + return KVM_ARM_PSCI_LATEST; + } return KVM_ARM_PSCI_0_1; } @@ -48,4 +53,11 @@ static inline int kvm_psci_version(struct kvm_vcpu *vcpu, struct kvm *kvm) int kvm_hvc_call_handler(struct kvm_vcpu *vcpu); +struct kvm_one_reg; + +int kvm_arm_get_fw_num_regs(struct kvm_vcpu *vcpu); +int kvm_arm_copy_fw_reg_indices(struct kvm_vcpu *vcpu, u64 __user *uindices); +int kvm_arm_get_fw_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg); +int kvm_arm_set_fw_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg); + #endif /* __KVM_ARM_PSCI_H__ */ |