Changeset 84714 in vbox for trunk

Timestamp:

Jun 6, 2020 10:01:54 AM (5 years ago)

Author:

vboxsync

Message:

AMD IOMMU: bugref:9654 PDM: Remove duplicate pfnIoApicSendMsi interface functions.

Location:

trunk

Files:

• include/VBox/vmm/pdmdev.h (modified) (7 diffs)
• src/VBox/VMM/VMMR0/PDMR0DevHlp.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMR3/PDMDevHlp.cpp (modified) (3 diffs)

trunk/include/VBox/vmm/pdmdev.h

@@ -417 +417 @@
 typedef PDMDEVREGR3 const *PCPDMDEVREGR3;
 /** Current DEVREGR3 version number. */
-#define PDM_DEVREGR3_VERSION                    PDM_VERSION_MAKE(0xffff, 4, 0)
+#define PDM_DEVREGR3_VERSION                    PDM_VERSION_MAKE(0xffff, 5, 0)
 
 
@@ -641 +641 @@
 typedef PDMDEVREGR0 const *PCPDMDEVREGR0;
 /** Current DEVREGR0 version number. */
-#define PDM_DEVREGR0_VERSION                    PDM_VERSION_MAKE(0xff80, 1, 0)
+#define PDM_DEVREGR0_VERSION                    PDM_VERSION_MAKE(0xff80, 2, 0)
 
 
@@ -711 +711 @@
 typedef PDMDEVREGRC const *PCPDMDEVREGRC;
 /** Current DEVREGRC version number. */
-#define PDM_DEVREGRC_VERSION                    PDM_VERSION_MAKE(0xff81, 1, 0)
+#define PDM_DEVREGRC_VERSION                    PDM_VERSION_MAKE(0xff81, 2, 0)
 
 
@@ -3380 +3380 @@
 
     /**
-     * Send an MSI straight to the I/O APIC.
-     *
-     * @param   pDevIns         PCI device instance.
-     * @param   GCPhys          Physical address MSI request was written.
-     * @param   uValue          Value written.
-     * @thread  Any thread, but will involve the emulation thread.
-     */
-    DECLR3CALLBACKMEMBER(void,  pfnIoApicSendMsi,(PPDMDEVINS pDevIns, RTGCPHYS GCPhys, uint32_t uValue));
-
-    /**
      * Attaches a driver (chain) to the device.
      *
@@ -4471 +4461 @@
 
     /**
-     * Send an MSI straight to the I/O APIC.
-     *
-     * @param   pDevIns         PCI device instance.
-     * @param   GCPhys          Physical address MSI request was written.
-     * @param   uValue          Value written.
-     * @thread  Any thread, but will involve the emulation thread.
-     */
-    DECLRCCALLBACKMEMBER(void,  pfnIoApicSendMsi,(PPDMDEVINS pDevIns, RTGCPHYS GCPhys, uint32_t uValue));
-
-    /**
      * Read physical memory.
      *
@@ -4919 +4899 @@
      */
     DECLR0CALLBACKMEMBER(void, pfnISASetIrq,(PPDMDEVINS pDevIns, int iIrq, int iLevel));
-
-    /**
-     * Send an MSI straight to the I/O APIC.
-     *
-     * @param   pDevIns         PCI device instance.
-     * @param   GCPhys          Physical address MSI request was written.
-     * @param   uValue          Value written.
-     * @thread  Any thread, but will involve the emulation thread.
-     */
-    DECLR0CALLBACKMEMBER(void,  pfnIoApicSendMsi,(PPDMDEVINS pDevIns, RTGCPHYS GCPhys, uint32_t uValue));
 
     /**
@@ -7290 +7260 @@
 }
 
-/**
- * @copydoc PDMDEVHLPR3::pfnIoApicSendMsi
- */
-DECLINLINE(void) PDMDevHlpIoApicSendMsi(PPDMDEVINS pDevIns, RTGCPHYS GCPhys, uint32_t uValue)
-{
-    pDevIns->CTX_SUFF(pHlp)->pfnIoApicSendMsi(pDevIns, GCPhys, uValue);
-}
-
 #ifdef IN_RING3
 

trunk/src/VBox/VMM/VMMR0/PDMR0DevHlp.cpp

