Changeset 42397 in vbox for trunk/src

Timestamp:

Jul 25, 2012 3:22:05 PM (12 years ago)

Author:

vboxsync

Message:

EFI/Ovmf: Intermediate changes to boot Ovmf based firmware (disabled:VBOX_WITH_OVMF).

Location:

trunk/src/VBox/Devices

Files:

• EFI/DevOVMF.cpp (copied) (copied from trunk/src/VBox/Devices/EFI/DevEFI.cpp ) (9 diffs)
• Makefile.kmk (modified) (2 diffs)
• build/VBoxDD.cpp (modified) (1 diff)

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

@@ -53 +53 @@
 #include <Common/PiFirmwareVolume.h>
 #include <Common/PiFirmwareFile.h>
-#include <IndustryStandard/PeImage.h>
 
 /*******************************************************************************
@@ -359 +358 @@
             {
                 case EFI_PANIC_CMD_BAD_ORG:
+#if 0
                     LogRel(("EFI Panic: You have to fix ORG offset in EfiThunk.asm! Must be 0x%x\n",
                             g_cbEfiThunkBinary));
@@ -364 +364 @@
                                      g_cbEfiThunkBinary);
                     break;
+#endif
 
                 case EFI_PANIC_CMD_THUNK_TRAP:
@@ -579 +580 @@
 }
 
-static int efiFindRelativeAddressOfEPAndBaseAddressOfModule(EFI_FFS_FILE_HEADER const *pFfsFile, uint32_t cbFfsFile, RTGCPHYS *pImageBase, uint8_t **ppbImage)
-{
-    /*
-     * Sections headers are lays at the beginning of block it describes,
-     * the first section header is located immediately after FFS header.
-     */
-    EFI_FILE_SECTION_POINTER uSecHdrPtr;
-    uint8_t const * const    pbFfsFileEnd = (uint8_t *)pFfsFile + cbFfsFile;
-    uint8_t const           *pbImage      = NULL;
-    uint8_t const           *pbSecHdr     = (uint8_t const *)&pFfsFile[1]; /* FFS header has fixed size */
-    for (; (uintptr_t)pbSecHdr < (uintptr_t)pbFfsFileEnd;
-         pbSecHdr += SECTION_SIZE(uSecHdrPtr.CommonHeader))
-    {
-        uSecHdrPtr.CommonHeader = (EFI_COMMON_SECTION_HEADER *)pbSecHdr;
-        if (    uSecHdrPtr.CommonHeader->Type == EFI_SECTION_PE32
-            ||  uSecHdrPtr.CommonHeader->Type == EFI_SECTION_TE)
-        {
-            /*Here should be other code containing sections*/
-            pbImage = (uint8_t const *)&uSecHdrPtr.Pe32Section[1]; /* the PE/PE+/TE headers begins just after the Section Header */
-            break;
-        }
-        Log2(("EFI: Section of type:%d has been detected\n", uSecHdrPtr.CommonHeader->Type));
-    }
-    AssertLogRelMsgReturn(pbImage, ("Failed to find PE32 or TE section for the SECURITY_CORE FFS\n"), VERR_INVALID_PARAMETER);
-
-    /*
-     * Parse the image extracting the ImageBase and the EntryPoint.
-     */
-    int rc = VINF_SUCCESS;
-    union EfiHdrUnion
-    {
-        EFI_IMAGE_DOS_HEADER    Dos;
-        EFI_IMAGE_NT_HEADERS32  Nt32;
-        EFI_IMAGE_NT_HEADERS64  Nt64;
-        EFI_TE_IMAGE_HEADER     Te;
-    };
-    EfiHdrUnion const *pHdr = (EfiHdrUnion const *)pbImage;
-
-    /* Skip MZ if found. */
-    if (pHdr->Dos.e_magic == RT_MAKE_U16('M',  'Z'))
-    {
-        uint8_t const *pbNewHdr = (uint8_t const *)pHdr + pHdr->Dos.e_lfanew;
-        AssertLogRelMsgReturn(   (uintptr_t)pbNewHdr <  (uintptr_t)pbFfsFileEnd
-                              && (uintptr_t)pbNewHdr >= (uintptr_t)&pHdr->Dos.e_lfanew + sizeof(pHdr->Dos.e_lfanew),
-                              ("%x\n", pHdr->Dos.e_lfanew),
-                              VERR_BAD_EXE_FORMAT);
-        pHdr = (EfiHdrUnion const *)pbNewHdr;
-    }
-
-    RTGCPHYS ImageBase;
-    RTGCPHYS EpRVA;
-    if (pHdr->Nt32.Signature == RT_MAKE_U32_FROM_U8('P', 'E', 0, 0))
-    {
-        AssertLogRelMsgReturn(   (   pHdr->Nt32.FileHeader.Machine == EFI_IMAGE_FILE_MACHINE_I386
-                                  && pHdr->Nt32.FileHeader.SizeOfOptionalHeader == sizeof(pHdr->Nt32.OptionalHeader))
-                              || (   pHdr->Nt32.FileHeader.Machine == EFI_IMAGE_MACHINE_X64
-                                  && pHdr->Nt32.FileHeader.SizeOfOptionalHeader == sizeof(pHdr->Nt64.OptionalHeader)),
-                              ("%x / %x\n", pHdr->Nt32.FileHeader.Machine, pHdr->Nt32.FileHeader.SizeOfOptionalHeader),
-                              VERR_LDR_ARCH_MISMATCH);
-        EFI_IMAGE_SECTION_HEADER *pSectionsHeaders = NULL;
-        int cSectionsHeaders = 0;
-        if (pHdr->Nt32.FileHeader.Machine == EFI_IMAGE_FILE_MACHINE_I386)
-        {
-            Log2(("EFI: PE32/i386\n"));
-            AssertLogRelMsgReturn(pHdr->Nt32.OptionalHeader.SizeOfImage < cbFfsFile,
-                                  ("%#x / %#x\n", pHdr->Nt32.OptionalHeader.SizeOfImage, cbFfsFile),
-                                  VERR_BAD_EXE_FORMAT);
-            ImageBase = pHdr->Nt32.OptionalHeader.ImageBase;
-            EpRVA     = pHdr->Nt32.OptionalHeader.AddressOfEntryPoint;
-            EpRVA     -= pHdr->Nt32.OptionalHeader.BaseOfCode;
-            AssertLogRelMsgReturn(EpRVA < pHdr->Nt32.OptionalHeader.SizeOfImage,
-                                  ("%#RGp / %#x\n", EpRVA, pHdr->Nt32.OptionalHeader.SizeOfImage),
-                                  VERR_BAD_EXE_FORMAT);
-            pSectionsHeaders = (EFI_IMAGE_SECTION_HEADER *)((uint8_t *)&pHdr->Nt32.OptionalHeader + pHdr->Nt32.FileHeader.SizeOfOptionalHeader);
-            cSectionsHeaders = pHdr->Nt32.FileHeader.NumberOfSections;
-        }
-        else
-        {
-            Log2(("EFI: PE+/AMD64 %RX16\n", pHdr->Nt32.FileHeader.Machine));
-            AssertLogRelMsgReturn(pHdr->Nt64.OptionalHeader.SizeOfImage < cbFfsFile,
-                                  ("%#x / %#x\n", pHdr->Nt64.OptionalHeader.SizeOfImage, cbFfsFile),
-                                  VERR_BAD_EXE_FORMAT);
-            ImageBase = pHdr->Nt64.OptionalHeader.ImageBase;
-            EpRVA     = pHdr->Nt64.OptionalHeader.AddressOfEntryPoint;
-            EpRVA     -= pHdr->Nt64.OptionalHeader.BaseOfCode;
-            AssertLogRelMsgReturn(EpRVA < pHdr->Nt64.OptionalHeader.SizeOfImage,
-                                  ("%#RGp / %#x\n", EpRVA, pHdr->Nt64.OptionalHeader.SizeOfImage),
-                                  VERR_BAD_EXE_FORMAT);
-            pSectionsHeaders = (EFI_IMAGE_SECTION_HEADER *)((uint8_t *)&pHdr->Nt64.OptionalHeader + pHdr->Nt64.FileHeader.SizeOfOptionalHeader);
-            cSectionsHeaders = pHdr->Nt64.FileHeader.NumberOfSections;
-        }
-        AssertPtrReturn(pSectionsHeaders, VERR_BAD_EXE_FORMAT);
-        int idxSection = 0;
-        for (; idxSection < cSectionsHeaders; ++idxSection)
-        {
-            EFI_IMAGE_SECTION_HEADER *pSection = &pSectionsHeaders[idxSection];
-            if (!RTStrCmp((const char *)&pSection->Name[0], ".text"))
-            {
-                EpRVA += pSection->PointerToRawData;
-                break;
-            }
-        }
-    }
-    else if (pHdr->Te.Signature == RT_MAKE_U16('V', 'Z'))
-    {
-        /* TE header */
-        Log2(("EFI: TE header\n"));
-        AssertLogRelMsgReturn(   pHdr->Te.Machine == EFI_IMAGE_FILE_MACHINE_I386
-                              || pHdr->Te.Machine == EFI_IMAGE_MACHINE_X64,
-                              ("%x\n", pHdr->Te.Machine),
-                              VERR_LDR_ARCH_MISMATCH);
-        ImageBase = pHdr->Te.ImageBase;
-        EpRVA     = pHdr->Te.AddressOfEntryPoint;
-        AssertLogRelMsgReturn(EpRVA < cbFfsFile,
-                              ("%#RGp / %#x\n", EpRVA, cbFfsFile),
-                              VERR_BAD_EXE_FORMAT);
-    }
-    else
-        AssertLogRelMsgFailedReturn(("%#x\n", pHdr->Nt32.Signature), VERR_INVALID_EXE_SIGNATURE);
-
-    Log2(("EFI: EpRVA=%RGp ImageBase=%RGp EntryPoint=%RGp\n", EpRVA, ImageBase, EpRVA + ImageBase));
-    if (pImageBase != NULL)
-        *pImageBase = ImageBase;
-    if (ppbImage != NULL)
-        *ppbImage = (uint8_t *)pbImage;
-    return (EpRVA);
-}
 
 /**
@@ -738 +612 @@
 
     uint8_t const * const pbFwVolEnd = pThis->pu8EfiRom + pFwVolHdr->FvLength;
-
+    pThis->GCLoadAddress = UINT32_C(0xfffff000) - pThis->cbEfiRom + PAGE_SIZE;
+
+#if 0
     /*
      * Ffs files are stored one by one, so to find SECURITY_CORE we've to
@@ -779 +655 @@
     LogRel(("EFI: Firmware volume loading at %RGp, PEI CORE at with EP at %RGp\n",
             pThis->GCLoadAddress, pThis->GCEntryPoint1));
+#endif
     return VINF_SUCCESS;
 }
@@ -863 +740 @@
 }
 
+#if 0
 /**
  * Patches and loads the EfiThunk ROM image.
@@ -941 +819 @@
     return rc;
 }
+#endif
 
 
@@ -1210 +1089 @@
         return rc;
 
+#if 0
     rc = efiLoadThunk(pThis, pCfg);
     if (RT_FAILURE(rc))
         return rc;
+#endif
 
     /*

trunk/src/VBox/Devices/Makefile.kmk

@@ -44 +44 @@
   include $(PATH_SUB_CURRENT)/Graphics/BIOS/Makefile.kmk
  endif
- ifdef VBOX_WITH_EFI
+ if defined(VBOX_WITH_EFI) && !defined(VBOX_WITH_OVMF)
   include $(PATH_SUB_CURRENT)/EFI/Thunk/Makefile.kmk
  endif
@@ -469 +469 @@
 
  ifdef VBOX_WITH_EFI
-  VBoxDD_DEFS           += VBOX_WITH_EFI
-  VBoxDD_LIBS           += $(PATH_STAGE_LIB)/EfiThunkBin$(VBOX_SUFF_LIB)
-  ifdef VBOX_WITH_ALT_EFITHUNK
-   VBoxDD_DEFS          += VBOX_WITH_ALT_EFITHUNK
-  endif
-  VBoxDD_SOURCES        += EFI/DevEFI.cpp
-  EFI/DevEFI.cpp_INCS       += EFI/tools/include
-  EFI/DevEFI.cpp_INCS.x86   += EFI/tools/include/Ia32
-  EFI/DevEFI.cpp_INCS.amd64 += EFI/tools/include/X64
+  ifndef VBOX_WITH_OVMF
+   VBoxDD_DEFS           += VBOX_WITH_EFI
+   VBoxDD_LIBS           += $(PATH_STAGE_LIB)/EfiThunkBin$(VBOX_SUFF_LIB)
+   ifdef VBOX_WITH_ALT_EFITHUNK
+    VBoxDD_DEFS          += VBOX_WITH_ALT_EFITHUNK
+   endif
+   VBoxDD_SOURCES        += EFI/DevEFI.cpp
+   EFI/DevEFI.cpp_INCS       += EFI/tools/include
+   EFI/DevEFI.cpp_INCS.x86   += EFI/tools/include/Ia32
+   EFI/DevEFI.cpp_INCS.amd64 += EFI/tools/include/X64
+  else
+   VBoxDD_DEFS           += VBOX_WITH_EFI
+   VBoxDD_SOURCES        += EFI/DevOVMF.cpp
+   EFI/DevOVMF.cpp_INCS       += EFI/tools/include
+   EFI/DevOVMF.cpp_INCS.x86   += EFI/tools/include/Ia32
+   EFI/DevOVMF.cpp_INCS.amd64 += EFI/tools/include/X64
+   build/VBoxDD.cpp_DEFS += VBOX_WITH_OVMF
+  endif
  endif
 

trunk/src/VBox/Devices/build/VBoxDD.cpp

@@ -37 +37 @@
 const void *g_apvVBoxDDDependencies[] =
 {
-#ifdef VBOX_WITH_EFI
+#if defined(VBOX_WITH_EFI) && !defined(VBOX_WITH_OVMF)
     &g_abEfiThunkBinary[0],
 #endif