diff options
| author | dim <dim@FreeBSD.org> | 2015-04-04 10:17:51 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-04-04 10:17:51 +0000 |
| commit | 441da571d47ec226c5c1799fe6e9dad14931a813 (patch) | |
| tree | 03ae73b5fa8cee569039a08677ba8f5db4c7032b /sys/dev/acpica | |
| parent | a66c38928305566ab81042d4242432a649ec767f (diff) | |
| download | FreeBSD-src-441da571d47ec226c5c1799fe6e9dad14931a813.zip FreeBSD-src-441da571d47ec226c5c1799fe6e9dad14931a813.tar.gz | |
MFC r272444 (by jkim):
Merge ACPICA 20140926.
MFC r278970 (by jkim):
Merge ACPICA 20141107 and 20150204.
Approved by: jkim
Relnotes: yes
Diffstat (limited to 'sys/dev/acpica')
| -rw-r--r-- | sys/dev/acpica/Osd/OsdTable.c | 4 | ||||
| -rw-r--r-- | sys/dev/acpica/acpi.c | 18 |
2 files changed, 9 insertions, 13 deletions
diff --git a/sys/dev/acpica/Osd/OsdTable.c b/sys/dev/acpica/Osd/OsdTable.c index 1e738f8..006b2ce 100644 --- a/sys/dev/acpica/Osd/OsdTable.c +++ b/sys/dev/acpica/Osd/OsdTable.c @@ -91,8 +91,8 @@ AcpiOsTableOverride(ACPI_TABLE_HEADER *ExistingTable, if (hdr == NULL || sz == 0) return (AE_ERROR); #ifndef notyet - /* Assume SSDT is loaded with DSDT. */ - AcpiGbl_DisableSsdtTableLoad = TRUE; + /* Assume SSDT is installed with DSDT. */ + AcpiGbl_DisableSsdtTableInstall = TRUE; #endif *NewTable = hdr; return (AE_OK); diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 853429b..65ade62 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -256,16 +256,6 @@ static char acpi_remove_interface[256]; TUNABLE_STR("hw.acpi.remove_interface", acpi_remove_interface, sizeof(acpi_remove_interface)); -/* - * Allow override of whether methods execute in parallel or not. - * Enable this for serial behavior, which fixes "AE_ALREADY_EXISTS" - * errors for AML that really can't handle parallel method execution. - * It is off by default since this breaks recursive methods and - * some IBMs use such code. - */ -static int acpi_serialize_methods; -TUNABLE_INT("hw.acpi.serialize_methods", &acpi_serialize_methods); - /* Allow users to dump Debug objects without ACPI debugger. */ static int acpi_debug_objects; TUNABLE_INT("debug.acpi.enable_debug_objects", &acpi_debug_objects); @@ -279,6 +269,12 @@ TUNABLE_INT("debug.acpi.interpreter_slack", &acpi_interpreter_slack); SYSCTL_INT(_debug_acpi, OID_AUTO, interpreter_slack, CTLFLAG_RDTUN, &acpi_interpreter_slack, 1, "Turn on interpreter slack mode."); +/* Ignore register widths set by FADT and use default widths instead. */ +static int acpi_ignore_reg_width = 1; +TUNABLE_INT("debug.acpi.default_register_width", &acpi_ignore_reg_width); +SYSCTL_INT(_debug_acpi, OID_AUTO, default_register_width, CTLFLAG_RDTUN, + &acpi_ignore_reg_width, 1, "Ignore register widths set by FADT"); + #ifdef __amd64__ /* Reset system clock while resuming. XXX Remove once tested. */ static int acpi_reset_clock = 1; @@ -474,9 +470,9 @@ acpi_attach(device_t dev) * Set the globals from our tunables. This is needed because ACPI-CA * uses UINT8 for some values and we have no tunable_byte. */ - AcpiGbl_AllMethodsSerialized = acpi_serialize_methods ? TRUE : FALSE; AcpiGbl_EnableInterpreterSlack = acpi_interpreter_slack ? TRUE : FALSE; AcpiGbl_EnableAmlDebugObject = acpi_debug_objects ? TRUE : FALSE; + AcpiGbl_UseDefaultRegisterWidths = acpi_ignore_reg_width ? TRUE : FALSE; #ifndef ACPI_DEBUG /* |
