Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8807e44 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Revert "ACPICA: Namespace: Fix namespace/interpreter lock ordering" 

Revert commit 45209046 (ACPICA: Namespace: Fix namespace/interpreter
lock ordering) that renders Dell Precision 5510 with the latest (1.2.10)
BIOS applied unable to boot.

Fixes: 45209046 (ACPICA: Namespace: Fix namespace/interpreter lock ordering)
Link: https://bugzilla.kernel.org/show_bug.cgi?id=121701


Reported-by: default avatarGreg White <gwhite@kupulau.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 92d21ac7

drivers/acpi/acpica/nsload.c

+1 −6
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ 
#include "acnamesp.h"

#include "acdispat.h"

#include "actables.h"

#include "acinterp.h"



#define _COMPONENT          ACPI_NAMESPACE

ACPI_MODULE_NAME("nsload")
@@ -79,8 +78,6 @@ acpi_ns_load_table(u32 table_index, struct acpi_namespace_node *node) 


	ACPI_FUNCTION_TRACE(ns_load_table);



	acpi_ex_enter_interpreter();



	/*

	 * Parse the table and load the namespace with all named

	 * objects found within. Control methods are NOT parsed
@@ -92,7 +89,7 @@ acpi_ns_load_table(u32 table_index, struct acpi_namespace_node *node) 
	 */

	status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);

	if (ACPI_FAILURE(status)) {

		goto unlock_interp;

		return_ACPI_STATUS(status);

	}



	/* If table already loaded into namespace, just return */
@@ -133,8 +130,6 @@ acpi_ns_load_table(u32 table_index, struct acpi_namespace_node *node) 


unlock:

	(void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);

unlock_interp:

	(void)acpi_ex_exit_interpreter();



	if (ACPI_FAILURE(status)) {

		return_ACPI_STATUS(status);

drivers/acpi/acpica/nsparse.c

+7 −2
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
#include "acparser.h"

#include "acdispat.h"

#include "actables.h"

#include "acinterp.h"



#define _COMPONENT          ACPI_NAMESPACE

ACPI_MODULE_NAME("nsparse")
@@ -170,6 +171,8 @@ acpi_ns_parse_table(u32 table_index, struct acpi_namespace_node *start_node) 


	ACPI_FUNCTION_TRACE(ns_parse_table);



	acpi_ex_enter_interpreter();



	/*

	 * AML Parse, pass 1

	 *
@@ -185,7 +188,7 @@ acpi_ns_parse_table(u32 table_index, struct acpi_namespace_node *start_node) 
	status = acpi_ns_one_complete_parse(ACPI_IMODE_LOAD_PASS1,

					    table_index, start_node);

	if (ACPI_FAILURE(status)) {

		return_ACPI_STATUS(status);

		goto error_exit;

	}



	/*
@@ -201,8 +204,10 @@ acpi_ns_parse_table(u32 table_index, struct acpi_namespace_node *start_node) 
	status = acpi_ns_one_complete_parse(ACPI_IMODE_LOAD_PASS2,

					    table_index, start_node);

	if (ACPI_FAILURE(status)) {

		return_ACPI_STATUS(status);

		goto error_exit;

	}



error_exit:

	acpi_ex_exit_interpreter();

	return_ACPI_STATUS(status);

}