patch-2.4.22 linux-2.4.22/drivers/acpi/tables/tbxface.c
Next file: linux-2.4.22/drivers/acpi/tables/tbxfroot.c
Previous file: linux-2.4.22/drivers/acpi/tables/tbutils.c
Back to the patch index
Back to the overall index
- Lines: 506
- Date:
2003-08-25 04:44:41.000000000 -0700
- Orig file:
linux-2.4.21/drivers/acpi/tables/tbxface.c
- Orig date:
2001-10-24 14:06:22.000000000 -0700
diff -urN linux-2.4.21/drivers/acpi/tables/tbxface.c linux-2.4.22/drivers/acpi/tables/tbxface.c
@@ -2,42 +2,59 @@
*
* Module Name: tbxface - Public interfaces to the ACPI subsystem
* ACPI table oriented interfaces
- * $Revision: 45 $
*
*****************************************************************************/
/*
- * 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 "acnamesp.h"
-#include "acinterp.h"
-#include "actables.h"
+#include <acpi/acpi.h>
+#include <acpi/acnamesp.h>
+#include <acpi/actables.h>
#define _COMPONENT ACPI_TABLES
- MODULE_NAME ("tbxface")
+ ACPI_MODULE_NAME ("tbxface")
/*******************************************************************************
*
- * FUNCTION: Acpi_load_tables
+ * FUNCTION: acpi_load_tables
*
* PARAMETERS: None
*
@@ -51,59 +68,60 @@
acpi_status
acpi_load_tables (void)
{
- ACPI_PHYSICAL_ADDRESS rsdp_physical_address;
- acpi_status status;
- u32 number_of_tables = 0;
+ struct acpi_pointer rsdp_address;
+ acpi_status status;
- FUNCTION_TRACE ("Acpi_load_tables");
+ ACPI_FUNCTION_TRACE ("acpi_load_tables");
/* Get the RSDP */
status = acpi_os_get_root_pointer (ACPI_LOGICAL_ADDRESSING,
- &rsdp_physical_address);
+ &rsdp_address);
if (ACPI_FAILURE (status)) {
- REPORT_ERROR (("Acpi_load_tables: Could not get RSDP, %s\n",
+ ACPI_REPORT_ERROR (("acpi_load_tables: Could not get RSDP, %s\n",
acpi_format_exception (status)));
goto error_exit;
}
/* Map and validate the RSDP */
- status = acpi_tb_verify_rsdp (rsdp_physical_address);
+ acpi_gbl_table_flags = rsdp_address.pointer_type;
+
+ status = acpi_tb_verify_rsdp (&rsdp_address);
if (ACPI_FAILURE (status)) {
- REPORT_ERROR (("Acpi_load_tables: RSDP Failed validation: %s\n",
+ ACPI_REPORT_ERROR (("acpi_load_tables: RSDP Failed validation: %s\n",
acpi_format_exception (status)));
goto error_exit;
}
/* Get the RSDT via the RSDP */
- status = acpi_tb_get_table_rsdt (&number_of_tables);
+ status = acpi_tb_get_table_rsdt ();
if (ACPI_FAILURE (status)) {
- REPORT_ERROR (("Acpi_load_tables: Could not load RSDT: %s\n",
+ ACPI_REPORT_ERROR (("acpi_load_tables: Could not load RSDT: %s\n",
acpi_format_exception (status)));
goto error_exit;
}
- /* Now get the rest of the tables */
+ /* Now get the tables needed by this subsystem (FADT, DSDT, etc.) */
- status = acpi_tb_get_all_tables (number_of_tables, NULL);
+ status = acpi_tb_get_required_tables ();
if (ACPI_FAILURE (status)) {
- REPORT_ERROR (("Acpi_load_tables: Error getting required tables (DSDT/FADT/FACS): %s\n",
+ ACPI_REPORT_ERROR (("acpi_load_tables: Error getting required tables (DSDT/FADT/FACS): %s\n",
acpi_format_exception (status)));
goto error_exit;
}
- ACPI_DEBUG_PRINT ((ACPI_DB_OK, "ACPI Tables successfully loaded\n"));
+ ACPI_DEBUG_PRINT ((ACPI_DB_INIT, "ACPI Tables successfully acquired\n"));
/* Load the namespace from the tables */
status = acpi_ns_load_namespace ();
if (ACPI_FAILURE (status)) {
- REPORT_ERROR (("Acpi_load_tables: Could not load namespace: %s\n",
+ ACPI_REPORT_ERROR (("acpi_load_tables: Could not load namespace: %s\n",
acpi_format_exception (status)));
goto error_exit;
}
@@ -112,7 +130,7 @@
error_exit:
- REPORT_ERROR (("Acpi_load_tables: Could not load tables: %s\n",
+ ACPI_REPORT_ERROR (("acpi_load_tables: Could not load tables: %s\n",
acpi_format_exception (status)));
return_ACPI_STATUS (status);
@@ -121,9 +139,9 @@
/*******************************************************************************
*
- * FUNCTION: Acpi_load_table
+ * FUNCTION: acpi_load_table
*
- * PARAMETERS: Table_ptr - pointer to a buffer containing the entire
+ * PARAMETERS: table_ptr - pointer to a buffer containing the entire
* table to be loaded
*
* RETURN: Status
@@ -137,13 +155,14 @@
acpi_status
acpi_load_table (
- acpi_table_header *table_ptr)
+ struct acpi_table_header *table_ptr)
{
- acpi_status status;
- acpi_table_desc table_info;
+ acpi_status status;
+ struct acpi_table_desc table_info;
+ struct acpi_pointer address;
- FUNCTION_TRACE ("Acpi_load_table");
+ ACPI_FUNCTION_TRACE ("acpi_load_table");
if (!table_ptr) {
@@ -152,40 +171,59 @@
/* Copy the table to a local buffer */
- status = acpi_tb_get_table (0, table_ptr, &table_info);
+ address.pointer_type = ACPI_LOGICAL_POINTER | ACPI_LOGICAL_ADDRESSING;
+ address.pointer.logical = table_ptr;
+
+ status = acpi_tb_get_table_body (&address, table_ptr, &table_info);
if (ACPI_FAILURE (status)) {
return_ACPI_STATUS (status);
}
/* Install the new table into the local data structures */
- status = acpi_tb_install_table (NULL, &table_info);
+ status = acpi_tb_install_table (&table_info);
if (ACPI_FAILURE (status)) {
- /* Free table allocated by Acpi_tb_get_table */
+ /* Free table allocated by acpi_tb_get_table_body */
acpi_tb_delete_single_table (&table_info);
return_ACPI_STATUS (status);
}
+ /* Convert the table to common format if necessary */
+
+ switch (table_info.type) {
+ case ACPI_TABLE_FADT:
+
+ status = acpi_tb_convert_table_fadt ();
+ break;
+
+ case ACPI_TABLE_FACS:
+
+ status = acpi_tb_build_common_facs (&table_info);
+ break;
+
+ default:
+ /* Load table into namespace if it contains executable AML */
+
+ status = acpi_ns_load_table (table_info.installed_desc, acpi_gbl_root_node);
+ break;
+ }
- status = acpi_ns_load_table (table_info.installed_desc, acpi_gbl_root_node);
if (ACPI_FAILURE (status)) {
/* Uninstall table and free the buffer */
- acpi_tb_uninstall_table (table_info.installed_desc);
- return_ACPI_STATUS (status);
+ (void) acpi_tb_uninstall_table (table_info.installed_desc);
}
-
return_ACPI_STATUS (status);
}
/*******************************************************************************
*
- * FUNCTION: Acpi_unload_table
+ * FUNCTION: acpi_unload_table
*
- * PARAMETERS: Table_type - Type of table to be unloaded
+ * PARAMETERS: table_type - Type of table to be unloaded
*
* RETURN: Status
*
@@ -195,12 +233,12 @@
acpi_status
acpi_unload_table (
- acpi_table_type table_type)
+ acpi_table_type table_type)
{
- acpi_table_desc *list_head;
+ struct acpi_table_desc *table_desc;
- FUNCTION_TRACE ("Acpi_unload_table");
+ ACPI_FUNCTION_TRACE ("acpi_unload_table");
/* Parameter validation */
@@ -212,39 +250,39 @@
/* Find all tables of the requested type */
- list_head = &acpi_gbl_acpi_tables[table_type];
- do {
+ table_desc = acpi_gbl_table_lists[table_type].next;
+ while (table_desc); {
/*
* Delete all namespace entries owned by this table. Note that these
* entries can appear anywhere in the namespace by virtue of the AML
* "Scope" operator. Thus, we need to track ownership by an ID, not
* simply a position within the hierarchy
*/
- acpi_ns_delete_namespace_by_owner (list_head->table_id);
-
- /* Delete (or unmap) the actual table */
+ acpi_ns_delete_namespace_by_owner (table_desc->table_id);
- acpi_tb_delete_acpi_table (table_type);
+ table_desc = table_desc->next;
+ }
- } while (list_head != &acpi_gbl_acpi_tables[table_type]);
+ /* Delete (or unmap) all tables of this type */
+ acpi_tb_delete_tables_by_type (table_type);
return_ACPI_STATUS (AE_OK);
}
/*******************************************************************************
*
- * FUNCTION: Acpi_get_table_header
+ * FUNCTION: acpi_get_table_header
*
- * PARAMETERS: Table_type - one of the defined table types
+ * PARAMETERS: table_type - one of the defined table types
* Instance - the non zero instance of the table, allows
* support for multiple tables of the same type
- * see Acpi_gbl_Acpi_table_flag
- * Out_table_header - pointer to the acpi_table_header if successful
+ * see acpi_gbl_acpi_table_flag
+ * out_table_header - pointer to the struct acpi_table_header if successful
*
* DESCRIPTION: This function is called to get an ACPI table header. The caller
* supplies an pointer to a data area sufficient to contain an ACPI
- * acpi_table_header structure.
+ * struct acpi_table_header structure.
*
* The header contains a length field that can be used to determine
* the size of the buffer needed to contain the entire table. This
@@ -255,15 +293,15 @@
acpi_status
acpi_get_table_header (
- acpi_table_type table_type,
- u32 instance,
- acpi_table_header *out_table_header)
+ acpi_table_type table_type,
+ u32 instance,
+ struct acpi_table_header *out_table_header)
{
- acpi_table_header *tbl_ptr;
- acpi_status status;
+ struct acpi_table_header *tbl_ptr;
+ acpi_status status;
- FUNCTION_TRACE ("Acpi_get_table_header");
+ ACPI_FUNCTION_TRACE ("acpi_get_table_header");
if ((instance == 0) ||
@@ -275,7 +313,7 @@
/* Check the table type and instance */
if ((table_type > ACPI_TABLE_MAX) ||
- (IS_SINGLE_TABLE (acpi_gbl_acpi_table_data[table_type].flags) &&
+ (ACPI_IS_SINGLE_TABLE (acpi_gbl_table_data[table_type].flags) &&
instance > 1)) {
return_ACPI_STATUS (AE_BAD_PARAMETER);
}
@@ -298,8 +336,8 @@
/*
* Copy the header to the caller's buffer
*/
- MEMCPY ((void *) out_table_header, (void *) tbl_ptr,
- sizeof (acpi_table_header));
+ ACPI_MEMCPY ((void *) out_table_header, (void *) tbl_ptr,
+ sizeof (struct acpi_table_header));
return_ACPI_STATUS (status);
}
@@ -307,54 +345,56 @@
/*******************************************************************************
*
- * FUNCTION: Acpi_get_table
+ * FUNCTION: acpi_get_table
*
- * PARAMETERS: Table_type - one of the defined table types
+ * PARAMETERS: table_type - one of the defined table types
* Instance - the non zero instance of the table, allows
* support for multiple tables of the same type
- * see Acpi_gbl_Acpi_table_flag
- * Ret_buffer - pointer to a structure containing a buffer to
+ * see acpi_gbl_acpi_table_flag
+ * ret_buffer - pointer to a structure containing a buffer to
* receive the table
*
* RETURN: Status
*
* DESCRIPTION: This function is called to get an ACPI table. The caller
- * supplies an Out_buffer large enough to contain the entire ACPI
- * table. The caller should call the Acpi_get_table_header function
+ * supplies an out_buffer large enough to contain the entire ACPI
+ * table. The caller should call the acpi_get_table_header function
* first to determine the buffer size needed. Upon completion
- * the Out_buffer->Length field will indicate the number of bytes
- * copied into the Out_buffer->Buf_ptr buffer. This table will be
+ * the out_buffer->Length field will indicate the number of bytes
+ * copied into the out_buffer->buf_ptr buffer. This table will be
* a complete table including the header.
*
******************************************************************************/
acpi_status
acpi_get_table (
- acpi_table_type table_type,
- u32 instance,
- acpi_buffer *ret_buffer)
+ acpi_table_type table_type,
+ u32 instance,
+ struct acpi_buffer *ret_buffer)
{
- acpi_table_header *tbl_ptr;
- acpi_status status;
- u32 ret_buf_len;
+ struct acpi_table_header *tbl_ptr;
+ acpi_status status;
+ acpi_size table_length;
- FUNCTION_TRACE ("Acpi_get_table");
+ ACPI_FUNCTION_TRACE ("acpi_get_table");
- /*
- * If we have a buffer, we must have a length too
- */
- if ((instance == 0) ||
- (!ret_buffer) ||
- ((!ret_buffer->pointer) && (ret_buffer->length))) {
+ /* Parameter validation */
+
+ if (instance == 0) {
return_ACPI_STATUS (AE_BAD_PARAMETER);
}
+ status = acpi_ut_validate_buffer (ret_buffer);
+ if (ACPI_FAILURE (status)) {
+ return_ACPI_STATUS (status);
+ }
+
/* Check the table type and instance */
if ((table_type > ACPI_TABLE_MAX) ||
- (IS_SINGLE_TABLE (acpi_gbl_acpi_table_data[table_type].flags) &&
+ (ACPI_IS_SINGLE_TABLE (acpi_gbl_table_data[table_type].flags) &&
instance > 1)) {
return_ACPI_STATUS (AE_BAD_PARAMETER);
}
@@ -368,38 +408,35 @@
}
/*
- * Acpi_tb_get_table_ptr will return a NULL pointer if the
+ * acpi_tb_get_table_ptr will return a NULL pointer if the
* table is not loaded.
*/
if (tbl_ptr == NULL) {
return_ACPI_STATUS (AE_NOT_EXIST);
}
- /*
- * Got a table ptr, assume it's ok and copy it to the user's buffer
- */
+ /* Get the table length */
+
if (table_type == ACPI_TABLE_RSDP) {
/*
* RSD PTR is the only "table" without a header
*/
- ret_buf_len = sizeof (RSDP_DESCRIPTOR);
+ table_length = sizeof (struct rsdp_descriptor);
}
else {
- ret_buf_len = tbl_ptr->length;
+ table_length = (acpi_size) tbl_ptr->length;
}
- /*
- * Verify we have space in the caller's buffer for the table
- */
- if (ret_buffer->length < ret_buf_len) {
- ret_buffer->length = ret_buf_len;
- return_ACPI_STATUS (AE_BUFFER_OVERFLOW);
- }
+ /* Validate/Allocate/Clear caller buffer */
- ret_buffer->length = ret_buf_len;
+ status = acpi_ut_initialize_buffer (ret_buffer, table_length);
+ if (ACPI_FAILURE (status)) {
+ return_ACPI_STATUS (status);
+ }
- MEMCPY ((void *) ret_buffer->pointer, (void *) tbl_ptr, ret_buf_len);
+ /* Copy the table to the buffer */
+ ACPI_MEMCPY ((void *) ret_buffer->pointer, (void *) tbl_ptr, table_length);
return_ACPI_STATUS (AE_OK);
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)