diff options
author | Zhao Yakui <yakui.zhao@intel.com> | 2008-12-17 03:55:18 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-01-09 01:41:58 -0500 |
commit | 237889bf0a62f1399fb2ba0c2a259e6a96597131 (patch) | |
tree | 248d6bf6e4e60c8760b9a2b6ba2e788b70e24c76 /arch/x86/kernel/acpi | |
parent | 13b40a1a065824d2d4e55c8b48ea9f3f9d162929 (diff) |
ACPI : Use RSDT instead of XSDT by adding boot option of "acpi=rsdt"
On some boxes there exist both RSDT and XSDT table. But unfortunately
sometimes there exists the following error when XSDT table is used:
a. 32/64X address mismatch
b. The 32/64X FACS address mismatch
In such case the boot option of "acpi=rsdt" is provided so that
RSDT is tried instead of XSDT table when the system can't work well.
http://bugzilla.kernel.org/show_bug.cgi?id=8246
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
cc:Thomas Renninger <trenn@suse.de>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/x86/kernel/acpi')
-rw-r--r-- | arch/x86/kernel/acpi/boot.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index 4c51a2f8fd31..db1a90a76b3e 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c | |||
@@ -47,7 +47,7 @@ | |||
47 | #endif | 47 | #endif |
48 | 48 | ||
49 | static int __initdata acpi_force = 0; | 49 | static int __initdata acpi_force = 0; |
50 | 50 | u32 acpi_rsdt_forced; | |
51 | #ifdef CONFIG_ACPI | 51 | #ifdef CONFIG_ACPI |
52 | int acpi_disabled = 0; | 52 | int acpi_disabled = 0; |
53 | #else | 53 | #else |
@@ -1783,6 +1783,10 @@ static int __init parse_acpi(char *arg) | |||
1783 | disable_acpi(); | 1783 | disable_acpi(); |
1784 | acpi_ht = 1; | 1784 | acpi_ht = 1; |
1785 | } | 1785 | } |
1786 | /* acpi=rsdt use RSDT instead of XSDT */ | ||
1787 | else if (strcmp(arg, "rsdt") == 0) { | ||
1788 | acpi_rsdt_forced = 1; | ||
1789 | } | ||
1786 | /* "acpi=noirq" disables ACPI interrupt routing */ | 1790 | /* "acpi=noirq" disables ACPI interrupt routing */ |
1787 | else if (strcmp(arg, "noirq") == 0) { | 1791 | else if (strcmp(arg, "noirq") == 0) { |
1788 | acpi_noirq_set(); | 1792 | acpi_noirq_set(); |