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

Timestamp:

Jul 15, 2020 10:17:15 AM (5 years ago)

Author:

vboxsync

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

139337

Message:

ACPI: Add IndexFields for IOMMU and SB I/O APIC. Let's see if this causes trouble.

Location:

trunk/src/VBox/Devices/PC

Files:

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

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

@@ -196 +196 @@
     SYSTEM_INFO_INDEX_PREF64_MEMORY_MAX = 30,
     SYSTEM_INFO_INDEX_NVME_ADDRESS      = 31, /**< First NVMe controller PCI address, or 0 */
-    SYSTEM_INFO_INDEX_END               = 32,
+    SYSTEM_INFO_INDEX_IOMMU_AMD_ADDRESS = 32, /**< AMD IOMMU PCI address, or 0 */
+    SYSTEM_INFO_INDEX_SB_IOAPIC_ADDRESS = 33, /**< Southbridge I/O APIC (needed by AMD IOMMU) PCI address, or 0 */
+    SYSTEM_INFO_INDEX_END               = 34,
     SYSTEM_INFO_INDEX_INVALID           = 0x80,
     SYSTEM_INFO_INDEX_VALID             = 0x200

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

@@ -376 +376 @@
         Offset (0x200),
         VAIN, 32,
+        IOMA, 32, // AMD IOMMU
+        SIOA, 32, // Southbridge IO APIC (when AMD IOMMU is present) 
     }