儲存庫 vbox 的更動 44820

時間撮記:

2013-2-25 下午02:45:13 (12 年 以前)

作者:

vboxsync

訊息:

BUGZ:6633 Expose OEM specific DMI table which contains TSC frequency value in kHz units provided by Time Manager; calculate number of DMI tables dynamically (no VBOX_DMI_TABLE_ENTR macro anymore).

位置:

trunk/src/VBox/Devices

檔案:

• EFI/DevEFI.cpp (修改) (3 筆差異)
• PC/BIOS/smidmi.inc (修改) (1 筆差異)
• PC/BIOS/vbdmismi.inc (修改) (1 筆差異)
• PC/DevFwCommon.cpp (修改) (9 筆差異)
• PC/DevFwCommon.h (修改) (1 筆差異)
• PC/DevPcBios.cpp (修改) (3 筆差異)
• PC/DevPcBios.h (修改) (1 筆差異)

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

@@ -167 +167 @@
     /** The size of the DMI tables. */
     uint16_t                cbDmiTables;
+    /** Number of the DMI tables. */
+    uint16_t                cNumDmiTables;
     /** The DMI tables. */
     uint8_t                 au8DMIPage[0x1000];
@@ -1405 +1407 @@
      * Plan some structures in RAM.
      */
-    FwCommonPlantSmbiosAndDmiHdrs(pDevIns, pThis->cbDmiTables);
+    FwCommonPlantSmbiosAndDmiHdrs(pDevIns, pThis->cbDmiTables, pThis->cNumDmiTables);
     if (pThis->u8IOAPIC)
         FwCommonPlantMpsFloatPtr(pDevIns);
@@ -1925 +1927 @@
     /** @todo XXX I wonder if we really need these tables as there is no SMBIOS header... */
     rc = FwCommonPlantDMITable(pDevIns, pThis->au8DMIPage, VBOX_DMI_TABLE_SIZE, &pThis->aUuid,
-                               pDevIns->pCfg, pThis->cCpus, &pThis->cbDmiTables);
+                               pDevIns->pCfg, pThis->cCpus, &pThis->cbDmiTables, &pThis->cNumDmiTables);
     AssertRCReturn(rc, rc);
     if (pThis->u8IOAPIC)

trunk/src/VBox/Devices/PC/BIOS/smidmi.inc

@@ -66 +66 @@
                 dw      0               ; DMI tables length (set by DevPcBios)
                 dd      VBOX_DMI_TABLE_BASE ; DMI tables base
-                dw      VBOX_DMI_TABLE_ENTR ; DMI tables entries
+                dw      0 ; DMI tables entries (set by DevPcBios)
                 db      VBOX_DMI_TABLE_VER ; DMI version
                 db      0               ; Just for alignment (16 bytes total)

trunk/src/VBox/Devices/PC/BIOS/vbdmismi.inc

@@ -3 +3 @@
 VBOX_DMI_TABLE_BASE     equ     0E1000h
 VBOX_DMI_TABLE_VER      equ     25h
-VBOX_DMI_TABLE_ENTR     equ     9
 VBOX_DMI_TABLE_SIZE     equ     352
 

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

@@ -35 +35 @@
 #include <iprt/system.h>
 
+#include "vl_vbox.h"
 #include "VBoxDD.h"
 #include "VBoxDD2.h"
@@ -240 +241 @@
 AssertCompileSize(DMIOEMSTRINGS, 0x7);
 
+/** DMI OEM-specific table (Type 128) */
+typedef struct DMIOEMSPECIFIC
+{
+    DMIHDR          header;
+    uint32_t        u32CpuFreqKHz;
+} *PDMIOEMSPECIFIC;
+AssertCompileSize(DMIOEMSPECIFIC, 0x8);
+
 /** Physical memory array (Type 16) */
 typedef struct DMIRAMARRAY
@@ -416 +425 @@
  *                              configuration string isn't present.
  * @param   pCfg                The handle to our config node.
+ * @param   cCpus               Number of VCPUs.
+ * @param   pcbDmiTables        Size of DMI data in bytes.
+ * @param   pcNumDmiTables      Number of DMI tables.
  */
