Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa2110cb authored by Lin Ming's avatar Lin Ming Committed by Len Brown
Browse files

ACPI: add boot option acpi=copy_dsdt to fix corrupt DSDT 

Some BIOS on Toshiba machines corrupt the DSDT, so add a new
boot option acpi=copy_dsdt to workaround it.
Add warning message to ask users to use this option if corrupt DSDT detected.

Also build a DMI blacklist to check it and automatically copy DSDT.

https://bugzilla.kernel.org/show_bug.cgi?id=14679



Signed-off-by: default avatarLin Ming <ming.m.lin@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 43323cb4

Documentation/kernel-parameters.txt

+1 −0
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ and is between 256 and 4096 characters. It is defined in the file 
			strict -- Be less tolerant of platforms that are not

				strictly ACPI specification compliant.

			rsdt -- prefer RSDT over (default) XSDT

			copy_dsdt -- copy DSDT to memory



			See also Documentation/power/pm.txt, pci=noacpi

arch/x86/kernel/acpi/boot.c

+4 −0
Original line number Diff line number Diff line
@@ -1576,6 +1576,10 @@ static int __init parse_acpi(char *arg) 
	/* "acpi=noirq" disables ACPI interrupt routing */

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

		acpi_noirq_set();

	}

	/* "acpi=copy_dsdt" copys DSDT */

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

		acpi_gbl_copy_dsdt_locally = 1;

	} else {

		/* Core will printk when we return error. */

		return -EINVAL;

drivers/acpi/acpica/tbutils.c

+4 −0
Original line number Diff line number Diff line
@@ -373,6 +373,10 @@ void acpi_tb_check_dsdt_header(void) 
		acpi_tb_print_table_header(0, &acpi_gbl_original_dsdt_header);

		acpi_tb_print_table_header(0, acpi_gbl_DSDT);



		ACPI_ERROR((AE_INFO,

			    "Please send DMI info to linux-acpi@vger.kernel.org\n"

			    "If system does not work as expected, please boot with acpi=copy_dsdt"));



		/* Disable further error messages */



		acpi_gbl_original_dsdt_header.length = acpi_gbl_DSDT->length;

drivers/acpi/bus.c

+37 −0
Original line number Diff line number Diff line
@@ -69,6 +69,37 @@ static struct dmi_system_id __cpuinitdata power_nocheck_dmi_table[] = { 
};





static int set_copy_dsdt(const struct dmi_system_id *id)

{

	printk(KERN_NOTICE "%s detected - "

		"force copy of DSDT to local memory\n", id->ident);

	acpi_gbl_copy_dsdt_locally = 1;

	return 0;

}



static struct dmi_system_id dsdt_dmi_table[] __initdata = {

	/*

	 * Insyde BIOS on some TOSHIBA machines corrupt the DSDT.

	 * https://bugzilla.kernel.org/show_bug.cgi?id=14679

	 */

	{

	 .callback = set_copy_dsdt,

	 .ident = "TOSHIBA Satellite A505",

	 .matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),

		DMI_MATCH(DMI_PRODUCT_NAME, "Satellite A505"),

		},

	},

	{

	 .callback = set_copy_dsdt,

	 .ident = "TOSHIBA Satellite L505D",

	 .matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),

		DMI_MATCH(DMI_PRODUCT_NAME, "Satellite L505D"),

		},

	}

};



/* --------------------------------------------------------------------------

                                Device Management

   -------------------------------------------------------------------------- */
@@ -813,6 +844,12 @@ void __init acpi_early_init(void) 


	acpi_gbl_permanent_mmap = 1;



	/*

	 * If the machine falls into the DMI check table,

	 * DSDT will be copied to memory

	 */

	dmi_check_system(dsdt_dmi_table);



	status = acpi_reallocate_root_table();

	if (ACPI_FAILURE(status)) {

		printk(KERN_ERR PREFIX