Changeset 74441 in vbox for trunk

Timestamp:

Sep 24, 2018 1:00:15 PM (6 years ago)

Author:

vboxsync

Message:

ACPI: Disable native PCIe capability control in _OSC method to make Windows guests happy (bugref:8973).

File:

• trunk/src/VBox/Devices/PC/vbox.dsl (modified) (1 diff)

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

@@ -1634 +1634 @@
             }
 
+            /* Defined in PCI Firmware Specification 3.0 and ACPI 3.0, with both specs
+             * referencing each other. The _OSC method must be present to make Linux happy,
+             * but needs to prevent the OS from taking much control so as to not upset Windows.
+             * NB: The first DWORD is defined in the ACPI spec but not the PCI FW spec.
+             */
             Method (_OSC, 4)
             {
+                Name(SUPP, 0)   // Support field value
+                Name(CTRL, 0)   // Control field value
+
+                // Break down the input capabilities buffer into individual DWORDs
+                CreateDWordField(Arg3, 0, CDW1)
+                CreateDWordField(Arg3, 4, CDW2)
+                CreateDWordField(Arg3, 8, CDW3)
+
                 If (LEqual (Arg0, ToUUID("33db4d5b-1ff7-401c-9657-7441c03dd766")))
                 {
-                    // OS controls everything.
-                    Return (Arg3)
+                    // Stash the Support and Control fields
+                    Store(CDW2, SUPP)
+                    Store(CDW3, CTRL)
+
+                    DBG("_OSC: SUPP=")
+                    HEX4(SUPP)
+                    DBG(" CTRL=")
+                    HEX4(CTRL)
+                    DBG("\n")
+
+                    // Mask off the PCI Express Capability Structure control
+                    // Not emulated well enough to satisfy Windows (Vista and later)
+                    And(CTRL, 0x0F, CTRL)
+
+                    // If capabilities were masked, set the Capabilities Masked flag (bit 4)
+                    If (LNotEqual(CDW3, CTRL))
+                    {
+                        Or(CDW1, 0x10, CDW1)
+                    }
+
+                    // Update the Control field and return
+                    Store(CTRL, CDW3)
+                    Return(Arg3)
                 }
                 Else
                 {
-                    // UUID not known
-                    CreateDWordField(Arg3, 0, CDW1)
-                    Or(CDW1, 4, CDW1)
-                    Return (Arg3)
+                    // UUID not known, set Unrecognized UUID flag (bit 2)
+                    Or(CDW1, 0x04, CDW1)
+                    Return(Arg3)
                 }
             }