diff options
| author | Sheng Yang <sheng@linux.intel.com> | 2010-12-21 14:18:49 +0800 |
|---|---|---|
| committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2011-01-07 10:03:50 -0500 |
| commit | d9b8ca8474fd4fdd43ba6d97a4fee8b49b978067 (patch) | |
| tree | 465e7e44d174ce1ad6211a4fbc7d018c01dc4627 /arch/x86/include/asm | |
| parent | 2904ed8dd5a748c52caf4d8b09d3d9834b5932fa (diff) | |
| download | op-kernel-dev-d9b8ca8474fd4fdd43ba6d97a4fee8b49b978067.zip op-kernel-dev-d9b8ca8474fd4fdd43ba6d97a4fee8b49b978067.tar.gz | |
xen: HVM X2APIC support
This patch is similiar to Gleb Natapov's patch for KVM, which enable the
hypervisor to emulate x2apic feature for the guest. By this way, the emulation
of lapic would be simpler with x2apic interface(MSR), and faster.
[v2: Re-organized 'xen_hvm_need_lapic' per Ian Campbell suggestion]
Acked-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: Sheng Yang <sheng@linux.intel.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'arch/x86/include/asm')
| -rw-r--r-- | arch/x86/include/asm/hypervisor.h | 3 | ||||
| -rw-r--r-- | arch/x86/include/asm/xen/hypervisor.h | 35 |
2 files changed, 38 insertions, 0 deletions
diff --git a/arch/x86/include/asm/hypervisor.h b/arch/x86/include/asm/hypervisor.h index 0c6f7af..7a15153 100644 --- a/arch/x86/include/asm/hypervisor.h +++ b/arch/x86/include/asm/hypervisor.h @@ -21,6 +21,7 @@ #define _ASM_X86_HYPERVISOR_H #include <asm/kvm_para.h> +#include <asm/xen/hypervisor.h> extern void init_hypervisor(struct cpuinfo_x86 *c); extern void init_hypervisor_platform(void); @@ -53,6 +54,8 @@ static inline bool hypervisor_x2apic_available(void) { if (kvm_para_available()) return true; + if (xen_x2apic_para_available()) + return true; return false; } diff --git a/arch/x86/include/asm/xen/hypervisor.h b/arch/x86/include/asm/xen/hypervisor.h index 396ff4c..66d0fff 100644 --- a/arch/x86/include/asm/xen/hypervisor.h +++ b/arch/x86/include/asm/xen/hypervisor.h @@ -37,4 +37,39 @@ extern struct shared_info *HYPERVISOR_shared_info; extern struct start_info *xen_start_info; +#include <asm/processor.h> + +static inline uint32_t xen_cpuid_base(void) +{ + uint32_t base, eax, ebx, ecx, edx; + char signature[13]; + + for (base = 0x40000000; base < 0x40010000; base += 0x100) { + cpuid(base, &eax, &ebx, &ecx, &edx); + *(uint32_t *)(signature + 0) = ebx; + *(uint32_t *)(signature + 4) = ecx; + *(uint32_t *)(signature + 8) = edx; + signature[12] = 0; + + if (!strcmp("XenVMMXenVMM", signature) && ((eax - base) >= 2)) + return base; + } + + return 0; +} + +#ifdef CONFIG_XEN +extern bool xen_hvm_need_lapic(void); + +static inline bool xen_x2apic_para_available(void) +{ + return xen_hvm_need_lapic(); +} +#else +static inline bool xen_x2apic_para_available(void) +{ + return (xen_cpuid_base() != 0); +} +#endif + #endif /* _ASM_X86_XEN_HYPERVISOR_H */ |
