Changeset 86408 in vbox for trunk/src/VBox/Devices/PC

Timestamp:

Oct 2, 2020 8:24:37 AM (4 years ago)

Author:

vboxsync

Message:

AMD IOMMU: bugref:9654 Add IVRS (IOMMU I/O Virtualization Reporting Structure) to the ACPI table and fixes to ACPI to accomodate the new system index for the IOMMU and southbridge I/O APIC devices.

Location:

trunk/src/VBox/Devices/PC

Files:

• DevACPI.cpp (modified) (1 diff)
• vbox.dsl (modified) (1 diff)

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

@@ -1421 +1421 @@
 
         u32 >>= pThis->u8IndexShift;
+
+        /* If the index exceeds 31 (which is all we can fit within offset 0x80), we need to divide the index again
+           for indices > 31 and < SYSTEM_INFO_INDEX_END. */
+        if (u32 > SYSTEM_INFO_INDEX_END && pThis->u8IndexShift == 2 && (u32 >> 2) < SYSTEM_INFO_INDEX_END)
+            u32 >>= 2;
+
         AssertMsg(u32 < SYSTEM_INFO_INDEX_END, ("%u - Max=%u. IndexShift=%u\n", u32, SYSTEM_INFO_INDEX_END, pThis->u8IndexShift));
         pThis->uSystemInfoIndex = u32;

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

@@ -1196 +1196 @@
                 }
 
+                // AMD IOMMU (AMD-Vi), I/O Virtualization Reporting Structure
+                Device (IVRS)
+                {
+                    Method(_ADR, 0, NotSerialized)
+                    {
+                        Return (IOMA)
+                    }
+                    Method (_STA, 0, NotSerialized)
+                    {
+                        if (LEqual (IOMA, Zero)) {
+                            Return (0x00)
+                        }
+                        else {
+                            Return (0x0F)
+                        }
+                    }
+                }
+
                 // System Management Controller
                 Device (SMC)