From: Sheng Yang <sheng@linux.intel.com>
To: "H. Peter Anvin" <hpa@zytor.com>, Ingo Molnar <mingo@elte.hu>
Cc: linux-kernel@vger.kernel.org,
Jeremy Fitzhardinge <jeremy@goop.org>,
Sheng Yang <sheng@linux.intel.com>
Subject: [PATCH 1/2] apic: Move hypervisor detection of x2apic to hypervisor.h
Date: Tue, 21 Dec 2010 14:18:48 +0800 [thread overview]
Message-ID: <1292912329-12451-1-git-send-email-sheng@linux.intel.com> (raw)
Then we can reuse it for Xen later.
Acked-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: Sheng Yang <sheng@linux.intel.com>
---
arch/x86/include/asm/hypervisor.h | 9 +++++++++
arch/x86/kernel/apic/apic.c | 5 +++--
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/arch/x86/include/asm/hypervisor.h b/arch/x86/include/asm/hypervisor.h
index ff2546c..0c6f7af 100644
--- a/arch/x86/include/asm/hypervisor.h
+++ b/arch/x86/include/asm/hypervisor.h
@@ -20,6 +20,8 @@
#ifndef _ASM_X86_HYPERVISOR_H
#define _ASM_X86_HYPERVISOR_H
+#include <asm/kvm_para.h>
+
extern void init_hypervisor(struct cpuinfo_x86 *c);
extern void init_hypervisor_platform(void);
@@ -47,4 +49,11 @@ 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;
+ return false;
+}
+
#endif
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 3f838d5..8408f2d 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -50,8 +50,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
--
1.7.0.1
next reply other threads:[~2010-12-21 6:19 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-21 6:18 Sheng Yang [this message]
2010-12-21 6:18 ` [PATCH 2/2 v2] xen: HVM X2APIC support Sheng Yang
2011-01-05 7:47 ` Sheng Yang
2011-01-05 14:56 ` Ian Campbell
2011-01-06 1:20 ` Sheng Yang
2011-01-06 9:10 ` Ian Campbell
2011-01-06 9:23 ` Sheng Yang
2011-01-06 9:35 ` Ian Campbell
2011-01-06 10:05 ` Sheng Yang
2011-01-06 15:00 ` Konrad Rzeszutek Wilk
2011-01-10 2:34 ` Sheng Yang
2010-12-21 17:15 ` [PATCH 1/2] apic: Move hypervisor detection of x2apic to hypervisor.h Jeremy Fitzhardinge
2010-12-21 18:15 ` Avi Kivity
2010-12-31 2:05 ` Sheng Yang
2011-01-04 8:57 ` Sheng Yang
2011-01-04 9:24 ` Ingo Molnar
2011-01-05 1:51 ` Sheng Yang
2011-01-05 7:40 ` Jeremy Fitzhardinge
2011-01-05 15:46 ` Konrad Rzeszutek Wilk
-- strict thread matches above, loose matches on Subject: below --
2010-12-08 6:03 Sheng Yang
2010-12-14 7:49 ` Sheng Yang
2010-12-07 7:51 Sheng Yang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1292912329-12451-1-git-send-email-sheng@linux.intel.com \
--to=sheng@linux.intel.com \
--cc=hpa@zytor.com \
--cc=jeremy@goop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox