# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1238428106 -3600
# Node ID d5ddc782bc499a3605417eeef519b33616402768
# Parent e54eeff2de547b173ee13557157e05ce3e3c3fe1
x86 acpi: Delete unnecessary and broken RSDP-scanning code.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxxxxx>
---
xen/arch/ia64/linux-xen/acpi.c | 4 ---
xen/arch/x86/acpi/boot.c | 49 -----------------------------------------
xen/include/xen/acpi.h | 1
3 files changed, 54 deletions(-)
diff -r e54eeff2de54 -r d5ddc782bc49 xen/arch/ia64/linux-xen/acpi.c
--- a/xen/arch/ia64/linux-xen/acpi.c Fri Mar 27 11:07:11 2009 +0900
+++ b/xen/arch/ia64/linux-xen/acpi.c Mon Mar 30 16:48:26 2009 +0100
@@ -76,11 +76,7 @@ unsigned long acpi_wakeup_address = 0;
unsigned long acpi_wakeup_address = 0;
#ifdef CONFIG_IA64_GENERIC
-#ifndef XEN
static unsigned long __init acpi_find_rsdp(void)
-#else
-unsigned long __init acpi_find_rsdp(void)
-#endif
{
unsigned long rsdp_phys = 0;
diff -r e54eeff2de54 -r d5ddc782bc49 xen/arch/x86/acpi/boot.c
--- a/xen/arch/x86/acpi/boot.c Fri Mar 27 11:07:11 2009 +0900
+++ b/xen/arch/x86/acpi/boot.c Mon Mar 30 16:48:26 2009 +0100
@@ -283,25 +283,6 @@ acpi_parse_nmi_src(struct acpi_subtable_
#endif /* CONFIG_X86_IO_APIC */
-static unsigned long __init
-acpi_scan_rsdp(unsigned long start, unsigned long length)
-{
- unsigned long offset = 0;
- unsigned long sig_len = sizeof("RSD PTR ") - 1;
-
- /*
- * Scan all 16-byte boundaries of the physical memory region for the
- * RSDP signature.
- */
- for (offset = 0; offset < length; offset += 16) {
- if (strncmp((char *)(start + offset), "RSD PTR ", sig_len))
- continue;
- return (start + offset);
- }
-
- return 0;
-}
-
static int __init acpi_parse_sbf(struct acpi_table_header *table)
{
struct acpi_table_boot *sb;
@@ -371,15 +352,8 @@ static void __init
static void __init
acpi_fadt_parse_sleep_info(struct acpi_table_fadt *fadt)
{
- struct acpi_table_rsdp *rsdp;
- unsigned long rsdp_phys;
struct acpi_table_facs *facs = NULL;
uint64_t facs_pa;
-
- rsdp_phys = acpi_find_rsdp();
- if (!rsdp_phys || acpi_disabled)
- goto bad;
- rsdp = __va(rsdp_phys);
acpi_fadt_copy_address(pm1a_cnt, pm1a_control, pm1_control);
acpi_fadt_copy_address(pm1b_cnt, pm1b_control, pm1_control);
@@ -483,29 +457,6 @@ static int __init acpi_parse_fadt(struct
return 0;
}
-unsigned long __init acpi_find_rsdp(void)
-{
- unsigned long rsdp_phys = 0;
-
-#if 0
- if (efi_enabled) {
- if (efi.acpi20 != EFI_INVALID_TABLE_ADDR)
- return efi.acpi20;
- else if (efi.acpi != EFI_INVALID_TABLE_ADDR)
- return efi.acpi;
- }
-#endif
- /*
- * Scan memory looking for the RSDP signature. First search EBDA (low
- * memory) paragraphs and then search upper memory (E0000-FFFFF).
- */
- rsdp_phys = acpi_scan_rsdp(0, 0x400);
- if (!rsdp_phys)
- rsdp_phys = acpi_scan_rsdp(0xE0000, 0x20000);
-
- return rsdp_phys;
-}
-
#ifdef CONFIG_X86_LOCAL_APIC
/*
* Parse LAPIC entries in MADT
diff -r e54eeff2de54 -r d5ddc782bc49 xen/include/xen/acpi.h
--- a/xen/include/xen/acpi.h Fri Mar 27 11:07:11 2009 +0900
+++ b/xen/include/xen/acpi.h Mon Mar 30 16:48:26 2009 +0100
@@ -282,7 +282,6 @@ typedef int (*acpi_table_entry_handler)
unsigned int acpi_get_processor_id (unsigned int cpu);
char * __acpi_map_table (unsigned long phys_addr, unsigned long size);
-unsigned long acpi_find_rsdp (void);
int acpi_boot_init (void);
int acpi_boot_table_init (void);
int acpi_numa_init (void);
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home