Changeset 72631 in vbox for trunk/src/VBox/Devices

Timestamp:

Jun 20, 2018 2:18:56 PM (7 years ago)

Author:

vboxsync

Message:

EFI: Added option to not put ROM range into the NVRAM firmware volume and leave it alone for flash use.

File:

• trunk/src/VBox/Devices/EFI/DevEFI.cpp (modified) (10 diffs)

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

@@ -174 +174 @@
     /** The size of the system EFI ROM. */
     uint64_t                cbEfiRom;
+    /** Offset into the actual ROM within EFI FW volume. */
+    uint64_t                uEfiRomOfs;
     /** The name of the EFI ROM file. */
     char                   *pszEfiRomFile;
@@ -198 +200 @@
     /** The DMI tables. */
     uint8_t                 au8DMIPage[0x1000];
+
+    /** Should NVRAM range be reserved for flash? */
+    bool                    fSkipNvramRange;
 
     /** I/O-APIC enabled? */
@@ -1894 +1899 @@
     if (pThis->pu8EfiRom)
     {
-        RTFileReadAllFree(pThis->pu8EfiRom, (size_t)pThis->cbEfiRom);
+        RTFileReadAllFree(pThis->pu8EfiRom, (size_t)pThis->cbEfiRom + pThis->uEfiRomOfs);
         pThis->pu8EfiRom = NULL;
     }
@@ -1985 +1990 @@
     AssertLogRelMsgReturn(!(pThis->cbEfiRom & PAGE_OFFSET_MASK), ("%RX64\n", pThis->cbEfiRom), VERR_INVALID_PARAMETER);
 
+    LogRel(("Found EFI FW Volume, %u bytes (%u %u-byte blocks)\n", pFwVolHdr->FvLength, pFwVolHdr->BlockMap[0].NumBlocks, pFwVolHdr->BlockMap[0].Length));
+
+    /* Adjust the FW variables to skip the NVRAM volume. */
+    if (pThis->fSkipNvramRange)
+    {
+        pThis->cbEfiRom  -= pFwVolHdr->FvLength;
+        pThis->uEfiRomOfs = pFwVolHdr->FvLength;
+    }
+
     pThis->GCLoadAddress = UINT32_C(0xfffff000) - pThis->cbEfiRom + PAGE_SIZE;
 
@@ -2036 +2050 @@
                               pThis->GCLoadAddress,
                               cbQuart,
-                              pThis->pu8EfiRom,
+                              pThis->pu8EfiRom + pThis->uEfiRomOfs,
                               cbQuart,
                               PGMPHYS_ROM_FLAGS_SHADOWED | PGMPHYS_ROM_FLAGS_PERMANENT_BINARY,
@@ -2046 +2060 @@
                               pThis->GCLoadAddress + cbQuart,
                               cbQuart,
-                              pThis->pu8EfiRom + cbQuart,
+                              pThis->pu8EfiRom + pThis->uEfiRomOfs + cbQuart,
                               cbQuart,
                               PGMPHYS_ROM_FLAGS_SHADOWED | PGMPHYS_ROM_FLAGS_PERMANENT_BINARY,
@@ -2055 +2069 @@
                               pThis->GCLoadAddress + cbQuart * 2,
                               cbQuart,
-                              pThis->pu8EfiRom + cbQuart * 2,
+                              pThis->pu8EfiRom + pThis->uEfiRomOfs + cbQuart * 2,
                               cbQuart,
                               PGMPHYS_ROM_FLAGS_SHADOWED | PGMPHYS_ROM_FLAGS_PERMANENT_BINARY,
@@ -2064 +2078 @@
                               pThis->GCLoadAddress + cbQuart * 3,
                               pThis->cbEfiRom - cbQuart * 3,
-                              pThis->pu8EfiRom + cbQuart * 3,
+                              pThis->pu8EfiRom + pThis->uEfiRomOfs + cbQuart * 3,
                               pThis->cbEfiRom - cbQuart * 3,
                               PGMPHYS_ROM_FLAGS_SHADOWED | PGMPHYS_ROM_FLAGS_PERMANENT_BINARY,
@@ -2198 +2212 @@
                               "BootArgs\0"
                               "DeviceProps\0"
+                              "SkipNvramRange\0"            // legacy
                               "GopMode\0"                   // legacy
                               "GraphicsMode\0"
@@ -2270 +2285 @@
         pThis->pszEfiRomFile = NULL;
     }
+
+    rc = CFGMR3QueryBoolDef(pCfg, "SkipNvramRange", &pThis->fSkipNvramRange, false);
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("Configuration error: Querying \"SkipNvramRange\" as integer failed"));
+
 
     /*