patch-2.4.22 linux-2.4.22/drivers/acpi/executer/excreate.c
Next file: linux-2.4.22/drivers/acpi/executer/exdump.c
Previous file: linux-2.4.22/drivers/acpi/executer/exconvrt.c
Back to the patch index
Back to the overall index
- Lines: 711
- Date:
2003-08-25 04:44:41.000000000 -0700
- Orig file:
linux-2.4.21/drivers/acpi/executer/excreate.c
- Orig date:
2001-10-24 14:06:22.000000000 -0700
diff -urN linux-2.4.21/drivers/acpi/executer/excreate.c linux-2.4.22/drivers/acpi/executer/excreate.c
@@ -1,48 +1,65 @@
/******************************************************************************
*
* Module Name: excreate - Named object creation
- * $Revision: 71 $
*
*****************************************************************************/
/*
- * 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 "acinterp.h"
-#include "amlcode.h"
-#include "acnamesp.h"
-#include "acevents.h"
-#include "acdispat.h"
+#include <acpi/acpi.h>
+#include <acpi/acinterp.h>
+#include <acpi/amlcode.h>
+#include <acpi/acnamesp.h>
+#include <acpi/acevents.h>
+#include <acpi/actables.h>
#define _COMPONENT ACPI_EXECUTER
- MODULE_NAME ("excreate")
+ ACPI_MODULE_NAME ("excreate")
+#ifndef ACPI_NO_METHOD_EXECUTION
/*****************************************************************************
*
- * FUNCTION: Acpi_ex_create_alias
+ * FUNCTION: acpi_ex_create_alias
*
- * PARAMETERS: Walk_state - Current state, contains List of
- * operands for the opcode
+ * PARAMETERS: walk_state - Current state, contains operands
*
* RETURN: Status
*
@@ -52,32 +69,69 @@
acpi_status
acpi_ex_create_alias (
- acpi_walk_state *walk_state)
+ struct acpi_walk_state *walk_state)
{
- acpi_namespace_node *source_node;
- acpi_status status;
+ struct acpi_namespace_node *target_node;
+ struct acpi_namespace_node *alias_node;
+ acpi_status status = AE_OK;
- FUNCTION_TRACE ("Ex_create_alias");
+ ACPI_FUNCTION_TRACE ("ex_create_alias");
/* Get the source/alias operands (both namespace nodes) */
- source_node = (acpi_namespace_node *) walk_state->operands[1];
+ alias_node = (struct acpi_namespace_node *) walk_state->operands[0];
+ target_node = (struct acpi_namespace_node *) walk_state->operands[1];
-
- /* Attach the original source object to the new Alias Node */
-
- status = acpi_ns_attach_object ((acpi_namespace_node *) walk_state->operands[0],
- source_node->object,
- source_node->type);
+ if (target_node->type == ACPI_TYPE_LOCAL_ALIAS) {
+ /*
+ * Dereference an existing alias so that we don't create a chain
+ * of aliases. With this code, we guarantee that an alias is
+ * always exactly one level of indirection away from the
+ * actual aliased name.
+ */
+ target_node = (struct acpi_namespace_node *) target_node->object;
+ }
/*
- * The new alias assumes the type of the source, but it points
- * to the same object. The reference count of the object has an
- * additional reference to prevent deletion out from under either the
- * source or the alias Node
+ * For objects that can never change (i.e., the NS node will
+ * permanently point to the same object), we can simply attach
+ * the object to the new NS node. For other objects (such as
+ * Integers, buffers, etc.), we have to point the Alias node
+ * to the original Node.
*/
+ switch (target_node->type) {
+ case ACPI_TYPE_INTEGER:
+ case ACPI_TYPE_STRING:
+ case ACPI_TYPE_BUFFER:
+ case ACPI_TYPE_PACKAGE:
+ case ACPI_TYPE_BUFFER_FIELD:
+
+ /*
+ * The new alias has the type ALIAS and points to the original
+ * NS node, not the object itself. This is because for these
+ * types, the object can change dynamically via a Store.
+ */
+ alias_node->type = ACPI_TYPE_LOCAL_ALIAS;
+ alias_node->object = ACPI_CAST_PTR (union acpi_operand_object, target_node);
+ break;
+
+ default:
+
+ /* Attach the original source object to the new Alias Node */
+
+ /*
+ * The new alias assumes the type of the target, and it points
+ * to the same object. The reference count of the object has an
+ * additional reference to prevent deletion out from under either the
+ * target node or the alias Node
+ */
+ status = acpi_ns_attach_object (alias_node,
+ acpi_ns_get_attached_object (target_node),
+ target_node->type);
+ break;
+ }
/* Since both operands are Nodes, we don't need to delete them */
@@ -87,9 +141,9 @@
/*****************************************************************************
*
- * FUNCTION: Acpi_ex_create_event
+ * FUNCTION: acpi_ex_create_event
*
- * PARAMETERS: Walk_state - Current state
+ * PARAMETERS: walk_state - Current state
*
* RETURN: Status
*
@@ -99,13 +153,13 @@
acpi_status
acpi_ex_create_event (
- acpi_walk_state *walk_state)
+ struct acpi_walk_state *walk_state)
{
- acpi_status status;
- acpi_operand_object *obj_desc;
+ acpi_status status;
+ union acpi_operand_object *obj_desc;
- FUNCTION_TRACE ("Ex_create_event");
+ ACPI_FUNCTION_TRACE ("ex_create_event");
obj_desc = acpi_ut_create_internal_object (ACPI_TYPE_EVENT);
@@ -114,11 +168,11 @@
goto cleanup;
}
- /* Create the actual OS semaphore */
-
- /* TBD: [Investigate] should be created with 0 or 1 units? */
-
- status = acpi_os_create_semaphore (ACPI_NO_UNIT_LIMIT, 1,
+ /*
+ * Create the actual OS semaphore, with zero initial units -- meaning
+ * that the event is created in an unsignalled state
+ */
+ status = acpi_os_create_semaphore (ACPI_NO_UNIT_LIMIT, 0,
&obj_desc->event.semaphore);
if (ACPI_FAILURE (status)) {
goto cleanup;
@@ -126,8 +180,8 @@
/* Attach object to the Node */
- status = acpi_ns_attach_object ((acpi_namespace_node *) walk_state->operands[0],
- obj_desc, (u8) ACPI_TYPE_EVENT);
+ status = acpi_ns_attach_object ((struct acpi_namespace_node *) walk_state->operands[0],
+ obj_desc, ACPI_TYPE_EVENT);
cleanup:
/*
@@ -141,27 +195,27 @@
/*****************************************************************************
*
- * FUNCTION: Acpi_ex_create_mutex
+ * FUNCTION: acpi_ex_create_mutex
*
- * PARAMETERS: Walk_state - Current state
+ * PARAMETERS: walk_state - Current state
*
* RETURN: Status
*
* DESCRIPTION: Create a new mutex object
*
- * Mutex (Name[0], Sync_level[1])
+ * Mutex (Name[0], sync_level[1])
*
****************************************************************************/
acpi_status
acpi_ex_create_mutex (
- acpi_walk_state *walk_state)
+ struct acpi_walk_state *walk_state)
{
- acpi_status status = AE_OK;
- acpi_operand_object *obj_desc;
+ acpi_status status = AE_OK;
+ union acpi_operand_object *obj_desc;
- FUNCTION_TRACE_PTR ("Ex_create_mutex", WALK_OPERANDS);
+ ACPI_FUNCTION_TRACE_PTR ("ex_create_mutex", ACPI_WALK_OPERANDS);
/* Create the new mutex object */
@@ -172,8 +226,11 @@
goto cleanup;
}
- /* Create the actual OS semaphore */
-
+ /*
+ * Create the actual OS semaphore.
+ * One unit max to make it a mutex, with one initial unit to allow
+ * the mutex to be acquired.
+ */
status = acpi_os_create_semaphore (1, 1, &obj_desc->mutex.semaphore);
if (ACPI_FAILURE (status)) {
goto cleanup;
@@ -182,9 +239,10 @@
/* Init object and attach to NS node */
obj_desc->mutex.sync_level = (u8) walk_state->operands[1]->integer.value;
+ obj_desc->mutex.node = (struct acpi_namespace_node *) walk_state->operands[0];
- status = acpi_ns_attach_object ((acpi_namespace_node *) walk_state->operands[0],
- obj_desc, (u8) ACPI_TYPE_MUTEX);
+ status = acpi_ns_attach_object (obj_desc->mutex.node,
+ obj_desc, ACPI_TYPE_MUTEX);
cleanup:
@@ -199,12 +257,12 @@
/*****************************************************************************
*
- * FUNCTION: Acpi_ex_create_region
+ * FUNCTION: acpi_ex_create_region
*
- * PARAMETERS: Aml_start - Pointer to the region declaration AML
- * Aml_length - Max length of the declaration AML
+ * PARAMETERS: aml_start - Pointer to the region declaration AML
+ * aml_length - Max length of the declaration AML
* Operands - List of operands for the opcode
- * Walk_state - Current state
+ * walk_state - Current state
*
* RETURN: Status
*
@@ -214,28 +272,29 @@
acpi_status
acpi_ex_create_region (
- u8 *aml_start,
- u32 aml_length,
- u8 region_space,
- acpi_walk_state *walk_state)
+ u8 *aml_start,
+ u32 aml_length,
+ u8 region_space,
+ struct acpi_walk_state *walk_state)
{
- acpi_status status;
- acpi_operand_object *obj_desc;
- acpi_namespace_node *node;
+ acpi_status status;
+ union acpi_operand_object *obj_desc;
+ struct acpi_namespace_node *node;
+ union acpi_operand_object *region_obj2;
- FUNCTION_TRACE ("Ex_create_region");
+ ACPI_FUNCTION_TRACE ("ex_create_region");
/* Get the Node from the object stack */
- node = (acpi_namespace_node *) walk_state->operands[0];
+ node = walk_state->op->common.node;
/*
* If the region object is already attached to this node,
* just return
*/
- if (node->object) {
+ if (acpi_ns_get_attached_object (node)) {
return_ACPI_STATUS (AE_OK);
}
@@ -243,9 +302,9 @@
* Space ID must be one of the predefined IDs, or in the user-defined
* range
*/
- if ((region_space >= NUM_REGION_TYPES) &&
- (region_space < USER_REGION_BEGIN)) {
- REPORT_ERROR (("Invalid Address_space type %X\n", region_space));
+ if ((region_space >= ACPI_NUM_PREDEFINED_REGIONS) &&
+ (region_space < ACPI_USER_REGION_BEGIN)) {
+ ACPI_REPORT_ERROR (("Invalid address_space type %X\n", region_space));
return_ACPI_STATUS (AE_AML_INVALID_SPACE_ID);
}
@@ -261,21 +320,13 @@
goto cleanup;
}
- /* Allocate a method object for this region */
-
- obj_desc->region.extra = acpi_ut_create_internal_object (
- INTERNAL_TYPE_EXTRA);
- if (!obj_desc->region.extra) {
- status = AE_NO_MEMORY;
- goto cleanup;
- }
-
/*
* Remember location in AML stream of address & length
* operands since they need to be evaluated at run time.
*/
- obj_desc->region.extra->extra.aml_start = aml_start;
- obj_desc->region.extra->extra.aml_length = aml_length;
+ region_obj2 = obj_desc->common.next_object;
+ region_obj2->extra.aml_start = aml_start;
+ region_obj2->extra.aml_length = aml_length;
/* Init the region from the operands */
@@ -286,102 +337,137 @@
/* Install the new region object in the parent Node */
- status = acpi_ns_attach_object (node, obj_desc,
- (u8) ACPI_TYPE_REGION);
- if (ACPI_FAILURE (status)) {
- goto cleanup;
- }
+ status = acpi_ns_attach_object (node, obj_desc, ACPI_TYPE_REGION);
- /*
- * If we have a valid region, initialize it
- * Namespace is NOT locked at this point.
- */
- status = acpi_ev_initialize_region (obj_desc, 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;
- }
- }
cleanup:
/* Remove local reference to the object */
acpi_ut_remove_reference (obj_desc);
-
return_ACPI_STATUS (status);
}
/*****************************************************************************
*
- * FUNCTION: Acpi_ex_create_table_region
+ * FUNCTION: acpi_ex_create_table_region
*
- * PARAMETERS: Walk_state - Current state
+ * PARAMETERS: walk_state - Current state
*
* RETURN: Status
*
- * DESCRIPTION: Create a new Data_table_region object
+ * DESCRIPTION: Create a new data_table_region object
*
****************************************************************************/
acpi_status
acpi_ex_create_table_region (
- acpi_walk_state *walk_state)
+ struct acpi_walk_state *walk_state)
{
- acpi_status status = AE_OK;
+ acpi_status status;
+ union acpi_operand_object **operand = &walk_state->operands[0];
+ union acpi_operand_object *obj_desc;
+ struct acpi_namespace_node *node;
+ struct acpi_table_header *table;
+ union acpi_operand_object *region_obj2;
- FUNCTION_TRACE ("Ex_create_table_region");
+ ACPI_FUNCTION_TRACE ("ex_create_table_region");
-/*
- acpi_operand_object *Obj_desc;
- Obj_desc = Acpi_ut_create_internal_object (ACPI_TYPE_REGION);
- if (!Obj_desc)
- {
- Status = AE_NO_MEMORY;
- goto Cleanup;
+ /* Get the Node from the object stack */
+
+ node = walk_state->op->common.node;
+
+ /*
+ * If the region object is already attached to this node,
+ * just return
+ */
+ if (acpi_ns_get_attached_object (node)) {
+ return_ACPI_STATUS (AE_OK);
}
+ /* Find the ACPI table */
-Cleanup:
-*/
+ status = acpi_tb_find_table (operand[1]->string.pointer,
+ operand[2]->string.pointer,
+ operand[3]->string.pointer, &table);
+
+ if (ACPI_FAILURE (status)) {
+ return_ACPI_STATUS (status);
+ }
+
+ /* Create the region descriptor */
+
+ obj_desc = acpi_ut_create_internal_object (ACPI_TYPE_REGION);
+ if (!obj_desc) {
+ return_ACPI_STATUS (AE_NO_MEMORY);
+ }
+
+ region_obj2 = obj_desc->common.next_object;
+ region_obj2->extra.region_context = NULL;
+
+ /* Init the region from the operands */
+
+ obj_desc->region.space_id = REGION_DATA_TABLE;
+ obj_desc->region.address = (acpi_physical_address) ACPI_TO_INTEGER (table);
+ obj_desc->region.length = table->length;
+ obj_desc->region.node = node;
+ obj_desc->region.flags = AOPOBJ_DATA_VALID;
+ /* Install the new region object in the parent Node */
+
+ status = acpi_ns_attach_object (node, obj_desc, ACPI_TYPE_REGION);
+ if (ACPI_FAILURE (status)) {
+ goto cleanup;
+ }
+
+ status = acpi_ev_initialize_region (obj_desc, FALSE);
+ if (ACPI_FAILURE (status)) {
+ if (status == AE_NOT_EXIST) {
+ status = AE_OK;
+ }
+ else {
+ goto cleanup;
+ }
+ }
+
+ obj_desc->region.flags |= AOPOBJ_SETUP_COMPLETE;
+
+
+cleanup:
+
+ /* Remove local reference to the object */
+
+ acpi_ut_remove_reference (obj_desc);
return_ACPI_STATUS (status);
}
/*****************************************************************************
*
- * FUNCTION: Acpi_ex_create_processor
+ * FUNCTION: acpi_ex_create_processor
*
- * PARAMETERS: Op - Op containing the Processor definition and
- * args
- * Processor_node - Parent Node for the processor object
+ * PARAMETERS: walk_state - Current state
*
* RETURN: Status
*
* DESCRIPTION: Create a new processor object and populate the fields
*
- * Processor (Name[0], Cpu_iD[1], Pblock_addr[2], Pblock_length[3])
+ * Processor (Name[0], cpu_iD[1], pblock_addr[2], pblock_length[3])
*
****************************************************************************/
acpi_status
acpi_ex_create_processor (
- acpi_walk_state *walk_state)
+ struct acpi_walk_state *walk_state)
{
- acpi_operand_object **operand = &walk_state->operands[0];
- acpi_operand_object *obj_desc;
- acpi_status status;
+ union acpi_operand_object **operand = &walk_state->operands[0];
+ union acpi_operand_object *obj_desc;
+ acpi_status status;
- FUNCTION_TRACE_PTR ("Ex_create_processor", walk_state);
+ ACPI_FUNCTION_TRACE_PTR ("ex_create_processor", walk_state);
/* Create the processor object */
@@ -395,13 +481,13 @@
* Initialize the processor object from the operands
*/
obj_desc->processor.proc_id = (u8) operand[1]->integer.value;
- obj_desc->processor.address = (ACPI_IO_ADDRESS) operand[2]->integer.value;
+ obj_desc->processor.address = (acpi_io_address) operand[2]->integer.value;
obj_desc->processor.length = (u8) operand[3]->integer.value;
/* Install the processor object in the parent Node */
- status = acpi_ns_attach_object ((acpi_namespace_node *) operand[0],
- obj_desc, (u8) ACPI_TYPE_PROCESSOR);
+ status = acpi_ns_attach_object ((struct acpi_namespace_node *) operand[0],
+ obj_desc, ACPI_TYPE_PROCESSOR);
/* Remove local reference to the object */
@@ -413,30 +499,28 @@
/*****************************************************************************
*
- * FUNCTION: Acpi_ex_create_power_resource
+ * FUNCTION: acpi_ex_create_power_resource
*
- * PARAMETERS: Op - Op containing the Power_resource definition
- * and args
- * Power_node - Parent Node for the power object
+ * PARAMETERS: walk_state - Current state
*
* RETURN: Status
*
- * DESCRIPTION: Create a new Power_resource object and populate the fields
+ * DESCRIPTION: Create a new power_resource object and populate the fields
*
- * Power_resource (Name[0], System_level[1], Resource_order[2])
+ * power_resource (Name[0], system_level[1], resource_order[2])
*
****************************************************************************/
acpi_status
acpi_ex_create_power_resource (
- acpi_walk_state *walk_state)
+ struct acpi_walk_state *walk_state)
{
- acpi_operand_object **operand = &walk_state->operands[0];
- acpi_status status;
- acpi_operand_object *obj_desc;
+ union acpi_operand_object **operand = &walk_state->operands[0];
+ acpi_status status;
+ union acpi_operand_object *obj_desc;
- FUNCTION_TRACE_PTR ("Ex_create_power_resource", walk_state);
+ ACPI_FUNCTION_TRACE_PTR ("ex_create_power_resource", walk_state);
/* Create the power resource object */
@@ -453,8 +537,8 @@
/* Install the power resource object in the parent Node */
- status = acpi_ns_attach_object ((acpi_namespace_node *) operand[0],
- obj_desc, (u8) ACPI_TYPE_POWER);
+ status = acpi_ns_attach_object ((struct acpi_namespace_node *) operand[0],
+ obj_desc, ACPI_TYPE_POWER);
/* Remove local reference to the object */
@@ -463,15 +547,15 @@
return_ACPI_STATUS (status);
}
+#endif
/*****************************************************************************
*
- * FUNCTION: Acpi_ex_create_method
+ * FUNCTION: acpi_ex_create_method
*
- * PARAMETERS: Aml_start - First byte of the method's AML
- * Aml_length - AML byte count for this method
- * Method_flags - AML method flag byte
- * Method - Method Node
+ * PARAMETERS: aml_start - First byte of the method's AML
+ * aml_length - AML byte count for this method
+ * walk_state - Current state
*
* RETURN: Status
*
@@ -481,17 +565,17 @@
acpi_status
acpi_ex_create_method (
- u8 *aml_start,
- u32 aml_length,
- acpi_walk_state *walk_state)
+ u8 *aml_start,
+ u32 aml_length,
+ struct acpi_walk_state *walk_state)
{
- acpi_operand_object **operand = &walk_state->operands[0];
- acpi_operand_object *obj_desc;
- acpi_status status;
- u8 method_flags;
+ union acpi_operand_object **operand = &walk_state->operands[0];
+ union acpi_operand_object *obj_desc;
+ acpi_status status;
+ u8 method_flags;
- FUNCTION_TRACE_PTR ("Ex_create_method", walk_state);
+ ACPI_FUNCTION_TRACE_PTR ("ex_create_method", walk_state);
/* Create a new method object */
@@ -520,7 +604,7 @@
if (method_flags & METHOD_FLAGS_SERIALIZED) {
/*
* ACPI 1.0: Concurrency = 1
- * ACPI 2.0: Concurrency = (Sync_level (in method declaration) + 1)
+ * ACPI 2.0: Concurrency = (sync_level (in method declaration) + 1)
*/
obj_desc->method.concurrency = (u8)
(((method_flags & METHOD_FLAGS_SYNCH_LEVEL) >> 4) + 1);
@@ -532,8 +616,8 @@
/* Attach the new object to the method Node */
- status = acpi_ns_attach_object ((acpi_namespace_node *) operand[0],
- obj_desc, (u8) ACPI_TYPE_METHOD);
+ status = acpi_ns_attach_object ((struct acpi_namespace_node *) operand[0],
+ obj_desc, ACPI_TYPE_METHOD);
/* Remove local reference to the object */
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)