Changeset 28203 in vbox

Timestamp:

Apr 12, 2010 12:58:12 PM (15 years ago)

Author:

vboxsync

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

59943

Message:

DevPcBios,DevEFI,DevFWCommon: Don't reconstruct the MPS table at reset, just replant the MPS table pointer.

Location:

trunk/src/VBox/Devices

Files:

• EFI/DevEFI.cpp (modified) (4 diffs)
• PC/DevFwCommon.cpp (modified) (3 diffs)
• PC/DevFwCommon.h (modified) (1 diff)
• PC/DevPcBios.cpp (modified) (1 diff)

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

@@ -474 +474 @@
     pThis->szPanicMsg[0] = '\0';
 
-    /* Plant DMI and MPS tables */
-    rc = FwCommonPlantDMITable(pDevIns,
-                               pThis->au8DMIPage,
-                               VBOX_DMI_TABLE_SIZE,
-                               &pThis->aUuid,
-                               pDevIns->pCfg,
-                               /*fPutSmbiosHeaders=*/true);
-    Assert(RT_SUCCESS(rc));
-
     if (pThis->u8IOAPIC)
-        FwCommonPlantMpsTable(pDevIns,
-                              pThis->au8DMIPage + VBOX_DMI_TABLE_SIZE,
-                              _4K - VBOX_DMI_TABLE_SIZE,
-                              pThis->cCpus);
-    rc = PDMDevHlpROMRegister(pDevIns, VBOX_DMI_TABLE_BASE, _4K, pThis->au8DMIPage,
-                              PGMPHYS_ROM_FLAGS_PERMANENT_BINARY, "DMI tables");
-
-    Assert(RT_SUCCESS(rc));
+        FwCommonPlantMpsFloatPtr(pDevIns);
 
     /*
@@ -1150 +1134 @@
     pThis->u64FsbFrequency = pThis->u64TscFrequency / 4;
     pThis->u64CpuFrequency = pThis->u64TscFrequency;
+
     /*
      * GOP graphics
@@ -1159 +1144 @@
         pThis->u32GopMode = 2; /* 1024x768 */
     }
+
     /*
      * Uga graphics
@@ -1202 +1188 @@
         return rc;
 
+    /*
+     * Plant DMI and MPS tables
+     */
+    rc = FwCommonPlantDMITable(pDevIns,
+                               pThis->au8DMIPage,
+                               VBOX_DMI_TABLE_SIZE,
+                               &pThis->aUuid,
+                               pDevIns->pCfg,
+                               true /*fPutSmbiosHeaders*/);
+    AssertRCReturn(rc, rc);
+    if (pThis->u8IOAPIC)
+        FwCommonPlantMpsTable(pDevIns,
+                              pThis->au8DMIPage + VBOX_DMI_TABLE_SIZE,
+                              _4K - VBOX_DMI_TABLE_SIZE,
+                              pThis->cCpus);
+    rc = PDMDevHlpROMRegister(pDevIns, VBOX_DMI_TABLE_BASE, _4K, pThis->au8DMIPage,
+                              PGMPHYS_ROM_FLAGS_PERMANENT_BINARY, "DMI tables");
+
+    AssertRCReturn(rc, rc);
 
     /*

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

@@ -710 +710 @@
 
 /**
- * Construct the MPS table. Only applicable if IOAPIC is active!
+ * Construct the MPS table for implanting as a ROM page.
+ *
+ * Only applicable if IOAPIC is active!
  *
  * See ``MultiProcessor Specificatiton Version 1.4 (May 1997)'':
@@ -850 +852 @@
               ("VBOX_MPS_TABLE_SIZE=%d, maximum allowed size is %d",
               pCfgTab->u16Length, cbMax));
-
+}
+
+/**
+ * Construct the MPS table pointer at VM construction and reset.
+ *
+ * Only applicable if IOAPIC is active!
+ *
+ * @param   pDevIns    The device instance data.
+ */
+void FwCommonPlantMpsFloatPtr(PPDMDEVINS pDevIns)
+{
     MPSFLOATPTR floatPtr;
     floatPtr.au8Signature[0]       = '_';
@@ -866 +878 @@
     floatPtr.au8Feature[4]         = 0;
     floatPtr.u8Checksum            = fwCommonChecksum((uint8_t*)&floatPtr, 16);
-    PDMDevHlpPhysWrite (pDevIns, 0x9fff0, &floatPtr, 16);
+    PDMDevHlpPhysWrite(pDevIns, 0x9fff0, &floatPtr, 16);
 }
+

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

@@ -37 +37 @@
 /* Plant MPS table */
 void FwCommonPlantMpsTable(PPDMDEVINS pDevIns, uint8_t *pTable, unsigned cbMax, uint16_t cCpus);
+void FwCommonPlantMpsFloatPtr(PPDMDEVINS pDevIns);
 
 #endif

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

@@ -769 +769 @@
 
     if (pThis->u8IOAPIC)
-        FwCommonPlantMpsTable(pDevIns, pThis->au8DMIPage + VBOX_DMI_TABLE_SIZE,
-                              _4K - VBOX_DMI_TABLE_SIZE, pThis->cCpus);
+        FwCommonPlantMpsFloatPtr(pDevIns);
 
     /*