patch-2.4.22 linux-2.4.22/drivers/acpi/executer/exregion.c
Next file: linux-2.4.22/drivers/acpi/executer/exresnte.c
Previous file: linux-2.4.22/drivers/acpi/executer/exprep.c
Back to the patch index
Back to the overall index
- Lines: 619
- Date:
2003-08-25 04:44:41.000000000 -0700
- Orig file:
linux-2.4.21/drivers/acpi/executer/exregion.c
- Orig date:
2001-10-24 14:06:22.000000000 -0700
diff -urN linux-2.4.21/drivers/acpi/executer/exregion.c linux-2.4.22/drivers/acpi/executer/exregion.c
@@ -1,52 +1,66 @@
/******************************************************************************
*
- * Module Name: exregion - ACPI default Op_region (address space) handlers
- * $Revision: 61 $
+ * Module Name: exregion - ACPI default op_region (address space) handlers
*
*****************************************************************************/
/*
- * 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 "acinterp.h"
-#include "amlcode.h"
-#include "acnamesp.h"
-#include "achware.h"
-#include "acevents.h"
+#include <acpi/acpi.h>
+#include <acpi/acinterp.h>
#define _COMPONENT ACPI_EXECUTER
- MODULE_NAME ("exregion")
+ ACPI_MODULE_NAME ("exregion")
/*******************************************************************************
*
- * FUNCTION: Acpi_ex_system_memory_space_handler
+ * FUNCTION: acpi_ex_system_memory_space_handler
*
* PARAMETERS: 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, or 32)
* Value - Pointer to in or out value
- * Handler_context - Pointer to Handler's context
- * Region_context - Pointer to context specific to the
+ * handler_context - Pointer to Handler's context
+ * region_context - Pointer to context specific to the
* accessed region
*
* RETURN: Status
@@ -57,20 +71,23 @@
acpi_status
acpi_ex_system_memory_space_handler (
- u32 function,
- ACPI_PHYSICAL_ADDRESS address,
- u32 bit_width,
- u32 *value,
- void *handler_context,
- void *region_context)
+ u32 function,
+ acpi_physical_address address,
+ u32 bit_width,
+ acpi_integer *value,
+ void *handler_context,
+ void *region_context)
{
- acpi_status status = AE_OK;
- void *logical_addr_ptr = NULL;
- acpi_mem_space_context *mem_info = region_context;
- u32 length;
+ acpi_status status = AE_OK;
+ void *logical_addr_ptr = NULL;
+ struct acpi_mem_space_context *mem_info = region_context;
+ u32 length;
+ acpi_size window_size;
+#ifndef ACPI_MISALIGNED_TRANSFERS
+ u32 remainder;
+#endif
-
- FUNCTION_TRACE ("Ex_system_memory_space_handler");
+ ACPI_FUNCTION_TRACE ("ex_system_memory_space_handler");
/* Validate and translate the bit width */
@@ -88,14 +105,28 @@
length = 4;
break;
+ case 64:
+ length = 8;
+ break;
+
default:
- ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Invalid System_memory width %d\n",
+ ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Invalid system_memory width %d\n",
bit_width));
return_ACPI_STATUS (AE_AML_OPERAND_VALUE);
- break;
}
+#ifndef ACPI_MISALIGNED_TRANSFERS
+ /*
+ * Hardware does not support non-aligned data transfers, we must verify
+ * the request.
+ */
+ (void) acpi_ut_short_divide ((acpi_integer *) &address, length, NULL, &remainder);
+ if (remainder != 0) {
+ return_ACPI_STATUS (AE_AML_ALIGNMENT);
+ }
+#endif
+
/*
* Does the request fit into the cached memory mapping?
* Is 1) Address below the current mapping? OR
@@ -115,61 +146,80 @@
mem_info->mapped_length);
}
- mem_info->mapped_length = 0; /* In case of failure below */
+ /*
+ * Don't attempt to map memory beyond the end of the region, and
+ * constrain the maximum mapping size to something reasonable.
+ */
+ window_size = (acpi_size) ((mem_info->address + mem_info->length) - address);
+ if (window_size > ACPI_SYSMEM_REGION_WINDOW_SIZE) {
+ window_size = ACPI_SYSMEM_REGION_WINDOW_SIZE;
+ }
/* Create a new mapping starting at the address given */
- status = acpi_os_map_memory (address, SYSMEM_REGION_WINDOW_SIZE,
+ status = acpi_os_map_memory (address, window_size,
(void **) &mem_info->mapped_logical_address);
if (ACPI_FAILURE (status)) {
+ ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Could not map memory at %8.8X%8.8X, size %X\n",
+ ACPI_HIDWORD (address), ACPI_LODWORD (address), (u32) window_size));
+ mem_info->mapped_length = 0;
return_ACPI_STATUS (status);
}
/* Save the physical address and mapping size */
mem_info->mapped_physical_address = address;
- mem_info->mapped_length = SYSMEM_REGION_WINDOW_SIZE;
+ mem_info->mapped_length = window_size;
}
-
/*
* Generate a logical pointer corresponding to the address we want to
* access
*/
-
- /* TBD: should these pointers go to 64-bit in all cases ? */
-
logical_addr_ptr = mem_info->mapped_logical_address +
((acpi_integer) address - (acpi_integer) mem_info->mapped_physical_address);
ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
- "System_memory %d (%d width) Address=%8.8X%8.8X\n", function, bit_width,
- HIDWORD (address), LODWORD (address)));
-
- /* Perform the memory read or write */
+ "system_memory %d (%d width) Address=%8.8X%8.8X\n", function, bit_width,
+ ACPI_HIDWORD (address), ACPI_LODWORD (address)));
+ /*
+ * Perform the memory read or write
+ *
+ * Note: For machines that do not support non-aligned transfers, the target
+ * address was checked for alignment above. We do not attempt to break the
+ * transfer up into smaller (byte-size) chunks because the AML specifically
+ * asked for a transfer width that the hardware may require.
+ */
switch (function) {
+ case ACPI_READ:
- case ACPI_READ_ADR_SPACE:
-
+ *value = 0;
switch (bit_width) {
case 8:
- *value = (u32)* (u8 *) logical_addr_ptr;
+ *value = (acpi_integer) *((u8 *) logical_addr_ptr);
break;
case 16:
- MOVE_UNALIGNED16_TO_32 (value, logical_addr_ptr);
+ *value = (acpi_integer) *((u16 *) logical_addr_ptr);
break;
case 32:
- MOVE_UNALIGNED32_TO_32 (value, logical_addr_ptr);
+ *value = (acpi_integer) *((u32 *) logical_addr_ptr);
break;
- }
+#if ACPI_MACHINE_WIDTH != 16
+ case 64:
+ *value = (acpi_integer) *((u64 *) logical_addr_ptr);
+ break;
+#endif
+ default:
+ /* bit_width was already validated */
+ break;
+ }
break;
-
- case ACPI_WRITE_ADR_SPACE:
+ case ACPI_WRITE:
switch (bit_width) {
case 8:
@@ -177,16 +227,24 @@
break;
case 16:
- MOVE_UNALIGNED16_TO_16 (logical_addr_ptr, value);
+ *(u16 *) logical_addr_ptr = (u16) *value;
break;
case 32:
- MOVE_UNALIGNED32_TO_32 (logical_addr_ptr, value);
+ *(u32 *) logical_addr_ptr = (u32) *value;
break;
- }
- break;
+#if ACPI_MACHINE_WIDTH != 16
+ case 64:
+ *(u64 *) logical_addr_ptr = (u64) *value;
+ break;
+#endif
+ default:
+ /* bit_width was already validated */
+ break;
+ }
+ break;
default:
status = AE_BAD_PARAMETER;
@@ -199,14 +257,14 @@
/*******************************************************************************
*
- * FUNCTION: Acpi_ex_system_io_space_handler
+ * FUNCTION: acpi_ex_system_io_space_handler
*
* PARAMETERS: 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, or 32)
* Value - Pointer to in or out value
- * Handler_context - Pointer to Handler's context
- * Region_context - Pointer to context specific to the
+ * handler_context - Pointer to Handler's context
+ * region_context - Pointer to context specific to the
* accessed region
*
* RETURN: Status
@@ -217,40 +275,38 @@
acpi_status
acpi_ex_system_io_space_handler (
- u32 function,
- ACPI_PHYSICAL_ADDRESS address,
- u32 bit_width,
- u32 *value,
- void *handler_context,
- void *region_context)
+ u32 function,
+ acpi_physical_address address,
+ u32 bit_width,
+ acpi_integer *value,
+ void *handler_context,
+ void *region_context)
{
- acpi_status status = AE_OK;
+ acpi_status status = AE_OK;
+ u32 value32;
- FUNCTION_TRACE ("Ex_system_io_space_handler");
+ ACPI_FUNCTION_TRACE ("ex_system_io_space_handler");
ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
- "System_iO %d (%d width) Address=%8.8X%8.8X\n", function, bit_width,
- HIDWORD (address), LODWORD (address)));
+ "system_iO %d (%d width) Address=%8.8X%8.8X\n", function, bit_width,
+ ACPI_HIDWORD (address), ACPI_LODWORD (address)));
/* Decode the function parameter */
switch (function) {
+ case ACPI_READ:
- case ACPI_READ_ADR_SPACE:
-
- *value = 0;
- status = acpi_os_read_port ((ACPI_IO_ADDRESS) address, value, bit_width);
+ status = acpi_os_read_port ((acpi_io_address) address, &value32, bit_width);
+ *value = value32;
break;
+ case ACPI_WRITE:
- case ACPI_WRITE_ADR_SPACE:
-
- status = acpi_os_write_port ((ACPI_IO_ADDRESS) address, *value, bit_width);
+ status = acpi_os_write_port ((acpi_io_address) address, (u32) *value, bit_width);
break;
-
default:
status = AE_BAD_PARAMETER;
break;
@@ -262,14 +318,14 @@
/*******************************************************************************
*
- * FUNCTION: Acpi_ex_pci_config_space_handler
+ * FUNCTION: acpi_ex_pci_config_space_handler
*
* PARAMETERS: 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, or 32)
* Value - Pointer to in or out value
- * Handler_context - Pointer to Handler's context
- * Region_context - Pointer to context specific to the
+ * handler_context - Pointer to Handler's context
+ * region_context - Pointer to context specific to the
* accessed region
*
* RETURN: Status
@@ -280,56 +336,53 @@
acpi_status
acpi_ex_pci_config_space_handler (
- u32 function,
- ACPI_PHYSICAL_ADDRESS address,
- u32 bit_width,
- u32 *value,
- void *handler_context,
- void *region_context)
+ u32 function,
+ acpi_physical_address address,
+ u32 bit_width,
+ acpi_integer *value,
+ void *handler_context,
+ void *region_context)
{
- acpi_status status = AE_OK;
- acpi_pci_id *pci_id;
- u16 pci_register;
+ acpi_status status = AE_OK;
+ struct acpi_pci_id *pci_id;
+ u16 pci_register;
- FUNCTION_TRACE ("Ex_pci_config_space_handler");
+ ACPI_FUNCTION_TRACE ("ex_pci_config_space_handler");
/*
- * The arguments to Acpi_os(Read|Write)Pci_cfg(Byte|Word|Dword) are:
+ * The arguments to acpi_os(Read|Write)pci_configuration are:
*
- * Pci_segment is the PCI bus segment range 0-31
- * Pci_bus is the PCI bus number range 0-255
- * Pci_device is the PCI device number range 0-31
- * Pci_function is the PCI device function number
- * Pci_register is the Config space register range 0-255 bytes
+ * pci_segment is the PCI bus segment range 0-31
+ * pci_bus is the PCI bus number range 0-255
+ * pci_device is the PCI device number range 0-31
+ * pci_function is the PCI device function number
+ * pci_register is the Config space register range 0-255 bytes
*
* Value - input value for write, output address for read
*
*/
- pci_id = (acpi_pci_id *) region_context;
- pci_register = (u16) address;
+ pci_id = (struct acpi_pci_id *) region_context;
+ pci_register = (u16) (u32) address;
ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
- "Pci_config %d (%d) Seg(%04x) Bus(%04x) Dev(%04x) Func(%04x) Reg(%04x)\n",
+ "pci_config %d (%d) Seg(%04x) Bus(%04x) Dev(%04x) Func(%04x) Reg(%04x)\n",
function, bit_width, pci_id->segment, pci_id->bus, pci_id->device,
pci_id->function, pci_register));
switch (function) {
-
- case ACPI_READ_ADR_SPACE:
+ case ACPI_READ:
*value = 0;
status = acpi_os_read_pci_configuration (pci_id, pci_register, value, bit_width);
break;
-
- case ACPI_WRITE_ADR_SPACE:
+ case ACPI_WRITE:
status = acpi_os_write_pci_configuration (pci_id, pci_register, *value, bit_width);
break;
-
default:
status = AE_BAD_PARAMETER;
@@ -342,14 +395,14 @@
/*******************************************************************************
*
- * FUNCTION: Acpi_ex_cmos_space_handler
+ * FUNCTION: acpi_ex_cmos_space_handler
*
* PARAMETERS: 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, or 32)
* Value - Pointer to in or out value
- * Handler_context - Pointer to Handler's context
- * Region_context - Pointer to context specific to the
+ * handler_context - Pointer to Handler's context
+ * region_context - Pointer to context specific to the
* accessed region
*
* RETURN: Status
@@ -360,17 +413,17 @@
acpi_status
acpi_ex_cmos_space_handler (
- u32 function,
- ACPI_PHYSICAL_ADDRESS address,
- u32 bit_width,
- u32 *value,
- void *handler_context,
- void *region_context)
+ u32 function,
+ acpi_physical_address address,
+ u32 bit_width,
+ acpi_integer *value,
+ void *handler_context,
+ void *region_context)
{
- acpi_status status = AE_OK;
+ acpi_status status = AE_OK;
- FUNCTION_TRACE ("Ex_cmos_space_handler");
+ ACPI_FUNCTION_TRACE ("ex_cmos_space_handler");
return_ACPI_STATUS (status);
@@ -379,37 +432,97 @@
/*******************************************************************************
*
- * FUNCTION: Acpi_ex_pci_bar_space_handler
+ * FUNCTION: acpi_ex_pci_bar_space_handler
*
* PARAMETERS: 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, or 32)
* Value - Pointer to in or out value
- * Handler_context - Pointer to Handler's context
- * Region_context - Pointer to context specific to the
+ * handler_context - Pointer to Handler's context
+ * region_context - Pointer to context specific to the
* accessed region
*
* RETURN: Status
*
- * DESCRIPTION: Handler for the PCI Bar_target address space (Op Region)
+ * DESCRIPTION: Handler for the PCI bar_target address space (Op Region)
*
******************************************************************************/
acpi_status
acpi_ex_pci_bar_space_handler (
- u32 function,
- ACPI_PHYSICAL_ADDRESS address,
- u32 bit_width,
- u32 *value,
- void *handler_context,
- void *region_context)
+ u32 function,
+ acpi_physical_address address,
+ u32 bit_width,
+ acpi_integer *value,
+ void *handler_context,
+ void *region_context)
{
- acpi_status status = AE_OK;
+ acpi_status status = AE_OK;
- FUNCTION_TRACE ("Ex_pci_bar_space_handler");
+ ACPI_FUNCTION_TRACE ("ex_pci_bar_space_handler");
return_ACPI_STATUS (status);
}
+
+/*******************************************************************************
+ *
+ * FUNCTION: acpi_ex_data_table_space_handler
+ *
+ * PARAMETERS: Function - Read or Write operation
+ * Address - Where in the space to read or write
+ * bit_width - Field width in bits (8, 16, or 32)
+ * Value - Pointer to in or out value
+ * handler_context - Pointer to Handler's context
+ * region_context - Pointer to context specific to the
+ * accessed region
+ *
+ * RETURN: Status
+ *
+ * DESCRIPTION: Handler for the Data Table address space (Op Region)
+ *
+ ******************************************************************************/
+
+acpi_status
+acpi_ex_data_table_space_handler (
+ u32 function,
+ acpi_physical_address address,
+ u32 bit_width,
+ acpi_integer *value,
+ void *handler_context,
+ void *region_context)
+{
+ acpi_status status = AE_OK;
+ u32 byte_width = ACPI_DIV_8 (bit_width);
+ u32 i;
+ char *logical_addr_ptr;
+
+
+ ACPI_FUNCTION_TRACE ("ex_data_table_space_handler");
+
+
+ logical_addr_ptr = ACPI_PHYSADDR_TO_PTR (address);
+
+
+ /* Perform the memory read or write */
+
+ switch (function) {
+ case ACPI_READ:
+
+ for (i = 0; i < byte_width; i++) {
+ ((char *) value) [i] = logical_addr_ptr[i];
+ }
+ break;
+
+ case ACPI_WRITE:
+ default:
+
+ return_ACPI_STATUS (AE_SUPPORT);
+ }
+
+ 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)