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

ACPICA: Tables: Avoid SSDT installation with acpi_gbl_disable_ssdt_table_load. 



It is reported that when acpi_gbl_disable_ssdt_table_load is specified, user
still can see it installed into /sys/firmware/acpi/tables on Linux boxes.
This is because the option only stops table "loading", but doesn't stop
table "installing", thus it is still in the acpi_gbl_root_table_list. With
previous cleanups, it is possible to prevent SSDT installations to make
it not such confusing.  The global variable is also renamed.  Lv Zheng.

Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
[rjw: Subject]
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 8a216d7f

Documentation/kernel-parameters.txt

+9 −1
Original line number Diff line number Diff line
@@ -237,7 +237,15 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			This feature is enabled by default.

			This option allows to turn off the feature.



	acpi_no_auto_ssdt	[HW,ACPI] Disable automatic loading of SSDT

	acpi_no_static_ssdt	[HW,ACPI]

			Disable installation of static SSDTs at early boot time

			By default, SSDTs contained in the RSDT/XSDT will be

			installed automatically and they will appear under

			/sys/firmware/acpi/tables.

			This option turns off this feature.

			Note that specifying this option does not affect

			dynamic table installation which will install SSDT

			tables to /sys/firmware/acpi/tables/dynamic.



	acpica_no_return_repair [HW, ACPI]

			Disable AML predefined validation mechanism

drivers/acpi/acpica/acglobal.h

+2 −2
Original line number Diff line number Diff line
@@ -160,10 +160,10 @@ ACPI_INIT_GLOBAL(u8, acpi_gbl_truncate_io_addresses, FALSE); 
ACPI_INIT_GLOBAL(u8, acpi_gbl_disable_auto_repair, FALSE);



/*

 * Optionally do not load any SSDTs from the RSDT/XSDT during initialization.

 * Optionally do not install any SSDTs from the RSDT/XSDT during initialization.

 * This can be useful for debugging ACPI problems on some machines.

 */

ACPI_INIT_GLOBAL(u8, acpi_gbl_disable_ssdt_table_load, FALSE);

ACPI_INIT_GLOBAL(u8, acpi_gbl_disable_ssdt_table_install, FALSE);



/*

 * We keep track of the latest version of Windows that has been requested by

drivers/acpi/acpica/tbinstal.c

+12 −0
Original line number Diff line number Diff line
@@ -580,6 +580,18 @@ acpi_tb_install_non_fixed_table(acpi_physical_address address, 
		return_ACPI_STATUS(status);

	}



	/*

	 * Optionally do not load any SSDTs from the RSDT/XSDT. This can

	 * be useful for debugging ACPI problems on some machines.

	 */

	if (!reload && acpi_gbl_disable_ssdt_table_install &&

	    ACPI_COMPARE_NAME(&new_table_desc.signature, ACPI_SIG_SSDT)) {

		ACPI_INFO((AE_INFO, "Ignoring installation of %4.4s at %p",

			   new_table_desc.signature.ascii, ACPI_CAST_PTR(void,

									 address)));

		goto release_and_exit;

	}



	/* Validate and verify a table before installation */



	status = acpi_tb_verify_table(&new_table_desc, NULL);

drivers/acpi/acpica/tbxfload.c

+0 −13
Original line number Diff line number Diff line
@@ -179,19 +179,6 @@ static acpi_status acpi_tb_load_namespace(void) 
			continue;

		}



		/*

		 * Optionally do not load any SSDTs from the RSDT/XSDT. This can

		 * be useful for debugging ACPI problems on some machines.

		 */

		if (acpi_gbl_disable_ssdt_table_load) {

			ACPI_INFO((AE_INFO, "Ignoring %4.4s at %p",

				   acpi_gbl_root_table_list.tables[i].signature.

				   ascii, ACPI_CAST_PTR(void,

							acpi_gbl_root_table_list.

							tables[i].address)));

			continue;

		}



		/* Ignore errors while loading tables, get as many as possible */



		(void)acpi_ut_release_mutex(ACPI_MTX_TABLES);

drivers/acpi/osl.c

+5 −6
Original line number Diff line number Diff line
@@ -1770,16 +1770,15 @@ acpi_status acpi_os_release_object(acpi_cache_t * cache, void *object) 
}

#endif



static int __init acpi_no_auto_ssdt_setup(char *s)

static int __init acpi_no_static_ssdt_setup(char *s)

{

        printk(KERN_NOTICE PREFIX "SSDT auto-load disabled\n");

	acpi_gbl_disable_ssdt_table_install = TRUE;

	pr_info("ACPI: static SSDT installation disabled\n");



        acpi_gbl_disable_ssdt_table_load = TRUE;



        return 1;

	return 0;

}



__setup("acpi_no_auto_ssdt", acpi_no_auto_ssdt_setup);

early_param("acpi_no_static_ssdt", acpi_no_static_ssdt_setup);



static int __init acpi_disable_return_repair(char *s)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE