Changeset 99927 in vbox for trunk

Timestamp:

May 23, 2023 8:05:36 AM (20 months ago)

Author:

vboxsync

Message:

Devices/EFI,Main: Include EFI firmware images for ARMv8 in VBoxDD2 and provide a basic efi device specific for ARMv8 to get rid of the firmware loading hack by using a dedicated device implementation mapping the image as a ROM into the guest address space, bugref:10400

Location:

trunk/src/VBox

Files:

• Devices/EFI/DevEFI-armv8.cpp (added)
• Devices/EFI/DevEFI-binaries.S (modified) (1 diff)
• Devices/EFI/FirmwareBin/VBoxEFIAArch32.fd (added)
• Devices/EFI/FirmwareBin/VBoxEFIAArch64.fd (added)
• Devices/Makefile.kmk (modified) (3 diffs)
• Devices/build/VBoxDD.cpp (modified) (1 diff)
• Devices/build/VBoxDD.h (modified) (1 diff)
• Devices/build/VBoxDD2.h (modified) (2 diffs)
• Main/src-client/ConsoleImplConfigArmV8.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/EFI/DevEFI-binaries.S

@@ -71 +71 @@
 .type g_cbEfiFirmware64 object
 #endif
+
+#ifdef VBOX_VMM_TARGET_ARMV8
+;
+; The ARMv8 bits
+;
+
+; 32-bit firmware:
+.p2align 6
+.globl NAME(g_abEfiFirmwareAArch32)
+NAME(g_abEfiFirmwareAArch32):
+        .incbin "VBoxEFIAArch32.fd"
+end_aarch32_firmware:
+
+.p2align 2
+.globl NAME(g_cbEfiFirmwareAArch32)
+NAME(g_cbEfiFirmwareAArch32):
+        .long end_aarch32_firmware - NAME(g_abEfiFirmwareAArch32)
+
+
+; 64-bit firmware:
+.p2align 6
+.globl NAME(g_abEfiFirmwareAArch64)
+NAME(g_abEfiFirmwareAArch64):
+        .incbin "VBoxEFIAArch64.fd"
+end_aarch64_firmware:
+
+.p2align 2
+.globl NAME(g_cbEfiFirmwareAArch64)
+NAME(g_cbEfiFirmwareAArch64):
+        .long  end_aarch64_firmware - NAME(g_abEfiFirmwareAArch64)
+
+# ifdef ASM_FORMAT_ELF
+.size g_abEfiFirmwareAArch32 end_aarch32_firmware - NAME(g_abEfiFirmwareAArch32)
+.type g_abEfiFirmwareAArch32 object
+.size g_cbEfiFirmwareAArch32 4
+.type g_cbEfiFirmwareAArch32 object
+
+.size g_abEfiFirmwareAArch64 end_aarch64_firmware - NAME(g_abEfiFirmwareAArch64)
+.type g_abEfiFirmwareAArch64 object
+.size g_cbEfiFirmwareAArch64 4
+.type g_cbEfiFirmwareAArch64 object
+# endif
+#endif

trunk/src/VBox/Devices/Makefile.kmk

@@ -926 +926 @@
   VBoxDD_SOURCES    += \
         Bus/DevPciGenericEcam.cpp \
+        EFI/DevEFI-armv8.cpp \
         Gpio/DevPL061.cpp \
         Misc/DevFlashCFI.cpp \
@@ -1212 +1213 @@
  VBoxDD2_DEFS            = \
         IN_VBOXDD2 \
-        $(if $(VBOX_WITH_PXE_ROM),VBOX_WITH_PXE_ROM,)
+        $(if $(VBOX_WITH_PXE_ROM),VBOX_WITH_PXE_ROM,) \
+        $(if $(VBOX_WITH_VIRT_ARMV8),VBOX_VMM_TARGET_ARMV8,)
  VBoxDD2_INCS           := \
         build \
@@ -1243 +1245 @@
         $(PATH_STAGE)/$(INST_BIN)VBoxEFI32.fd \
         $(PATH_STAGE)/$(INST_BIN)VBoxEFI64.fd
+  ifdef VBOX_WITH_VIRT_ARMV8
+   EFI/DevEFI-binaries.S_DEPS   += \
+        $(PATH_STAGE)/$(INST_BIN)VBoxEFIAArch32.fd \
+        $(PATH_STAGE)/$(INST_BIN)VBoxEFIAArch64.fd
+  endif
  endif
 

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

@@ -249 +249 @@
 #endif
 #ifdef VBOX_VMM_TARGET_ARMV8
+    rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceEfiArmV8);
+    if (RT_FAILURE(rc))
+        return rc;
+
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DevicePl011);
     if (RT_FAILURE(rc))

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

@@ -230 +230 @@
 
 #ifdef VBOX_VMM_TARGET_ARMV8
+extern const PDMDEVREG g_DeviceEfiArmV8;
 extern const PDMDEVREG g_DevicePl011;
 extern const PDMDEVREG g_DevicePl031Rtc;

trunk/src/VBox/Devices/build/VBoxDD2.h

@@ -60 +60 @@
 extern DECLEXPORT(const unsigned char)  g_abEfiFirmware64[];
 extern DECLEXPORT(const unsigned)       g_cbEfiFirmware64;
+#  ifdef VBOX_VMM_TARGET_ARMV8
+extern DECLEXPORT(const unsigned char)  g_abEfiFirmwareAArch32[];
+extern DECLEXPORT(const unsigned)       g_cbEfiFirmwareAArch32;
+extern DECLEXPORT(const unsigned char)  g_abEfiFirmwareAArch64[];
+extern DECLEXPORT(const unsigned)       g_cbEfiFirmwareAArch64;
+#  endif
 # endif
 #else  /* !IN_VBOXDD2 */
@@ -83 +89 @@
 extern DECLIMPORT(const unsigned char)  g_abEfiFirmware64[];
 extern DECLIMPORT(const unsigned)       g_cbEfiFirmware64;
+#  ifdef VBOX_VMM_TARGET_ARMV8
+extern DECLIMPORT(const unsigned char)  g_abEfiFirmwareAArch32[];
+extern DECLIMPORT(const unsigned)       g_cbEfiFirmwareAArch32;
+extern DECLIMPORT(const unsigned char)  g_abEfiFirmwareAArch64[];
+extern DECLIMPORT(const unsigned)       g_cbEfiFirmwareAArch64;
+#  endif
 # endif
 #endif /* !IN_VBOXDD2 */

trunk/src/VBox/Main/src-client/ConsoleImplConfigArmV8.cpp

@@ -178 +178 @@
 
         PCFGMNODE pMemRegion = NULL;
-        InsertConfigNode(pMem, "Flash", &pMemRegion);
-        InsertConfigInteger(pMemRegion, "GCPhysStart", 0);
-        InsertConfigInteger(pMemRegion, "Size", 64 * _1M);
-
         InsertConfigNode(pMem, "Conventional", &pMemRegion);
         InsertConfigInteger(pMemRegion, "GCPhysStart", 0x40000000);
@@ -285 +281 @@
 
         InsertConfigNode(pRoot, "Devices", &pDevices);
+
+        InsertConfigNode(pDevices, "efi-armv8",             &pDev);
+        InsertConfigNode(pDev,     "0",                     &pInst);
+        InsertConfigNode(pInst,    "Config",                &pCfg);
+        InsertConfigInteger(pCfg,  "GCPhysLoadAddress",     0);
+        InsertConfigString(pCfg,   "EfiRom",                "VBoxEFIAArch64.fd");
 
         InsertConfigNode(pDevices, "gic",                   &pDev);