@@ -312 +312 @@
 
 
-/** @interface_method_impl{PDMDEVHLPR0,pfnIoApicSendMsi} */
-static DECLCALLBACK(void) pdmR0DevHlp_IoApicSendMsi(PPDMDEVINS pDevIns, RTGCPHYS GCPhys, uint32_t uValue)
-{
-    PDMDEV_ASSERT_DEVINS(pDevIns);
-    LogFlow(("pdmR0DevHlp_IoApicSendMsi: caller=%p/%d: GCPhys=%RGp uValue=%#x\n", pDevIns, pDevIns->iInstance, GCPhys, uValue));
-    PGVM pGVM = pDevIns->Internal.s.pGVM;
-
-    uint32_t uTagSrc;
-    pDevIns->Internal.s.pIntR3R0->uLastIrqTag = uTagSrc = pdmCalcIrqTag(pGVM, pDevIns->Internal.s.pInsR3R0->idTracing);
-    VBOXVMM_PDM_IRQ_HILO(VMMGetCpu(pGVM), RT_LOWORD(uTagSrc), RT_HIWORD(uTagSrc));
-
-    if (pGVM->pdm.s.IoApic.pDevInsR0)
-        pGVM->pdm.s.IoApic.pfnSendMsiR0(pGVM->pdm.s.IoApic.pDevInsR0, GCPhys, uValue, uTagSrc);
-    else
-        AssertFatalMsgFailed(("Lazy bastards!"));
-
-    LogFlow(("pdmR0DevHlp_IoApicSendMsi: caller=%p/%d: returns void; uTagSrc=%#x\n", pDevIns, pDevIns->iInstance, uTagSrc));
-}
-
-
 /** @interface_method_impl{PDMDEVHLPR0,pfnPhysRead} */
 static DECLCALLBACK(int) pdmR0DevHlp_PhysRead(PPDMDEVINS pDevIns, RTGCPHYS GCPhys, void *pvBuf, size_t cbRead, uint32_t fFlags)
@@ -1279 +1259 @@
     pdmR0DevHlp_PCISetIrq,
     pdmR0DevHlp_ISASetIrq,
-    pdmR0DevHlp_IoApicSendMsi,
     pdmR0DevHlp_PhysRead,
     pdmR0DevHlp_PhysWrite,

trunk/src/VBox/VMM/VMMR3/PDMDevHlp.cpp

@@ -1962 +1962 @@
 {
     pdmR3DevHlp_ISASetIrq(pDevIns, iIrq, iLevel);
-}
-
-
-/** @interface_method_impl{PDMDEVHLPR3,pfnIoApicSendMsi} */
-static DECLCALLBACK(void) pdmR3DevHlp_IoApicSendMsi(PPDMDEVINS pDevIns, RTGCPHYS GCPhys, uint32_t uValue)
-{
-    PDMDEV_ASSERT_DEVINS(pDevIns);
-    LogFlow(("pdmR3DevHlp_IoApicSendMsi: caller='%s'/%d: GCPhys=%RGp uValue=%#x\n", pDevIns->pReg->szName, pDevIns->iInstance, GCPhys, uValue));
-
-    /*
-     * Validate input.
-     */
-    Assert(GCPhys != 0);
-    Assert(uValue != 0);
-
-    PVM pVM = pDevIns->Internal.s.pVMR3;
-
-    /*
-     * Do the job.
-     */
-    pdmLock(pVM);
-    uint32_t uTagSrc;
-    pDevIns->Internal.s.uLastIrqTag = uTagSrc = pdmCalcIrqTag(pVM, pDevIns->idTracing);
-    VBOXVMM_PDM_IRQ_HILO(VMMGetCpu(pVM), RT_LOWORD(uTagSrc), RT_HIWORD(uTagSrc));
-
-    PDMIoApicSendMsi(pVM, GCPhys, uValue, uTagSrc);  /* (The API takes the lock recursively.) */
-
-    pdmUnlock(pVM);
-
-    LogFlow(("pdmR3DevHlp_IoApicSendMsi: caller='%s'/%d: returns void\n", pDevIns->pReg->szName, pDevIns->iInstance));
 }
 
@@ -4214 +4184 @@
     pdmR3DevHlp_ISASetIrq,
     pdmR3DevHlp_ISASetIrqNoWait,
-    pdmR3DevHlp_IoApicSendMsi,
     pdmR3DevHlp_DriverAttach,
     pdmR3DevHlp_DriverDetach,
@@ -5063 +5032 @@
     pdmR3DevHlp_ISASetIrq,
     pdmR3DevHlp_ISASetIrqNoWait,
-    pdmR3DevHlp_IoApicSendMsi,
     pdmR3DevHlp_DriverAttach,
     pdmR3DevHlp_DriverDetach,