Commit 23493d0a authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini

KVM x86: Extend AMD specific guest behavior to Hygon virtual CPUs

Extend guest_cpuid_is_amd() to cover Hygon virtual CPUs and rename it
accordingly.  Hygon CPUs use an AMD-based core and so have the same
basic behavior as AMD CPUs.

Fixes: b8f4abb6 ("x86/kvm: Add Hygon Dhyana support to KVM")
Cc: Pu Wen <puwen@hygon.cn>
Signed-off-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 15608ed0
...@@ -946,7 +946,7 @@ bool kvm_cpuid(struct kvm_vcpu *vcpu, u32 *eax, u32 *ebx, ...@@ -946,7 +946,7 @@ bool kvm_cpuid(struct kvm_vcpu *vcpu, u32 *eax, u32 *ebx,
* requested. AMD CPUID semantics returns all zeroes for any * requested. AMD CPUID semantics returns all zeroes for any
* undefined leaf, whether or not the leaf is in range. * undefined leaf, whether or not the leaf is in range.
*/ */
if (!entry && check_limit && !guest_cpuid_is_amd(vcpu) && if (!entry && check_limit && !guest_cpuid_is_amd_or_hygon(vcpu) &&
!cpuid_function_in_range(vcpu, function)) { !cpuid_function_in_range(vcpu, function)) {
max = kvm_find_cpuid_entry(vcpu, 0, 0); max = kvm_find_cpuid_entry(vcpu, 0, 0);
if (max) { if (max) {
......
...@@ -214,12 +214,14 @@ static __always_inline void guest_cpuid_clear(struct kvm_vcpu *vcpu, ...@@ -214,12 +214,14 @@ static __always_inline void guest_cpuid_clear(struct kvm_vcpu *vcpu,
*reg &= ~__feature_bit(x86_feature); *reg &= ~__feature_bit(x86_feature);
} }
static inline bool guest_cpuid_is_amd(struct kvm_vcpu *vcpu) static inline bool guest_cpuid_is_amd_or_hygon(struct kvm_vcpu *vcpu)
{ {
struct kvm_cpuid_entry2 *best; struct kvm_cpuid_entry2 *best;
best = kvm_find_cpuid_entry(vcpu, 0, 0); best = kvm_find_cpuid_entry(vcpu, 0, 0);
return best && is_guest_vendor_amd(best->ebx, best->ecx, best->edx); return best &&
(is_guest_vendor_amd(best->ebx, best->ecx, best->edx) ||
is_guest_vendor_hygon(best->ebx, best->ecx, best->edx));
} }
static inline int guest_cpuid_family(struct kvm_vcpu *vcpu) static inline int guest_cpuid_family(struct kvm_vcpu *vcpu)
......
...@@ -4510,7 +4510,8 @@ static void reset_rsvds_bits_mask(struct kvm_vcpu *vcpu, ...@@ -4510,7 +4510,8 @@ static void reset_rsvds_bits_mask(struct kvm_vcpu *vcpu,
cpuid_maxphyaddr(vcpu), context->root_level, cpuid_maxphyaddr(vcpu), context->root_level,
context->nx, context->nx,
guest_cpuid_has(vcpu, X86_FEATURE_GBPAGES), guest_cpuid_has(vcpu, X86_FEATURE_GBPAGES),
is_pse(vcpu), guest_cpuid_is_amd(vcpu)); is_pse(vcpu),
guest_cpuid_is_amd_or_hygon(vcpu));
} }
static void static void
......
...@@ -2550,7 +2550,7 @@ static void kvmclock_sync_fn(struct work_struct *work) ...@@ -2550,7 +2550,7 @@ static void kvmclock_sync_fn(struct work_struct *work)
static bool can_set_mci_status(struct kvm_vcpu *vcpu) static bool can_set_mci_status(struct kvm_vcpu *vcpu)
{ {
/* McStatusWrEn enabled? */ /* McStatusWrEn enabled? */
if (guest_cpuid_is_amd(vcpu)) if (guest_cpuid_is_amd_or_hygon(vcpu))
return !!(vcpu->arch.msr_hwcr & BIT_ULL(18)); return !!(vcpu->arch.msr_hwcr & BIT_ULL(18));
return false; return false;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment