Tables: Add AcpiInstallTable() API to be invoked by OSPM early table …

…installation. This patch adds a new API - AcpiInstallTable(). OSPMs can use this API to install tables during early boot stage. Lv Zheng. Signed-off-by: Lv Zheng <lv.zheng@intel.com>
acpica · Mar 19, 2014 · 32ae0ea · 32ae0ea
1 parent c5dfd64
commit 32ae0ea
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 8 deletions.
diff --git a/source/components/executer/exconfig.c b/source/components/executer/exconfig.c
@@ -603,7 +603,7 @@ AcpiExLoadOp (
     ACPI_INFO ((AE_INFO, "Dynamic OEM Table Load:"));
     (void) AcpiUtAcquireMutex (ACPI_MTX_TABLES);
     Status = AcpiTbInstallNonFixedTable (ACPI_PTR_TO_PHYSADDR (Table),
-                ACPI_TABLE_ORIGIN_INTERN_VIRTUAL, TRUE, &TableIndex);
+                ACPI_TABLE_ORIGIN_INTERN_VIRTUAL, TRUE, TRUE, &TableIndex);
     (void) AcpiUtReleaseMutex (ACPI_MTX_TABLES);
     if (ACPI_FAILURE (Status))
     {

diff --git a/source/components/tables/tbinstal.c b/source/components/tables/tbinstal.c
@@ -514,6 +514,7 @@ AcpiTbReleaseTemporalTable (
  *
  * PARAMETERS:  TableIndex              - Index into root table array
  *              NewTableDesc            - New table descriptor to install
+ *              Override                - Whether override should be performed
  *
  * RETURN:      None
  *
@@ -527,7 +528,8 @@ AcpiTbReleaseTemporalTable (
 void
 AcpiTbInstallAndOverrideTable (
     UINT32                  TableIndex,
-    ACPI_TABLE_DESC         *NewTableDesc)
+    ACPI_TABLE_DESC         *NewTableDesc,
+    BOOLEAN                 Override)
 {
     if (TableIndex >= AcpiGbl_RootTableList.CurrentTableCount)
     {
@@ -541,7 +543,10 @@ AcpiTbInstallAndOverrideTable (
      * one if desired. Any table within the RSDT/XSDT can be replaced,
      * including the DSDT which is pointed to by the FADT.
      */
-    AcpiTbOverrideTable (NewTableDesc);
+    if (Override)
+    {
+        AcpiTbOverrideTable (NewTableDesc);
+    }
 
     AcpiTbInstallTable (&AcpiGbl_RootTableList.Tables[TableIndex],
         NewTableDesc->Address, NewTableDesc->Flags, NewTableDesc->Pointer);
@@ -612,7 +617,7 @@ AcpiTbInstallFixedTable (
         goto ReleaseAndExit;
     }
 
-    AcpiTbInstallAndOverrideTable (TableIndex, &NewTableDesc);
+    AcpiTbInstallAndOverrideTable (TableIndex, &NewTableDesc, TRUE);
 
 ReleaseAndExit:
 
@@ -680,6 +685,7 @@ AcpiTbIsEquivalentTable (
  *                                    address depending on the TableFlags)
  *              Flags               - Flags for the table
  *              Reload              - Whether reload should be performed
+ *              Override            - Whether override should be performed
  *              TableIndex          - Where the table index is returned
  *
  * RETURN:      Status
@@ -698,6 +704,7 @@ AcpiTbInstallNonFixedTable (
     ACPI_PHYSICAL_ADDRESS   Address,
     UINT8                   Flags,
     BOOLEAN                 Reload,
+    BOOLEAN                 Override,
     UINT32                  *TableIndex)
 {
     UINT32                  i;
@@ -826,7 +833,7 @@ AcpiTbInstallNonFixedTable (
         goto ReleaseAndExit;
     }
     *TableIndex = i;
-    AcpiTbInstallAndOverrideTable (i, &NewTableDesc);
+    AcpiTbInstallAndOverrideTable (i, &NewTableDesc, Override);
 
 ReleaseAndExit:
 

diff --git a/source/components/tables/tbutils.c b/source/components/tables/tbutils.c
@@ -584,7 +584,7 @@ AcpiTbParseRootTable (
 
         Status = AcpiTbInstallNonFixedTable (
             AcpiTbGetRootTableEntry (TableEntry, TableEntrySize),
-            ACPI_TABLE_ORIGIN_INTERN_PHYSICAL, FALSE, &TableIndex);
+            ACPI_TABLE_ORIGIN_INTERN_PHYSICAL, FALSE, TRUE, &TableIndex);
 
         if (ACPI_SUCCESS (Status) &&
             ACPI_COMPARE_NAME (&AcpiGbl_RootTableList.Tables[TableIndex].Signature,

diff --git a/source/components/tables/tbxfload.c b/source/components/tables/tbxfload.c
@@ -280,6 +280,53 @@ AcpiTbLoadNamespace (
 }
 
 
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiInstallTable
+ *
+ * PARAMETERS:  Address             - Address of the ACPI table to be installed.
+ *              Physical            - Whether the address is a physical table
+ *                                    address or not
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Dynamically install an ACPI table.
+ *              Note: This function should only be invoked after
+ *                    AcpiInitializeTables() and before AcpiLoadTables().
+ *
+ ******************************************************************************/
+
+ACPI_STATUS
+AcpiInstallTable (
+    ACPI_PHYSICAL_ADDRESS   Address,
+    BOOLEAN                 Physical)
+{
+    ACPI_STATUS             Status;
+    UINT8                   Flags;
+    UINT32                  TableIndex;
+
+
+    ACPI_FUNCTION_TRACE (AcpiInstallTable);
+
+
+    if (Physical)
+    {
+        Flags = ACPI_TABLE_ORIGIN_EXTERN_VIRTUAL;
+    }
+    else
+    {
+        Flags = ACPI_TABLE_ORIGIN_INTERN_PHYSICAL;
+    }
+
+    Status = AcpiTbInstallNonFixedTable (Address, Flags,
+        FALSE, FALSE, &TableIndex);
+
+    return_ACPI_STATUS (Status);
+}
+
+ACPI_EXPORT_SYMBOL_INIT (AcpiInstallTable)
+
+
 /*******************************************************************************
  *
  * FUNCTION:    AcpiLoadTable
@@ -328,7 +375,7 @@ AcpiLoadTable (
     ACPI_INFO ((AE_INFO, "Host-directed Dynamic ACPI Table Load:"));
     (void) AcpiUtAcquireMutex (ACPI_MTX_TABLES);
     Status = AcpiTbInstallNonFixedTable (ACPI_PTR_TO_PHYSADDR (Table),
-                ACPI_TABLE_ORIGIN_EXTERN_VIRTUAL, TRUE, &TableIndex);
+            ACPI_TABLE_ORIGIN_EXTERN_VIRTUAL, TRUE, FALSE, &TableIndex);
     (void) AcpiUtReleaseMutex (ACPI_MTX_TABLES);
     if (ACPI_FAILURE (Status))
     {

diff --git a/source/include/acpixf.h b/source/include/acpixf.h
@@ -274,6 +274,11 @@ AcpiDecodePldBuffer (
  * ACPI table load/unload interfaces
  */
 ACPI_STATUS
+AcpiInstallTable (
+    ACPI_PHYSICAL_ADDRESS   Address,
+    BOOLEAN                 Physical);
+
+ACPI_STATUS
 AcpiLoadTable (
     ACPI_TABLE_HEADER       *Table);
 

diff --git a/source/include/actables.h b/source/include/actables.h
@@ -200,6 +200,7 @@ AcpiTbInstallNonFixedTable (
     ACPI_PHYSICAL_ADDRESS   Address,
     UINT8                   Flags,
     BOOLEAN                 Reload,
+    BOOLEAN                 Override,
     UINT32                  *TableIndex);
 
 ACPI_STATUS
@@ -289,7 +290,8 @@ AcpiTbInstallTable (
 void
 AcpiTbInstallAndOverrideTable (
     UINT32                  TableIndex,
-    ACPI_TABLE_DESC         *NewTableDesc);
+    ACPI_TABLE_DESC         *NewTableDesc,
+    BOOLEAN                 Override);
 
 ACPI_STATUS
 AcpiTbInstallFixedTable (