diff options
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/include/asm/hypervisor.h | 26 | ||||
-rw-r--r-- | arch/x86/include/asm/processor.h | 4 | ||||
-rw-r--r-- | arch/x86/include/asm/vmware.h | 26 | ||||
-rw-r--r-- | arch/x86/kernel/cpu/Makefile | 1 | ||||
-rw-r--r-- | arch/x86/kernel/cpu/common.c | 2 | ||||
-rw-r--r-- | arch/x86/kernel/cpu/hypervisor.c | 48 | ||||
-rw-r--r-- | arch/x86/kernel/cpu/vmware.c | 88 | ||||
-rw-r--r-- | arch/x86/kernel/setup.c | 7 | ||||
-rw-r--r-- | arch/x86/kernel/tsc.c | 9 |
9 files changed, 210 insertions, 1 deletions
diff --git a/arch/x86/include/asm/hypervisor.h b/arch/x86/include/asm/hypervisor.h new file mode 100644 index 000000000000..369f5c5d09a1 --- /dev/null +++ b/arch/x86/include/asm/hypervisor.h | |||
@@ -0,0 +1,26 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2008, VMware, Inc. | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify | ||
5 | * it under the terms of the GNU General Public License as published by | ||
6 | * the Free Software Foundation; either version 2 of the License, or | ||
7 | * (at your option) any later version. | ||
8 | * | ||
9 | * This program is distributed in the hope that it will be useful, but | ||
10 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
11 | * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or | ||
12 | * NON INFRINGEMENT. See the GNU General Public License for more | ||
13 | * details. | ||
14 | * | ||
15 | * You should have received a copy of the GNU General Public License | ||
16 | * along with this program; if not, write to the Free Software | ||
17 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
18 | * | ||
19 | */ | ||
20 | #ifndef ASM_X86__HYPERVISOR_H | ||
21 | #define ASM_X86__HYPERVISOR_H | ||
22 | |||
23 | extern unsigned long get_hypervisor_tsc_freq(void); | ||
24 | extern void init_hypervisor(struct cpuinfo_x86 *c); | ||
25 | |||
26 | #endif | ||
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index 5ca01e383269..a570eafa4755 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h | |||
@@ -110,6 +110,7 @@ struct cpuinfo_x86 { | |||
110 | /* Index into per_cpu list: */ | 110 | /* Index into per_cpu list: */ |
111 | u16 cpu_index; | 111 | u16 cpu_index; |
112 | #endif | 112 | #endif |
113 | unsigned int x86_hyper_vendor; | ||
113 | } __attribute__((__aligned__(SMP_CACHE_BYTES))); | 114 | } __attribute__((__aligned__(SMP_CACHE_BYTES))); |
114 | 115 | ||
115 | #define X86_VENDOR_INTEL 0 | 116 | #define X86_VENDOR_INTEL 0 |
@@ -123,6 +124,9 @@ struct cpuinfo_x86 { | |||
123 | 124 | ||
124 | #define X86_VENDOR_UNKNOWN 0xff | 125 | #define X86_VENDOR_UNKNOWN 0xff |
125 | 126 | ||
127 | #define X86_HYPER_VENDOR_NONE 0 | ||
128 | #define X86_HYPER_VENDOR_VMWARE 1 | ||
129 | |||
126 | /* | 130 | /* |
127 | * capabilities of CPUs | 131 | * capabilities of CPUs |
128 | */ | 132 | */ |
diff --git a/arch/x86/include/asm/vmware.h b/arch/x86/include/asm/vmware.h new file mode 100644 index 000000000000..02dfea5aebc4 --- /dev/null +++ b/arch/x86/include/asm/vmware.h | |||
@@ -0,0 +1,26 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2008, VMware, Inc. | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify | ||
5 | * it under the terms of the GNU General Public License as published by | ||
6 | * the Free Software Foundation; either version 2 of the License, or | ||
7 | * (at your option) any later version. | ||
8 | * | ||
9 | * This program is distributed in the hope that it will be useful, but | ||
10 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
11 | * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or | ||
12 | * NON INFRINGEMENT. See the GNU General Public License for more | ||
13 | * details. | ||
14 | * | ||
15 | * You should have received a copy of the GNU General Public License | ||
16 | * along with this program; if not, write to the Free Software | ||
17 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
18 | * | ||
19 | */ | ||
20 | #ifndef ASM_X86__VMWARE_H | ||
21 | #define ASM_X86__VMWARE_H | ||
22 | |||
23 | extern unsigned long vmware_get_tsc_khz(void); | ||
24 | extern int vmware_platform(void); | ||
25 | |||
26 | #endif | ||
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile index 82ec6075c057..a5c04e88777e 100644 --- a/arch/x86/kernel/cpu/Makefile +++ b/arch/x86/kernel/cpu/Makefile | |||
@@ -4,6 +4,7 @@ | |||
4 | 4 | ||
5 | obj-y := intel_cacheinfo.o addon_cpuid_features.o | 5 | obj-y := intel_cacheinfo.o addon_cpuid_features.o |
6 | obj-y += proc.o capflags.o powerflags.o common.o | 6 | obj-y += proc.o capflags.o powerflags.o common.o |
7 | obj-y += vmware.o hypervisor.o | ||
7 | 8 | ||
8 | obj-$(CONFIG_X86_32) += bugs.o cmpxchg.o | 9 | obj-$(CONFIG_X86_32) += bugs.o cmpxchg.o |
9 | obj-$(CONFIG_X86_64) += bugs_64.o | 10 | obj-$(CONFIG_X86_64) += bugs_64.o |
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index b9c9ea0217a9..b88595c36254 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c | |||
@@ -36,6 +36,7 @@ | |||
36 | #include <asm/proto.h> | 36 | #include <asm/proto.h> |
37 | #include <asm/sections.h> | 37 | #include <asm/sections.h> |
38 | #include <asm/setup.h> | 38 | #include <asm/setup.h> |
39 | #include <asm/hypervisor.h> | ||
39 | 40 | ||
40 | #include "cpu.h" | 41 | #include "cpu.h" |
41 | 42 | ||
@@ -703,6 +704,7 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c) | |||
703 | detect_ht(c); | 704 | detect_ht(c); |
704 | #endif | 705 | #endif |
705 | 706 | ||
707 | init_hypervisor(c); | ||
706 | /* | 708 | /* |
707 | * On SMP, boot_cpu_data holds the common feature set between | 709 | * On SMP, boot_cpu_data holds the common feature set between |
708 | * all CPUs; so make sure that we indicate which features are | 710 | * all CPUs; so make sure that we indicate which features are |
diff --git a/arch/x86/kernel/cpu/hypervisor.c b/arch/x86/kernel/cpu/hypervisor.c new file mode 100644 index 000000000000..7bd55064ffe9 --- /dev/null +++ b/arch/x86/kernel/cpu/hypervisor.c | |||
@@ -0,0 +1,48 @@ | |||
1 | /* | ||
2 | * Common hypervisor code | ||
3 | * | ||
4 | * Copyright (C) 2008, VMware, Inc. | ||
5 | * Author : Alok N Kataria <akataria@vmware.com> | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License as published by | ||
9 | * the Free Software Foundation; either version 2 of the License, or | ||
10 | * (at your option) any later version. | ||
11 | * | ||
12 | * This program is distributed in the hope that it will be useful, but | ||
13 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or | ||
15 | * NON INFRINGEMENT. See the GNU General Public License for more | ||
16 | * details. | ||
17 | * | ||
18 | * You should have received a copy of the GNU General Public License | ||
19 | * along with this program; if not, write to the Free Software | ||
20 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
21 | * | ||
22 | */ | ||
23 | |||
24 | #include <asm/processor.h> | ||
25 | #include <asm/vmware.h> | ||
26 | |||
27 | static inline void __cpuinit | ||
28 | detect_hypervisor_vendor(struct cpuinfo_x86 *c) | ||
29 | { | ||
30 | if (vmware_platform()) { | ||
31 | c->x86_hyper_vendor = X86_HYPER_VENDOR_VMWARE; | ||
32 | } else { | ||
33 | c->x86_hyper_vendor = X86_HYPER_VENDOR_NONE; | ||
34 | } | ||
35 | } | ||
36 | |||
37 | unsigned long get_hypervisor_tsc_freq(void) | ||
38 | { | ||
39 | if (boot_cpu_data.x86_hyper_vendor == X86_HYPER_VENDOR_VMWARE) | ||
40 | return vmware_get_tsc_khz(); | ||
41 | return 0; | ||
42 | } | ||
43 | |||
44 | void __cpuinit init_hypervisor(struct cpuinfo_x86 *c) | ||
45 | { | ||
46 | detect_hypervisor_vendor(c); | ||
47 | } | ||
48 | |||
diff --git a/arch/x86/kernel/cpu/vmware.c b/arch/x86/kernel/cpu/vmware.c new file mode 100644 index 000000000000..d5d1b75a4b77 --- /dev/null +++ b/arch/x86/kernel/cpu/vmware.c | |||
@@ -0,0 +1,88 @@ | |||
1 | /* | ||
2 | * VMware Detection code. | ||
3 | * | ||
4 | * Copyright (C) 2008, VMware, Inc. | ||
5 | * Author : Alok N Kataria <akataria@vmware.com> | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License as published by | ||
9 | * the Free Software Foundation; either version 2 of the License, or | ||
10 | * (at your option) any later version. | ||
11 | * | ||
12 | * This program is distributed in the hope that it will be useful, but | ||
13 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or | ||
15 | * NON INFRINGEMENT. See the GNU General Public License for more | ||
16 | * details. | ||
17 | * | ||
18 | * You should have received a copy of the GNU General Public License | ||
19 | * along with this program; if not, write to the Free Software | ||
20 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
21 | * | ||
22 | */ | ||
23 | |||
24 | #include <linux/dmi.h> | ||
25 | #include <asm/div64.h> | ||
26 | |||
27 | #define CPUID_VMWARE_INFO_LEAF 0x40000000 | ||
28 | #define VMWARE_HYPERVISOR_MAGIC 0x564D5868 | ||
29 | #define VMWARE_HYPERVISOR_PORT 0x5658 | ||
30 | |||
31 | #define VMWARE_PORT_CMD_GETVERSION 10 | ||
32 | #define VMWARE_PORT_CMD_GETHZ 45 | ||
33 | |||
34 | #define VMWARE_PORT(cmd, eax, ebx, ecx, edx) \ | ||
35 | __asm__("inl (%%dx)" : \ | ||
36 | "=a"(eax), "=c"(ecx), "=d"(edx), "=b"(ebx) : \ | ||
37 | "0"(VMWARE_HYPERVISOR_MAGIC), \ | ||
38 | "1"(VMWARE_PORT_CMD_##cmd), \ | ||
39 | "2"(VMWARE_HYPERVISOR_PORT), "3"(0) : \ | ||
40 | "memory"); | ||
41 | |||
42 | static inline int __vmware_platform(void) | ||
43 | { | ||
44 | uint32_t eax, ebx, ecx, edx; | ||
45 | VMWARE_PORT(GETVERSION, eax, ebx, ecx, edx); | ||
46 | return eax != (uint32_t)-1 && ebx == VMWARE_HYPERVISOR_MAGIC; | ||
47 | } | ||
48 | |||
49 | static unsigned long __vmware_get_tsc_khz(void) | ||
50 | { | ||
51 | uint64_t tsc_hz; | ||
52 | uint32_t eax, ebx, ecx, edx; | ||
53 | |||
54 | VMWARE_PORT(GETHZ, eax, ebx, ecx, edx); | ||
55 | |||
56 | if (eax == (uint32_t)-1) | ||
57 | return 0; | ||
58 | tsc_hz = eax | (((uint64_t)ebx) << 32); | ||
59 | do_div(tsc_hz, 1000); | ||
60 | BUG_ON(tsc_hz >> 32); | ||
61 | return tsc_hz; | ||
62 | } | ||
63 | |||
64 | int vmware_platform(void) | ||
65 | { | ||
66 | if (cpu_has_hypervisor) { | ||
67 | unsigned int eax, ebx, ecx, edx; | ||
68 | char hyper_vendor_id[13]; | ||
69 | |||
70 | cpuid(CPUID_VMWARE_INFO_LEAF, &eax, &ebx, &ecx, &edx); | ||
71 | memcpy(hyper_vendor_id + 0, &ebx, 4); | ||
72 | memcpy(hyper_vendor_id + 4, &ecx, 4); | ||
73 | memcpy(hyper_vendor_id + 8, &edx, 4); | ||
74 | hyper_vendor_id[12] = '\0'; | ||
75 | if (!strcmp(hyper_vendor_id, "VMwareVMware")) | ||
76 | return 1; | ||
77 | } else if (dmi_available && dmi_name_in_vendors("VMware") && | ||
78 | __vmware_platform()) | ||
79 | return 1; | ||
80 | |||
81 | return 0; | ||
82 | } | ||
83 | |||
84 | unsigned long vmware_get_tsc_khz(void) | ||
85 | { | ||
86 | BUG_ON(!vmware_platform()); | ||
87 | return __vmware_get_tsc_khz(); | ||
88 | } | ||
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 0fa6790c1dd3..f44dadfb32cf 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c | |||
@@ -98,6 +98,7 @@ | |||
98 | 98 | ||
99 | #include <mach_apic.h> | 99 | #include <mach_apic.h> |
100 | #include <asm/paravirt.h> | 100 | #include <asm/paravirt.h> |
101 | #include <asm/hypervisor.h> | ||
101 | 102 | ||
102 | #include <asm/percpu.h> | 103 | #include <asm/percpu.h> |
103 | #include <asm/topology.h> | 104 | #include <asm/topology.h> |
@@ -909,6 +910,12 @@ void __init setup_arch(char **cmdline_p) | |||
909 | 910 | ||
910 | dmi_check_system(bad_bios_dmi_table); | 911 | dmi_check_system(bad_bios_dmi_table); |
911 | 912 | ||
913 | /* | ||
914 | * VMware detection requires dmi to be available, so this | ||
915 | * needs to be done after dmi_scan_machine, for the BP. | ||
916 | */ | ||
917 | init_hypervisor(&boot_cpu_data); | ||
918 | |||
912 | #ifdef CONFIG_X86_32 | 919 | #ifdef CONFIG_X86_32 |
913 | probe_roms(); | 920 | probe_roms(); |
914 | #endif | 921 | #endif |
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c index 62348e4fd8d1..6dbf0bcb44a8 100644 --- a/arch/x86/kernel/tsc.c +++ b/arch/x86/kernel/tsc.c | |||
@@ -15,6 +15,7 @@ | |||
15 | #include <asm/vgtod.h> | 15 | #include <asm/vgtod.h> |
16 | #include <asm/time.h> | 16 | #include <asm/time.h> |
17 | #include <asm/delay.h> | 17 | #include <asm/delay.h> |
18 | #include <asm/hypervisor.h> | ||
18 | 19 | ||
19 | unsigned int cpu_khz; /* TSC clocks / usec, not used here */ | 20 | unsigned int cpu_khz; /* TSC clocks / usec, not used here */ |
20 | EXPORT_SYMBOL(cpu_khz); | 21 | EXPORT_SYMBOL(cpu_khz); |
@@ -352,9 +353,15 @@ unsigned long native_calibrate_tsc(void) | |||
352 | { | 353 | { |
353 | u64 tsc1, tsc2, delta, ref1, ref2; | 354 | u64 tsc1, tsc2, delta, ref1, ref2; |
354 | unsigned long tsc_pit_min = ULONG_MAX, tsc_ref_min = ULONG_MAX; | 355 | unsigned long tsc_pit_min = ULONG_MAX, tsc_ref_min = ULONG_MAX; |
355 | unsigned long flags, latch, ms, fast_calibrate; | 356 | unsigned long flags, latch, ms, fast_calibrate, tsc_khz; |
356 | int hpet = is_hpet_enabled(), i, loopmin; | 357 | int hpet = is_hpet_enabled(), i, loopmin; |
357 | 358 | ||
359 | tsc_khz = get_hypervisor_tsc_freq(); | ||
360 | if (tsc_khz) { | ||
361 | printk(KERN_INFO "TSC: Frequency read from the hypervisor\n"); | ||
362 | return tsc_khz; | ||
363 | } | ||
364 | |||
358 | local_irq_save(flags); | 365 | local_irq_save(flags); |
359 | fast_calibrate = quick_pit_calibrate(); | 366 | fast_calibrate = quick_pit_calibrate(); |
360 | local_irq_restore(flags); | 367 | local_irq_restore(flags); |