-int FwCommonPlantDMITable(PPDMDEVINS pDevIns, uint8_t *pTable, unsigned cbMax, PCRTUUID pUuid, PCFGMNODE pCfg, uint16_t cCpus, uint16_t *pcbDmiTables)
+int FwCommonPlantDMITable(PPDMDEVINS pDevIns, uint8_t *pTable, unsigned cbMax, PCRTUUID pUuid, PCFGMNODE pCfg, uint16_t cCpus, uint16_t *pcbDmiTables, uint16_t *pcNumDmiTables)
 {
 #define CHECKSIZE(cbWant) \
@@ -869 +881 @@
         TERM_STRUCT;
 
+        /*************************************
+         * DMI OEM specific table (Type 128) *
+         ************************************/
+        PDMIOEMSPECIFIC pOEMSpecific = (PDMIOEMSPECIFIC)pszStr;
+        CHECKSIZE(sizeof(*pOEMSpecific));
+        START_STRUCT(pOEMSpecific);
+        pOEMSpecific->header.u8Type    = 0x80; /* OEM specific */
+        pOEMSpecific->header.u8Length  = sizeof(*pOEMSpecific);
+        pOEMSpecific->header.u16Handle = 0x0008; /* Just next free handle */
+        pOEMSpecific->u32CpuFreqKHz    = cpu_to_le32((uint32_t)((uint64_t)TMCpuTicksPerSecond(PDMDevHlpGetVM(pDevIns)) / 1000));
+        TERM_STRUCT;
+
         /* End-of-table marker - includes padding to account for fixed table size. */
         PDMIHDR pEndOfTable          = (PDMIHDR)pszStr;
@@ -877 +901 @@
         pEndOfTable->u16Handle       = 0xFEFF;
         *pcbDmiTables = ((uintptr_t)pszStr - (uintptr_t)pTable) + 2;
+
+        /* We currently plant 10 DMI tables. Update this if tables number changed. */
+        *pcNumDmiTables = 10;
 
         /* If more fields are added here, fix the size check in READCFGSTR */
@@ -896 +923 @@
  * @param   pDevIns    The device instance data.
  */
-void FwCommonPlantSmbiosAndDmiHdrs(PPDMDEVINS pDevIns, uint16_t cbDmiTables)
+void FwCommonPlantSmbiosAndDmiHdrs(PPDMDEVINS pDevIns, uint16_t cbDmiTables, uint16_t cNumDmiTables)
 {
     struct
@@ -922 +949 @@
             0,                                 // DMI tables length
             VBOX_DMI_TABLE_BASE,               // DMI tables base
-            VBOX_DMI_TABLE_ENTR,               // DMI tables entries
+            0,                                 // DMI tables entries
             VBOX_DMI_TABLE_VER,                // DMI version
         }
@@ -928 +955 @@
 
     aBiosHeaders.dmi.u16TablesLength = cbDmiTables;
+    aBiosHeaders.dmi.u16TableEntries = cNumDmiTables;
     aBiosHeaders.smbios.u8Checksum   = fwCommonChecksum((uint8_t*)&aBiosHeaders.smbios, sizeof(aBiosHeaders.smbios));
     aBiosHeaders.dmi.u8Checksum      = fwCommonChecksum((uint8_t*)&aBiosHeaders.dmi,    sizeof(aBiosHeaders.dmi));
@@ -933 +961 @@
     PDMDevHlpPhysWrite(pDevIns, 0xfe300, &aBiosHeaders, sizeof(aBiosHeaders));
 }
-AssertCompile(VBOX_DMI_TABLE_ENTR == 9);
 
 /**

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

@@ -28 +28 @@
 
 /* Plant DMI table */
-int FwCommonPlantDMITable(PPDMDEVINS pDevIns, uint8_t *pTable, unsigned cbMax, PCRTUUID pUuid, PCFGMNODE pCfg, uint16_t cCpus, uint16_t *pcbDmiTables);
-void FwCommonPlantSmbiosAndDmiHdrs(PPDMDEVINS pDevIns, uint16_t cbDmiTables);
+int FwCommonPlantDMITable(PPDMDEVINS pDevIns, uint8_t *pTable, unsigned cbMax, PCRTUUID pUuid, PCFGMNODE pCfg, uint16_t cCpus, uint16_t *pcbDmiTables, uint16_t *pcNumDmiTables);
+void FwCommonPlantSmbiosAndDmiHdrs(PPDMDEVINS pDevIns, uint16_t cbDmiTables, uint16_t cNumDmiTables);
 
 /* Plant MPS table */

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

@@ -35 +35 @@
 #include <VBox/param.h>
 
+#include "vl_vbox.h"
 #include "VBoxDD.h"
 #include "VBoxDD2.h"
@@ -1243 +1244 @@
     uuid.Gen.u16TimeHiAndVersion = RT_H2BE_U16(uuid.Gen.u16TimeHiAndVersion);
     uint16_t cbDmiTables = 0;
+    uint16_t cNumDmiTables = 0;
     rc = FwCommonPlantDMITable(pDevIns, pThis->au8DMIPage, VBOX_DMI_TABLE_SIZE,
-                               &uuid, pCfg, pThis->cCpus, &cbDmiTables);
+                               &uuid, pCfg, pThis->cCpus, &cbDmiTables, &cNumDmiTables);
     if (RT_FAILURE(rc))
         return rc;
@@ -1258 +1260 @@
             && *(uint16_t*)&pThis->pu8PcBios[i + 0x06] == 0)
         {
-            *(uint16_t*)&pThis->pu8PcBios[i + 0x06] = cbDmiTables;
+            *(uint16_t*)&pThis->pu8PcBios[i + 0x06] = cpu_to_le16(cbDmiTables);
+            *(uint16_t*)&pThis->pu8PcBios[i + 0x0C] = cpu_to_le16(cNumDmiTables);
             uint8_t u8Sum = 0;
             for (unsigned j = 0; j < pThis->cbPcBios; j++)

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

@@ -23 +23 @@
 #define VBOX_DMI_TABLE_VER          0x25
 
-/** define VBOX_DMI_TABLE_ENTR
- *
- * This is the number of DMI structures.
- */
-#define VBOX_DMI_TABLE_ENTR         9
-
 /** def VBOX_DMI_TABLE_SIZE
  *