Changeset 31963 in vbox

Timestamp:

Aug 25, 2010 3:12:50 PM (15 years ago)

Author:

vboxsync

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

65196

Message:

ACPI: Hook S1 power state.

Location:

trunk/src/VBox/Devices/PC

Files:

• DevACPI.cpp (modified) (7 diffs)
• vbox.dsl (modified) (2 diffs)

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

@@ -162 +162 @@
     SYSTEM_INFO_INDEX_NIC_ADDRESS       = 15, /**< NIC PCI address, or 0 */
     SYSTEM_INFO_INDEX_AUDIO_ADDRESS     = 16, /**< Audio card PCI address, or 0 */
-    SYSTEM_INFO_INDEX_END               = 17,
+    SYSTEM_INFO_INDEX_POWER_STATES      = 17,
+    SYSTEM_INFO_INDEX_END               = 18,
     SYSTEM_INFO_INDEX_INVALID           = 0x80,
     SYSTEM_INFO_INDEX_VALID             = 0x200
@@ -259 +260 @@
     /** Primary audio card PCI address */
     uint32_t            u32AudioPciAddress;
-    uint32_t            u32Pad0;
+    /** Flag whether S1 power state is enabled */
+    bool                fS1Enabled;
+    /** Flag whether S4 power state is enabled */
+    bool                fS4Enabled;
+    /** Flag whether S1 triggers a state save */
+    bool                fSuspendToDisk;
+//    uint32_t            u32Pad0;
 
     /** ACPI port base interface. */
@@ -1045 +1052 @@
 }
 
+static int acpiSleep(ACPIState *s)
+{
+    int rc;
+    /* First pause the VM to stop it executing. Note that failures aren't fatal, we can
+     * just continue the guest as if it was immediately resumed.
+     */
+    rc = PDMDevHlpVMSuspend(s->pDevIns);    /* This is VM pause, not really ACPI suspend. */
+
+    /* The guest was probably reading the PMSTS register in a loop. The resume flag must
+     * be set before continuing in any way - needs to be part of saved state.
+     */
+    s->pm1a_sts |= WAK_STS; 
+
+    if (RT_FAILURE(rc))
+        AssertMsgFailed(("Could not pause the VM. rc = %Rrc\n", rc));
+
+    if (s->fSuspendToDisk) {
+//        rc = PDMDevHlpVMSuspendToDisk(s->pDevIns);
+        if (RT_FAILURE(rc))
+            AssertMsgFailed(("Could not save VM state. rc = %Rrc\n", rc));        
+    }
+    return rc;
+}
+
 /** Converts a ACPI port interface pointer to an ACPI state pointer. */
 #define IACPIPORT_2_ACPISTATE(pInterface) ( (ACPIState*)((uintptr_t)pInterface - RT_OFFSETOF(ACPIState, IACPIPort)) )
@@ -1165 +1196 @@
             case 0x00:                  /* S0 */
                 break;
+            case 0x01:                  /* S1 */
+                LogRel(("Entering S1 power state (powered-on suspend)\n"));
+                return acpiSleep(s);
+            case 0x04:                  /* S4 */
+                LogRel(("Entering S4 power state (suspend to disk)\n"));
+                return acpiPowerDown(s);/* Same behavior as S5 */
             case 0x05:                  /* S5 */
-                LogRel(("Entering S5 (power down)\n"));
+                LogRel(("Entering S5 power state (power down)\n"));
                 return acpiPowerDown(s);
             default:
@@ -1512 +1549 @@
                 case SYSTEM_INFO_INDEX_AUDIO_ADDRESS:
                     *pu32 = s->u32AudioPciAddress;
+                    break;
+
+                case SYSTEM_INFO_INDEX_POWER_STATES:
+                    *pu32 = RT_BIT(0) | RT_BIT(5);  /* S1 and S5 always exposed */
+                    if (s->fS1Enabled)              /* Optionally expose S1 and S4 */
+                        *pu32 |= RT_BIT(1);
+                    if (s->fS4Enabled)
+                        *pu32 |= RT_BIT(4);
                     break;
 
