Changeset 90907 in vbox for trunk/src/VBox/Devices/EFI/Firmware

Timestamp:

Aug 26, 2021 10:17:06 AM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

146543

Message:

EFI/Firmware: Don't just install a static selection of ACPI tables but use the XSDT to install all pre existing ones (like for the upcoming TPM and IOMMU support or custom tables added by the user), bugref:4643 bugref:10075 bugref:9967 bugref:9654

File:

• trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.c (modified) (8 diffs)

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.c

@@ -150 +150 @@
 #ifdef VBOX
 
+/* Disables the old code only copying a selection of tables, missing out a bunch of things available in the XSDT/RSDT. */
+# define ACPI_NO_STATIC_TABLES_SELECTION 1
+
 # define ACPI_RSD_PTR       SIGNATURE_64('R', 'S', 'D', ' ', 'P', 'T', 'R', ' ')
 # define EBDA_BASE          (0x9FC0 << 4)
@@ -180 +183 @@
 }
 
+#ifndef ACPI_NO_STATIC_TABLES_SELECTION
 VOID *FindSignature(VOID* Start, UINT32 Signature, BOOLEAN NoChecksum)
 {
@@ -198 +202 @@
   return NULL;
 }
+#endif
 
 VOID
@@ -204 +209 @@
     UINT32 Table = 0;
     EFI_ACPI_2_0_ROOT_SYSTEM_DESCRIPTION_POINTER *RsdPtr;
+#ifndef ACPI_NO_STATIC_TABLES_SELECTION
     VOID *TablesPage;
+#else
+    EFI_ACPI_DESCRIPTION_HEADER *RsdtTbl;
+#endif
+    UINT64 *PtrTbl;
+    UINT32 Index;
+
+    RsdPtr = (EFI_ACPI_2_0_ROOT_SYSTEM_DESCRIPTION_POINTER*)FindAcpiRsdPtr();
+    ASSERT(RsdPtr != NULL);
+
+#ifndef ACPI_NO_STATIC_TABLES_SELECTION
 #define FLAG_OPTIONAL    1<<0
 #define FLAG_NO_CHECKSUM 1<<1
@@ -227 +243 @@
         { SIGNATURE_32('M', 'C', 'F', 'G'), FLAG_OPTIONAL, "MCFG"}
     };
-    UINT32 Index;
-
-    RsdPtr = (EFI_ACPI_2_0_ROOT_SYSTEM_DESCRIPTION_POINTER*)FindAcpiRsdPtr();
-    ASSERT(RsdPtr != NULL);
-    TablesPage = (VOID*)(UINTN)((RsdPtr->RsdtAddress) & ~0xfff);
+
+    TablesPage = (VOID *)(UINTN)((RsdPtr->RsdtAddress) & ~0xfff);
     DEBUG((DEBUG_INFO, "TablesPage:%p\n", TablesPage));
 
@@ -253 +266 @@
            Tables[Table++] = Ptr;
     }
+#else
+    RsdtTbl = (EFI_ACPI_DESCRIPTION_HEADER*)(UINTN)RsdPtr->XsdtAddress;
+    DEBUG((DEBUG_INFO, "RsdtTbl:%p\n", RsdtTbl));
+
+    PtrTbl = (UINT64 *)(RsdtTbl + 1);
+    for (Index = 0; Index < (RsdtTbl->Length - sizeof(*RsdtTbl)) / sizeof(UINT64); Index++)
+    {
+        EFI_ACPI_DESCRIPTION_HEADER *Header = (EFI_ACPI_DESCRIPTION_HEADER *)(UINTN)*PtrTbl++;
+        DEBUG ((DEBUG_VERBOSE, "Table %p found \"%-4.4a\" size 0x%x\n", Header, (CONST CHAR8 *)&Header->Signature, Header->Length));
+
+        if (Header->Signature == SIGNATURE_32('F', 'A', 'C', 'P'))
+        {
+            /* Add the DSDT pointer from there. */
+            EFI_ACPI_2_0_FIXED_ACPI_DESCRIPTION_TABLE *Fadt = (EFI_ACPI_2_0_FIXED_ACPI_DESCRIPTION_TABLE *)Header;
+            DEBUG((DEBUG_INFO, "Found FACP: DSDT 0x%x FACS 0x%x XDsdt %p XFacs %p\n", Fadt->Dsdt, Fadt->FirmwareCtrl, Fadt->XDsdt, Fadt->XFirmwareCtrl));
+            Tables[Table++] = (VOID *)(UINTN)Fadt->FirmwareCtrl;
+            Tables[Table++] = (VOID *)(UINTN)Fadt->Dsdt;
+        }
+
+        Tables[Table++] = Header;
+    }
+#endif
 
 #if 0
@@ -270 +305 @@
 #endif
 
-    DEBUG((DEBUG_INFO, "We found %d tables from %d\n", Table, TablesSize));
+    DEBUG((DEBUG_INFO, "We found %d tables (max allowed %d)\n", Table, TablesSize));
     Tables[Table] = NULL;
 }
@@ -298 +333 @@
   EFI_ACPI_TABLE_PROTOCOL        *AcpiTable;
 #ifdef VBOX
+# ifndef ACPI_NO_STATIC_TABLES_SELECTION
   VOID                           *VBoxTables[10];
+# else
+  VOID                           *VBoxTables[128];
+# endif
 #else
   EFI_FIRMWARE_VOLUME2_PROTOCOL  *FwVol;