shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-04-04 12:13:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "FROMLIST: BACKPORT: KVM: arm64: Indicate SYSTEM_RESET2 in kvm_run::system_event flags field"

Browse Source 
This reverts commit 1cff9a26fc.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Iebfafe1890f2d3c07218d3345f7d3d65af03b127
This commit is contained in:
Will Deacon
2022-07-07 15:49:14 +01:00
parent f775f87d16
commit fb05e4fb48
3 changed files with 4 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/virt/kvm/api.rst
View File

@@ -5681,11 +5681,6 @@ Valid values for 'type' are:
to ignore the request, or to gather VM memory core dump and/or
reset/shutdown of the VM.
Valid flags are:
- KVM_SYSTEM_EVENT_RESET_FLAG_PSCI_RESET2 (arm64 only) -- the guest issued
a SYSTEM_RESET2 call according to v1.1 of the PSCI specification.
::
/* KVM_EXIT_IOAPIC_EOI */

7
arch/arm64/include/uapi/asm/kvm.h
View File

@@ -418,13 +418,6 @@ 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)
/* Protected KVM */
#define KVM_CAP_ARM_PROTECTED_VM_FLAGS_SET_FW_IPA 0
#define KVM_CAP_ARM_PROTECTED_VM_FLAGS_INFO 1

15
arch/arm64/kvm/psci.c
View File

@@ -146,7 +146,7 @@ static unsigned long kvm_psci_vcpu_affinity_info(struct kvm_vcpu *vcpu)
return PSCI_0_2_AFFINITY_LEVEL_OFF;
}
static void kvm_prepare_system_event(struct kvm_vcpu *vcpu, u32 type, u64 flags)
static void kvm_prepare_system_event(struct kvm_vcpu *vcpu, u32 type)
{
int i;
struct kvm_vcpu *tmp;
@@ -166,24 +166,17 @@ static void kvm_prepare_system_event(struct kvm_vcpu *vcpu, u32 type, u64 flags)
memset(&vcpu->run->system_event, 0, sizeof(vcpu->run->system_event));
vcpu->run->system_event.type = type;
vcpu->run->system_event.flags = flags;
vcpu->run->exit_reason = KVM_EXIT_SYSTEM_EVENT;
}
static void kvm_psci_system_off(struct kvm_vcpu *vcpu)
{
kvm_prepare_system_event(vcpu, KVM_SYSTEM_EVENT_SHUTDOWN, 0);
kvm_prepare_system_event(vcpu, KVM_SYSTEM_EVENT_SHUTDOWN);
}
static void kvm_psci_system_reset(struct kvm_vcpu *vcpu)
{
kvm_prepare_system_event(vcpu, KVM_SYSTEM_EVENT_RESET, 0);
}
static void kvm_psci_system_reset2(struct kvm_vcpu *vcpu)
{
kvm_prepare_system_event(vcpu, KVM_SYSTEM_EVENT_RESET,
KVM_SYSTEM_EVENT_RESET_FLAG_PSCI_RESET2);
kvm_prepare_system_event(vcpu, KVM_SYSTEM_EVENT_RESET);
}
static unsigned long kvm_psci_check_allowed_function(struct kvm_vcpu *vcpu, u32 fn)
@@ -343,7 +336,7 @@ static int kvm_psci_1_x_call(struct kvm_vcpu *vcpu, u32 minor)
arg < PSCI_1_1_RESET_TYPE_VENDOR_START) {
val = PSCI_RET_INVALID_PARAMS;
} else {
kvm_psci_system_reset2(vcpu);
kvm_psci_system_reset(vcpu);
val = PSCI_RET_INTERNAL_FAILURE;
ret = 0;
}