On Monday 16 June 2008 03:50:30 am Zhao Yakui wrote: ... > In fact we have another similar bug: > http://bugzilla.kernel.org/show_bug.cgi?id=8246 > > The 32/64X address mismatch also exists on the laptop of IBM R51e. ... Thanks. Below is a version with the R51e included. Thomas Introduce acpi_root_table=rsdt boot param and dmi list to force rsdt Signed-off-by: Thomas Renninger <trenn@xxxxxxx> Tested-by: Mark Doughty <me@xxxxxxxxxxxxxxxxx> CC: Yakui Zhao <yakui.zhao@xxxxxxxxx> --- Documentation/kernel-parameters.txt | 5 ++++ drivers/acpi/tables.c | 43 ++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) Index: linux-acpi-2.6_video_native_vs_vendor/drivers/acpi/tables.c =================================================================== --- linux-acpi-2.6_video_native_vs_vendor.orig/drivers/acpi/tables.c +++ linux-acpi-2.6_video_native_vs_vendor/drivers/acpi/tables.c @@ -32,6 +32,7 @@ #include <linux/errno.h> #include <linux/acpi.h> #include <linux/bootmem.h> +#include <linux/dmi.h> #define PREFIX "ACPI: " @@ -282,6 +283,43 @@ static void __init check_multiple_madt(v return; } +static struct dmi_system_id acpi_rsdt_dmi_table[] = { + { + .ident = "ThinkPad ", /* R40e, broken C-states */ + .matches = { + DMI_MATCH(DMI_BIOS_VENDOR, "IBM"), + DMI_MATCH(DMI_BIOS_VERSION, "1SET")}, + }, + { + .ident = "ThinkPad ", /* R50e, slow booting */ + .matches = { + DMI_MATCH(DMI_BIOS_VENDOR, "IBM"), + DMI_MATCH(DMI_BIOS_VERSION, "1WET")}, + }, + { + .ident = "ThinkPad ", /* R51e, slow booting */ + .matches = { + DMI_MATCH(DMI_BIOS_VENDOR, "IBM"), + DMI_MATCH(DMI_BIOS_VERSION, "78ET")}, + }, + { + .ident = "ThinkPad ", /* T40, T40p, T41, T41p, T42, T42p + R50, R50p */ + .matches = { + DMI_MATCH(DMI_BIOS_VENDOR, "IBM"), + DMI_MATCH(DMI_BIOS_VERSION, "1RET")}, + }, + {} +}; + +static int __init acpi_force_rsdt(char *opt) +{ + if (!strcmp(opt, "rsdt")) + acpi_gbl_force_rsdt = 1; + return 0; +} +early_param("acpi_root_table", acpi_force_rsdt); + /* * acpi_table_init() * @@ -293,6 +331,11 @@ static void __init check_multiple_madt(v int __init acpi_table_init(void) { + if (dmi_check_system(acpi_rsdt_dmi_table)) + acpi_gbl_force_rsdt = 1; + if (acpi_gbl_force_rsdt) + printk(KERN_INFO "Using RSDT as ACPI root table\n"); + acpi_initialize_tables(initial_tables, ACPI_MAX_TABLES, 0); check_multiple_madt(); return 0; Index: linux-acpi-2.6_video_native_vs_vendor/Documentation/kernel-parameters.txt =================================================================== --- linux-acpi-2.6_video_native_vs_vendor.orig/Documentation/kernel-parameters.txt +++ linux-acpi-2.6_video_native_vs_vendor/Documentation/kernel-parameters.txt @@ -230,6 +230,11 @@ and is between 256 and 4096 characters. to assume that this machine's pmtimer latches its value and always returns good values. + acpi_root_table= [X86,ACPI] + { rsdt } + rsdt: Take RSDT address for fetching + ACPI tables (instead of XSDT) + agp= [AGP] { off | try_unsupported } off: disable AGP support -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
