Commit 67effe8f authored by Len Brown's avatar Len Brown

ACPI: add "acpi_no_auto_ssdt" bootparam

"acpi_no_auto_ssdt" prevents Linux from automatically loading
all the SSDTs listed in the RSDT/XSDT.

This is needed for debugging.  In particular,
it allows a DSDT override to optionally be a DSDT+SSDT override.

http://bugzilla.kernel.org/show_bug.cgi?id=3774Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent e4903fb5
...@@ -166,6 +166,8 @@ and is between 256 and 4096 characters. It is defined in the file ...@@ -166,6 +166,8 @@ and is between 256 and 4096 characters. It is defined in the file
acpi_irq_isa= [HW,ACPI] If irq_balance, mark listed IRQs used by ISA acpi_irq_isa= [HW,ACPI] If irq_balance, mark listed IRQs used by ISA
Format: <irq>,<irq>... Format: <irq>,<irq>...
acpi_no_auto_ssdt [HW,ACPI] Disable automatic loading of SSDT
acpi_os_name= [HW,ACPI] Tell ACPI BIOS the name of the OS acpi_os_name= [HW,ACPI] Tell ACPI BIOS the name of the OS
Format: To spoof as Windows 98: ="Microsoft Windows" Format: To spoof as Windows 98: ="Microsoft Windows"
......
...@@ -52,6 +52,8 @@ ACPI_MODULE_NAME("tbxface") ...@@ -52,6 +52,8 @@ ACPI_MODULE_NAME("tbxface")
/* Local prototypes */ /* Local prototypes */
static acpi_status acpi_tb_load_namespace(void); static acpi_status acpi_tb_load_namespace(void);
static int no_auto_ssdt;
/******************************************************************************* /*******************************************************************************
* *
* FUNCTION: acpi_allocate_root_table * FUNCTION: acpi_allocate_root_table
...@@ -536,6 +538,10 @@ static acpi_status acpi_tb_load_namespace(void) ...@@ -536,6 +538,10 @@ static acpi_status acpi_tb_load_namespace(void)
ACPI_INFO((AE_INFO, "Table DSDT replaced by host OS")); ACPI_INFO((AE_INFO, "Table DSDT replaced by host OS"));
acpi_tb_print_table_header(0, table); acpi_tb_print_table_header(0, table);
if (no_auto_ssdt == 0) {
printk(KERN_WARNING "ACPI: DSDT override uses original SSDTs unless \"acpi_no_auto_ssdt\"");
}
} }
status = status =
...@@ -577,6 +583,11 @@ static acpi_status acpi_tb_load_namespace(void) ...@@ -577,6 +583,11 @@ static acpi_status acpi_tb_load_namespace(void)
continue; continue;
} }
if (no_auto_ssdt) {
printk(KERN_WARNING "ACPI: SSDT ignored due to \"acpi_no_auto_ssdt\"\n");
continue;
}
/* Ignore errors while loading tables, get as many as possible */ /* Ignore errors while loading tables, get as many as possible */
(void)acpi_ut_release_mutex(ACPI_MTX_TABLES); (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
...@@ -622,3 +633,15 @@ acpi_status acpi_load_tables(void) ...@@ -622,3 +633,15 @@ acpi_status acpi_load_tables(void)
} }
ACPI_EXPORT_SYMBOL(acpi_load_tables) ACPI_EXPORT_SYMBOL(acpi_load_tables)
static int __init acpi_no_auto_ssdt_setup(char *s) {
printk(KERN_NOTICE "ACPI: SSDT auto-load disabled\n");
no_auto_ssdt = 1;
return 1;
}
__setup("acpi_no_auto_ssdt", acpi_no_auto_ssdt_setup);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment