ACPICA: Executer: Add option to bypass opcode tracing

ACPICA commit 61e9e20aadfaa03184d0959fbdc1fa5cdfea2551

This patch adds option to bypass opcode tracing. The option can be used to
reduce the trace message output. Lv Zheng.

Link: https://github.com/acpica/acpica/commit/61e9e20a
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/acpica/exdebug.c b/drivers/acpi/acpica/exdebug.c
index 708b2aed0145a006239eee25f0de486133621fbb..de92458236f56aa25a546276bc59f94038a78029 100644 (file)
--- a/drivers/acpi/acpica/exdebug.c
+++ b/drivers/acpi/acpica/exdebug.c
@@ -598,7 +598,8 @@ acpi_ex_start_trace_opcode(union acpi_parse_object *op,
 
        ACPI_FUNCTION_NAME(ex_start_trace_opcode);
 
-       if (acpi_ex_interpreter_trace_enabled(NULL)) {
+       if (acpi_ex_interpreter_trace_enabled(NULL) &&
+           (acpi_gbl_trace_flags & ACPI_TRACE_OPCODE)) {
                ACPI_TRACE_POINT(ACPI_TRACE_AML_OPCODE, TRUE,
                                 op->common.aml, op->common.aml_op_name);
        }
@@ -625,7 +626,8 @@ acpi_ex_stop_trace_opcode(union acpi_parse_object *op,
 
        ACPI_FUNCTION_NAME(ex_stop_trace_opcode);
 
-       if (acpi_ex_interpreter_trace_enabled(NULL)) {
+       if (acpi_ex_interpreter_trace_enabled(NULL) &&
+           (acpi_gbl_trace_flags & ACPI_TRACE_OPCODE)) {
                ACPI_TRACE_POINT(ACPI_TRACE_AML_OPCODE, FALSE,
                                 op->common.aml, op->common.aml_op_name);
        }

diff --git a/include/acpi/acoutput.h b/include/acpi/acoutput.h
index c3f0ac135f682ec67ceb65e2f64b113d1b0f4434..908d4f9c348ccb9e04ad81e0398a66c687b00917 100644 (file)
--- a/include/acpi/acoutput.h
+++ b/include/acpi/acoutput.h
@@ -187,8 +187,9 @@
 /*
  * Global trace flags
  */
-#define ACPI_TRACE_ENABLED          ((u32) 2)
-#define ACPI_TRACE_ONESHOT          ((u32) 1)
+#define ACPI_TRACE_ENABLED          ((u32) 4)
+#define ACPI_TRACE_ONESHOT          ((u32) 2)
+#define ACPI_TRACE_OPCODE           ((u32) 1)
 
 /* Defaults for trace debugging level/layer */