Changeset 16711 in vbox

Timestamp:

Feb 12, 2009 3:46:54 PM (16 years ago)

Author:

vboxsync

Message:

ACPI: conditionally enable showing CPU ACPI object, needed by some guests

Location:

trunk/src/VBox/Devices/PC

Files:

• DevACPI.cpp (modified) (5 diffs)
• vbox.dsl (modified) (3 diffs)

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

@@ -134 +134 @@
     SYSTEM_INFO_INDEX_SMC_STATUS        = 3,
     SYSTEM_INFO_INDEX_FDC_STATUS        = 4,
-    SYSTEM_INFO_INDEX_LAST              = 5,
+    SYSTEM_INFO_INDEX_CPU0_STATUS       = 5,
+    SYSTEM_INFO_INDEX_CPU1_STATUS       = 6,
+    SYSTEM_INFO_INDEX_CPU2_STATUS       = 7,
+    SYSTEM_INFO_INDEX_CPU3_STATUS       = 8,
+    SYSTEM_INFO_INDEX_LAST              = 9,
     SYSTEM_INFO_INDEX_INVALID           = 0x80,
     SYSTEM_INFO_INDEX_VALID             = 0x200
@@ -194 +198 @@
     /** the guest handled the last power button event */
     bool                fPowerButtonHandled;
+    /** If ACPI CPU device should be shown */
+    bool                fShowCpu;
     /** Aligning IBase. */
-    bool                afAlignment[3];
+    bool                afAlignment[2];
 
     /** ACPI port base interface. */
@@ -809 +815 @@
     madt.IOApic.u8Type     = 1;
     madt.IOApic.u8Length   = sizeof(ACPITBLIOAPIC);
-    madt.IOApic.u8IOApicId = 0;
+    madt.IOApic.u8IOApicId = 1;
     madt.IOApic.u8Reserved = 0;
     madt.IOApic.u32Address = RT_H2LE_U32(0xfec00000);
@@ -1329 +1335 @@
                             : 0;
                     break;
-
+                case SYSTEM_INFO_INDEX_CPU0_STATUS:
+                    *pu32 = s->fShowCpu ? (  STA_DEVICE_PRESENT_MASK
+                                           | STA_DEVICE_ENABLED_MASK
+                                           | STA_DEVICE_SHOW_IN_UI_MASK
+                                           | STA_DEVICE_FUNCTIONING_PROPERLY_MASK)
+                            : 0;
+                    break;
+
+                case SYSTEM_INFO_INDEX_CPU1_STATUS:
+                case SYSTEM_INFO_INDEX_CPU2_STATUS:
+                case SYSTEM_INFO_INDEX_CPU3_STATUS:
+                    *pu32 = 0;
+                    break;
 
                 /* Solaris 9 tries to read from this index */
@@ -1814 +1832 @@
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Failed to read \"SmcEnabled\""));
+    /** @todo: a bit of hack: if we have SMC, also show CPU in ACPI */
+    s->fShowCpu = s->fUseSmc;
 
     rc = CFGMR3QueryBool (pCfgHandle, "GCEnabled", &fGCEnabled);

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

@@ -123 +123 @@
     // with SpeedStep if it finds a CPU object and when it finds out that it can't, it
     // tries to unload and crashes (MS probably never tested this code path).
-//    Scope (\_PR)
-//    {
-//        Processor (CPU1, 0x01, 0x00000000, 0x00) {}
-//    }
+    Scope (\_PR)
+    {
+        Processor (CPU0, 0x00, 0x00000410, 0x06) 
+        {
+           Method (_STA) { Return(\_SB.UCP0) }
+        }
+        // Maybe we'll need more entries for SMP systems, enabled depending on runtime config 
+    }
 
     Scope (\_SB)
@@ -139 +143 @@
         IndexField (IDX0, DAT0, DwordAcc, NoLock, Preserve)
         {
-            MEML, 32,
-            UIOA, 32,
-            UHPT, 32,
-            USMC, 32,
-            UFDC, 32,
+            MEML,  32,
+            UIOA,  32,
+            UHPT,  32,
+            USMC,  32,
+            UFDC,  32,
+            UCP0,  32,
             Offset (0x80),
             ININ, 32,
@@ -163 +168 @@
             DBG ("UFDC: ")
             HEX4 (UFDC)
+            DBG ("UCP0: ")
+            HEX4 (UCP0)
         }