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

Timestamp:

Sep 18, 2019 9:02:07 PM (6 years ago)

Author:

vboxsync

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

133477

Message:

EFI/FirmwareNew: Implement support for the DataHub protocol which was removed in newer EDK versions and enable the VBoxAppleSim DXE driver again as it is required for macOS to boot

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• OvmfPkg/OvmfPkgIa32.dsc (modified) (1 diff)
• OvmfPkg/OvmfPkgIa32.fdf (modified) (1 diff)
• OvmfPkg/OvmfPkgX64.dsc (modified) (1 diff)
• OvmfPkg/OvmfPkgX64.fdf (modified) (1 diff)
• VBoxPkg/VBoxAppleSim/Cpu.c (modified) (4 diffs)
• VBoxPkg/VBoxAppleSim/DataHub.c (added)
• VBoxPkg/VBoxAppleSim/DataHub.h (added)
• VBoxPkg/VBoxAppleSim/VBoxAppleSim.c (modified) (2 diffs)
• VBoxPkg/VBoxAppleSim/VBoxAppleSim.inf (modified) (1 diff)

trunk/src/VBox/Devices/EFI/FirmwareNew/OvmfPkg/OvmfPkgIa32.dsc

@@ -851 +851 @@
  VBoxPkg/VBoxFsDxe/VBoxHfs.inf
  VBoxPkg/VBoxSysTables/VBoxSysTables.inf
- #VBoxPkg/VBoxAppleSim/VBoxAppleSim.inf
- # we need it for VBoxAppleSim
- #IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf
+ VBoxPkg/VBoxAppleSim/VBoxAppleSim.inf
  MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
  MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf

trunk/src/VBox/Devices/EFI/FirmwareNew/OvmfPkg/OvmfPkgIa32.fdf

@@ -278 +278 @@
 INF VBoxPkg/VBoxFsDxe/VBoxHfs.inf
 INF VBoxPkg/VBoxSysTables/VBoxSysTables.inf
-#INF VBoxPkg/VBoxAppleSim/VBoxAppleSim.inf
- # we need it for VBoxAppleSim
-#INF IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf
+INF VBoxPkg/VBoxAppleSim/VBoxAppleSim.inf
 INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
 !endif

trunk/src/VBox/Devices/EFI/FirmwareNew/OvmfPkg/OvmfPkgX64.dsc

@@ -892 +892 @@
  VBoxPkg/VBoxFsDxe/VBoxHfs.inf
  VBoxPkg/VBoxSysTables/VBoxSysTables.inf
- #VBoxPkg/VBoxAppleSim/VBoxAppleSim.inf
- # we need it for VBoxAppleSim
- #IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf
+ VBoxPkg/VBoxAppleSim/VBoxAppleSim.inf
 !endif
 

trunk/src/VBox/Devices/EFI/FirmwareNew/OvmfPkg/OvmfPkgX64.fdf

@@ -279 +279 @@
 INF VBoxPkg/VBoxFsDxe/VBoxHfs.inf
 INF VBoxPkg/VBoxSysTables/VBoxSysTables.inf
-#INF VBoxPkg/VBoxAppleSim/VBoxAppleSim.inf
- # we need it for VBoxAppleSim
-#INF IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf
+INF VBoxPkg/VBoxAppleSim/VBoxAppleSim.inf
 INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
 !endif

trunk/src/VBox/Devices/EFI/FirmwareNew/VBoxPkg/VBoxAppleSim/Cpu.c

@@ -29 +29 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-#include <Framework/FrameworkInternalFormRepresentation.h>
-
-#include <Library/BaseMemoryLib.h>
 #include <Library/DebugLib.h>
 #include <Library/UefiBootServicesTableLib.h>
@@ -40 +37 @@
 #include <Library/BaseLib.h>
 
-#include <Guid/DataHubRecords.h>
+#include <Protocol/Cpu.h>
 
-#include <Protocol/Cpu.h>
-#include <Protocol/DataHub.h>
-#include <Protocol/FrameworkHii.h>
-#include <Protocol/CpuIo.h>
+#include "DataHub.h"
 
 #define EFI_CPU_DATA_MAXIMUM_LENGTH 0x100
-
-typedef union {
-    EFI_CPU_DATA_RECORD *DataRecord;
-    UINT8               *Raw;
-} EFI_CPU_DATA_RECORD_BUFFER;
-
-EFI_SUBCLASS_TYPE1_HEADER mCpuDataRecordHeader = {
-    EFI_PROCESSOR_SUBCLASS_VERSION,       // Version
-    sizeof (EFI_SUBCLASS_TYPE1_HEADER),   // Header Size
-    0,                                    // Instance, Initialize later
-    EFI_SUBCLASS_INSTANCE_NON_APPLICABLE, // SubInstance
-    0                                     // RecordType, Initialize later
-};
 
 EFI_GUID gEfiAppleMagicHubGuid = {
@@ -69 +50 @@
     0x26fdeb7e, 0xb8af, 0x4ccf, { 0xaa, 0x97, 0x02, 0x63, 0x3c, 0xe4, 0x8c, 0xa7 }
 };
-
-EFI_GUID gEfiDataHubProtocolGuid = {
-    0xae80d021, 0x618e, 0x11d4, { 0xbc, 0xd7, 0x00, 0x80, 0xc7, 0x3c, 0x88, 0x81 }
-}
 
 #pragma pack(1)
@@ -109 +86 @@
         &gEfiProcessorSubClassGuid, /* DataRecordGuid */
         &gEfiAppleMagicHubGuid,     /* ProducerName */
-        EFI_DATA_RECORD_CLASS_DATA,
+        EFI_DATA_CLASS_DATA,
         MagicData,
         RecordSize

trunk/src/VBox/Devices/EFI/FirmwareNew/VBoxPkg/VBoxAppleSim/VBoxAppleSim.c

@@ -45 +45 @@
 #include <Guid/Mps.h>
 
+#include "DataHub.h"
 #include "VBoxPkg.h"
 #include "DevEFI.h"
@@ -312 +313 @@
     ASSERT_EFI_ERROR(rc);
 
+    rc = InitializeDataHub(ImageHandle, SystemTable);
+    ASSERT_EFI_ERROR(rc);
+
     GetVmVariable(EFI_INFO_INDEX_FSB_FREQUENCY, (CHAR8 *)&FSBFrequency, sizeof(FSBFrequency));
     GetVmVariable(EFI_INFO_INDEX_TSC_FREQUENCY, (CHAR8 *)&TSCFrequency, sizeof(TSCFrequency));

trunk/src/VBox/Devices/EFI/FirmwareNew/VBoxPkg/VBoxAppleSim/VBoxAppleSim.inf

@@ -40 +40 @@
         Cpu.c
         Console.c
+        DataHub.c
 
 [Packages]