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

Timestamp:

Nov 20, 2009 1:34:44 PM (15 years ago)

Author:

vboxsync

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

55046

Message:

EFI: correct 64-bit entry points

File:

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

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

@@ -763 +763 @@
 static int efiLoadThunk(PDEVEFI pThis, PCFGMNODE pCfgHandle)
 {
+    uint8_t f64BitEntry = 0;
+    int rc;
+
+    rc = CFGMR3QueryU8Def(pCfgHandle, "64BitEntry", &f64BitEntry, 0);
+    if (RT_FAILURE (rc))
+        return PDMDEV_SET_ERROR(pThis->pDevIns, rc,
+                                N_("Configuration error: Failed to read \"64BitEntry\""));
+
     /*
      * Make a copy of the page and set the values of the DEVEFIINFO structure
      * found at the beginning of it.
      */
+    
+    if (f64BitEntry)
+        LogRel(("Using 64-bit EFI firmware\n"));
 
     /* Duplicate the page so we can change it. */
@@ -785 +796 @@
     pEfiInfo->cbBelow4GB    = pThis->cbBelow4GB;
     pEfiInfo->cbAbove4GB    = pThis->cbAbove4GB;
-    pEfiInfo->fFlags        = 0; /* todo 0 bit makes 64-bit fw to boot need some knitting with GUI */
+    /* zeroth bit controls use of 64-bit entry point in fw */
+    pEfiInfo->fFlags        = f64BitEntry ? 1 : 0;
     pEfiInfo->cCpus         = pThis->cCpus;
     pEfiInfo->pfnPeiEP      = (uint32_t)pThis->GCEntryPoint1;
@@ -791 +803 @@
 
     /* Register the page as a ROM (data will be copied). */
-    int rc = PDMDevHlpROMRegister(pThis->pDevIns, UINT32_C(0xfffff000), PAGE_SIZE,
-                                  pThis->pu8EfiThunk,
-                                  PGMPHYS_ROM_FLAGS_PERMANENT_BINARY, "EFI Thunk");
+    rc = PDMDevHlpROMRegister(pThis->pDevIns, UINT32_C(0xfffff000), PAGE_SIZE,
+                              pThis->pu8EfiThunk,
+                              PGMPHYS_ROM_FLAGS_PERMANENT_BINARY, "EFI Thunk");
     if (RT_FAILURE(rc))
         return rc;
@@ -870 +882 @@
                               "DmiOEMVBoxRev\0"
 #endif
+                              "64BitEntry\0"
                               ))
         return PDMDEV_SET_ERROR(pDevIns, VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES,