patch-2.4.22 linux-2.4.22/drivers/acpi/events/evregion.c
Next file: linux-2.4.22/drivers/acpi/events/evrgnini.c
Previous file: linux-2.4.22/drivers/acpi/events/evmisc.c
Back to the patch index
Back to the overall index
- Lines: 947
- Date:
2003-08-25 04:44:41.000000000 -0700
- Orig file:
linux-2.4.21/drivers/acpi/events/evregion.c
- Orig date:
2001-10-24 14:06:22.000000000 -0700
diff -urN linux-2.4.21/drivers/acpi/events/evregion.c linux-2.4.22/drivers/acpi/events/evregion.c
@@ -1,66 +1,93 @@
/******************************************************************************
*
- * Module Name: evregion - ACPI Address_space (Op_region) handler dispatch
- * $Revision: 113 $
+ * Module Name: evregion - ACPI address_space (op_region) handler dispatch
*
*****************************************************************************/
/*
- * 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 "acevents.h"
-#include "acnamesp.h"
-#include "acinterp.h"
-#include "amlcode.h"
+#include <acpi/acpi.h>
+#include <acpi/acevents.h>
+#include <acpi/acnamesp.h>
+#include <acpi/acinterp.h>
#define _COMPONENT ACPI_EVENTS
- MODULE_NAME ("evregion")
+ ACPI_MODULE_NAME ("evregion")
+
+#define ACPI_NUM_DEFAULT_SPACES 4
+
+u8 acpi_gbl_default_address_spaces[ACPI_NUM_DEFAULT_SPACES] = {
+ ACPI_ADR_SPACE_SYSTEM_MEMORY,
+ ACPI_ADR_SPACE_SYSTEM_IO,
+ ACPI_ADR_SPACE_PCI_CONFIG,
+ ACPI_ADR_SPACE_DATA_TABLE};
/*******************************************************************************
*
- * FUNCTION: Acpi_ev_install_default_address_space_handlers
+ * FUNCTION: acpi_ev_init_address_spaces
*
- * PARAMETERS:
+ * PARAMETERS: None
*
* RETURN: Status
*
- * DESCRIPTION: Installs the core subsystem address space handlers.
+ * DESCRIPTION: Installs the core subsystem default address space handlers.
*
******************************************************************************/
acpi_status
-acpi_ev_install_default_address_space_handlers (
- void)
-{
- acpi_status status;
+acpi_ev_init_address_spaces (
+ void) {
+ acpi_status status;
+ acpi_native_uint i;
- FUNCTION_TRACE ("Ev_install_default_address_space_handlers");
+ ACPI_FUNCTION_TRACE ("ev_init_address_spaces");
/*
* All address spaces (PCI Config, EC, SMBus) are scope dependent
- * and registration must occur for a specific device. In the case
- * system memory and IO address spaces there is currently no device
- * associated with the address space. For these we use the root.
+ * and registration must occur for a specific device.
+ *
+ * In the case of the system memory and IO address spaces there is currently
+ * no device associated with the address space. For these we use the root.
+ *
* We install the default PCI config space handler at the root so
* that this space is immediately available even though the we have
* not enumerated all the PCI Root Buses yet. This is to conform
@@ -68,45 +95,39 @@
* space must be always available -- even though we are nowhere
* near ready to find the PCI root buses at this point.
*
- * NOTE: We ignore AE_EXIST because this means that a handler has
- * already been installed (via Acpi_install_address_space_handler)
+ * NOTE: We ignore AE_ALREADY_EXISTS because this means that a handler
+ * has already been installed (via acpi_install_address_space_handler).
+ * Similar for AE_SAME_HANDLER.
*/
- status = acpi_install_address_space_handler (acpi_gbl_root_node,
- ACPI_ADR_SPACE_SYSTEM_MEMORY,
- ACPI_DEFAULT_HANDLER, NULL, NULL);
- if ((ACPI_FAILURE (status)) &&
- (status != AE_EXIST)) {
- return_ACPI_STATUS (status);
- }
-
- status = acpi_install_address_space_handler (acpi_gbl_root_node,
- ACPI_ADR_SPACE_SYSTEM_IO,
- ACPI_DEFAULT_HANDLER, NULL, NULL);
- if ((ACPI_FAILURE (status)) &&
- (status != AE_EXIST)) {
- return_ACPI_STATUS (status);
- }
-
- status = acpi_install_address_space_handler (acpi_gbl_root_node,
- ACPI_ADR_SPACE_PCI_CONFIG,
- ACPI_DEFAULT_HANDLER, NULL, NULL);
- if ((ACPI_FAILURE (status)) &&
- (status != AE_EXIST)) {
- return_ACPI_STATUS (status);
- }
+ for (i = 0; i < ACPI_NUM_DEFAULT_SPACES; i++) {
+ status = acpi_install_address_space_handler ((acpi_handle) acpi_gbl_root_node,
+ acpi_gbl_default_address_spaces[i],
+ ACPI_DEFAULT_HANDLER, NULL, NULL);
+ switch (status) {
+ case AE_OK:
+ case AE_SAME_HANDLER:
+ case AE_ALREADY_EXISTS:
+
+ /* These exceptions are all OK */
+
+ break;
+
+ default:
+
+ return_ACPI_STATUS (status);
+ }
+ }
return_ACPI_STATUS (AE_OK);
}
-/* TBD: [Restructure] Move elsewhere */
-
/*******************************************************************************
*
- * FUNCTION: Acpi_ev_execute_reg_method
+ * FUNCTION: acpi_ev_execute_reg_method
*
- * PARAMETERS: Region_obj - Object structure
+ * PARAMETERS: region_obj - Object structure
* Function - On (1) or Off (0)
*
* RETURN: Status
@@ -117,25 +138,31 @@
static acpi_status
acpi_ev_execute_reg_method (
- acpi_operand_object *region_obj,
- u32 function)
+ union acpi_operand_object *region_obj,
+ u32 function)
{
- acpi_operand_object *params[3];
- acpi_status status;
+ union acpi_operand_object *params[3];
+ union acpi_operand_object *region_obj2;
+ acpi_status status;
+
+ ACPI_FUNCTION_TRACE ("ev_execute_reg_method");
- FUNCTION_TRACE ("Ev_execute_reg_method");
+ region_obj2 = acpi_ns_get_secondary_object (region_obj);
+ if (!region_obj2) {
+ return_ACPI_STATUS (AE_NOT_EXIST);
+ }
- if (region_obj->region.extra->extra.method_REG == NULL) {
+ if (region_obj2->extra.method_REG == NULL) {
return_ACPI_STATUS (AE_OK);
}
/*
- * _REG method has two arguments
- * Arg0: Integer: Operation region space ID
- * Same value as Region_obj->Region.Space_id
- * Arg1: Integer: connection status
+ * _REG method has two arguments
+ * Arg0: Integer: Operation region space ID
+ * Same value as region_obj->Region.space_id
+ * Arg1: Integer: connection status
* 1 for connecting the handler,
* 0 for disconnecting the handler
* Passed as a parameter
@@ -151,18 +178,16 @@
goto cleanup;
}
- /*
- * Set up the parameter objects
- */
- params[0]->integer.value = region_obj->region.space_id;
+ /* Set up the parameter objects */
+
+ params[0]->integer.value = region_obj->region.space_id;
params[1]->integer.value = function;
params[2] = NULL;
- /*
- * Execute the method, no return value
- */
- DEBUG_EXEC(acpi_ut_display_init_pathname (region_obj->region.extra->extra.method_REG, " [Method]"));
- status = acpi_ns_evaluate_by_handle (region_obj->region.extra->extra.method_REG, params, NULL);
+ /* Execute the method, no return value */
+
+ ACPI_DEBUG_EXEC(acpi_ut_display_init_pathname (ACPI_TYPE_METHOD, region_obj2->extra.method_REG, NULL));
+ status = acpi_ns_evaluate_by_handle (region_obj2->extra.method_REG, params, NULL);
acpi_ut_remove_reference (params[1]);
@@ -175,13 +200,13 @@
/*******************************************************************************
*
- * FUNCTION: Acpi_ev_address_space_dispatch
+ * FUNCTION: acpi_ev_address_space_dispatch
*
- * PARAMETERS: Region_obj - internal region object
- * Space_id - ID of the address space (0-255)
+ * PARAMETERS: region_obj - internal region object
+ * space_id - ID of the address space (0-255)
* Function - Read or Write operation
* Address - Where in the space to read or write
- * Bit_width - Field width in bits (8, 16, or 32)
+ * bit_width - Field width in bits (8, 16, 32, or 64)
* Value - Pointer to in or out value
*
* RETURN: Status
@@ -193,121 +218,142 @@
acpi_status
acpi_ev_address_space_dispatch (
- acpi_operand_object *region_obj,
- u32 function,
- ACPI_PHYSICAL_ADDRESS address,
- u32 bit_width,
- u32 *value)
+ union acpi_operand_object *region_obj,
+ u32 function,
+ acpi_physical_address address,
+ u32 bit_width,
+ void *value)
{
- acpi_status status;
- acpi_adr_space_handler handler;
- acpi_adr_space_setup region_setup;
- acpi_operand_object *handler_desc;
- void *region_context = NULL;
+ acpi_status status;
+ acpi_status status2;
+ acpi_adr_space_handler handler;
+ acpi_adr_space_setup region_setup;
+ union acpi_operand_object *handler_desc;
+ union acpi_operand_object *region_obj2;
+ void *region_context = NULL;
- FUNCTION_TRACE ("Ev_address_space_dispatch");
+ ACPI_FUNCTION_TRACE ("ev_address_space_dispatch");
- /*
- * Ensure that there is a handler associated with this region
- */
- handler_desc = region_obj->region.addr_handler;
+ region_obj2 = acpi_ns_get_secondary_object (region_obj);
+ if (!region_obj2) {
+ return_ACPI_STATUS (AE_NOT_EXIST);
+ }
+
+ /* Ensure that there is a handler associated with this region */
+
+ handler_desc = region_obj->region.address_space;
if (!handler_desc) {
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "no handler for region(%p) [%s]\n",
region_obj, acpi_ut_get_region_name (region_obj->region.space_id)));
- return_ACPI_STATUS(AE_NOT_EXIST);
+ return_ACPI_STATUS (AE_NOT_EXIST);
}
/*
* It may be the case that the region has never been initialized
* Some types of regions require special init code
*/
- if (!(region_obj->region.flags & AOPOBJ_INITIALIZED)) {
+ if (!(region_obj->region.flags & AOPOBJ_SETUP_COMPLETE)) {
/*
* This region has not been initialized yet, do it
*/
- region_setup = handler_desc->addr_handler.setup;
+ region_setup = handler_desc->address_space.setup;
if (!region_setup) {
- /*
- * Bad news, no init routine and not init'd
- */
+ /* No initialization routine, exit with error */
+
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "No init routine for region(%p) [%s]\n",
region_obj, acpi_ut_get_region_name (region_obj->region.space_id)));
- return_ACPI_STATUS (AE_UNKNOWN_STATUS);
+ return_ACPI_STATUS (AE_NOT_EXIST);
}
/*
* We must exit the interpreter because the region setup will potentially
- * execute control methods
+ * execute control methods (e.g., _REG method for this region)
*/
acpi_ex_exit_interpreter ();
status = region_setup (region_obj, ACPI_REGION_ACTIVATE,
- handler_desc->addr_handler.context, ®ion_context);
+ handler_desc->address_space.context, ®ion_context);
/* Re-enter the interpreter */
- acpi_ex_enter_interpreter ();
+ status2 = acpi_ex_enter_interpreter ();
+ if (ACPI_FAILURE (status2)) {
+ return_ACPI_STATUS (status2);
+ }
+
+ /* Check for failure of the Region Setup */
- /*
- * Init routine may fail
- */
if (ACPI_FAILURE (status)) {
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Region Init: %s [%s]\n",
acpi_format_exception (status),
acpi_ut_get_region_name (region_obj->region.space_id)));
- return_ACPI_STATUS(status);
+ return_ACPI_STATUS (status);
}
- region_obj->region.flags |= AOPOBJ_INITIALIZED;
-
/*
- * Save the returned context for use in all accesses to
- * this particular region.
+ * Region initialization may have been completed by region_setup
*/
- region_obj->region.extra->extra.region_context = region_context;
+ if (!(region_obj->region.flags & AOPOBJ_SETUP_COMPLETE)) {
+ region_obj->region.flags |= AOPOBJ_SETUP_COMPLETE;
+
+ if (region_obj2->extra.region_context) {
+ /* The handler for this region was already installed */
+
+ ACPI_MEM_FREE (region_context);
+ }
+ else {
+ /*
+ * Save the returned context for use in all accesses to
+ * this particular region
+ */
+ region_obj2->extra.region_context = region_context;
+ }
+ }
}
- /*
- * We have everything we need, begin the process
- */
- handler = handler_desc->addr_handler.handler;
+ /* We have everything we need, we can invoke the address space handler */
- ACPI_DEBUG_PRINT ((ACPI_DB_OPREGION,
- "Addrhandler %p (%p), Address %8.8X%8.8X\n",
- ®ion_obj->region.addr_handler->addr_handler, handler, HIDWORD(address),
- LODWORD(address)));
+ handler = handler_desc->address_space.handler;
- if (!(handler_desc->addr_handler.flags & ADDR_HANDLER_DEFAULT_INSTALLED)) {
- /*
- * For handlers other than the default (supplied) handlers, we must
- * exit the interpreter because the handler *might* block -- we don't
- * know what it will do, so we can't hold the lock on the intepreter.
+ ACPI_DEBUG_PRINT ((ACPI_DB_OPREGION,
+ "Handler %p (@%p) Address %8.8X%8.8X [%s]\n",
+ ®ion_obj->region.address_space->address_space, handler,
+ ACPI_HIDWORD (address), ACPI_LODWORD (address),
+ acpi_ut_get_region_name (region_obj->region.space_id)));
+
+ if (!(handler_desc->address_space.flags & ACPI_ADDR_HANDLER_DEFAULT_INSTALLED)) {
+ /*
+ * For handlers other than the default (supplied) handlers, we must
+ * exit the interpreter because the handler *might* block -- we don't
+ * know what it will do, so we can't hold the lock on the intepreter.
*/
acpi_ex_exit_interpreter();
}
- /*
- * Invoke the handler.
- */
+ /* Call the handler */
+
status = handler (function, address, bit_width, value,
- handler_desc->addr_handler.context,
- region_obj->region.extra->extra.region_context);
+ handler_desc->address_space.context,
+ region_obj2->extra.region_context);
if (ACPI_FAILURE (status)) {
- ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Region handler: %s [%s]\n",
- acpi_format_exception (status),
- acpi_ut_get_region_name (region_obj->region.space_id)));
+ ACPI_REPORT_ERROR (("Handler for [%s] returned %s\n",
+ acpi_ut_get_region_name (region_obj->region.space_id),
+ acpi_format_exception (status)));
}
- if (!(handler_desc->addr_handler.flags & ADDR_HANDLER_DEFAULT_INSTALLED)) {
+ if (!(handler_desc->address_space.flags & ACPI_ADDR_HANDLER_DEFAULT_INSTALLED)) {
/*
* We just returned from a non-default handler, we must re-enter the
* interpreter
*/
- acpi_ex_enter_interpreter ();
+ status2 = acpi_ex_enter_interpreter ();
+ if (ACPI_FAILURE (status2)) {
+ return_ACPI_STATUS (status2);
+ }
}
return_ACPI_STATUS (status);
@@ -315,10 +361,10 @@
/*******************************************************************************
*
- * FUNCTION: Acpi_ev_disassociate_region_from_handler
+ * FUNCTION: acpi_ev_detach_region
*
- * PARAMETERS: Region_obj - Region Object
- * Acpi_ns_is_locked - Namespace Region Already Locked?
+ * PARAMETERS: region_obj - Region Object
+ * acpi_ns_is_locked - Namespace Region Already Locked?
*
* RETURN: None
*
@@ -328,112 +374,118 @@
******************************************************************************/
void
-acpi_ev_disassociate_region_from_handler(
- acpi_operand_object *region_obj,
- u8 acpi_ns_is_locked)
+acpi_ev_detach_region(
+ union acpi_operand_object *region_obj,
+ u8 acpi_ns_is_locked)
{
- acpi_operand_object *handler_obj;
- acpi_operand_object *obj_desc;
- acpi_operand_object **last_obj_ptr;
- acpi_adr_space_setup region_setup;
- void *region_context;
- acpi_status status;
+ union acpi_operand_object *handler_obj;
+ union acpi_operand_object *obj_desc;
+ union acpi_operand_object **last_obj_ptr;
+ acpi_adr_space_setup region_setup;
+ void *region_context;
+ union acpi_operand_object *region_obj2;
+ acpi_status status;
+
+ ACPI_FUNCTION_TRACE ("ev_detach_region");
- FUNCTION_TRACE ("Ev_disassociate_region_from_handler");
+ region_obj2 = acpi_ns_get_secondary_object (region_obj);
+ if (!region_obj2) {
+ return_VOID;
+ }
+ region_context = region_obj2->extra.region_context;
- region_context = region_obj->region.extra->extra.region_context;
+ /* Get the address handler from the region object */
- /*
- * Get the address handler from the region object
- */
- handler_obj = region_obj->region.addr_handler;
+ handler_obj = region_obj->region.address_space;
if (!handler_obj) {
- /*
- * This region has no handler, all done
- */
+ /* This region has no handler, all done */
+
return_VOID;
}
+ /* Find this region in the handler's list */
- /*
- * Find this region in the handler's list
- */
- obj_desc = handler_obj->addr_handler.region_list;
- last_obj_ptr = &handler_obj->addr_handler.region_list;
+ obj_desc = handler_obj->address_space.region_list;
+ last_obj_ptr = &handler_obj->address_space.region_list;
while (obj_desc) {
- /*
- * See if this is the one
- */
+ /* Is this the correct Region? */
+
if (obj_desc == region_obj) {
ACPI_DEBUG_PRINT ((ACPI_DB_OPREGION,
"Removing Region %p from address handler %p\n",
region_obj, handler_obj));
- /*
- * This is it, remove it from the handler's list
- */
+
+ /* This is it, remove it from the handler's list */
+
*last_obj_ptr = obj_desc->region.next;
obj_desc->region.next = NULL; /* Must clear field */
if (acpi_ns_is_locked) {
- acpi_ut_release_mutex (ACPI_MTX_NAMESPACE);
+ status = acpi_ut_release_mutex (ACPI_MTX_NAMESPACE);
+ if (ACPI_FAILURE (status)) {
+ return_VOID;
+ }
}
- /*
- * Now stop region accesses by executing the _REG method
- */
- acpi_ev_execute_reg_method (region_obj, 0);
+ /* Now stop region accesses by executing the _REG method */
+
+ status = acpi_ev_execute_reg_method (region_obj, 0);
+ if (ACPI_FAILURE (status)) {
+ ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "%s from region _REG, [%s]\n",
+ acpi_format_exception (status),
+ acpi_ut_get_region_name (region_obj->region.space_id)));
+ }
if (acpi_ns_is_locked) {
- acpi_ut_acquire_mutex (ACPI_MTX_NAMESPACE);
+ status = acpi_ut_acquire_mutex (ACPI_MTX_NAMESPACE);
+ if (ACPI_FAILURE (status)) {
+ return_VOID;
+ }
}
- /*
- * Call the setup handler with the deactivate notification
- */
- region_setup = handler_obj->addr_handler.setup;
+ /* Call the setup handler with the deactivate notification */
+
+ region_setup = handler_obj->address_space.setup;
status = region_setup (region_obj, ACPI_REGION_DEACTIVATE,
- handler_obj->addr_handler.context, ®ion_context);
+ handler_obj->address_space.context, ®ion_context);
+
+ /* Init routine may fail, Just ignore errors */
- /*
- * Init routine may fail, Just ignore errors
- */
if (ACPI_FAILURE (status)) {
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "%s from region init, [%s]\n",
acpi_format_exception (status),
acpi_ut_get_region_name (region_obj->region.space_id)));
}
- region_obj->region.flags &= ~(AOPOBJ_INITIALIZED);
+ region_obj->region.flags &= ~(AOPOBJ_SETUP_COMPLETE);
/*
- * Remove handler reference in the region
+ * Remove handler reference in the region
*
- * NOTE: this doesn't mean that the region goes away
- * The region is just inaccessible as indicated to
- * the _REG method
+ * NOTE: this doesn't mean that the region goes away
+ * The region is just inaccessible as indicated to
+ * the _REG method
*
- * If the region is on the handler's list
- * this better be the region's handler
+ * If the region is on the handler's list
+ * this better be the region's handler
*/
- region_obj->region.addr_handler = NULL;
+ region_obj->region.address_space = NULL;
+ acpi_ut_remove_reference (handler_obj);
return_VOID;
+ }
- } /* found the right handler */
+ /* Walk the linked list of handlers */
- /*
- * Move through the linked list of handlers
- */
last_obj_ptr = &obj_desc->region.next;
obj_desc = obj_desc->region.next;
}
- /*
- * If we get here, the region was not in the handler's region list
- */
+ /* If we get here, the region was not in the handler's region list */
+
ACPI_DEBUG_PRINT ((ACPI_DB_OPREGION,
"Cannot remove region %p from address handler %p\n",
region_obj, handler_obj));
@@ -444,11 +496,11 @@
/*******************************************************************************
*
- * FUNCTION: Acpi_ev_associate_region_and_handler
+ * FUNCTION: acpi_ev_attach_region
*
- * PARAMETERS: Handler_obj - Handler Object
- * Region_obj - Region Object
- * Acpi_ns_is_locked - Namespace Region Already Locked?
+ * PARAMETERS: handler_obj - Handler Object
+ * region_obj - Region Object
+ * acpi_ns_is_locked - Namespace Region Already Locked?
*
* RETURN: None
*
@@ -458,15 +510,16 @@
******************************************************************************/
acpi_status
-acpi_ev_associate_region_and_handler (
- acpi_operand_object *handler_obj,
- acpi_operand_object *region_obj,
- u8 acpi_ns_is_locked)
+acpi_ev_attach_region (
+ union acpi_operand_object *handler_obj,
+ union acpi_operand_object *region_obj,
+ u8 acpi_ns_is_locked)
{
- acpi_status status;
+ acpi_status status;
+ acpi_status status2;
- FUNCTION_TRACE ("Ev_associate_region_and_handler");
+ ACPI_FUNCTION_TRACE ("ev_attach_region");
ACPI_DEBUG_PRINT ((ACPI_DB_OPREGION,
@@ -474,28 +527,38 @@
region_obj, handler_obj, acpi_ut_get_region_name (region_obj->region.space_id)));
- /*
- * Link this region to the front of the handler's list
- */
- region_obj->region.next = handler_obj->addr_handler.region_list;
- handler_obj->addr_handler.region_list = region_obj;
+ /* Link this region to the front of the handler's list */
- /*
- * set the region's handler
- */
- region_obj->region.addr_handler = handler_obj;
+ region_obj->region.next = handler_obj->address_space.region_list;
+ handler_obj->address_space.region_list = region_obj;
+
+ /* Install the region's handler */
+
+ if (region_obj->region.address_space) {
+ return_ACPI_STATUS (AE_ALREADY_EXISTS);
+ }
+
+ region_obj->region.address_space = handler_obj;
+ acpi_ut_add_reference (handler_obj);
/*
- * Last thing, tell all users that this region is usable
+ * Tell all users that this region is usable by running the _REG
+ * method
*/
if (acpi_ns_is_locked) {
- acpi_ut_release_mutex (ACPI_MTX_NAMESPACE);
+ status2 = acpi_ut_release_mutex (ACPI_MTX_NAMESPACE);
+ if (ACPI_FAILURE (status2)) {
+ return_ACPI_STATUS (status2);
+ }
}
status = acpi_ev_execute_reg_method (region_obj, 1);
if (acpi_ns_is_locked) {
- acpi_ut_acquire_mutex (ACPI_MTX_NAMESPACE);
+ status2 = acpi_ut_acquire_mutex (ACPI_MTX_NAMESPACE);
+ if (ACPI_FAILURE (status2)) {
+ return_ACPI_STATUS (status2);
+ }
}
return_ACPI_STATUS (status);
@@ -504,14 +567,14 @@
/*******************************************************************************
*
- * FUNCTION: Acpi_ev_addr_handler_helper
+ * FUNCTION: acpi_ev_install_handler
*
* PARAMETERS: Handle - Node to be dumped
* Level - Nesting level of the handle
- * Context - Passed into Acpi_ns_walk_namespace
+ * Context - Passed into acpi_ns_walk_namespace
*
- * DESCRIPTION: This routine checks to see if the object is a Region if it
- * is then the address handler is installed in it.
+ * DESCRIPTION: This routine installs an address handler into objects that are
+ * of type Region or Device.
*
* If the Object is a Device, and the device has a handler of
* the same type then the search is terminated in that branch.
@@ -522,23 +585,23 @@
******************************************************************************/
acpi_status
-acpi_ev_addr_handler_helper (
- acpi_handle obj_handle,
- u32 level,
- void *context,
- void **return_value)
+acpi_ev_install_handler (
+ acpi_handle obj_handle,
+ u32 level,
+ void *context,
+ void **return_value)
{
- acpi_operand_object *handler_obj;
- acpi_operand_object *tmp_obj;
- acpi_operand_object *obj_desc;
- acpi_namespace_node *node;
- acpi_status status;
+ union acpi_operand_object *handler_obj;
+ union acpi_operand_object *next_handler_obj;
+ union acpi_operand_object *obj_desc;
+ struct acpi_namespace_node *node;
+ acpi_status status;
- PROC_NAME ("Ev_addr_handler_helper");
+ ACPI_FUNCTION_NAME ("ev_install_handler");
- handler_obj = (acpi_operand_object *) context;
+ handler_obj = (union acpi_operand_object *) context;
/* Parameter validation */
@@ -554,8 +617,8 @@
}
/*
- * We only care about regions.and objects
- * that can have address handlers
+ * We only care about regions.and objects
+ * that are allowed to have address space handlers
*/
if ((node->type != ACPI_TYPE_DEVICE) &&
(node->type != ACPI_TYPE_REGION) &&
@@ -567,81 +630,70 @@
obj_desc = acpi_ns_get_attached_object (node);
if (!obj_desc) {
- /*
- * The object DNE, we don't care about it
- */
+ /* No object, just exit */
+
return (AE_OK);
}
- /*
- * Devices are handled different than regions
- */
- if (IS_THIS_OBJECT_TYPE (obj_desc, ACPI_TYPE_DEVICE)) {
- /*
- * See if this guy has any handlers
- */
- tmp_obj = obj_desc->device.addr_handler;
- while (tmp_obj) {
- /*
- * Now let's see if it's for the same address space.
- */
- if (tmp_obj->addr_handler.space_id == handler_obj->addr_handler.space_id) {
- /*
- * It's for the same address space
- */
+ /* Devices are handled different than regions */
+
+ if (ACPI_GET_OBJECT_TYPE (obj_desc) == ACPI_TYPE_DEVICE) {
+ /* Check if this Device already has a handler for this address space */
+
+ next_handler_obj = obj_desc->device.address_space;
+ while (next_handler_obj) {
+ /* Found a handler, is it for the same address space? */
+
+ if (next_handler_obj->address_space.space_id == handler_obj->address_space.space_id) {
ACPI_DEBUG_PRINT ((ACPI_DB_OPREGION,
"Found handler for region [%s] in device %p(%p) handler %p\n",
- acpi_ut_get_region_name (handler_obj->addr_handler.space_id),
- obj_desc, tmp_obj, handler_obj));
+ acpi_ut_get_region_name (handler_obj->address_space.space_id),
+ obj_desc, next_handler_obj, handler_obj));
/*
- * Since the object we found it on was a device, then it
- * means that someone has already installed a handler for
- * the branch of the namespace from this device on. Just
- * bail out telling the walk routine to not traverse this
- * branch. This preserves the scoping rule for handlers.
+ * Since the object we found it on was a device, then it
+ * means that someone has already installed a handler for
+ * the branch of the namespace from this device on. Just
+ * bail out telling the walk routine to not traverse this
+ * branch. This preserves the scoping rule for handlers.
*/
return (AE_CTRL_DEPTH);
}
- /*
- * Move through the linked list of handlers
- */
- tmp_obj = tmp_obj->addr_handler.next;
+ /* Walk the linked list of handlers attached to this device */
+
+ next_handler_obj = next_handler_obj->address_space.next;
}
/*
- * As long as the device didn't have a handler for this
- * space we don't care about it. We just ignore it and
- * proceed.
+ * As long as the device didn't have a handler for this
+ * space we don't care about it. We just ignore it and
+ * proceed.
*/
return (AE_OK);
}
- /*
- * Only here if it was a region
- */
- if (obj_desc->region.space_id != handler_obj->addr_handler.space_id) {
+ /* Object is a Region */
+
+ if (obj_desc->region.space_id != handler_obj->address_space.space_id) {
/*
- * This region is for a different address space
- * ignore it
+ * This region is for a different address space
+ * -- just ignore it
*/
return (AE_OK);
}
/*
- * Now we have a region and it is for the handler's address
- * space type.
+ * Now we have a region and it is for the handler's address
+ * space type.
*
- * First disconnect region for any previous handler (if any)
+ * First disconnect region for any previous handler (if any)
*/
- acpi_ev_disassociate_region_from_handler (obj_desc, FALSE);
+ acpi_ev_detach_region (obj_desc, FALSE);
- /*
- * Then connect the region to the new handler
- */
- status = acpi_ev_associate_region_and_handler (handler_obj, obj_desc, FALSE);
+ /* Connect the region to the new handler */
+ status = acpi_ev_attach_region (handler_obj, obj_desc, FALSE);
return (status);
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)