patch-2.4.22 linux-2.4.22/drivers/acpi/dispatcher/dswload.c
Next file: linux-2.4.22/drivers/acpi/dispatcher/dswscope.c
Previous file: linux-2.4.22/drivers/acpi/dispatcher/dswexec.c
Back to the patch index
Back to the overall index
- Lines: 1074
- Date:
2003-08-25 04:44:41.000000000 -0700
- Orig file:
linux-2.4.21/drivers/acpi/dispatcher/dswload.c
- Orig date:
2001-10-24 14:06:22.000000000 -0700
diff -urN linux-2.4.21/drivers/acpi/dispatcher/dswload.c linux-2.4.22/drivers/acpi/dispatcher/dswload.c
@@ -1,48 +1,66 @@
/******************************************************************************
*
* Module Name: dswload - Dispatcher namespace load callbacks
- * $Revision: 50 $
*
*****************************************************************************/
/*
- * Copyright (C) 2000, 2001 R. Byron Moore
+ * Copyright (C) 2000 - 2003, R. Byron Moore
+ * All rights reserved.
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions, and the following disclaimer,
+ * without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ * substantially similar to the "NO WARRANTY" disclaimer below
+ * ("Disclaimer") and any redistribution must be conditioned upon
+ * including a substantially similar Disclaimer requirement for further
+ * binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ * of any contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
*/
-#include "acpi.h"
-#include "acparser.h"
-#include "amlcode.h"
-#include "acdispat.h"
-#include "acinterp.h"
-#include "acnamesp.h"
-#include "acevents.h"
+#include <acpi/acpi.h>
+#include <acpi/acparser.h>
+#include <acpi/amlcode.h>
+#include <acpi/acdispat.h>
+#include <acpi/acinterp.h>
+#include <acpi/acnamesp.h>
+#include <acpi/acevents.h>
#define _COMPONENT ACPI_DISPATCHER
- MODULE_NAME ("dswload")
+ ACPI_MODULE_NAME ("dswload")
/*******************************************************************************
*
- * FUNCTION: Acpi_ds_init_callbacks
+ * FUNCTION: acpi_ds_init_callbacks
*
- * PARAMETERS: Walk_state - Current state of the parse tree walk
- * Pass_number - 1, 2, or 3
+ * PARAMETERS: walk_state - Current state of the parse tree walk
+ * pass_number - 1, 2, or 3
*
* RETURN: Status
*
@@ -52,8 +70,8 @@
acpi_status
acpi_ds_init_callbacks (
- acpi_walk_state *walk_state,
- u32 pass_number)
+ struct acpi_walk_state *walk_state,
+ u32 pass_number)
{
switch (pass_number) {
@@ -70,14 +88,15 @@
break;
case 3:
+#ifndef ACPI_NO_METHOD_EXECUTION
walk_state->parse_flags |= ACPI_PARSE_EXECUTE | ACPI_PARSE_DELETE_TREE;
walk_state->descending_callback = acpi_ds_exec_begin_op;
walk_state->ascending_callback = acpi_ds_exec_end_op;
+#endif
break;
default:
return (AE_BAD_PARAMETER);
- break;
}
return (AE_OK);
@@ -86,9 +105,9 @@
/*******************************************************************************
*
- * FUNCTION: Acpi_ds_load1_begin_op
+ * FUNCTION: acpi_ds_load1_begin_op
*
- * PARAMETERS: Walk_state - Current state of the parse tree walk
+ * PARAMETERS: walk_state - Current state of the parse tree walk
* Op - Op that has been just been reached in the
* walk; Arguments have not been evaluated yet.
*
@@ -100,33 +119,42 @@
acpi_status
acpi_ds_load1_begin_op (
- acpi_walk_state *walk_state,
- acpi_parse_object **out_op)
+ struct acpi_walk_state *walk_state,
+ union acpi_parse_object **out_op)
{
- acpi_parse_object *op;
- acpi_namespace_node *node;
- acpi_status status;
- acpi_object_type8 data_type;
- NATIVE_CHAR *path;
+ union acpi_parse_object *op;
+ struct acpi_namespace_node *node;
+ acpi_status status;
+ acpi_object_type object_type;
+ char *path;
+ u32 flags;
+
+ ACPI_FUNCTION_NAME ("ds_load1_begin_op");
- PROC_NAME ("Ds_load1_begin_op");
op = walk_state->op;
ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, "Op=%p State=%p\n", op, walk_state));
-
/* We are only interested in opcodes that have an associated name */
- if (walk_state->op) {
- if (!(walk_state->op_info->flags & AML_NAMED)) {
+ if (op) {
+ if (!(walk_state->op_info->flags & AML_NAMED)) {
+#if 0
+ if ((walk_state->op_info->class == AML_CLASS_EXECUTE) ||
+ (walk_state->op_info->class == AML_CLASS_CONTROL)) {
+ acpi_os_printf ("\n\n***EXECUTABLE OPCODE %s***\n\n", walk_state->op_info->name);
+ *out_op = op;
+ return (AE_CTRL_SKIP);
+ }
+#endif
*out_op = op;
return (AE_OK);
}
/* Check if this object has already been installed in the namespace */
- if (op->node) {
+ if (op->common.node) {
*out_op = op;
return (AE_OK);
}
@@ -136,30 +164,117 @@
/* Map the raw opcode into an internal object type */
- data_type = acpi_ds_map_named_opcode_to_data_type (walk_state->opcode);
-
+ object_type = walk_state->op_info->object_type;
ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
- "State=%p Op=%p Type=%x\n", walk_state, op, data_type));
+ "State=%p Op=%p [%s] ", walk_state, op, acpi_ut_get_type_name (object_type)));
+ switch (walk_state->opcode) {
+ case AML_SCOPE_OP:
- if (walk_state->opcode == AML_SCOPE_OP) {
- ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
- "State=%p Op=%p Type=%x\n", walk_state, op, data_type));
- }
+ /*
+ * The target name of the Scope() operator must exist at this point so
+ * that we can actually open the scope to enter new names underneath it.
+ * Allow search-to-root for single namesegs.
+ */
+ status = acpi_ns_lookup (walk_state->scope_info, path, object_type,
+ ACPI_IMODE_EXECUTE, ACPI_NS_SEARCH_PARENT, walk_state, &(node));
+ if (ACPI_FAILURE (status)) {
+ ACPI_REPORT_NSERROR (path, status);
+ return (status);
+ }
- /*
- * Enter the named type into the internal namespace. We enter the name
- * as we go downward in the parse tree. Any necessary subobjects that involve
- * arguments to the opcode must be created as we go back up the parse tree later.
- */
- status = acpi_ns_lookup (walk_state->scope_info, path, data_type,
- IMODE_LOAD_PASS1, NS_NO_UPSEARCH, walk_state, &(node));
+ /*
+ * Check to make sure that the target is
+ * one of the opcodes that actually opens a scope
+ */
+ switch (node->type) {
+ case ACPI_TYPE_LOCAL_SCOPE: /* Scope */
+ case ACPI_TYPE_DEVICE:
+ case ACPI_TYPE_POWER:
+ case ACPI_TYPE_PROCESSOR:
+ case ACPI_TYPE_THERMAL:
+
+ /* These are acceptable types */
+ break;
- if (ACPI_FAILURE (status)) {
- return (status);
+ case ACPI_TYPE_INTEGER:
+ case ACPI_TYPE_STRING:
+ case ACPI_TYPE_BUFFER:
+
+ /*
+ * These types we will allow, but we will change the type. This
+ * enables some existing code of the form:
+ *
+ * Name (DEB, 0)
+ * Scope (DEB) { ... }
+ *
+ * Note: silently change the type here. On the second pass, we will report a warning
+ */
+
+ ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Type override - [%4.4s] had invalid type (%s) for Scope operator, changed to (Scope)\n",
+ path, acpi_ut_get_type_name (node->type)));
+
+ node->type = ACPI_TYPE_ANY;
+ walk_state->scope_info->common.value = ACPI_TYPE_ANY;
+ break;
+
+ default:
+
+ /* All other types are an error */
+
+ ACPI_REPORT_ERROR (("Invalid type (%s) for target of Scope operator [%4.4s] (Cannot override)\n",
+ acpi_ut_get_type_name (node->type), path));
+
+ return (AE_AML_OPERAND_TYPE);
+ }
+ break;
+
+
+ default:
+
+ /*
+ * For all other named opcodes, we will enter the name into the namespace.
+ *
+ * Setup the search flags.
+ * Since we are entering a name into the namespace, we do not want to
+ * enable the search-to-root upsearch.
+ *
+ * There are only two conditions where it is acceptable that the name
+ * already exists:
+ * 1) the Scope() operator can reopen a scoping object that was
+ * previously defined (Scope, Method, Device, etc.)
+ * 2) Whenever we are parsing a deferred opcode (op_region, Buffer,
+ * buffer_field, or Package), the name of the object is already
+ * in the namespace.
+ */
+ flags = ACPI_NS_NO_UPSEARCH;
+ if ((walk_state->opcode != AML_SCOPE_OP) &&
+ (!(walk_state->parse_flags & ACPI_PARSE_DEFERRED_OP))) {
+ flags |= ACPI_NS_ERROR_IF_FOUND;
+ ACPI_DEBUG_PRINT_RAW ((ACPI_DB_DISPATCH, "Cannot already exist\n"));
+ }
+ else {
+ ACPI_DEBUG_PRINT_RAW ((ACPI_DB_DISPATCH, "Both Find or Create allowed\n"));
+ }
+
+ /*
+ * Enter the named type into the internal namespace. We enter the name
+ * as we go downward in the parse tree. Any necessary subobjects that involve
+ * arguments to the opcode must be created as we go back up the parse tree later.
+ */
+ status = acpi_ns_lookup (walk_state->scope_info, path, object_type,
+ ACPI_IMODE_LOAD_PASS1, flags, walk_state, &(node));
+ if (ACPI_FAILURE (status)) {
+ ACPI_REPORT_NSERROR (path, status);
+ return (status);
+ }
+ break;
}
+
+ /* Common exit */
+
if (!op) {
/* Create a new op */
@@ -171,13 +286,18 @@
/* Initialize */
- ((acpi_parse2_object *)op)->name = node->name;
+ op->named.name = node->name.integer;
+
+#if (defined (ACPI_NO_METHOD_EXECUTION) || defined (ACPI_CONSTANT_EVAL_ONLY))
+ op->named.path = (u8 *) path;
+#endif
+
/*
* Put the Node in the "op" object that the parser uses, so we
* can get it again quickly when this scope is closed
*/
- op->node = node;
+ op->common.node = node;
acpi_ps_append_arg (acpi_ps_get_parent_scope (&walk_state->parser_state), op);
*out_op = op;
@@ -187,9 +307,9 @@
/*******************************************************************************
*
- * FUNCTION: Acpi_ds_load1_end_op
+ * FUNCTION: acpi_ds_load1_end_op
*
- * PARAMETERS: Walk_state - Current state of the parse tree walk
+ * PARAMETERS: walk_state - Current state of the parse tree walk
* Op - Op that has been just been completed in the
* walk; Arguments have now been evaluated.
*
@@ -202,57 +322,107 @@
acpi_status
acpi_ds_load1_end_op (
- acpi_walk_state *walk_state)
+ struct acpi_walk_state *walk_state)
{
- acpi_parse_object *op;
- acpi_object_type8 data_type;
+ union acpi_parse_object *op;
+ acpi_object_type object_type;
+ acpi_status status = AE_OK;
+
+ ACPI_FUNCTION_NAME ("ds_load1_end_op");
- PROC_NAME ("Ds_load1_end_op");
op = walk_state->op;
ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, "Op=%p State=%p\n", op, walk_state));
-
/* We are only interested in opcodes that have an associated name */
- if (!(walk_state->op_info->flags & AML_NAMED)) {
+ if (!(walk_state->op_info->flags & (AML_NAMED | AML_FIELD))) {
return (AE_OK);
}
- /* Get the type to determine if we should pop the scope */
+ /* Get the object type to determine if we should pop the scope */
- data_type = acpi_ds_map_named_opcode_to_data_type (op->opcode);
+ object_type = walk_state->op_info->object_type;
- if (op->opcode == AML_NAME_OP) {
- /* For Name opcode, check the argument */
+#ifndef ACPI_NO_METHOD_EXECUTION
+ if (walk_state->op_info->flags & AML_FIELD) {
+ if (walk_state->opcode == AML_FIELD_OP ||
+ walk_state->opcode == AML_BANK_FIELD_OP ||
+ walk_state->opcode == AML_INDEX_FIELD_OP) {
+ status = acpi_ds_init_field_objects (op, walk_state);
+ }
+ return (status);
+ }
- if (op->value.arg) {
- data_type = acpi_ds_map_opcode_to_data_type (
- (op->value.arg)->opcode, NULL);
- ((acpi_namespace_node *)op->node)->type =
- (u8) data_type;
+
+ if (op->common.aml_opcode == AML_REGION_OP) {
+ status = acpi_ex_create_region (op->named.data, op->named.length,
+ (acpi_adr_space_type) ((op->common.value.arg)->common.value.integer), walk_state);
+ if (ACPI_FAILURE (status)) {
+ return (status);
+ }
+ }
+#endif
+
+ if (op->common.aml_opcode == AML_NAME_OP) {
+ /* For Name opcode, get the object type from the argument */
+
+ if (op->common.value.arg) {
+ object_type = (acpi_ps_get_opcode_info ((op->common.value.arg)->common.aml_opcode))->object_type;
+ op->common.node->type = (u8) object_type;
+ }
+ }
+
+ if (op->common.aml_opcode == AML_METHOD_OP) {
+ /*
+ * method_op pkg_length name_string method_flags term_list
+ *
+ * Note: We must create the method node/object pair as soon as we
+ * see the method declaration. This allows later pass1 parsing
+ * of invocations of the method (need to know the number of
+ * arguments.)
+ */
+ ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
+ "LOADING-Method: State=%p Op=%p named_obj=%p\n",
+ walk_state, op, op->named.node));
+
+ if (!acpi_ns_get_attached_object (op->named.node)) {
+ walk_state->operands[0] = (void *) op->named.node;
+ walk_state->num_operands = 1;
+
+ status = acpi_ds_create_operands (walk_state, op->common.value.arg);
+ if (ACPI_SUCCESS (status)) {
+ status = acpi_ex_create_method (op->named.data,
+ op->named.length, walk_state);
+ }
+ walk_state->operands[0] = NULL;
+ walk_state->num_operands = 0;
+
+ if (ACPI_FAILURE (status)) {
+ return (status);
+ }
}
}
/* Pop the scope stack */
- if (acpi_ns_opens_scope (data_type)) {
+ if (acpi_ns_opens_scope (object_type)) {
ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, "(%s): Popping scope for Op %p\n",
- acpi_ut_get_type_name (data_type), op));
+ acpi_ut_get_type_name (object_type), op));
- acpi_ds_scope_stack_pop (walk_state);
+ status = acpi_ds_scope_stack_pop (walk_state);
}
- return (AE_OK);
+ return (status);
}
/*******************************************************************************
*
- * FUNCTION: Acpi_ds_load2_begin_op
+ * FUNCTION: acpi_ds_load2_begin_op
*
- * PARAMETERS: Walk_state - Current state of the parse tree walk
+ * PARAMETERS: walk_state - Current state of the parse tree walk
* Op - Op that has been just been reached in the
* walk; Arguments have not been evaluated yet.
*
@@ -264,35 +434,28 @@
acpi_status
acpi_ds_load2_begin_op (
- acpi_walk_state *walk_state,
- acpi_parse_object **out_op)
+ struct acpi_walk_state *walk_state,
+ union acpi_parse_object **out_op)
{
- acpi_parse_object *op;
- acpi_namespace_node *node;
- acpi_status status;
- acpi_object_type8 data_type;
- NATIVE_CHAR *buffer_ptr;
- void *original = NULL;
+ union acpi_parse_object *op;
+ struct acpi_namespace_node *node;
+ acpi_status status;
+ acpi_object_type object_type;
+ char *buffer_ptr;
- PROC_NAME ("Ds_load2_begin_op");
+ ACPI_FUNCTION_TRACE ("ds_load2_begin_op");
+
op = walk_state->op;
ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, "Op=%p State=%p\n", op, walk_state));
-
if (op) {
/* We only care about Namespace opcodes here */
- if (!(walk_state->op_info->flags & AML_NSOPCODE) &&
- walk_state->opcode != AML_INT_NAMEPATH_OP) {
- return (AE_OK);
- }
-
- /* TBD: [Restructure] Temp! same code as in psparse */
-
- if (!(walk_state->op_info->flags & AML_NAMED)) {
- return (AE_OK);
+ if ((!(walk_state->op_info->flags & AML_NSOPCODE) && (walk_state->opcode != AML_INT_NAMEPATH_OP)) ||
+ (!(walk_state->op_info->flags & AML_NAMED))) {
+ return_ACPI_STATUS (AE_OK);
}
/*
@@ -301,61 +464,125 @@
if (walk_state->opcode == AML_INT_NAMEPATH_OP) {
/* For Namepath op, get the path string */
- buffer_ptr = op->value.string;
+ buffer_ptr = op->common.value.string;
if (!buffer_ptr) {
/* No name, just exit */
- return (AE_OK);
+ return_ACPI_STATUS (AE_OK);
}
}
else {
/* Get name from the op */
- buffer_ptr = (NATIVE_CHAR *) &((acpi_parse2_object *)op)->name;
+ buffer_ptr = (char *) &op->named.name;
}
}
else {
+ /* Get the namestring from the raw AML */
+
buffer_ptr = acpi_ps_get_next_namestring (&walk_state->parser_state);
}
+ /* Map the opcode into an internal object type */
- /* Map the raw opcode into an internal object type */
-
- data_type = acpi_ds_map_named_opcode_to_data_type (walk_state->opcode);
+ object_type = walk_state->op_info->object_type;
ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
- "State=%p Op=%p Type=%x\n", walk_state, op, data_type));
+ "State=%p Op=%p Type=%X\n", walk_state, op, object_type));
+
+ switch (walk_state->opcode) {
+ case AML_FIELD_OP:
+ case AML_BANK_FIELD_OP:
+ case AML_INDEX_FIELD_OP:
- if (walk_state->opcode == AML_FIELD_OP ||
- walk_state->opcode == AML_BANK_FIELD_OP ||
- walk_state->opcode == AML_INDEX_FIELD_OP) {
node = NULL;
status = AE_OK;
- }
+ break;
+
+ case AML_INT_NAMEPATH_OP:
- else if (walk_state->opcode == AML_INT_NAMEPATH_OP) {
/*
- * The Name_path is an object reference to an existing object. Don't enter the
+ * The name_path is an object reference to an existing object. Don't enter the
* name into the namespace, but look it up for use later
*/
- status = acpi_ns_lookup (walk_state->scope_info, buffer_ptr, data_type,
- IMODE_EXECUTE, NS_SEARCH_PARENT, walk_state, &(node));
- }
+ status = acpi_ns_lookup (walk_state->scope_info, buffer_ptr, object_type,
+ ACPI_IMODE_EXECUTE, ACPI_NS_SEARCH_PARENT, walk_state, &(node));
+ break;
- else {
- if (op && op->node) {
- original = op->node;
- node = op->node;
+ case AML_SCOPE_OP:
- if (acpi_ns_opens_scope (data_type)) {
- status = acpi_ds_scope_stack_push (node, data_type, walk_state);
+ /*
+ * The Path is an object reference to an existing object. Don't enter the
+ * name into the namespace, but look it up for use later
+ */
+ status = acpi_ns_lookup (walk_state->scope_info, buffer_ptr, object_type,
+ ACPI_IMODE_EXECUTE, ACPI_NS_SEARCH_PARENT, walk_state, &(node));
+ if (ACPI_FAILURE (status)) {
+ ACPI_REPORT_NSERROR (buffer_ptr, status);
+ return_ACPI_STATUS (status);
+ }
+ /*
+ * We must check to make sure that the target is
+ * one of the opcodes that actually opens a scope
+ */
+ switch (node->type) {
+ case ACPI_TYPE_LOCAL_SCOPE: /* Scope */
+ case ACPI_TYPE_DEVICE:
+ case ACPI_TYPE_POWER:
+ case ACPI_TYPE_PROCESSOR:
+ case ACPI_TYPE_THERMAL:
+
+ /* These are acceptable types */
+ break;
+
+ case ACPI_TYPE_INTEGER:
+ case ACPI_TYPE_STRING:
+ case ACPI_TYPE_BUFFER:
+
+ /*
+ * These types we will allow, but we will change the type. This
+ * enables some existing code of the form:
+ *
+ * Name (DEB, 0)
+ * Scope (DEB) { ... }
+ */
+
+ ACPI_REPORT_WARNING (("Type override - [%4.4s] had invalid type (%s) for Scope operator, changed to (Scope)\n",
+ buffer_ptr, acpi_ut_get_type_name (node->type)));
+
+ node->type = ACPI_TYPE_ANY;
+ walk_state->scope_info->common.value = ACPI_TYPE_ANY;
+ break;
+
+ default:
+
+ /* All other types are an error */
+
+ ACPI_REPORT_ERROR (("Invalid type (%s) for target of Scope operator [%4.4s]\n",
+ acpi_ut_get_type_name (node->type), buffer_ptr));
+
+ return (AE_AML_OPERAND_TYPE);
+ }
+ break;
+
+ default:
+
+ /* All other opcodes */
+
+ if (op && op->common.node) {
+ /* This op/node was previously entered into the namespace */
+
+ node = op->common.node;
+
+ if (acpi_ns_opens_scope (object_type)) {
+ status = acpi_ds_scope_stack_push (node, object_type, walk_state);
if (ACPI_FAILURE (status)) {
- return (status);
+ return_ACPI_STATUS (status);
}
}
- return (AE_OK);
+ return_ACPI_STATUS (AE_OK);
}
/*
@@ -363,50 +590,50 @@
* as we go downward in the parse tree. Any necessary subobjects that involve
* arguments to the opcode must be created as we go back up the parse tree later.
*/
- status = acpi_ns_lookup (walk_state->scope_info, buffer_ptr, data_type,
- IMODE_EXECUTE, NS_NO_UPSEARCH, walk_state, &(node));
+ status = acpi_ns_lookup (walk_state->scope_info, buffer_ptr, object_type,
+ ACPI_IMODE_EXECUTE, ACPI_NS_NO_UPSEARCH, walk_state, &(node));
+ break;
}
- if (ACPI_SUCCESS (status)) {
- if (!op) {
- /* Create a new op */
+ if (ACPI_FAILURE (status)) {
+ ACPI_REPORT_NSERROR (buffer_ptr, status);
+ return_ACPI_STATUS (status);
+ }
- op = acpi_ps_alloc_op (walk_state->opcode);
- if (!op) {
- return (AE_NO_MEMORY);
- }
- /* Initialize */
+ if (!op) {
+ /* Create a new op */
- ((acpi_parse2_object *)op)->name = node->name;
- *out_op = op;
+ op = acpi_ps_alloc_op (walk_state->opcode);
+ if (!op) {
+ return_ACPI_STATUS (AE_NO_MEMORY);
}
- /*
- * Put the Node in the "op" object that the parser uses, so we
- * can get it again quickly when this scope is closed
- */
- op->node = node;
-
- if (original) {
- ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "old %p new %p\n", original, node));
+ /* Initialize the new op */
- if (original != node) {
- ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
- "Lookup match error: old %p new %p\n", original, node));
- }
+ if (node) {
+ op->named.name = node->name.integer;
+ }
+ if (out_op) {
+ *out_op = op;
}
}
- return (status);
+ /*
+ * Put the Node in the "op" object that the parser uses, so we
+ * can get it again quickly when this scope is closed
+ */
+ op->common.node = node;
+
+ return_ACPI_STATUS (status);
}
/*******************************************************************************
*
- * FUNCTION: Acpi_ds_load2_end_op
+ * FUNCTION: acpi_ds_load2_end_op
*
- * PARAMETERS: Walk_state - Current state of the parse tree walk
+ * PARAMETERS: walk_state - Current state of the parse tree walk
* Op - Op that has been just been completed in the
* walk; Arguments have now been evaluated.
*
@@ -419,48 +646,44 @@
acpi_status
acpi_ds_load2_end_op (
- acpi_walk_state *walk_state)
+ struct acpi_walk_state *walk_state)
{
- acpi_parse_object *op;
- acpi_status status = AE_OK;
- acpi_object_type8 data_type;
- acpi_namespace_node *node;
- acpi_parse_object *arg;
- acpi_namespace_node *new_node;
- u32 i;
+ union acpi_parse_object *op;
+ acpi_status status = AE_OK;
+ acpi_object_type object_type;
+ struct acpi_namespace_node *node;
+ union acpi_parse_object *arg;
+ struct acpi_namespace_node *new_node;
+#ifndef ACPI_NO_METHOD_EXECUTION
+ u32 i;
+#endif
- PROC_NAME ("Ds_load2_end_op");
+ ACPI_FUNCTION_TRACE ("ds_load2_end_op");
op = walk_state->op;
- ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, "Op=%p State=%p\n", op, walk_state));
-
+ ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, "Opcode [%s] Op %p State %p\n",
+ walk_state->op_info->name, op, walk_state));
/* Only interested in opcodes that have namespace objects */
if (!(walk_state->op_info->flags & AML_NSOBJECT)) {
- return (AE_OK);
+ return_ACPI_STATUS (AE_OK);
}
- if (op->opcode == AML_SCOPE_OP) {
+ if (op->common.aml_opcode == AML_SCOPE_OP) {
ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
"Ending scope Op=%p State=%p\n", op, walk_state));
-
- if (((acpi_parse2_object *)op)->name == -1) {
- ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Unnamed scope! Op=%p State=%p\n",
- op, walk_state));
- return (AE_OK);
- }
}
- data_type = acpi_ds_map_named_opcode_to_data_type (op->opcode);
+ object_type = walk_state->op_info->object_type;
/*
* Get the Node/name from the earlier lookup
* (It was saved in the *op structure)
*/
- node = op->node;
+ node = op->common.node;
/*
* Put the Node on the object stack (Contains the ACPI Name of
@@ -471,11 +694,14 @@
/* Pop the scope stack */
- if (acpi_ns_opens_scope (data_type)) {
-
+ if (acpi_ns_opens_scope (object_type) && (op->common.aml_opcode != AML_INT_METHODCALL_OP)) {
ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, "(%s) Popping scope for Op %p\n",
- acpi_ut_get_type_name (data_type), op));
- acpi_ds_scope_stack_pop (walk_state);
+ acpi_ut_get_type_name (object_type), op));
+
+ status = acpi_ds_scope_stack_pop (walk_state);
+ if (ACPI_FAILURE (status)) {
+ goto cleanup;
+ }
}
/*
@@ -507,14 +733,16 @@
*/
ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
- "Create-Load [%s] State=%p Op=%p Named_obj=%p\n",
- acpi_ps_get_opcode_name (op->opcode), walk_state, op, node));
+ "Create-Load [%s] State=%p Op=%p named_obj=%p\n",
+ acpi_ps_get_opcode_name (op->common.aml_opcode), walk_state, op, node));
/* Decode the opcode */
- arg = op->value.arg;
+ arg = op->common.value.arg;
switch (walk_state->op_info->type) {
+#ifndef ACPI_NO_METHOD_EXECUTION
+
case AML_TYPE_CREATE_FIELD:
/*
@@ -527,24 +755,25 @@
case AML_TYPE_NAMED_FIELD:
- arg = op->value.arg;
- switch (op->opcode) {
+ switch (op->common.aml_opcode) {
case AML_INDEX_FIELD_OP:
- status = acpi_ds_create_index_field (op, (acpi_handle) arg->node,
+ status = acpi_ds_create_index_field (op, (acpi_handle) arg->common.node,
walk_state);
break;
-
case AML_BANK_FIELD_OP:
- status = acpi_ds_create_bank_field (op, arg->node, walk_state);
+ status = acpi_ds_create_bank_field (op, arg->common.node, walk_state);
break;
-
case AML_FIELD_OP:
- status = acpi_ds_create_field (op, arg->node, walk_state);
+ status = acpi_ds_create_field (op, arg->common.node, walk_state);
+ break;
+
+ default:
+ /* All NAMED_FIELD opcodes must be handled above */
break;
}
break;
@@ -557,31 +786,27 @@
goto cleanup;
}
- switch (op->opcode) {
+ switch (op->common.aml_opcode) {
case AML_PROCESSOR_OP:
status = acpi_ex_create_processor (walk_state);
break;
-
case AML_POWER_RES_OP:
status = acpi_ex_create_power_resource (walk_state);
break;
-
case AML_MUTEX_OP:
status = acpi_ex_create_mutex (walk_state);
break;
-
case AML_EVENT_OP:
status = acpi_ex_create_event (walk_state);
break;
-
case AML_DATA_REGION_OP:
status = acpi_ex_create_table_region (walk_state);
@@ -597,7 +822,6 @@
status = AE_OK;
goto cleanup;
- break;
}
/* Delete operands */
@@ -608,40 +832,32 @@
}
break;
-
+#endif /* ACPI_NO_METHOD_EXECUTION */
case AML_TYPE_NAMED_COMPLEX:
- switch (op->opcode) {
- case AML_METHOD_OP:
- /*
- * Method_op Pkg_length Names_string Method_flags Term_list
- */
- ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
- "LOADING-Method: State=%p Op=%p Named_obj=%p\n",
- walk_state, op, node));
-
- if (!node->object) {
- status = acpi_ds_create_operands (walk_state, arg);
- if (ACPI_FAILURE (status)) {
- goto cleanup;
- }
-
- status = acpi_ex_create_method (((acpi_parse2_object *) op)->data,
- ((acpi_parse2_object *) op)->length,
- walk_state);
- }
- break;
-
-
+ switch (op->common.aml_opcode) {
+#ifndef ACPI_NO_METHOD_EXECUTION
case AML_REGION_OP:
/*
- * The Op_region is not fully parsed at this time. Only valid argument is the Space_id.
+ * The op_region is not fully parsed at this time. Only valid argument is the space_id.
* (We must save the address of the AML of the address and length operands)
*/
- status = acpi_ex_create_region (((acpi_parse2_object *) op)->data,
- ((acpi_parse2_object *) op)->length,
- (ACPI_ADR_SPACE_TYPE) arg->value.integer, walk_state);
+ /*
+ * If we have a valid region, initialize it
+ * Namespace is NOT locked at this point.
+ */
+ status = acpi_ev_initialize_region (acpi_ns_get_attached_object (node), FALSE);
+ if (ACPI_FAILURE (status)) {
+ /*
+ * If AE_NOT_EXIST is returned, it is not fatal
+ * because many regions get created before a handler
+ * is installed for said region.
+ */
+ if (AE_NOT_EXIST == status) {
+ status = AE_OK;
+ }
+ }
break;
@@ -649,6 +865,13 @@
status = acpi_ds_create_node (walk_state, node, op);
break;
+#endif /* ACPI_NO_METHOD_EXECUTION */
+
+
+ default:
+ /* All NAMED_COMPLEX opcodes must be handled above */
+ /* Note: Method objects were already created in Pass 1 */
+ break;
}
break;
@@ -662,29 +885,34 @@
case AML_CLASS_METHOD_CALL:
ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
- "RESOLVING-Method_call: State=%p Op=%p Named_obj=%p\n",
+ "RESOLVING-method_call: State=%p Op=%p named_obj=%p\n",
walk_state, op, node));
/*
* Lookup the method name and save the Node
*/
- status = acpi_ns_lookup (walk_state->scope_info, arg->value.string,
- ACPI_TYPE_ANY, IMODE_LOAD_PASS2,
- NS_SEARCH_PARENT | NS_DONT_OPEN_SCOPE,
+ status = acpi_ns_lookup (walk_state->scope_info, arg->common.value.string,
+ ACPI_TYPE_ANY, ACPI_IMODE_LOAD_PASS2,
+ ACPI_NS_SEARCH_PARENT | ACPI_NS_DONT_OPEN_SCOPE,
walk_state, &(new_node));
if (ACPI_SUCCESS (status)) {
- /* TBD: has name already been resolved by here ??*/
-
- /* TBD: [Restructure] Make sure that what we found is indeed a method! */
- /* We didn't search for a method on purpose, to see if the name would resolve! */
+ /*
+ * Make sure that what we found is indeed a method
+ * We didn't search for a method on purpose, to see if the name would resolve
+ */
+ if (new_node->type != ACPI_TYPE_METHOD) {
+ status = AE_AML_OPERAND_TYPE;
+ }
/* We could put the returned object (Node) on the object stack for later, but
* for now, we will put it in the "op" object that the parser uses, so we
* can get it again at the end of this scope
*/
- op->node = new_node;
+ op->common.node = new_node;
+ }
+ else {
+ ACPI_REPORT_NSERROR (arg->common.value.string, status);
}
-
break;
@@ -692,14 +920,13 @@
break;
}
-
cleanup:
/* Remove the Node pushed at the very beginning */
walk_state->operands[0] = NULL;
walk_state->num_operands = 0;
- return (status);
+ return_ACPI_STATUS (status);
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)