renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-19 02:34:01 +08:00
Code

ACPICA: Debugger: Fix "terminate" command by cleaning up subsystem shutdown logic

Browse Source 
ACPICA commit 7e823714911480be47e310fb1b3590d289b9fd99

Segmentation fault can be seen for executing the "terminate" command. This
is because acpi_ut_subsystem_shutdown() is errnously called multiple times.

This patch cleans up acpi_ut_subsystem_shutdown() logics to fix this
issue. Lv Zheng.

Link: https://github.com/acpica/acpica/commit/7e823714
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>
This commit is contained in:
Lv Zheng 2015-10-19 10:25:42 +08:00 committed by Rafael J. Wysocki
parent af08f9cc50
commit 086ab742ac
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/acpi/acpica/dbinput.c
View File

@ -1074,6 +1074,7 @@ acpi_db_command_dispatch(char *input_buffer,
* re-creating the semaphores! * re-creating the semaphores!
*/ */
acpi_gbl_db_terminate_loop = TRUE;
/* acpi_initialize (NULL); */ /* acpi_initialize (NULL); */
break; break;
@ -1151,7 +1152,7 @@ void ACPI_SYSTEM_XFACE acpi_db_execute_thread(void *context)
acpi_status status = AE_OK; acpi_status status = AE_OK;
acpi_status Mstatus; acpi_status Mstatus;
while (status != AE_CTRL_TERMINATE) { while (status != AE_CTRL_TERMINATE && !acpi_gbl_db_terminate_loop) {
acpi_gbl_method_executing = FALSE; acpi_gbl_method_executing = FALSE;
acpi_gbl_step_to_next_call = FALSE; acpi_gbl_step_to_next_call = FALSE;

13
drivers/acpi/acpica/utinit.c
View File

@ -282,6 +282,19 @@ void acpi_ut_subsystem_shutdown(void)
{ {
ACPI_FUNCTION_TRACE(ut_subsystem_shutdown); ACPI_FUNCTION_TRACE(ut_subsystem_shutdown);
/* Just exit if subsystem is already shutdown */
if (acpi_gbl_shutdown) {
ACPI_ERROR((AE_INFO, "ACPI Subsystem is already terminated"));
return_VOID;
}
/* Subsystem appears active, go ahead and shut it down */
acpi_gbl_shutdown = TRUE;
acpi_gbl_startup_flags = 0;
ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Shutting down ACPI Subsystem\n"));
#ifndef ACPI_ASL_COMPILER #ifndef ACPI_ASL_COMPILER
/* Close the acpi_event Handling */ /* Close the acpi_event Handling */

13
drivers/acpi/acpica/utxface.c
View File

@ -67,19 +67,6 @@ acpi_status __init acpi_terminate(void)
ACPI_FUNCTION_TRACE(acpi_terminate); ACPI_FUNCTION_TRACE(acpi_terminate);
/* Just exit if subsystem is already shutdown */
if (acpi_gbl_shutdown) {
ACPI_ERROR((AE_INFO, "ACPI Subsystem is already terminated"));
return_ACPI_STATUS(AE_OK);
}
/* Subsystem appears active, go ahead and shut it down */
acpi_gbl_shutdown = TRUE;
acpi_gbl_startup_flags = 0;
ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Shutting down ACPI Subsystem\n"));
/* Shutdown and free all resources */ /* Shutdown and free all resources */
acpi_ut_subsystem_shutdown(); acpi_ut_subsystem_shutdown();