mirror of https://github.com/OpenIPC/firmware.git
42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
diff -drupN a/arch/x86/kvm/cpuid.h b/arch/x86/kvm/cpuid.h
|
|
--- a/arch/x86/kvm/cpuid.h 2018-08-06 17:23:04.000000000 +0300
|
|
+++ b/arch/x86/kvm/cpuid.h 2022-06-12 05:28:14.000000000 +0300
|
|
@@ -165,7 +165,7 @@ static inline bool guest_cpuid_has_ibpb(
|
|
struct kvm_cpuid_entry2 *best;
|
|
|
|
best = kvm_find_cpuid_entry(vcpu, 0x80000008, 0);
|
|
- if (best && (best->ebx & bit(X86_FEATURE_AMD_IBPB)))
|
|
+ if (best && (best->ebx & bit(X86_FEATURE_IBPB)))
|
|
return true;
|
|
best = kvm_find_cpuid_entry(vcpu, 7, 0);
|
|
return best && (best->edx & bit(X86_FEATURE_SPEC_CTRL));
|
|
@@ -176,10 +176,10 @@ static inline bool guest_cpuid_has_spec_
|
|
struct kvm_cpuid_entry2 *best;
|
|
|
|
best = kvm_find_cpuid_entry(vcpu, 0x80000008, 0);
|
|
- if (best && (best->ebx & bit(X86_FEATURE_AMD_IBRS)))
|
|
+ if (best && (best->ebx & bit(X86_FEATURE_IBRS)))
|
|
return true;
|
|
best = kvm_find_cpuid_entry(vcpu, 7, 0);
|
|
- return best && (best->edx & (bit(X86_FEATURE_SPEC_CTRL) | bit(X86_FEATURE_SPEC_CTRL_SSBD)));
|
|
+ return best && (best->edx & (bit(X86_FEATURE_SPEC_CTRL) | bit(X86_FEATURE_RDS)));
|
|
}
|
|
|
|
static inline bool guest_cpuid_has_arch_capabilities(struct kvm_vcpu *vcpu)
|
|
@@ -190,15 +190,6 @@ static inline bool guest_cpuid_has_arch_
|
|
return best && (best->edx & bit(X86_FEATURE_ARCH_CAPABILITIES));
|
|
}
|
|
|
|
-static inline bool guest_cpuid_has_virt_ssbd(struct kvm_vcpu *vcpu)
|
|
-{
|
|
- struct kvm_cpuid_entry2 *best;
|
|
-
|
|
- best = kvm_find_cpuid_entry(vcpu, 0x80000008, 0);
|
|
- return best && (best->ebx & bit(X86_FEATURE_VIRT_SSBD));
|
|
-}
|
|
-
|
|
-
|
|
|
|
/*
|
|
* NRIPS is provided through cpuidfn 0x8000000a.edx bit 3
|