Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1212664

[PATCH 14/20] ACPICA: Make the max-number-of-loops runtime configurable.

Show all headers | View raw

From: Bob Moore <robert.moore@intel.com>

ACPICA commit a9d9c2d0c2d077bb3175ec9c252cf0e5da3efd45

Was previously compile-time only.
Add support option for acpiexec.

Link: https://github.com/acpica/acpica/commit/a9d9c2d0
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
---
 drivers/acpi/acpica/acglobal.h  |    4 ++++
 drivers/acpi/acpica/dscontrol.c |    2 +-
 drivers/acpi/acpica/utinit.c    |    1 +
 include/acpi/acconfig.h         |    4 ----
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h
index c597192..03c443b 100644
--- a/drivers/acpi/acpica/acglobal.h
+++ b/drivers/acpi/acpica/acglobal.h
@@ -236,6 +236,10 @@ ACPI_INIT_GLOBAL(u32, acpi_gbl_nesting_level, 0);
 
 ACPI_GLOBAL(struct acpi_thread_state *, acpi_gbl_current_walk_list);
 
+/* Maximum number of While() loop iterations before forced abort */
+
+ACPI_GLOBAL(u16, acpi_gbl_max_loop_iterations);
+
 /* Control method single step flag */
 
 ACPI_GLOBAL(u8, acpi_gbl_cm_single_step);
diff --git a/drivers/acpi/acpica/dscontrol.c b/drivers/acpi/acpica/dscontrol.c
index 39da9da..435fc16 100644
--- a/drivers/acpi/acpica/dscontrol.c
+++ b/drivers/acpi/acpica/dscontrol.c
@@ -212,7 +212,7 @@ acpi_ds_exec_end_control_op(struct acpi_walk_state * walk_state,
 			 */
 			control_state->control.loop_count++;
 			if (control_state->control.loop_count >
-			    ACPI_MAX_LOOP_ITERATIONS) {
+			    acpi_gbl_max_loop_iterations) {
 				status = AE_AML_INFINITE_LOOP;
 				break;
 			}
diff --git a/drivers/acpi/acpica/utinit.c b/drivers/acpi/acpica/utinit.c
index 7f897c6..28ab3a1 100644
--- a/drivers/acpi/acpica/utinit.c
+++ b/drivers/acpi/acpica/utinit.c
@@ -207,6 +207,7 @@ acpi_status acpi_ut_init_globals(void)
 	acpi_gbl_debugger_configuration = DEBUGGER_THREADING;
 	acpi_gbl_osi_mutex = NULL;
 	acpi_gbl_reg_methods_executed = FALSE;
+	acpi_gbl_max_loop_iterations = 0xFFFF;
 
 	/* Hardware oriented */
 
diff --git a/include/acpi/acconfig.h b/include/acpi/acconfig.h
index 03aacfb..e11611c 100644
--- a/include/acpi/acconfig.h
+++ b/include/acpi/acconfig.h
@@ -136,10 +136,6 @@
 
 #define ACPI_ROOT_TABLE_SIZE_INCREMENT  4
 
-/* Maximum number of While() loop iterations before forced abort */
-
-#define ACPI_MAX_LOOP_ITERATIONS        0xFFFF
-
 /* Maximum sleep allowed via Sleep() operator */
 
 #define ACPI_MAX_SLEEP                  2000	/* 2000 millisec == two seconds */
-- 
1.7.10

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/20] ACPICA: 20150818 Release Lv Zheng <lv.zheng@intel.com> - 2015-08-25 04:30 +0200
  [PATCH 08/20] ACPICA: Headers: Fix some comments, no functional change. Lv Zheng <lv.zheng@intel.com> - 2015-08-25 04:30 +0200
  [PATCH 02/20] ACPICA: Disassembler: Remove duplicate code in _PLD processing. Lv Zheng <lv.zheng@intel.com> - 2015-08-25 04:30 +0200
  [PATCH 06/20] ACPICA: Tables: Fix global table list issues by removing fixed table indexes. Lv Zheng <lv.zheng@intel.com> - 2015-08-25 04:30 +0200
  [PATCH 12/20] ACPICA: Add additional debug info/statements. Lv Zheng <lv.zheng@intel.com> - 2015-08-25 04:30 +0200
  [PATCH 04/20] ACPICA: Disassembler: Update for new listing mode. Lv Zheng <lv.zheng@intel.com> - 2015-08-25 04:30 +0200
  [PATCH 07/20] ACPICA: Tables: Cleanup to reduce FACS globals. Lv Zheng <lv.zheng@intel.com> - 2015-08-25 04:30 +0200
  [PATCH 09/20] ACPICA: acpinames: Add new options and wildcard support. Lv Zheng <lv.zheng@intel.com> - 2015-08-25 04:30 +0200
  [PATCH 05/20] ACPICA: Update info messages during ACPICA init. Lv Zheng <lv.zheng@intel.com> - 2015-08-25 04:30 +0200
  [PATCH 11/20] ACPICA: Table handling: Cleanup and update debug output for tools. Lv Zheng <lv.zheng@intel.com> - 2015-08-25 04:30 +0200
  [PATCH 10/20] ACPICA: acpiexec/acpinames: Support very large number of ACPI tables. Lv Zheng <lv.zheng@intel.com> - 2015-08-25 04:30 +0200
  [PATCH 01/20] ACPICA: Correctly cleanup after a ACPI table load failure. Lv Zheng <lv.zheng@intel.com> - 2015-08-25 04:30 +0200
  [PATCH 19/20] ACPICA: Debugger: Cleanup debugging outputs to dump name path without trailing underscores. Lv Zheng <lv.zheng@intel.com> - 2015-08-25 04:40 +0200
  [PATCH 03/20] ACPICA: Update parameter validation for data_table_region and load_table. Lv Zheng <lv.zheng@intel.com> - 2015-08-25 04:40 +0200
  [PATCH 16/20] ACPICA: Debugger: Split debugger initialization/termination APIs. Lv Zheng <lv.zheng@intel.com> - 2015-08-25 04:40 +0200
  [PATCH 14/20] ACPICA: Make the max-number-of-loops runtime configurable. Lv Zheng <lv.zheng@intel.com> - 2015-08-25 04:40 +0200
  [PATCH 20/20] ACPICA: Update version to 20150818. Lv Zheng <lv.zheng@intel.com> - 2015-08-25 04:40 +0200
  [PATCH 17/20] ACPICA: Disassembler: Cleanup acpi_gbl_db_opt_disasm. Lv Zheng <lv.zheng@intel.com> - 2015-08-25 04:40 +0200
  [PATCH 13/20] ACPICA: Debugger: Add option to display namespace summary/counts. Lv Zheng <lv.zheng@intel.com> - 2015-08-25 04:40 +0200
  [PATCH 18/20] ACPICA: Disassembler: Cleanup acpi_gbl_db_opt_verbose acpiexec usage. Lv Zheng <lv.zheng@intel.com> - 2015-08-25 04:40 +0200
  [PATCH 15/20] ACPICA: Header support to improve compatibility with MSVC. Lv Zheng <lv.zheng@intel.com> - 2015-08-25 04:40 +0200
  Re: [PATCH 00/20] ACPICA: 20150818 Release "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2015-08-26 01:30 +0200

csiph-web