@@ -2360 +2405 @@
                               "NicPciAddress\0"
                               "AudioPciAddress\0"
+                              "EnableSuspendToDisk\0"
+                              "PowerS1Enabled\0"
+                              "PowerS4Enabled\0"
                               "CpuHotPlug\0"
                               "AmlFilePath\0"
@@ -2419 +2467 @@
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Failed to read \"AudioPciAddress\""));
+
+    /* query whether S1 power state should be exposed */
+    rc = CFGMR3QueryBoolDef(pCfg, "PowerS1Enabled", &s->fS1Enabled, true);
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("Configuration error: Failed to read \"PowerS1Enabled\""));
+
+    /* query whether S4 power state should be exposed */
+    rc = CFGMR3QueryBoolDef(pCfg, "PowerS4Enabled", &s->fS4Enabled, true);
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("Configuration error: Failed to read \"PowerS1Enabled\""));
+
+    /* query whether S1 power state should save the VM state */
+    rc = CFGMR3QueryBoolDef(pCfg, "EnableSuspendToDisk", &s->fSuspendToDisk, false);
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("Configuration error: Failed to read \"EnableSuspendToDisk\""));
 
     /* query whether we are allow CPU hot plugging */

trunk/src/VBox/Devices/PC/vbox.dsl

@@ -117 +117 @@
     }
 
+    // Declare indexed registers used for reading configuration information
+    OperationRegion (SYSI, SystemIO, 0x4048, 0x08)
+    Field (SYSI, DwordAcc, NoLock, Preserve)
+    {
+       IDX0, 32,
+       DAT0, 32,
+    }
+
+    IndexField (IDX0, DAT0, DwordAcc, NoLock, Preserve)
+    {
+        MEML,  32,
+        UIOA,  32,
+        UHPT,  32,
+        USMC,  32,
+        UFDC,  32,
+        // UCP0-UCP3 no longer used and only kept here for saved state compatibilty
+        UCP0,  32,
+        UCP1,  32,
+        UCP2,  32,
+        UCP3,  32,
+        MEMH,  32,
+        URTC,  32,
+        CPUL,  32,
+        CPUC,  32,
+        CPET,  32,
+        CPEV,  32,
+        NICA,  32,
+        HDAA,  32,
+        PWRS,  32,
+        Offset (0x80),
+        ININ, 32,
+        Offset (0x200),
+        VAIN, 32,
+    }
+
     Scope (\_SB)
     {
-        OperationRegion (SYSI, SystemIO, 0x4048, 0x08)
-        Field (SYSI, DwordAcc, NoLock, Preserve)
-        {
-            IDX0, 32,
-            DAT0, 32,
-        }
-
-        IndexField (IDX0, DAT0, DwordAcc, NoLock, Preserve)
-        {
-            MEML,  32,
-            UIOA,  32,
-            UHPT,  32,
-            USMC,  32,
-            UFDC,  32,
-            // UCP0-UCP3 no longer used and only kept here for saved state compatibilty
-            UCP0,  32,
-            UCP1,  32,
-            UCP2,  32,
-            UCP3,  32,
-            MEMH,  32,
-            URTC,  32,
-            CPUL,  32,
-            CPUC,  32,
-            CPET,  32,
-            CPEV,  32,
-            NICA,  32,
-            HDAA,  32,
-            Offset (0x80),
-            ININ, 32,
-            Offset (0x200),
-            VAIN, 32,
-        }
-
         Method (_INI, 0, NotSerialized)
         {
@@ -1305 +1307 @@
     })
 
+    // Shift one by the power state number
+//    If (And(PWRS, ShiftLeft(One,1))) {
+        Name (_S1, Package (2) {
+            0x01,
+            0x01,
+        })
+//    }
+
+//    If (And(PWRS, ShiftLeft(One,4))) {
+        Name (_S4, Package (2) {
+            0x05,
+            0x05,
+        })
+//    }
+
     Name (_S5, Package (2) {
         0x05,