ia64/xen-unstable

changeset 19435:d5ddc782bc49

x86 acpi: Delete unnecessary and broken RSDP-scanning code.

Signed-off-by: Keir Fraser <keir.fraser@eu.citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Mon Mar 30 16:48:26 2009 +0100 (2009-03-30)
parents e54eeff2de54
children 1f8e6aca0868
files xen/arch/ia64/linux-xen/acpi.c xen/arch/x86/acpi/boot.c xen/include/xen/acpi.h
line diff
     1.1 --- a/xen/arch/ia64/linux-xen/acpi.c	Fri Mar 27 11:07:11 2009 +0900
     1.2 +++ b/xen/arch/ia64/linux-xen/acpi.c	Mon Mar 30 16:48:26 2009 +0100
     1.3 @@ -76,11 +76,7 @@ unsigned int acpi_cpei_phys_cpuid;
     1.4  unsigned long acpi_wakeup_address = 0;
     1.5  
     1.6  #ifdef CONFIG_IA64_GENERIC
     1.7 -#ifndef XEN
     1.8  static unsigned long __init acpi_find_rsdp(void)
     1.9 -#else
    1.10 -unsigned long __init acpi_find_rsdp(void)
    1.11 -#endif
    1.12  {
    1.13  	unsigned long rsdp_phys = 0;
    1.14  
     2.1 --- a/xen/arch/x86/acpi/boot.c	Fri Mar 27 11:07:11 2009 +0900
     2.2 +++ b/xen/arch/x86/acpi/boot.c	Mon Mar 30 16:48:26 2009 +0100
     2.3 @@ -283,25 +283,6 @@ acpi_parse_nmi_src(struct acpi_subtable_
     2.4  
     2.5  #endif /* CONFIG_X86_IO_APIC */
     2.6  
     2.7 -static unsigned long __init
     2.8 -acpi_scan_rsdp(unsigned long start, unsigned long length)
     2.9 -{
    2.10 -	unsigned long offset = 0;
    2.11 -	unsigned long sig_len = sizeof("RSD PTR ") - 1;
    2.12 -
    2.13 -	/*
    2.14 -	 * Scan all 16-byte boundaries of the physical memory region for the
    2.15 -	 * RSDP signature.
    2.16 -	 */
    2.17 -	for (offset = 0; offset < length; offset += 16) {
    2.18 -		if (strncmp((char *)(start + offset), "RSD PTR ", sig_len))
    2.19 -			continue;
    2.20 -		return (start + offset);
    2.21 -	}
    2.22 -
    2.23 -	return 0;
    2.24 -}
    2.25 -
    2.26  static int __init acpi_parse_sbf(struct acpi_table_header *table)
    2.27  {
    2.28  	struct acpi_table_boot *sb;
    2.29 @@ -371,16 +352,9 @@ extern u32 pmtmr_ioport;
    2.30  static void __init
    2.31  acpi_fadt_parse_sleep_info(struct acpi_table_fadt *fadt)
    2.32  {
    2.33 -	struct acpi_table_rsdp *rsdp;
    2.34 -	unsigned long rsdp_phys;
    2.35  	struct acpi_table_facs *facs = NULL;
    2.36  	uint64_t facs_pa;
    2.37  
    2.38 -	rsdp_phys = acpi_find_rsdp();
    2.39 -	if (!rsdp_phys || acpi_disabled)
    2.40 -		goto bad;
    2.41 -	rsdp = __va(rsdp_phys);
    2.42 -
    2.43  	acpi_fadt_copy_address(pm1a_cnt, pm1a_control, pm1_control);
    2.44  	acpi_fadt_copy_address(pm1b_cnt, pm1b_control, pm1_control);
    2.45  	acpi_fadt_copy_address(pm1a_evt, pm1a_event, pm1_event);
    2.46 @@ -483,29 +457,6 @@ static int __init acpi_parse_fadt(struct
    2.47  	return 0;
    2.48  }
    2.49  
    2.50 -unsigned long __init acpi_find_rsdp(void)
    2.51 -{
    2.52 -	unsigned long rsdp_phys = 0;
    2.53 -
    2.54 -#if 0
    2.55 -	if (efi_enabled) {
    2.56 -		if (efi.acpi20 != EFI_INVALID_TABLE_ADDR)
    2.57 -			return efi.acpi20;
    2.58 -		else if (efi.acpi != EFI_INVALID_TABLE_ADDR)
    2.59 -			return efi.acpi;
    2.60 -	}
    2.61 -#endif
    2.62 -	/*
    2.63 -	 * Scan memory looking for the RSDP signature. First search EBDA (low
    2.64 -	 * memory) paragraphs and then search upper memory (E0000-FFFFF).
    2.65 -	 */
    2.66 -	rsdp_phys = acpi_scan_rsdp(0, 0x400);
    2.67 -	if (!rsdp_phys)
    2.68 -		rsdp_phys = acpi_scan_rsdp(0xE0000, 0x20000);
    2.69 -
    2.70 -	return rsdp_phys;
    2.71 -}
    2.72 -
    2.73  #ifdef	CONFIG_X86_LOCAL_APIC
    2.74  /*
    2.75   * Parse LAPIC entries in MADT
     3.1 --- a/xen/include/xen/acpi.h	Fri Mar 27 11:07:11 2009 +0900
     3.2 +++ b/xen/include/xen/acpi.h	Mon Mar 30 16:48:26 2009 +0100
     3.3 @@ -282,7 +282,6 @@ typedef int (*acpi_table_entry_handler) 
     3.4  
     3.5  unsigned int acpi_get_processor_id (unsigned int cpu);
     3.6  char * __acpi_map_table (unsigned long phys_addr, unsigned long size);
     3.7 -unsigned long acpi_find_rsdp (void);
     3.8  int acpi_boot_init (void);
     3.9  int acpi_boot_table_init (void);
    3.10  int acpi_numa_init (void);