qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH] KVM: CPUID takes ecx as input value for some functions
@ 2009-01-12  8:10 Amit Shah
  0 siblings, 0 replies; 4+ messages in thread
From: Amit Shah @ 2009-01-12  8:10 UTC (permalink / raw)
  To: qemu-devel; +Cc: Amit Shah, aliguori, avi, kvm

The CPUID instruction takes the value of ECX as an input parameter
in addition to the value of EAX as the count for functions 4 and 0xb.
Make sure we pass the value to the instruction.

Also convert to the qemu-style whitespace for the surrounding code.

Signed-off-by: Amit Shah <amit.shah@redhat.com>
---
 qemu/target-i386/cpu.h       |    2 +-
 qemu/target-i386/helper.c    |   36 +++++++++++++++++++-----------------
 qemu/target-i386/op_helper.c |    2 +-
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/qemu/target-i386/cpu.h b/qemu/target-i386/cpu.h
index 944e386..d9834db 100644
--- a/qemu/target-i386/cpu.h
+++ b/qemu/target-i386/cpu.h
@@ -743,7 +743,7 @@ int cpu_x86_signal_handler(int host_signum, void *pinfo,
 int cpu_x86_handle_mmu_fault(CPUX86State *env, target_ulong addr,
                              int is_write, int mmu_idx, int is_softmmu);
 void cpu_x86_set_a20(CPUX86State *env, int a20_state);
-void cpu_x86_cpuid(CPUX86State *env, uint32_t index,
+void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
                    uint32_t *eax, uint32_t *ebx,
                    uint32_t *ecx, uint32_t *edx);
 
diff --git a/qemu/target-i386/helper.c b/qemu/target-i386/helper.c
index cda0390..070c785 100644
--- a/qemu/target-i386/helper.c
+++ b/qemu/target-i386/helper.c
@@ -1377,7 +1377,8 @@ static void breakpoint_handler(CPUState *env)
 }
 #endif /* !CONFIG_USER_ONLY */
 
