Commit fab46105 authored by Lv Zheng's avatar Lv Zheng Committed by Rafael J. Wysocki
Browse files

ACPICA: Cleanup the option of forcing the use of the RSDT. 



This change adds a runtime option that will force ACPICA to use the
RSDT instead of the XSDT. Although the ACPI spec requires that an XSDT
be used instead of the RSDT, the XSDT has been found to be corrupt or
ill-formed on some machines.

This option is already in the Linux kernel.  When it is back ported to
ACPICA, code is re-written to follow ACPICA coding style.  This patch
is the generation of the integration.

Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 671cc68d

arch/ia64/kernel/acpi.c

+0 −1
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ 


#define PREFIX			"ACPI: "



u32 acpi_rsdt_forced;

unsigned int acpi_cpei_override;

unsigned int acpi_cpei_phys_cpuid;

arch/x86/kernel/acpi/boot.c

+1 −2
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ 


#include "sleep.h" /* To include x86_acpi_suspend_lowlevel */

static int __initdata acpi_force = 0;

u32 acpi_rsdt_forced;

int acpi_disabled;

EXPORT_SYMBOL(acpi_disabled);
@@ -1564,7 +1563,7 @@ static int __init parse_acpi(char *arg) 
	}

	/* acpi=rsdt use RSDT instead of XSDT */

	else if (strcmp(arg, "rsdt") == 0) {

		acpi_rsdt_forced = 1;

		acpi_gbl_do_not_use_xsdt = TRUE;

	}

	/* "acpi=noirq" disables ACPI interrupt routing */

	else if (strcmp(arg, "noirq") == 0) {

drivers/acpi/acpica/acglobal.h

+8 −0
Original line number Diff line number Diff line
@@ -118,6 +118,14 @@ bool ACPI_INIT_GLOBAL(acpi_gbl_enable_aml_debug_object, FALSE); 
 */

u8 ACPI_INIT_GLOBAL(acpi_gbl_copy_dsdt_locally, FALSE);



/*

 * Optionally ignore an XSDT if present and use the RSDT instead.

 * Although the ACPI specification requires that an XSDT be used instead

 * of the RSDT, the XSDT has been found to be corrupt or ill-formed on

 * some machines. Default behavior is to use the XSDT if present.

 */

u8 ACPI_INIT_GLOBAL(acpi_gbl_do_not_use_xsdt, FALSE);



/*

 * Optionally truncate I/O addresses to 16 bits. Provides compatibility

 * with other ACPI implementations. NOTE: During ACPICA initialization,

drivers/acpi/acpica/tbutils.c

+5 −5
Original line number Diff line number Diff line
@@ -478,10 +478,10 @@ acpi_status __init acpi_tb_parse_root_table(acpi_physical_address rsdp_address) 
				   ACPI_CAST_PTR(struct acpi_table_header,

						 rsdp));



	/* Differentiate between RSDT and XSDT root tables */

	/* Use XSDT if present and not overridden. Otherwise, use RSDT */



	if ((rsdp->revision > 1) && rsdp->xsdt_physical_address

			&& !acpi_rsdt_forced) {

	if ((rsdp->revision > 1) &&

	    rsdp->xsdt_physical_address && !acpi_gbl_do_not_use_xsdt) {

		/*

		 * RSDP contains an XSDT (64-bit physical addresses). We must use

		 * the XSDT if the revision is > 1 and the XSDT pointer is present,
@@ -503,8 +503,8 @@ acpi_status __init acpi_tb_parse_root_table(acpi_physical_address rsdp_address) 
	acpi_os_unmap_memory(rsdp, sizeof(struct acpi_table_rsdp));



	/*

	 * If it is present, validate the XSDT for access/size and ensure

	 * that all table entries are at least non-NULL

	 * If it is present and used, validate the XSDT for access/size

	 * and ensure that all table entries are at least non-NULL

	 */

	if (table_entry_size == ACPI_XSDT_ENTRY_SIZE) {

		status = acpi_tb_validate_xsdt(address);

include/acpi/acpixf.h

+8 −8
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ 
#include <acpi/acbuffer.h>



extern u8 acpi_gbl_permanent_mmap;

extern u32 acpi_rsdt_forced;



/*

 * Globals that are publically available
@@ -72,17 +71,18 @@ extern u32 acpi_dbg_layer; 


/* ACPICA runtime options */



extern u8 acpi_gbl_enable_interpreter_slack;

extern u8 acpi_gbl_all_methods_serialized;

extern u8 acpi_gbl_create_osi_method;

extern u8 acpi_gbl_use_default_register_widths;

extern acpi_name acpi_gbl_trace_method_name;

extern u32 acpi_gbl_trace_flags;

extern bool acpi_gbl_enable_aml_debug_object;

extern u8 acpi_gbl_copy_dsdt_locally;

extern u8 acpi_gbl_truncate_io_addresses;

extern u8 acpi_gbl_create_osi_method;

extern u8 acpi_gbl_disable_auto_repair;

extern u8 acpi_gbl_disable_ssdt_table_load;

extern u8 acpi_gbl_do_not_use_xsdt;

extern bool acpi_gbl_enable_aml_debug_object;

extern u8 acpi_gbl_enable_interpreter_slack;

extern u32 acpi_gbl_trace_flags;

extern acpi_name acpi_gbl_trace_method_name;

extern u8 acpi_gbl_truncate_io_addresses;

extern u8 acpi_gbl_use_default_register_widths;



/*

 * Hardware-reduced prototypes. All interfaces that use these macros will

CRA Git | Maintained and supported by SUSTech CRA and CCSE