Commit 8c8ae4e8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents a1e8fad5 d9b8ca84

arch/x86/include/asm/hypervisor.h

+12 −0
Original line number Diff line number Diff line
@@ -20,6 +20,9 @@ 
#ifndef _ASM_X86_HYPERVISOR_H

#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);
@@ -47,4 +50,13 @@ extern const struct hypervisor_x86 x86_hyper_vmware; 
extern const struct hypervisor_x86 x86_hyper_ms_hyperv;

extern const struct hypervisor_x86 x86_hyper_xen_hvm;



static inline bool hypervisor_x2apic_available(void)

{

	if (kvm_para_available())

		return true;

	if (xen_x2apic_para_available())

		return true;

	return false;

}



#endif

arch/x86/include/asm/xen/hypervisor.h

+35 −0
Original line number Diff line number Diff line
@@ -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 */

arch/x86/kernel/apic/apic.c

+3 −2
Original line number Diff line number Diff line
@@ -49,8 +49,8 @@ 
#include <asm/mtrr.h>

#include <asm/smp.h>

#include <asm/mce.h>

#include <asm/kvm_para.h>

#include <asm/tsc.h>

#include <asm/hypervisor.h>



unsigned int num_processors;
@@ -1476,7 +1476,8 @@ void __init enable_IR_x2apic(void) 
		/* IR is required if there is APIC ID > 255 even when running

		 * under KVM

		 */

		if (max_physical_apicid > 255 || !kvm_para_available())

		if (max_physical_apicid > 255 ||

		    !hypervisor_x2apic_available())

			goto nox2apic;

		/*

		 * without IR all CPUs can be addressed by IOAPIC/MSI

arch/x86/xen/enlighten.c

+12 −19
Original line number Diff line number Diff line
@@ -1256,25 +1256,6 @@ asmlinkage void __init xen_start_kernel(void) 
#endif

}



static 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;

}



static int init_hvm_pv_info(int *major, int *minor)

{

	uint32_t eax, ebx, ecx, edx, pages, msr, base;
@@ -1384,6 +1365,18 @@ static bool __init xen_hvm_platform(void) 
	return true;

}



bool xen_hvm_need_lapic(void)

{

	if (xen_pv_domain())

		return false;

	if (!xen_hvm_domain())

		return false;

	if (xen_feature(XENFEAT_hvm_pirqs) && xen_have_vector_callback)

		return false;

	return true;

}

EXPORT_SYMBOL_GPL(xen_hvm_need_lapic);



const __refconst struct hypervisor_x86 x86_hyper_xen_hvm = {

	.name			= "Xen HVM",

	.detect			= xen_hvm_platform,