aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2016-08-04 04:43:13 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-08-12 21:09:32 -0400
commit02dcdc3e860ac21f5fb3a9a30a5073267f74e596 (patch)
treebf60aacef5ea8b0c0a0b3d2a84c76182e259aa7c
parent7c312ad1f28030c3a95b0de087bf52c45c16a0db (diff)
ACPICA: Simplify configuration for "Max Loops" system parameter
ACPICA commit 857c510d70e18eecc275dd3087807a18bae8aa51 Allow for static configuration of this parameter. It is used to abort out of infinite loops caused by non-response from hardware. Link: https://github.com/acpica/acpica/commit/857c510d Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Lv Zheng <lv.zheng@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--drivers/acpi/acpica/utinit.c2
-rw-r--r--include/acpi/acconfig.h4
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/utinit.c b/drivers/acpi/acpica/utinit.c
index f91f724c487c..1711fdf41709 100644
--- a/drivers/acpi/acpica/utinit.c
+++ b/drivers/acpi/acpica/utinit.c
@@ -206,7 +206,7 @@ acpi_status acpi_ut_init_globals(void)
206 acpi_gbl_next_owner_id_offset = 0; 206 acpi_gbl_next_owner_id_offset = 0;
207 acpi_gbl_debugger_configuration = DEBUGGER_THREADING; 207 acpi_gbl_debugger_configuration = DEBUGGER_THREADING;
208 acpi_gbl_osi_mutex = NULL; 208 acpi_gbl_osi_mutex = NULL;
209 acpi_gbl_max_loop_iterations = 0xFFFF; 209 acpi_gbl_max_loop_iterations = ACPI_MAX_LOOP_COUNT;
210 210
211 /* Hardware oriented */ 211 /* Hardware oriented */
212 212
diff --git a/include/acpi/acconfig.h b/include/acpi/acconfig.h
index fe2e3ac7b5e3..12c2882bf647 100644
--- a/include/acpi/acconfig.h
+++ b/include/acpi/acconfig.h
@@ -144,6 +144,10 @@
144 144
145#define ACPI_ADDRESS_RANGE_MAX 2 145#define ACPI_ADDRESS_RANGE_MAX 2
146 146
147/* Maximum number of While() loops before abort */
148
149#define ACPI_MAX_LOOP_COUNT 0xFFFF
150
147/****************************************************************************** 151/******************************************************************************
148 * 152 *
149 * ACPI Specification constants (Do not change unless the specification changes) 153 * ACPI Specification constants (Do not change unless the specification changes)