-static void host_cpuid(uint32_t function, uint32_t *eax, uint32_t *ebx,
+static void host_cpuid(uint32_t function, uint32_t count,
+                       uint32_t *eax, uint32_t *ebx,
                        uint32_t *ecx, uint32_t *edx)
 {
 #if defined(CONFIG_KVM) || defined(USE_KVM)
@@ -1385,19 +1386,19 @@ static void host_cpuid(uint32_t function, uint32_t *eax, uint32_t *ebx,
 
 #ifdef __x86_64__
     asm volatile("cpuid"
-		 : "=a"(vec[0]), "=b"(vec[1]),
-		   "=c"(vec[2]), "=d"(vec[3])
-		 : "0"(function) : "cc");
+                 : "=a"(vec[0]), "=b"(vec[1]),
+                   "=c"(vec[2]), "=d"(vec[3])
+                 : "0"(function), "c"(count) : "cc");
 #else
     asm volatile("pusha \n\t"
-		 "cpuid \n\t"
-		 "mov %%eax, 0(%1) \n\t"
-		 "mov %%ebx, 4(%1) \n\t"
-		 "mov %%ecx, 8(%1) \n\t"
-		 "mov %%edx, 12(%1) \n\t"
-		 "popa"
-		 : : "a"(function), "S"(vec)
-		 : "memory", "cc");
+                 "cpuid \n\t"
+                 "mov %%eax, 0(%1) \n\t"
+                 "mov %%ebx, 4(%1) \n\t"
+                 "mov %%ecx, 8(%1) \n\t"
+                 "mov %%edx, 12(%1) \n\t"
+                 "popa"
+                 : : "a"(function), "c"(count), "S"(vec)
+                 : "memory", "cc");
 #endif
 
     if (eax)
@@ -1411,10 +1412,12 @@ static void host_cpuid(uint32_t function, uint32_t *eax, uint32_t *ebx,
 #endif
 }
 
-void cpu_x86_cpuid(CPUX86State *env, uint32_t index,
+void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
                    uint32_t *eax, uint32_t *ebx,
                    uint32_t *ecx, uint32_t *edx)
 {
+
+    fprintf(stderr, "cpuid requested, %x, ecx=%x\n", index, *ecx);
     /* test if maximum index reached */
     if (index & 0x80000000) {
         if (index > env->cpuid_xlevel)
@@ -1436,7 +1439,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index,
          * actuall cpu, and say goodbye to migration between different vendors
          * is you use compatibility mode. */
         if (kvm_enabled())
-            host_cpuid(0, NULL, ebx, ecx, edx);
+            host_cpuid(0, 0, NULL, ebx, ecx, edx);
         break;
     case 1:
         *eax = env->cpuid_version;
@@ -1457,7 +1460,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index,
         break;
     case 4:
         /* cache info: needed for Core compatibility */
-        switch (*ecx) {
+        switch (count) {
             case 0: /* L1 dcache info */
                 *eax = 0x0000121;
                 *ebx = 0x1c0003f;
@@ -1483,7 +1486,6 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index,
                 *edx = 0;
                 break;
         }
-
         break;
     case 5:
         /* mwait info: needed for Core compatibility */
@@ -1528,7 +1530,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index,
         if (kvm_enabled()) {
             uint32_t h_eax, h_edx;
 
-            host_cpuid(0x80000001, &h_eax, NULL, NULL, &h_edx);
+            host_cpuid(index, 0, &h_eax, NULL, NULL, &h_edx);
 
             /* disable CPU features that the host does not support */
 
diff --git a/qemu/target-i386/op_helper.c b/qemu/target-i386/op_helper.c
index 6e0e32e..74ba643 100644
--- a/qemu/target-i386/op_helper.c
+++ b/qemu/target-i386/op_helper.c
@@ -1898,7 +1898,7 @@ void helper_cpuid(void)
 
     helper_svm_check_intercept_param(SVM_EXIT_CPUID, 0);
 
-    cpu_x86_cpuid(env, (uint32_t)EAX, &eax, &ebx, &ecx, &edx);
+    cpu_x86_cpuid(env, (uint32_t)EAX, (uint32_t)ECX, &eax, &ebx, &ecx, &edx);
     EAX = eax;
     EBX = ebx;
     ECX = ecx;
-- 
1.6.0.6

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [Qemu-devel] v2:  KVM: support for 'count' in CPUID functions 4, 0xb and 0xd.
@ 2009-01-13  7:09 Amit Shah
  2009-01-13  7:09 ` [Qemu-devel] [PATCH] KVM: CPUID takes ecx as input value for some functions Amit Shah
  0 siblings, 1 reply; 4+ messages in thread
From: Amit Shah @ 2009-01-13  7:09 UTC (permalink / raw)
  To: qemu-devel; +Cc: aliguori, avi, kvm

These two patches were sent separately earlier. There are a couple of
small changes in this version, including removal of a debug message that
was left behind.

Please apply.

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [Qemu-devel] KVM: completely support cpuid functions 2, 4, b, d
@ 2009-02-04 16:34 Amit Shah
  2009-02-04 16:34 ` [Qemu-devel] [PATCH] KVM: CPUID takes ecx as input value for some functions Amit Shah
  0 siblings, 1 reply; 4+ messages in thread
From: Amit Shah @ 2009-02-04 16:34 UTC (permalink / raw)
  To: aliguori; +Cc: qemu-devel


These patches add support for cpuid functions 2, 4, 0xb, 0xd. cpuid function
2 keeps returning values till we get a 0. The others take a 'count' parameter
in addition to the function number.

With these patches, KVM can run a VM started with a newer CPU type (coreduo,
core2duo). These patches also pave way for a "host" CPU type, where we could
pass the CPU type of the current host to the VM.

Please apply.

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [Qemu-devel] v23: KVM: Complete support for cpuid functions 2, 4, b, d
@ 2009-02-09 14:09 Amit Shah
  2009-02-09 14:09 ` [Qemu-devel] [PATCH] KVM: CPUID takes ecx as input value for some functions Amit Shah
  0 siblings, 1 reply; 4+ messages in thread
From: Amit Shah @ 2009-02-09 14:09 UTC (permalink / raw)
  To: aliguori; +Cc: qemu-devel


Not really v23, this is rebased to qemu-svn and also fixes
a small bug for cpuid function 2.

Please apply.

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-02-09 14:09 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-01-12  8:10 [Qemu-devel] [PATCH] KVM: CPUID takes ecx as input value for some functions Amit Shah
  -- strict thread matches above, loose matches on Subject: below --
2009-01-13  7:09 [Qemu-devel] v2: KVM: support for 'count' in CPUID functions 4, 0xb and 0xd Amit Shah
2009-01-13  7:09 ` [Qemu-devel] [PATCH] KVM: CPUID takes ecx as input value for some functions Amit Shah
2009-02-04 16:34 [Qemu-devel] KVM: completely support cpuid functions 2, 4, b, d Amit Shah
2009-02-04 16:34 ` [Qemu-devel] [PATCH] KVM: CPUID takes ecx as input value for some functions Amit Shah
2009-02-09 14:09 [Qemu-devel] v23: KVM: Complete support for cpuid functions 2, 4, b, d Amit Shah
2009-02-09 14:09 ` [Qemu-devel] [PATCH] KVM: CPUID takes ecx as input value for some functions Amit Shah

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).