From patchwork Thu Apr 28 01:27:11 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: BrillyWu@viatech.com.cn X-Patchwork-Id: 737991 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p3S1RKtk002786 for ; Thu, 28 Apr 2011 01:27:21 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752698Ab1D1B1R (ORCPT ); Wed, 27 Apr 2011 21:27:17 -0400 Received: from exchtp08.via.com.tw ([61.66.243.7]:13597 "EHLO exchtp08.via.com.tw" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751905Ab1D1B1R convert rfc822-to-8bit (ORCPT ); Wed, 27 Apr 2011 21:27:17 -0400 Received: from mailtp.via.com.tw ([10.5.254.18]) by exchtp08.via.com.tw with Microsoft SMTPSVC(6.0.3790.4675); Thu, 28 Apr 2011 09:27:15 +0800 Received: from exchsg04.s3graphics.com ([10.3.254.212]) by mailtp.via.com.tw with Microsoft SMTPSVC(6.0.3790.4675); Thu, 28 Apr 2011 09:27:14 +0800 X-MimeOLE: Produced By Microsoft Exchange V6.5 Content-class: urn:content-classes:message MIME-Version: 1.0 Subject: [PATCH] qemu-kvm: Add CPUID support for VIA CPU Date: Thu, 28 Apr 2011 09:27:11 +0800 Message-ID: In-Reply-To: <4DB7D85A.6030600@redhat.com> X-MS-Has-Attach: X-MS-TNEF-Correlator: Thread-Topic: [PATCH] qemu-kvm: Add CPUID support for VIA CPU Thread-Index: AcwEt+WWrjiGl3F6Q1CIRfFVTSGudAAiyopg References: <4DA565D8.8050504@redhat.com> <4DA589DF.8060002@redhat.com> <4DA6A6C4.4040507@redhat.com> <4DA6C745.9070406@redhat.com> <4DB3CEE1.1040609@redhat.com> <4DB7D85A.6030600@redhat.com> From: To: Cc: , , X-OriginalArrivalTime: 28 Apr 2011 01:27:14.0480 (UTC) FILETIME=[6787C300:01CC0543] Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 28 Apr 2011 01:27:21 +0000 (UTC) When KVM is running on VIA CPU with host cpu's model, the feautures of VIA CPU will be passed into kvm guest by calling the CPUID instruction for Centaur. Signed-off-by: BrillyWu Signed-off-by: KaryJin --- target-i386/cpu.h | 3 +++ target-i386/cpuid.c | 44 +++++++++++++++++++++++++++++++++++++++++++- target-i386/kvm.c | 15 +++++++++++++++ 3 files changed, 61 insertions(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- a/target-i386/cpu.h 2011-04-25 14:31:51.042132014 +0800 +++ b/target-i386/cpu.h 2011-04-25 14:32:10.632132001 +0800 @@ -721,6 +721,9 @@ typedef struct CPUX86State { uint32_t cpuid_ext3_features; uint32_t cpuid_apic_id; int cpuid_vendor_override; + /*Store the results of Centaur's CPUID instructions*/ + uint32_t cpuid_xlevel2; + uint32_t cpuid_ext4_features; /* MTRRs */ uint64_t mtrr_fixed[11]; --- a/target-i386/cpuid.c 2011-04-25 14:31:54.812132057 +0800 +++ b/target-i386/cpuid.c 2011-04-25 14:32:14.822132001 +0800 @@ -228,6 +228,9 @@ typedef struct x86_def_t { char model_id[48]; int vendor_override; uint32_t flags; + /*Store the results of Centaur's CPUID instructions*/ + uint32_t ext4_features; + uint32_t xlevel2; } x86_def_t; #define I486_FEATURES (CPUID_FP87 | CPUID_VME | CPUID_PSE) @@ -520,6 +523,13 @@ static int cpu_x86_fill_host(x86_def_t * cpu_x86_fill_model_id(x86_cpu_def->model_id); x86_cpu_def->vendor_override = 0; + /* Call Centaur's CPUID instruction. */ + host_cpuid(0xC0000000, 0, &eax, &ebx, &ecx, &edx); + if (eax >= 0xC0000001) { + x86_cpu_def->xlevel2 = eax; /*support VIA max extended level*/ + host_cpuid(0xC0000001, 0, &eax, &ebx, &ecx, &edx); + x86_cpu_def->ext4_features = edx; + } /* * Every SVM feature requires emulation support in KVM - so we can't just @@ -853,6 +863,8 @@ int cpu_x86_register (CPUX86State *env, env->cpuid_xlevel = def->xlevel; env->cpuid_kvm_features = def->kvm_features; env->cpuid_svm_features = def->svm_features; + env->cpuid_ext4_features = def->ext4_features; + env->cpuid_xlevel2 = def->xlevel2; if (!kvm_enabled()) { env->cpuid_features &= TCG_FEATURES; env->cpuid_ext_features &= TCG_EXT_FEATURES; @@ -1032,7 +1044,15 @@ void cpu_x86_cpuid(CPUX86State *env, uin uint32_t *ecx, uint32_t *edx) { /* test if maximum index reached */ - if (index & 0x80000000) { + if ((index & 0xC0000000) == 0xC0000000) { + /* Handle the Centaur's CPUID instruction.* + * If cpuid_xlevel2 is "0", then put into the* + * default case. */ + if (env->cpuid_xlevel2 == 0) + index = 0xF0000000; + else if (index > env->cpuid_xlevel2) + index = env->cpuid_xlevel2; + } else if (index & 0x80000000) { if (index > env->cpuid_xlevel) index = env->cpuid_level; } else { @@ -1254,6 +1274,28 @@ void cpu_x86_cpuid(CPUX86State *env, uin *edx = 0; } break; + case 0xC0000000: + *eax = env->cpuid_xlevel2; + *ebx = 0; + *ecx = 0; + *edx = 0; + break; + case 0xC0000001: + /* Support for VIA CPU's CPUID instruction */ + *eax = env->cpuid_version; + *ebx = 0; + *ecx = 0; + *edx = env->cpuid_ext4_features; + break; + case 0xC0000002: + case 0xC0000003: + case 0xC0000004: + /*Reserved for the future, and now filled with zero*/ + *eax = 0; + *ebx = 0; + *ecx = 0; + *edx = 0; + break; default: /* reserved values: zero */ *eax = 0; --- a/target-i386/kvm.c 2011-04-25 14:31:59.752132003 +0800 +++ b/target-i386/kvm.c 2011-04-25 14:32:19.822132002 +0800 @@ -476,6 +476,21 @@ int kvm_arch_init_vcpu(CPUState *env) cpu_x86_cpuid(env, i, 0, &c->eax, &c->ebx, &c->ecx, &c->edx); } + /* Call Centaur's CPUID instructions they are supported. */ + if (env->cpuid_xlevel2 > 0) { + env->cpuid_ext4_features &= + kvm_arch_get_supported_cpuid(env, 0xC0000001, 0, R_EDX); + cpu_x86_cpuid(env, 0xC0000000, 0, &limit, &unused, &unused, &unused); + + for (i = 0xC0000000; i <= limit; i++) { + c = &cpuid_data.entries[cpuid_i++]; + + c->function = i; + c->flags = 0; + cpu_x86_cpuid(env, i, 0, &c->eax, &c->ebx, &c->ecx, &c->edx); + } + } + cpuid_data.cpuid.nent = cpuid_i; #ifdef KVM_CAP_MCE