Changeset 25025 in vbox for trunk/src/VBox/Devices/PC

Timestamp:

Nov 26, 2009 5:06:38 PM (15 years ago)

Author:

vboxsync

Message:

EFI: system tables work (device side)

Location:

trunk/src/VBox/Devices/PC

Files:

• DevFwCommon.cpp (modified) (3 diffs)
• DevFwCommon.h (modified) (2 diffs)

trunk/src/VBox/Devices/PC/DevFwCommon.cpp

@@ -42 +42 @@
 
 #pragma pack(1)
+
+typedef struct SMBIOSHDR
+{
+    uint8_t         au8Signature[4];
+    uint8_t         u8Checksum;
+    uint8_t         u8Eps;
+    uint8_t         u8VersionMajor;
+    uint8_t         u8VersionMinor;
+    uint16_t        u16MaxStructureSize;
+    uint8_t         u8EntryPointRevision;
+    uint8_t         u8Pad[5];
+} *SMBIOSHDRPTR;
+AssertCompileSize(SMBIOSHDR, 16);
+
+typedef struct DMIMAINHDR
+{
+    uint8_t         au8Signature[5];
+    uint8_t         u8Checksum;
+    uint16_t        u16TablesLength;
+    uint32_t        u32TableBase;
+    uint16_t        u16TableEntries;
+    uint16_t        u8TableVersion;
+    uint8_t         u8Pad;
+} *DMIMAINHDRPTR;
 
 /** DMI header */
@@ -253 +277 @@
  * @param   pCfgHandle  The handle to our config node.
  */
-int sharedfwPlantDMITable(PPDMDEVINS pDevIns, uint8_t *pTable, unsigned cbMax, PRTUUID pUuid, PCFGMNODE pCfgHandle)
+int sharedfwPlantDMITable(PPDMDEVINS pDevIns, uint8_t *pTable, unsigned cbMax, PRTUUID pUuid, PCFGMNODE pCfgHandle, bool fPutSmbiosHeaders)
 {
     char *pszStr = (char *)pTable;
@@ -497 +521 @@
     MMR3HeapFree(pszDmiOEMVBoxRev);
 
+    if (fPutSmbiosHeaders)
+    {
+        struct {
+            struct SMBIOSHDR     smbios;
+            struct DMIMAINHDR    dmi;
+        } aBiosHeaders =
+        {
+            // The SMBIOS header
+            {
+                { 0x5f, 0x53, 0x4d, 0x5f},         // "_SM_" signature
+                0x00,                              // checksum
+                0x1f,                              // EPS length, defined by standard
+                VBOX_SMBIOS_MAJOR_VER,             // SMBIOS major version
+                VBOX_SMBIOS_MINOR_VER,             // SMBIOS minor version
+                VBOX_SMBIOS_MAXSS,                 // Maximum structure size
+                0x00,                              // Entry point revision
+                { 0x00, 0x00, 0x00, 0x00, 0x00 }   // padding
+            },
+            // The DMI header
+            {
+                { 0x5f, 0x44, 0x4d, 0x49, 0x5f },  // "_DMI_" signature
+                0x00,                              // checksum
+                VBOX_DMI_TABLE_SIZE,               // DMI tables length
+                VBOX_DMI_TABLE_BASE,               // DMI tables base
+                VBOX_DMI_TABLE_ENTR,               // DMI tables entries
+                VBOX_DMI_TABLE_VER,                // DMI version
+                0x00
+            }
+        };
+
+        aBiosHeaders.smbios.u8Checksum = sharedfwChecksum((uint8_t*)&aBiosHeaders.smbios, sizeof(aBiosHeaders.smbios));
+        aBiosHeaders.dmi.u8Checksum = sharedfwChecksum((uint8_t*)&aBiosHeaders.dmi, sizeof(aBiosHeaders.dmi));
+
+        //Log(("Write SMBIOS\n"));
+        PDMDevHlpPhysWrite (pDevIns, 0xff30, &aBiosHeaders, sizeof(aBiosHeaders));
+    }
+
     return VINF_SUCCESS;
 }

trunk/src/VBox/Devices/PC/DevFwCommon.h

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * DevFwCommon - shared header for code common between different firmware types (EFI, BIOS).   
+ * DevFwCommon - shared header for code common between different firmware types (EFI, BIOS).
  */
 
@@ -32 +32 @@
 
 /* Plant DMI table */
-int sharedfwPlantDMITable(PPDMDEVINS pDevIns, uint8_t *pTable, unsigned cbMax, PRTUUID pUuid, PCFGMNODE pCfgHandle);
+int sharedfwPlantDMITable(PPDMDEVINS pDevIns, uint8_t *pTable, unsigned cbMax, PRTUUID pUuid, PCFGMNODE pCfgHandle, bool fPutSmbiosHeaders = false);
 
 /* Plant MPS table */