ACPICA: Debugger: Fix dead lock issue ocurred in single stepping mode

ACPICA commit 35273add90da19cd8790fdb5735f52e3c9861684

When single step execution is not ended, executing another control methods
leads to dead locks around interpreter lock/namespace lock/method
serialization lock. So we should only allow one execution from the debugger
at same time. Lv Zheng.

Link: https://github.com/acpica/acpica/commit/35273add
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/dbexec.c b/drivers/acpi/acpica/dbexec.c
index 258e6157c658ccd8b6510ad9eeaee2adc6cc55f8..d713e2df65b918989368f5a4e982a0a30614c45d 100644 (file)
--- a/drivers/acpi/acpica/dbexec.c
+++ b/drivers/acpi/acpica/dbexec.c
@@ -370,7 +370,17 @@ acpi_db_execute(char *name, char **args, acpi_object_type * types, u32 flags)
 #ifdef ACPI_DEBUG_OUTPUT
        u32 previous_allocations;
        u32 allocations;
+#endif
 
+       /*
+        * Allow one execution to be performed by debugger or single step
+        * execution will be dead locked by the interpreter mutexes.
+        */
+       if (acpi_gbl_method_executing) {
+               acpi_os_printf("Only one debugger execution is allowed.\n");
+               return;
+       }
+#ifdef ACPI_DEBUG_OUTPUT
        /* Memory allocation tracking */
 
        previous_allocations = acpi_db_get_outstanding_allocations();