Changeset 86131 in vbox for trunk/include/VBox

Timestamp:

Sep 16, 2020 6:10:58 AM (5 years ago)

Author:

vboxsync

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

140372

Message:

AMD IOMMU: bugref:9654 Fix IRTE format. We now remap interrupts successfully.

File:

• trunk/include/VBox/iommu-amd.h (modified) (4 diffs)

trunk/include/VBox/iommu-amd.h

@@ -561 +561 @@
 #define IOMMU_DTE_QWORD_3_VALID_MASK            UINT64_C(0xffc0000000000000)
 
+/** The number of bits to shift the DTE offset to get the DTE. */
+#define IOMMU_DTE_SIZE_SHIFT                    5
+AssertCompile(1 << IOMMU_DTE_SIZE_SHIFT == sizeof(DTE_T));
+
 /** Mask of the interrupt table root pointer. */
 #define IOMMU_DTE_IRTE_ROOT_PTR_MASK            UINT64_C(0x000fffffffffffc0)
@@ -659 +663 @@
 
 /**
- * Interrupt Remapping Table Entry (IRTE).
+ * Interrupt Remapping Table Entry (IRTE) - Basic Format.
  * In accordance with the AMD spec.
  */
@@ -667 +671 @@
     {
         uint32_t    u1RemapEnable : 1;      /**< Bit  0     - RemapEn: Remap Enable. */
-        uint32_t    u1SuppressPf : 1;       /**< Bit  1     - SupIOPF: Supress I/O Page Fault. */
-        uint32_t    u3IntrType : 1;         /**< Bits 4:2   - IntType: Interrupt Type. */
+        uint32_t    u1SuppressIoPf : 1;     /**< Bit  1     - SupIOPF: Supress I/O Page Fault. */
+        uint32_t    u3IntrType : 3;         /**< Bits 4:2   - IntType: Interrupt Type. */
         uint32_t    u1ReqEoi : 1;           /**< Bit  5     - RqEoi: Request EOI. */
         uint32_t    u1DestMode : 1;         /**< Bit  6     - DM: Destination Mode. */
@@ -680 +684 @@
 } IRTE_T;
 AssertCompileSize(IRTE_T, 4);
-/** The number of bits to shift the IRTE offset to get the IRTE. */
-#define IOMMU_IRTE_SIZE_SHIFT   (2)
 /** Pointer to an IRTE_T struct. */
 typedef IRTE_T *PIRTE_T;
 /** Pointer to a const IRTE_T struct. */
 typedef IRTE_T const *PCIRTE_T;
+
+/** The number of bits to shift the IRTE offset to get the IRTE. */
+#define IOMMU_IRTE_SIZE_SHIFT               2
+AssertCompile(1 << IOMMU_IRTE_SIZE_SHIFT == sizeof(IRTE_T));
 
 /** The IRTE offset corresponds directly to bits 10:0 of the originating MSI