[PATCH 01/17] xen/dom0: handle acpi lapic parsing in Xen dom0

Jeremy Fitzhardinge
2009-05-12T23:26:33Z

When running in Xen dom0, we still want to parse the ACPI tables to
find out about local and IO apics, but we don't want to actually use
the lapics.

Put a couple of tests for Xen to prevent lapics from being mapped or
accessed. This is very Xen-specific behaviour, so there didn't seem to
be any point in adding more indirection.

[ Impact: ignore local apics, which are not usable under Xen ]

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Reviewed-by: "H. Peter Anvin" <hpa@zytor.com>
---
arch/x86/kernel/acpi/boot.c | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 723989d..4147e0c 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -41,6 +41,8 @@
#include <asm/mpspec.h>
#include <asm/smp.h>

+#include <asm/xen/hypervisor.h>
+
static int __initdata acpi_force = 0;
u32 acpi_rsdt_forced;
#ifdef CONFIG_ACPI
@@ -218,6 +220,10 @@ static void __cpuinit acpi_register_lapic(int id, u8 enabled)
{
unsigned int ver = 0;

+ /* We don't want to register lapics when in Xen dom0 */
+ if (xen_initial_domain())
+ return;
+
if (!enabled) {
++disabled_cpus;
return;
@@ -802,6 +808,10 @@ static int __init acpi_parse_fadt(struct acpi_table_header *table)

static void __init acpi_register_lapic_address(unsigned long address)
{
+ /* Xen dom0 doesn't have usable lapics */
+ if (xen_initial_domain())
+ return;
+
mp_lapic_addr = address;

set_fixmap_nocache(FIX_APIC_BASE, address);
--
1.6.0.6