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

Commit 8931d9ea authored by Lin Ming's avatar Lin Ming Committed by Len Brown
Browse files

ACPICA: Fix to allow region arguments to reference other scopes 

Allow referenced objects to be in a different scope.

http://www.acpica.org/bugzilla/show_bug.cgi?id=937
http://marc.info/?l=linux-acpi&m=131636632718222&w=2



ACPI Error: [RAMB] Namespace lookup failure, AE_NOT_FOUND (20110112/psargs-359)
ACPI Exception: AE_NOT_FOUND, Could not execute arguments for [RAMW] (Region) (20110112/nsinit-349)

    Scope (_SB)
    {
        Name (RAMB, 0xDF5A1018)
        OperationRegion (\RAMW, SystemMemory, RAMB, 0x00010000)
    }

For above ASL code, we need to save scope node(\_SB) to lookup
the argument node(\_SB.RAMB).

Reported-by: default avatarJim Green <student.northwestern@gmail.com>
Signed-off-by: default avatarLin Ming <ming.m.lin@intel.com>
Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 42f52843

drivers/acpi/acpica/acobject.h

+1 −0
Original line number Diff line number Diff line
@@ -358,6 +358,7 @@ typedef enum { 
 */

struct acpi_object_extra {

	ACPI_OBJECT_COMMON_HEADER struct acpi_namespace_node *method_REG;	/* _REG method for this region (if any) */

	struct acpi_namespace_node *scope_node;

	void *region_context;	/* Region-specific data */

	u8 *aml_start;

	u32 aml_length;

drivers/acpi/acpica/dsargs.c

+1 −1
Original line number Diff line number Diff line
@@ -384,7 +384,7 @@ acpi_status acpi_ds_get_region_arguments(union acpi_operand_object *obj_desc) 


	/* Execute the argument AML */



	status = acpi_ds_execute_arguments(node, node->parent,

	status = acpi_ds_execute_arguments(node, extra_desc->extra.scope_node,

					   extra_desc->extra.aml_length,

					   extra_desc->extra.aml_start);

	if (ACPI_FAILURE(status)) {

drivers/acpi/acpica/excreate.c

+6 −0
Original line number Diff line number Diff line
@@ -330,6 +330,12 @@ acpi_ex_create_region(u8 * aml_start, 
	region_obj2 = obj_desc->common.next_object;

	region_obj2->extra.aml_start = aml_start;

	region_obj2->extra.aml_length = aml_length;

	if (walk_state->scope_info) {

		region_obj2->extra.scope_node =

		    walk_state->scope_info->scope.node;

	} else {

		region_obj2->extra.scope_node = node;

	}



	/* Init the region from the operands */