Changeset 21837 in vbox for trunk/src/VBox/Devices/PC/DevACPI.cpp

Timestamp:

Jul 28, 2009 1:12:23 PM (16 years ago)

Author:

vboxsync

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

50466

Message:

ACPI: correect PM rebasing, now Fedora EFI installs with ACPI timer

File:

• trunk/src/VBox/Devices/PC/DevACPI.cpp (modified) (8 diffs)

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

@@ -67 +67 @@
     PM_TMR_OFFSET                       = 0x08,
     GPE0_OFFSET                         = 0x20,
-    GPE1_OFFSET                         =   -1   /**<  not supported  */
+    GPE1_OFFSET                         =   -1    /**<  not supported  */
 };
 
@@ -231 +231 @@
     bool                fR0Enabled;
     /** Aligning IBase. */
-    bool                afAlignment[4];
+    bool                afAlignment[2];
 
     /** ACPI port base interface. */
@@ -1708 +1708 @@
 static int acpiUnregisterPmHandlers(ACPIState *pThis)
 {
-    /** @todo r=bird: How can this work when acpiDeregisterPmHandlers is called
-     *        after the guest changed uPmIoPortBase? */
 #define U(offset, cnt) \
     do { \
@@ -1757 +1755 @@
     SSMFIELD_ENTRY(ACPIState, pm1a_sts),
     SSMFIELD_ENTRY(ACPIState, pm1a_ctl),
-    SSMFIELD_ENTRY(ACPIState, cCpus),           /**< @todo r=bird: This is a configuration parameter that will not change, so no need to save it. */
     SSMFIELD_ENTRY(ACPIState, pm_timer_initial),
     SSMFIELD_ENTRY(ACPIState, gpe0_en),
@@ -1763 +1760 @@
     SSMFIELD_ENTRY(ACPIState, uBatteryIndex),
     SSMFIELD_ENTRY(ACPIState, uSystemInfoIndex),
-    SSMFIELD_ENTRY(ACPIState, u64RamSize),      /**< @todo r=bird: ditto. */
     SSMFIELD_ENTRY(ACPIState, uSleepState),
     SSMFIELD_ENTRY(ACPIState, u8IndexShift),
-    SSMFIELD_ENTRY(ACPIState, u8UseIOApic),     /**< @todo r=bird: ditto. */
-    SSMFIELD_ENTRY(ACPIState, fUseFdc),         /**< @todo r=bird: ditto. */
-    SSMFIELD_ENTRY(ACPIState, fUseHpet),        /**< @todo r=bird: ditto. */
-    SSMFIELD_ENTRY(ACPIState, fUseSmc),         /**< @todo r=bird: ditto. */
-    SSMFIELD_ENTRY(ACPIState, fShowCpu),        /**< @todo r=bird: ditto. */
-    SSMFIELD_ENTRY(ACPIState, fShowRtc),        /**< @todo r=bird: ditto. */
     SSMFIELD_ENTRY(ACPIState, uPmIoPortBase),
-    SSMFIELD_ENTRY(ACPIState, fGCEnabled),      /**< @todo r=bird: ditto. */
-    SSMFIELD_ENTRY(ACPIState, fR0Enabled),      /**< @todo r=bird: ditto. */
     SSMFIELD_ENTRY_TERM()
 };
@@ -1790 +1778 @@
     ACPIState *s = PDMINS_2_DATA(pDevIns, ACPIState *);
     int rc;
+
+    /*
+     * Unregister PM handlers, will register with actual base
+     * after state successfully loaded.
+     */
+    rc = acpiUnregisterPmHandlers(s);
+    if (RT_FAILURE(rc))
+        return rc;
 
     switch (u32Version)
@@ -1805 +1801 @@
     if (RT_SUCCESS(rc))
     {
-        /** @todo r=bird: Why aren't the handlers deregistered first? */
         rc = acpiRegisterPmHandlers(s);
         if (RT_FAILURE(rc))
@@ -1962 +1957 @@
     ACPIState  *pThis   = PDMINS_2_DATA(pDevIns, ACPIState *);
 
-    if (Address == 0x40)
-    {
-        pThis->uPmIoPortBase = u32Value & 0xffc0;
-    }
-
+    pThis->pfnAcpiPciConfigWrite(pPciDev, Address, u32Value, cb);
+
+    /* PMREGMISC written */
     if (Address == 0x80)
     {
-        if (u32Value & 1)
+        /* Check Power Management IO Space Enable (PMIOSE) bit */
+        if (pPciDev->config[0x80] & 0x1)
         {
             int rc;
 
-            acpiUnregisterPmHandlers(pThis);
-
-            rc = acpiRegisterPmHandlers(pThis);
-            Assert(RT_SUCCESS(rc));
+            RTIOPORT uNewBase =
+                    RTIOPORT(RT_LE2H_U32(*(uint32_t*)&pPciDev->config[0x40]));
+            uNewBase &= 0xffc0;
+
+            if (uNewBase != pThis->uPmIoPortBase)
+            {
+                rc = acpiUnregisterPmHandlers(pThis);
+                Assert(RT_SUCCESS(rc));
+
+                pThis->uPmIoPortBase = uNewBase;
+
+                rc = acpiRegisterPmHandlers(pThis);
+                Assert(RT_SUCCESS(rc));
+            }
         }
     }
-
-    pThis->pfnAcpiPciConfigWrite(pPciDev, Address, u32Value, cb);
 }