diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-10 11:48:29 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-10 11:48:29 -0500 |
commit | 8c8ae4e8cd5a67467192f3361eeec463694f8ed8 (patch) | |
tree | c4216f3f8cb89dd6a12e727d886abc0f6ab74c83 /arch | |
parent | a1e8fad5900fa94adb500c6e0dfd60a307f7a3c9 (diff) | |
parent | d9b8ca8474fd4fdd43ba6d97a4fee8b49b978067 (diff) |
Merge branch 'stable/generic' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
* 'stable/generic' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
xen: HVM X2APIC support
apic: Move hypervisor detection of x2apic to hypervisor.h
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/include/asm/hypervisor.h | 12 | ||||
-rw-r--r-- | arch/x86/include/asm/xen/hypervisor.h | 35 | ||||
-rw-r--r-- | arch/x86/kernel/apic/apic.c | 5 | ||||
-rw-r--r-- | arch/x86/xen/enlighten.c | 31 |
4 files changed, 62 insertions, 21 deletions
diff --git a/arch/x86/include/asm/hypervisor.h b/arch/x86/include/asm/hypervisor.h index ff2546ce7178..7a15153c675d 100644 --- a/arch/x86/include/asm/hypervisor.h +++ b/arch/x86/include/asm/hypervisor.h | |||
@@ -20,6 +20,9 @@ | |||
20 | #ifndef _ASM_X86_HYPERVISOR_H | 20 | #ifndef _ASM_X86_HYPERVISOR_H |
21 | #define _ASM_X86_HYPERVISOR_H | 21 | #define _ASM_X86_HYPERVISOR_H |
22 | 22 | ||
23 | #include <asm/kvm_para.h> | ||
24 | #include <asm/xen/hypervisor.h> | ||
25 | |||
23 | extern void init_hypervisor(struct cpuinfo_x86 *c); | 26 | extern void init_hypervisor(struct cpuinfo_x86 *c); |
24 | extern void init_hypervisor_platform(void); | 27 | extern void init_hypervisor_platform(void); |
25 | 28 | ||
@@ -47,4 +50,13 @@ extern const struct hypervisor_x86 x86_hyper_vmware; | |||
47 | extern const struct hypervisor_x86 x86_hyper_ms_hyperv; | 50 | extern const struct hypervisor_x86 x86_hyper_ms_hyperv; |
48 | extern const struct hypervisor_x86 x86_hyper_xen_hvm; | 51 | extern const struct hypervisor_x86 x86_hyper_xen_hvm; |
49 | 52 | ||
53 | static inline bool hypervisor_x2apic_available(void) | ||
54 | { | ||
55 | if (kvm_para_available()) | ||
56 | return true; | ||
57 | if (xen_x2apic_para_available()) | ||
58 | return true; | ||
59 | return false; | ||
60 | } | ||
61 | |||
50 | #endif | 62 | #endif |
diff --git a/arch/x86/include/asm/xen/hypervisor.h b/arch/x86/include/asm/xen/hypervisor.h index 396ff4cc8ed4..66d0fff1ee84 100644 --- a/arch/x86/include/asm/xen/hypervisor.h +++ b/arch/x86/include/asm/xen/hypervisor.h | |||
@@ -37,4 +37,39 @@ | |||
37 | extern struct shared_info *HYPERVISOR_shared_info; | 37 | extern struct shared_info *HYPERVISOR_shared_info; |
38 | extern struct start_info *xen_start_info; | 38 | extern struct start_info *xen_start_info; |
39 | 39 | ||
40 | #include <asm/processor.h> | ||
41 | |||
42 | static inline uint32_t xen_cpuid_base(void) | ||
43 | { | ||
44 | uint32_t base, eax, ebx, ecx, edx; | ||
45 | char signature[13]; | ||
46 | |||
47 | for (base = 0x40000000; base < 0x40010000; base += 0x100) { | ||
48 | cpuid(base, &eax, &ebx, &ecx, &edx); | ||
49 | *(uint32_t *)(signature + 0) = ebx; | ||
50 | *(uint32_t *)(signature + 4) = ecx; | ||
51 | *(uint32_t *)(signature + 8) = edx; | ||
52 | signature[12] = 0; | ||
53 | |||
54 | if (!strcmp("XenVMMXenVMM", signature) && ((eax - base) >= 2)) | ||
55 | return base; | ||
56 | } | ||
57 | |||
58 | return 0; | ||
59 | } | ||
60 | |||
61 | #ifdef CONFIG_XEN | ||
62 | extern bool xen_hvm_need_lapic(void); | ||
63 | |||
64 | static inline bool xen_x2apic_para_available(void) | ||
65 | { | ||
66 | return xen_hvm_need_lapic(); | ||
67 | } | ||
68 | #else | ||
69 | static inline bool xen_x2apic_para_available(void) | ||
70 | { | ||
71 | return (xen_cpuid_base() != 0); | ||
72 | } | ||
73 | #endif | ||
74 | |||
40 | #endif /* _ASM_X86_XEN_HYPERVISOR_H */ | 75 | #endif /* _ASM_X86_XEN_HYPERVISOR_H */ |
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index 79e6baa8aa0a..a51345ba449e 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c | |||
@@ -49,8 +49,8 @@ | |||
49 | #include <asm/mtrr.h> | 49 | #include <asm/mtrr.h> |
50 | #include <asm/smp.h> | 50 | #include <asm/smp.h> |
51 | #include <asm/mce.h> | 51 | #include <asm/mce.h> |
52 | #include <asm/kvm_para.h> | ||
53 | #include <asm/tsc.h> | 52 | #include <asm/tsc.h> |
53 | #include <asm/hypervisor.h> | ||
54 | 54 | ||
55 | unsigned int num_processors; | 55 | unsigned int num_processors; |
56 | 56 | ||
@@ -1476,7 +1476,8 @@ void __init enable_IR_x2apic(void) | |||
1476 | /* IR is required if there is APIC ID > 255 even when running | 1476 | /* IR is required if there is APIC ID > 255 even when running |
1477 | * under KVM | 1477 | * under KVM |
1478 | */ | 1478 | */ |
1479 | if (max_physical_apicid > 255 || !kvm_para_available()) | 1479 | if (max_physical_apicid > 255 || |
1480 | !hypervisor_x2apic_available()) | ||
1480 | goto nox2apic; | 1481 | goto nox2apic; |
1481 | /* | 1482 | /* |
1482 | * without IR all CPUs can be addressed by IOAPIC/MSI | 1483 | * without IR all CPUs can be addressed by IOAPIC/MSI |
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index aa8c89ae54cf..6aba2a23e2c3 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c | |||
@@ -1256,25 +1256,6 @@ asmlinkage void __init xen_start_kernel(void) | |||
1256 | #endif | 1256 | #endif |
1257 | } | 1257 | } |
1258 | 1258 | ||
1259 | static uint32_t xen_cpuid_base(void) | ||
1260 | { | ||
1261 | uint32_t base, eax, ebx, ecx, edx; | ||
1262 | char signature[13]; | ||
1263 | |||
1264 | for (base = 0x40000000; base < 0x40010000; base += 0x100) { | ||
1265 | cpuid(base, &eax, &ebx, &ecx, &edx); | ||
1266 | *(uint32_t *)(signature + 0) = ebx; | ||
1267 | *(uint32_t *)(signature + 4) = ecx; | ||
1268 | *(uint32_t *)(signature + 8) = edx; | ||
1269 | signature[12] = 0; | ||
1270 | |||
1271 | if (!strcmp("XenVMMXenVMM", signature) && ((eax - base) >= 2)) | ||
1272 | return base; | ||
1273 | } | ||
1274 | |||
1275 | return 0; | ||
1276 | } | ||
1277 | |||
1278 | static int init_hvm_pv_info(int *major, int *minor) | 1259 | static int init_hvm_pv_info(int *major, int *minor) |
1279 | { | 1260 | { |
1280 | uint32_t eax, ebx, ecx, edx, pages, msr, base; | 1261 | uint32_t eax, ebx, ecx, edx, pages, msr, base; |
@@ -1384,6 +1365,18 @@ static bool __init xen_hvm_platform(void) | |||
1384 | return true; | 1365 | return true; |
1385 | } | 1366 | } |
1386 | 1367 | ||
1368 | bool xen_hvm_need_lapic(void) | ||
1369 | { | ||
1370 | if (xen_pv_domain()) | ||
1371 | return false; | ||
1372 | if (!xen_hvm_domain()) | ||
1373 | return false; | ||
1374 | if (xen_feature(XENFEAT_hvm_pirqs) && xen_have_vector_callback) | ||
1375 | return false; | ||
1376 | return true; | ||
1377 | } | ||
1378 | EXPORT_SYMBOL_GPL(xen_hvm_need_lapic); | ||
1379 | |||
1387 | const __refconst struct hypervisor_x86 x86_hyper_xen_hvm = { | 1380 | const __refconst struct hypervisor_x86 x86_hyper_xen_hvm = { |
1388 | .name = "Xen HVM", | 1381 | .name = "Xen HVM", |
1389 | .detect = xen_hvm_platform, | 1382 | .detect = xen_hvm_platform, |