Changeset 36218 in vbox

Timestamp:

Mar 9, 2011 9:32:02 AM (14 years ago)

Author:

vboxsync

Message:

PCI: interrupts work

Location:

trunk

Files:

• include/VBox/rawpci.h (modified) (5 diffs)
• src/VBox/Devices/Bus/DevPciIch9.cpp (modified) (4 diffs)
• src/VBox/HostDrivers/Support/SUPDrv.c (modified) (1 diff)
• src/VBox/HostDrivers/VBoxPci/VBoxPci.c (modified) (3 diffs)
• src/VBox/HostDrivers/VBoxPci/VBoxPciInternal.h (modified) (3 diffs)

trunk/include/VBox/rawpci.h

@@ -158 +158 @@
 } PCIRAWREQPCICFGREAD;
 
+/** Parameters buffer for PCIRAWR0_DO_REGISTER_R0_IRQ_HANDLER call. */
+typedef struct
+{
+    /* in */
+    int32_t              iGuestIrq;
+    RTR0PTR              pfnHandler;
+    RTR0PTR              pfnHandlerContext;
+    /* out */
+    int32_t              iHostIrq;
+} PCIRAWREQREGISTERR0IRQHANDLER;
+
+/** Parameters buffer for PCIRAWR0_DO_UNREGISTER_R0_IRQ_HANDLER call. */
+typedef struct
+{
+    /* in */
+    int32_t              iHostIrq;
+} PCIRAWREQUNREGISTERR0IRQHANDLER;
+
 /**
  * Request buffer use for communication with the driver.
@@ -187 +205 @@
         PCIRAWREQPCICFGWRITE   aPciCfgWrite;
         PCIRAWREQPCICFGREAD    aPciCfgRead;
+        PCIRAWREQREGISTERR0IRQHANDLER   aRegisterR0IrqHandler;
+        PCIRAWREQUNREGISTERR0IRQHANDLER aUnregisterR0IrqHandler;
     } u;
 } PCIRAWSENDREQ;
@@ -218 +238 @@
     /* Perform PCI config read. */
     PCIRAWR0_DO_PCICFG_READ,
+    /* Register device IRQ R0 handler. */
+    PCIRAWR0_DO_REGISTER_R0_IRQ_HANDLER,
+    /* Unregister device IRQ R0 handler. */
+    PCIRAWR0_DO_UNREGISTER_R0_IRQ_HANDLER,
     /** The usual 32-bit type blow up. */
     PCIRAWR0_DO_32BIT_HACK = 0x7fffffff
@@ -225 +249 @@
 typedef struct RAWPCIFACTORY *PRAWPCIFACTORY;
 typedef struct RAWPCIDEVPORT *PRAWPCIDEVPORT;
+
+/**
+ * Interrupt service routine callback.
+ *
+ * @param   pvContext       Opaque user data which to the handler.
+ * @param   iIrq            Interrupt number.
+ */
+typedef DECLCALLBACK(void) FNRAWPCIISR(void *pvContext, int32_t iIrq);
+typedef FNRAWPCIISR *PFNRAWPCIISR;
 
 /**
@@ -332 +365 @@
                                                uint32_t          Register,
                                                PCIRAWMEMLOC      *pValue));
+
+    /**
+     * Request to register interrupt handler.
+     *
+     * @param   pPort       Pointer to this structure.
+     * @param   pfnHandler  Pointer to the handler.
+     * @param   pIrqContext Context passed to the handler.
+     * @param   piHostIrq   Which host IRQ is used.
+     */
+    DECLR0CALLBACKMEMBER(int,  pfnRegisterIrqHandler,(PRAWPCIDEVPORT pPort,
+                                                      PFNRAWPCIISR pfnHandler,
+                                                      void* pIrqContext,
+                                                      int32_t *piHostIrq));
+
+    /**
+     * Request to unregister interrupt handler.
+     *
+     * @param   pPort       Pointer to this structure.
+     * @param   iHostIrq    Which host IRQ was used (retured by earlier pfnRegisterIrqHandler).
+     */
+    DECLR0CALLBACKMEMBER(int,  pfnUnregisterIrqHandler,(PRAWPCIDEVPORT pPort,
+                                                        int32_t iHostIrq));
 
     /** Structure version number. (RAWPCIDEVPORT_VERSION) */

trunk/src/VBox/Devices/Bus/DevPciIch9.cpp

@@ -1658 +1658 @@
         return;
 
-    Log(("BIOS init device: %02x::%02x.%d\n", uBus, uDevFn >> 3, uDevFn & 7));
+    Log(("BIOS init device: %02x:%02x.%d\n", uBus, uDevFn >> 3, uDevFn & 7));
 
     switch (uDevClass)
@@ -2296 +2296 @@
                             pciDevIsMsixCapable(pPciDev) ? " MSI-X" : ""
                             );
-            if (!pciDevIsPassthrough(pPciDev) && PCIDevGetInterruptPin(pPciDev) != 0)
-                pHlp->pfnPrintf(pHlp, " IRQ%d", PCIDevGetInterruptLine(pPciDev));
+            if (ich9pciGetByte(pPciDev, VBOX_PCI_INTERRUPT_PIN) != 0)
+                pHlp->pfnPrintf(pHlp, " IRQ%d", ich9pciGetByte(pPciDev, VBOX_PCI_INTERRUPT_LINE));
 
             pHlp->pfnPrintf(pHlp, "\n");
