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

Timestamp:

Feb 13, 2009 4:06:37 PM (16 years ago)

Author:

vboxsync

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

42787

Message:

SMP guests: implement support for multiple CPU ACPI objects (#ifdef'ed VBOX_WITH_SMP_GUESTS)

Location:

trunk/src/VBox/Devices/PC

Files:

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

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

@@ -1346 +1346 @@
                 case SYSTEM_INFO_INDEX_CPU2_STATUS:
                 case SYSTEM_INFO_INDEX_CPU3_STATUS:
+#ifdef VBOX_WITH_SMP_GUESTS
+                    *pu32 = (s->fShowCpu && 
+                             s->uSystemInfoIndex - SYSTEM_INFO_INDEX_CPU0_STATUS < cCpus)
+                            ? (  STA_DEVICE_PRESENT_MASK
+                                           | STA_DEVICE_ENABLED_MASK
+                                           | STA_DEVICE_SHOW_IN_UI_MASK
+                                           | STA_DEVICE_FUNCTIONING_PROPERLY_MASK)
+                            : 0;
+#else
                     *pu32 = 0;
+#endif
                     break;
 
@@ -1832 +1842 @@
         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 */
+    /** @todo: a bit of hack: if we have SMC, also show CPU object in ACPI tables */
     s->fShowCpu = s->fUseSmc;
 

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).
+    // So we enable this ACPI object only for certain guests, which do need it,
+    // if by accident Windows guest seen enabled CPU object, just boot from latest
+    // known good configuration, as it remembers state, even if ACPI object gets disabled.
     Scope (\_PR)
     {
-        Processor (CPU0, 0x00, 0x00000410, 0x06) 
+       Processor (CPU0, /* Name */
+                   0x00, /* Id */
+                   0x0,  /* Processor IO ports range start */ 
+                   0x0   /* Processor IO ports range length */ 
+                   ) 
         {
            Method (_STA) { Return(\_SB.UCP0) }
         }
-        // Maybe we'll need more entries for SMP systems, enabled depending on runtime config 
+        Processor (CPU1, /* Name */
+                   0x01, /* Id */
+                   0x0,  /* Processor IO ports range start */ 
+                   0x0   /* Processor IO ports range length */ 
+                   ) 
+        {
+           Method (_STA) { Return(\_SB.UCP1) }
+        }
+        Processor (CPU2, /* Name */
+                   0x02, /* Id */
+                   0x0,  /* Processor IO ports range start */ 
+                   0x0   /* Processor IO ports range length */ 
+                   ) 
+        {
+           Method (_STA) { Return(\_SB.UCP2) }
+        }
+        Processor (CPU3, /* Name */
+                   0x03, /* Id */
+                   0x0,  /* Processor IO ports range start */ 
+                   0x0   /* Processor IO ports range length */ 
+                   ) 
+        {
+           Method (_STA) { Return(\_SB.UCP3) }
+        }
     }
 
@@ -148 +178 @@
             USMC,  32,
             UFDC,  32,
+            // @todo: maybe make it bitmask instead?
             UCP0,  32,
+            UCP1,  32,
+            UCP2,  32,
+            UCP3,  32,
             Offset (0x80),
             ININ, 32,
@@ -900 +934 @@
                     0x20,               // Length
                     )
-                //IRQNoFlags () {8}
+                // This line seriously confuses Windows ACPI driver, so not even try to 
+                // enable SMC for Windows guests
+                IRQNoFlags () {8}
             })
         }