Changeset 88484 in vbox for trunk/include/VBox

Timestamp:

Apr 13, 2021 5:50:44 AM (4 years ago)

Author:

vboxsync

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

143743

Message:

Intel IOMMU: bugref:9967 Main: Use the same I/O APIC PCI address reservation as we do on AMD, as it keeps things simpler than moving PCI devices/slots around again.
Also for now don't opt out of x2APIC (seems Linux VMs are configured with x2APIC by default, so let's try get things working with x2APIC).

File:

• trunk/include/VBox/iommu-intel.h (modified) (3 diffs)

trunk/include/VBox/iommu-intel.h

@@ -1831 +1831 @@
 
 /**
+ * ACPI Device Scope Structure - PCI device path.
+ * In accordance with the Intel spec.
+ */
+typedef struct ACPIDEVSCOPEPATH
+{
+    /** PCI device number. */
+    uint8_t     uDevice;
+    /** PCI function number.   */
+    uint8_t     uFunction;
+} ACPIDEVSCOPEPATH;
+AssertCompileSize(ACPIDEVSCOPEPATH, 2);
+
+
+/**
  * Device Scope Structure.
  * In accordance with the Intel spec.
@@ -1838 +1852 @@
 {
     /** Type, see ACPIDMARDEVSCOPE_TYPE_XXX. */
-    uint8_t         uType;
+    uint8_t             uType;
     /** Length (must be 6 + size of auPath field).  */
-    uint8_t         cbLength;
+    uint8_t             cbLength;
     /** Reserved (MBZ). */
-    uint8_t         abRsvd[2];
+    uint8_t             abRsvd[2];
     /** Enumeration ID (for I/O APIC, HPET and ACPI namespace devices). */
-    uint8_t         idEnum;
+    uint8_t             idEnum;
     /** First bus number for this device. */
-    uint8_t         uStartBusNum;
+    uint8_t             uStartBusNum;
     /** Hierarchical path from the Host Bridge to the device. */
-    uint16_t        auPath[1];
+    ACPIDEVSCOPEPATH    Path;
 } ACPIDMARDEVSCOPE;
 #pragma pack()
@@ -1854 +1868 @@
 AssertCompileMemberOffset(ACPIDMARDEVSCOPE, idEnum,       4);
 AssertCompileMemberOffset(ACPIDMARDEVSCOPE, uStartBusNum, 5);
-AssertCompileMemberOffset(ACPIDMARDEVSCOPE, auPath,       6);
+AssertCompileMemberOffset(ACPIDMARDEVSCOPE, Path,         6);
 
 /** ACPI DMAR revision (not the OEM revision field).