@@ -2618 +2618 @@
 
     /** @todo: other chipset devices shall be registered too */
-    /** @todo: what to with bridges? */
 
     PDMDevHlpDBGFInfoRegister(pDevIns, "pci", "Display PCI bus status. (no arguments)", ich9pciInfo);
@@ -2642 +2641 @@
     if (pciDevIsPassthrough(pDev))
     {
-        // implement reset handler
-        AssertFailed();
+        // no reset handler - we can do what we need in PDM reset handler
+        // @todo: is it correct?
     }
     else

trunk/src/VBox/HostDrivers/Support/SUPDrv.c

@@ -289 +289 @@
     { "RTThreadUserWait",                       (void *)RTThreadUserWait },
     { "RTThreadUserWaitNoResume",               (void *)RTThreadUserWaitNoResume },
+#else
+    /** 
+     * @todo: remove me, once above code enabled. 
+     * We need RTThreadCreate/RTThreadWait in the PCI driver.
+     */
+    { "RTThreadCreate",                         (void *)RTThreadCreate },
+    { "RTThreadWait",                           (void *)RTThreadWait },
 #endif
     { "RTThreadPreemptIsEnabled",               (void *)RTThreadPreemptIsEnabled },

trunk/src/VBox/HostDrivers/VBoxPci/VBoxPci.c

@@ -187 +187 @@
 
     int rc = vboxPciOsDevPciCfgWrite(pThis, Register, pValue);
+
+    return rc;
+}
+
+DECLHIDDEN(int) vboxPciDevRegisterIrqHandler(PRAWPCIDEVPORT pPort, PFNRAWPCIISR pfnHandler, void* pIrqContext, int32_t *piHostIrq)
+{
+    PVBOXRAWPCIINS pThis = DEVPORT_2_VBOXRAWPCIINS(pPort);
+    int rc;
+
+    pThis->pfnIrqHandler = pfnHandler;
+    pThis->pIrqContext   = pIrqContext;
+    rc = vboxPciOsDevRegisterIrqHandler(pThis, pfnHandler, pIrqContext, piHostIrq);
+    if (RT_FAILURE(rc))
+    {
+        pThis->pfnIrqHandler = NULL;
+        pThis->pIrqContext   = NULL;
+        *piHostIrq = -1;
+    }
+
+    return rc;
+}
+
+DECLHIDDEN(int) vboxPciDevUnregisterIrqHandler(PRAWPCIDEVPORT pPort, int32_t iHostIrq)
+{
+    PVBOXRAWPCIINS pThis = DEVPORT_2_VBOXRAWPCIINS(pPort);
+
+    int rc = vboxPciOsDevUnregisterIrqHandler(pThis, iHostIrq);
 
     return rc;
@@ -226 +253 @@
     pNew->DevPort.pfnPciCfgRead         = vboxPciDevPciCfgRead;
     pNew->DevPort.pfnPciCfgWrite        = vboxPciDevPciCfgWrite;
-
+    pNew->DevPort.pfnPciCfgRead         = vboxPciDevPciCfgRead;
+    pNew->DevPort.pfnPciCfgWrite        = vboxPciDevPciCfgWrite;
+    pNew->DevPort.pfnRegisterIrqHandler = vboxPciDevRegisterIrqHandler;
+    pNew->DevPort.pfnUnregisterIrqHandler = vboxPciDevUnregisterIrqHandler;
     pNew->DevPort.u32VersionEnd         = RAWPCIDEVPORT_VERSION;
 
@@ -284 +314 @@
 }
 
-
-
-
 static DECLHIDDEN(bool) vboxPciCanUnload(PVBOXRAWPCIGLOBALS pGlobals)
 {

trunk/src/VBox/HostDrivers/VBoxPci/VBoxPciInternal.h

@@ -65 +65 @@
     /** Port, given to the outside world. */
     RAWPCIDEVPORT      DevPort;
+
+    PFNRAWPCIISR       pfnIrqHandler;
+    void              *pIrqContext;
 } VBOXRAWPCIINS;
 
@@ -103 +106 @@
 DECLHIDDEN(int)  vboxPciOsDevInit  (PVBOXRAWPCIINS pIns, uint32_t fFlags);
 DECLHIDDEN(int)  vboxPciOsDevDeinit(PVBOXRAWPCIINS pIns, uint32_t fFlags);
+
 DECLHIDDEN(int)  vboxPciOsDevGetRegionInfo(PVBOXRAWPCIINS pIns,
                                            int32_t        iRegion,
@@ -120 +124 @@
                                          uint64_t       u64RegionSize,
                                          RTR0PTR        RegionBase);
+
 DECLHIDDEN(int)  vboxPciOsDevPciCfgWrite(PVBOXRAWPCIINS pIns, uint32_t Register, PCIRAWMEMLOC *pValue);
 DECLHIDDEN(int)  vboxPciOsDevPciCfgRead (PVBOXRAWPCIINS pIns, uint32_t Register, PCIRAWMEMLOC *pValue);
+
+DECLHIDDEN(int)  vboxPciOsDevRegisterIrqHandler  (PVBOXRAWPCIINS pIns, PFNRAWPCIISR pfnHandler, void* pIrqContext, int32_t *piHostIrq);
+DECLHIDDEN(int)  vboxPciOsDevUnregisterIrqHandler(PVBOXRAWPCIINS pIns, int32_t iHostIrq);
 
 RT_C_DECLS_END