Changeset 86204 in vbox for trunk/include/VBox

Timestamp:

Sep 21, 2020 5:31:18 PM (5 years ago)

Author:

vboxsync

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

140464

Message:

AMD IOMMU: bugref:9654 Reworked register accesses (write done) to support sub-qword accesses for qword registers.
In theory, we should also support 1 and 2 byte transfers. Currently using IOMMMIO_FLAGS_WRITE_DWORD_QWORD_READ_MISSING.

File:

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

trunk/include/VBox/iommu-amd.h

@@ -56 +56 @@
  * @{
  */
+#define IOMMU_MMIO_OFF_QWORD_TABLE_0_START          IOMMU_MMIO_OFF_DEV_TAB_BAR
 #define IOMMU_MMIO_OFF_DEV_TAB_BAR                  0x00
 #define IOMMU_MMIO_OFF_CMD_BUF_BAR                  0x08
@@ -105 +106 @@
 #define IOMMU_MMIO_OFF_XT_PPR_INTR_CTRL             0x178
 #define IOMMU_MMIO_OFF_XT_GALOG_INT_CTRL            0x180
-
+#define IOMMU_MMIO_OFF_QWORD_TABLE_0_END            (IOMMU_MMIO_OFF_XT_GALOG_INT_CTRL + 8)
+
+#define IOMMU_MMIO_OFF_QWORD_TABLE_1_START          IOMMU_MMIO_OFF_MARC_APER_BAR_0
 #define IOMMU_MMIO_OFF_MARC_APER_BAR_0              0x200
 #define IOMMU_MMIO_OFF_MARC_APER_RELOC_0            0x208
@@ -118 +121 @@
 #define IOMMU_MMIO_OFF_MARC_APER_RELOC_3            0x250
 #define IOMMU_MMIO_OFF_MARC_APER_LEN_3              0x258
-
+#define IOMMU_MMIO_OFF_QWORD_TABLE_1_END            (IOMMU_MMIO_OFF_MARC_APER_LEN_3 + 8)
+
+#define IOMMU_MMIO_OFF_QWORD_TABLE_2_START          IOMMU_MMIO_OFF_RSVD_REG
 #define IOMMU_MMIO_OFF_RSVD_REG                     0x1ff8
 
-#define IOMMU_MMIO_CMD_BUF_HEAD_PTR                 0x2000
-#define IOMMU_MMIO_CMD_BUF_TAIL_PTR                 0x2008
-#define IOMMU_MMIO_EVT_LOG_HEAD_PTR                 0x2010
-#define IOMMU_MMIO_EVT_LOG_TAIL_PTR                 0x2018
+#define IOMMU_MMIO_OFF_CMD_BUF_HEAD_PTR             0x2000
+#define IOMMU_MMIO_OFF_CMD_BUF_TAIL_PTR             0x2008
+#define IOMMU_MMIO_OFF_EVT_LOG_HEAD_PTR             0x2010
+#define IOMMU_MMIO_OFF_EVT_LOG_TAIL_PTR             0x2018
 
 #define IOMMU_MMIO_OFF_STATUS                       0x2020
@@ -143 +148 @@
 #define IOMMU_MMIO_OFF_PPR_LOG_OVERFLOW_EARLY       0x2088
 #define IOMMU_MMIO_OFF_PPR_LOG_B_OVERFLOW_EARLY     0x2090
+#define IOMMU_MMIO_OFF_QWORD_TABLE_2_END            (IOMMU_MMIO_OFF_PPR_LOG_B_OVERFLOW_EARLY + 8)
 /** @} */
 
@@ -698 +704 @@
     {
         uint32_t    u32Operand1Lo;          /**< Bits 31:0   - Operand 1 (Lo). */
-        uint32_t    u32Operand1Hi : 28;     /**< Bits 59:32  - Operand 1 (Hi). */
+        uint32_t    u28Operand1Hi : 28;     /**< Bits 59:32  - Operand 1 (Hi). */
         uint32_t    u4Opcode : 4;           /**< Bits 63:60  - Op Code. */
         uint64_t    u64Operand2;            /**< Bits 127:64 - Operand 2. */
@@ -884 +890 @@
     {
         uint32_t    u32Operand1Lo;          /**< Bits 31:0   - Operand 1 (Lo). */
-        uint32_t    u32Operand1Hi : 28;     /**< Bits 59:32  - Operand 1 (Hi). */
+        uint32_t    u28Operand1Hi : 28;     /**< Bits 59:32  - Operand 1 (Hi). */
         uint32_t    u4EvtCode : 4;          /**< Bits 63:60  - Event code. */
         uint32_t    u32Operand2Lo;          /**< Bits 95:64  - Operand 2 (Lo). */