[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] Xen parses IOAPIC entries in the ACPI MADT.
ChangeSet 1.1436, 2005/05/11 09:05:14+01:00, kaf24@xxxxxxxxxxxxxxxxxxxx Xen parses IOAPIC entries in the ACPI MADT. Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx> boot.c | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff -Nru a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c --- a/xen/arch/x86/acpi/boot.c 2005-05-11 05:03:47 -04:00 +++ b/xen/arch/x86/acpi/boot.c 2005-05-11 05:03:47 -04:00 @@ -37,7 +37,9 @@ #include <asm/irq.h> #include <asm/mpspec.h> -int sbf_port; /* XXX XEN */ +int sbf_port; +#define end_pfn_map max_page +#define CONFIG_ACPI_PCI #ifdef CONFIG_X86_64 @@ -109,7 +111,7 @@ if (!phys_addr || !size) return NULL; - if (phys_addr < (max_page << PAGE_SHIFT)) + if (phys_addr < (end_pfn_map << PAGE_SHIFT)) return __va(phys_addr); return NULL; @@ -279,7 +281,7 @@ #endif /*CONFIG_X86_LOCAL_APIC*/ -#if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_ACPI_INTERPRETER) +#if defined(CONFIG_X86_IO_APIC) /*&& defined(CONFIG_ACPI_INTERPRETER)*/ static int __init acpi_parse_ioapic ( @@ -302,6 +304,7 @@ return 0; } +#ifdef CONFIG_ACPI_INTERPRETER /* * Parse Interrupt Source Override for the ACPI SCI */ @@ -335,6 +338,7 @@ acpi_sci_override_gsi = gsi; return; } +#endif static int __init acpi_parse_int_src_ovr ( @@ -349,11 +353,13 @@ acpi_table_print_madt_entry(header); +#ifdef CONFIG_ACPI_INTERPRETER if (intsrc->bus_irq == acpi_fadt.sci_int) { acpi_sci_ioapic_setup(intsrc->global_irq, intsrc->flags.polarity, intsrc->flags.trigger); return 0; } +#endif if (acpi_skip_timer_override && intsrc->bus_irq == 0 && intsrc->global_irq == 2) { @@ -698,7 +704,7 @@ } #endif /* CONFIG_X86_LOCAL_APIC */ -#if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_ACPI_INTERPRETER) +#if defined(CONFIG_X86_IO_APIC) /*&& defined(CONFIG_ACPI_INTERPRETER)*/ /* * Parse IOAPIC related entries in MADT * returns 0 on success, < 0 on error @@ -744,12 +750,14 @@ return count; } +#ifdef CONFIG_ACPI_INTERPRETER /* * If BIOS did not supply an INT_SRC_OVR for the SCI * pretend we got one so we can set the SCI flags. */ if (!acpi_sci_override_gsi) acpi_sci_ioapic_setup(acpi_fadt.sci_int, 0, 0); +#endif /* Fill in identity legacy mapings where no override */ mp_config_acpi_legacy_irqs(); @@ -855,10 +863,6 @@ disable_acpi(); return error; } - -#if 0 /*def __i386__*/ - check_acpi_pci(); -#endif acpi_table_parse(ACPI_BOOT, acpi_parse_sbf); _______________________________________________ Xen-changelog mailing list Xen-changelog@xxxxxxxxxxxxxxxxxxx http://lists.xensource.com/xen-changelog
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |