Changeset 42663 in vbox for trunk/src/VBox/Devices

Timestamp:

Aug 7, 2012 2:16:30 PM (12 years ago)

Author:

vboxsync

Message:

HPET: More comments; do not lose high dword of timer config.

File:

• trunk/src/VBox/Devices/PC/DevHPET.cpp (modified) (6 diffs)

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

@@ -46 +46 @@
 
 /** Base address for MMIO. */
+/* On ICH9, it is 0xFED0x000 where 'x' is 0-3, default 0. We do not support
+ * relocation as the platform firmware is responsible for configuring the
+ * HPET base address and the OS isn't expected to move it.
+ * WARNING: This has to match the ACPI tables! */
 #define HPET_BASE                   0xfed00000
+
+/* HPET reserves a 1K range. */
+#define HPET_BAR_SIZE               0x1000
 
 /** The number of timers for PIIX4 / PIIX3. */
@@ -515 +522 @@
         {
             DEVHPET_LOCK_RETURN(pThis, VINF_IOM_R3_MMIO_WRITE);
+            uint64_t    u64Mask = HPET_TN_CFG_WRITE_MASK;
+
             Log(("write HPET_TN_CFG: %d: %x\n", iTimerNo, u32NewValue));
-            uint64_t const iOldValue = (uint32_t)pHpetTimer->u64Config;
-
-            uint64_t u64Mask = HPET_TN_CFG_WRITE_MASK;
             if (pHpetTimer->u64Config & HPET_TN_PERIODIC_CAP)
                 u64Mask |= HPET_TN_PERIODIC;
@@ -542 +548 @@
 
             /* We only care about lower 32-bits so far */
-            pHpetTimer->u64Config = hpetUpdateMasked(u32NewValue, iOldValue, u64Mask);
+            pHpetTimer->u64Config = hpetUpdateMasked(u32NewValue, pHpetTimer->u64Config, u64Mask);
             DEVHPET_UNLOCK(pThis);
             break;
         }
 
-        case HPET_TN_CFG + 4: /* Interrupt capabilities */
+        case HPET_TN_CFG + 4: /* Interrupt capabilities - read only. */
         {
             Log(("write HPET_TN_CFG + 4, useless\n"));
@@ -1432 +1438 @@
      * addresses and sizes.
      */
-    rc = PDMDevHlpMMIORegister(pDevIns, HPET_BASE, 0x1000, pThis,
+    rc = PDMDevHlpMMIORegister(pDevIns, HPET_BASE, HPET_BAR_SIZE, pThis,
                                IOMMMIO_FLAGS_READ_PASSTHRU | IOMMMIO_FLAGS_WRITE_PASSTHRU,
                                hpetMMIOWrite, hpetMMIORead, "HPET Memory");
@@ -1439 +1445 @@
     if (fRCEnabled)
     {
-        rc = PDMDevHlpMMIORegisterRC(pDevIns, HPET_BASE, 0x1000, NIL_RTRCPTR /*pvUser*/, "hpetMMIOWrite", "hpetMMIORead");
+        rc = PDMDevHlpMMIORegisterRC(pDevIns, HPET_BASE, HPET_BAR_SIZE, NIL_RTRCPTR /*pvUser*/, "hpetMMIOWrite", "hpetMMIORead");
         AssertRCReturn(rc, rc);
 
@@ -1448 +1454 @@
     if (fR0Enabled)
     {
-        rc = PDMDevHlpMMIORegisterR0(pDevIns, HPET_BASE, 0x1000, NIL_RTR0PTR /*pvUser*/,
+        rc = PDMDevHlpMMIORegisterR0(pDevIns, HPET_BASE, HPET_BAR_SIZE, NIL_RTR0PTR /*pvUser*/,
                                      "hpetMMIOWrite", "hpetMMIORead");
         AssertRCReturn(rc, rc);