Changeset 85007 in vbox for trunk/src/VBox/Devices/PC/DevIoApic.cpp

Timestamp:

Jun 30, 2020 5:19:25 PM (5 years ago)

Author:

vboxsync

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

138905

Message:

AMD IOMMU: bugref:9654 PDM, Main: Changes for southbridge I/O APIC and related PCI address assignment.

File:

• trunk/src/VBox/Devices/PC/DevIoApic.cpp (modified) (4 diffs)

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

@@ -24 +24 @@
 #include <VBox/vmm/hm.h>
 #include <VBox/msi.h>
+#include <Vbox/pci.h>
 #include <VBox/vmm/pdmdev.h>
 
@@ -165 +166 @@
 #define IOAPIC_DIRECT_OFF_DATA                  0x10
 #define IOAPIC_DIRECT_OFF_EOI                   0x40    /* Newer I/O APIC only. */
-
-/** The I/O APIC's Bus:Device:Function. */
-#define IOAPIC_BUS_DEV_FN                       NIL_PCIBDF
 
 /* Use PDM critsect for now for I/O APIC locking, see @bugref{8245#c121}. */
@@ -657 +655 @@
         uint32_t const uPinMask = UINT32_C(1) << idxRte;
         if (pThis->uIrr & uPinMask)
-            ioapicSignalIntrForRte(pDevIns, pThis, pThisCC, IOAPIC_BUS_DEV_FN, idxRte);
+            ioapicSignalIntrForRte(pDevIns, pThis, pThisCC, VBOX_PCI_BDF_SB_IOAPIC, idxRte);
 
         IOAPIC_UNLOCK(pDevIns, pThis, pThisCC);
@@ -772 +770 @@
                 uint32_t const uPinMask = UINT32_C(1) << idxRte;
                 if (pThis->uIrr & uPinMask)
-                    ioapicSignalIntrForRte(pDevIns, pThis, pThisCC, IOAPIC_BUS_DEV_FN, idxRte);
+                    ioapicSignalIntrForRte(pDevIns, pThis, pThisCC, VBOX_PCI_BDF_SB_IOAPIC, idxRte);
             }
         }