Changeset 105042 in vbox for trunk/src/VBox/Devices/EFI

Timestamp:

Jun 27, 2024 8:53:11 AM (10 months ago)

Author:

vboxsync

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

163660

Message:

Devices/EFI/DevEFI: Add info item to convey the start of the PPI MMIO area to the firmware, bugref:10701

Location:

trunk/src/VBox/Devices/EFI

Files:

• DevEFI.cpp (modified) (5 diffs)
• DevEFI.h (modified) (1 diff)

trunk/src/VBox/Devices/EFI/DevEFI.cpp

@@ -191 +191 @@
     /** Length of PCI config space MMIO region */
     uint64_t                cbMcfgLength;
+    /** Physical address of the TPM PPI area. */
+    uint64_t                u64TpmPpiBase;
     /** Size of the configured NVRAM device. */
     uint32_t                cbNvram;
@@ -321 +323 @@
         case EFI_INFO_INDEX_MCFG_BASE:
         case EFI_INFO_INDEX_MCFG_SIZE:
+        case EFI_INFO_INDEX_TPM_PPI_BASE:
             return 8;
         case EFI_INFO_INDEX_APIC_MODE:
@@ -423 +426 @@
         case EFI_INFO_INDEX_MCFG_SIZE:          return efiInfoNextByteU64(pThisCC, pThisCC->cbMcfgLength);
         case EFI_INFO_INDEX_APIC_MODE:          return efiInfoNextByteU8(pThisCC, pThisCC->u8APIC);
+        case EFI_INFO_INDEX_TPM_PPI_BASE:       return efiInfoNextByteU64(pThisCC, pThisCC->u64TpmPpiBase);
 
         default:
@@ -1560 +1564 @@
                                   "UgaVerticalResolution|"     // legacy
                                   "GraphicsResolution|"
-                                  "NvramFile", "");
+                                  "NvramFile|"
+                                  "TpmPpiBase", "");
 
     /* CPU count (optional). */
@@ -1757 +1762 @@
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Querying \"NvramFile\" as a string failed"));
+
+    rc = pHlp->pfnCFGMQueryU64Def(pCfg, "TpmPpiBase", &pThisCC->u64TpmPpiBase, 0);
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("Configuration error: Querying \"TpmPpiBase\" as integer failed"));
 
     /*

trunk/src/VBox/Devices/EFI/DevEFI.h

@@ -85 +85 @@
     EFI_INFO_INDEX_CPU_COUNT_CURRENT,
     EFI_INFO_INDEX_CPU_COUNT_MAX,
+    EFI_INFO_INDEX_TPM_PPI_BASE,
     EFI_INFO_INDEX_END
 } EfiInfoIndex;