This patch splits acpi_initialize_tables() into two steps, and
introduces two new functions:
acpi_initialize_tables_firmware() and acpi_tb_root_table_override(),
which work just the same as acpi_initialize_tables() if they are called
in sequence.
Signed-off-by: Tang Chen <tangc...@cn.fujitsu.com>
Reviewed-by: Zhang Yanfei <zhangyan...@cn.fujitsu.com>
---
drivers/acpi/acpica/tbxface.c | 64 ++++++++++++++++++++++++++++++++++++----
1 files changed, 57 insertions(+), 7 deletions(-)
diff --git a/drivers/acpi/acpica/tbxface.c b/drivers/acpi/acpica/tbxface.c
index 98e4cad..ecaa5e1 100644
--- a/drivers/acpi/acpica/tbxface.c
+++ b/drivers/acpi/acpica/tbxface.c
@@ -72,8 +72,7 @@ acpi_status acpi_allocate_root_table(u32 initial_table_count)
}
/*******************************************************************************
- *
- * FUNCTION: acpi_initialize_tables
+ * FUNCTION: acpi_initialize_tables_firmware
*
* PARAMETERS: initial_table_array - Pointer to an array of pre-allocated
* struct acpi_table_desc structures. If
NULL, the
@@ -86,8 +85,6 @@ acpi_status acpi_allocate_root_table(u32 initial_table_count)
*
* RETURN: Status
*
- * DESCRIPTION: Initialize the table manager, get the RSDP and RSDT/XSDT.
- *
* NOTE: Allows static allocation of the initial table array in order
* to avoid the use of dynamic memory in confined environments
* such as the kernel boot sequence where it may not be available.
@@ -98,8 +95,8 @@ acpi_status acpi_allocate_root_table(u32 initial_table_count)
******************************************************************************/
acpi_status __init
-acpi_initialize_tables(struct acpi_table_desc * initial_table_array,
- u32 initial_table_count, u8 allow_resize)
+acpi_initialize_tables_firmware(struct acpi_table_desc * initial_table_array,
+ u32 initial_table_count, u8 allow_resize)
{
acpi_physical_address rsdp_address;
acpi_status status;
@@ -144,10 +141,63 @@ acpi_initialize_tables(struct acpi_table_desc *
initial_table_array,
* in a common, more useable format.
*/
status = acpi_tb_root_table_install(rsdp_address);
+
+ return_ACPI_STATUS(status);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION: acpi_initialize_tables
+ *
+ * PARAMETERS: None
+ *
+ * RETURN: None
+ *
+ * DESCRIPTION: Allow host OS to replace any table installed in global root
+ * table list.
+ *
+
******************************************************************************/
+
+void acpi_initialize_tables_override(void)
+{
+ acpi_tb_root_table_override();
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION: acpi_initialize_tables
+ *
+ * PARAMETERS: initial_table_array - Pointer to an array of pre-allocated
+ * struct acpi_table_desc structures. If
NULL, the
+ * array is dynamically allocated.
+ * initial_table_count - Size of initial_table_array, in number of
+ * struct acpi_table_desc structures
+ * allow_resize - Flag to tell Table Manager if resize of
+ * pre-allocated array is allowed. Ignored
+ * if initial_table_array is NULL.
+ *
+ * RETURN: Status
+ *
+ * DESCRIPTION: Initialize the table manager, get the RSDP and RSDT/XSDT.
+ *
+
******************************************************************************/
+
+acpi_status __init
+acpi_initialize_tables(struct acpi_table_desc * initial_table_array,
+ u32 initial_table_count, u8 allow_resize)
+{
+ acpi_status status;
+
+ status = acpi_initialize_tables_firmware(initial_table_array,
+ initial_table_count, allow_resize);
if (ACPI_FAILURE(status))
return_ACPI_STATUS(status);
- acpi_tb_root_table_override();
+ /*
+ * Allow host OS to replace any table installed in global root
+ * table list.
+ */
+ acpi_initialize_tables_override();
return_ACPI_STATUS(AE_OK);
}
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
