Changeset 109212 in vbox

Timestamp:

May 9, 2025 6:25:38 AM (10 days ago)

Author:

vboxsync

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

168790

Message:

GIC: bugref:10877 Add MSI registeration callbacks in PCI ECAM configured when the ITS is enabled. Added invoking of the GIC backend's MSI handler from PDM.

Location:

trunk

Files:

• include/VBox/vmm/pdmgic.h (modified) (1 diff)
• src/VBox/Devices/Bus/DevPciGenericEcam.cpp (modified) (6 diffs)
• src/VBox/Devices/Bus/DevPciIch9.cpp (modified) (3 diffs)
• src/VBox/Devices/Bus/DevPciInternal.h (modified) (1 diff)
• src/VBox/Main/src-client/ConsoleImplConfigArmV8.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMAll/GITSAll.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/PDMAll.cpp (modified) (3 diffs)
• src/VBox/VMM/include/GITSInternal.h (modified) (1 diff)

trunk/include/VBox/vmm/pdmgic.h

@@ -127 +127 @@
      *                      Cannot be NIL_PCIBDF.
      * @param   pMsi        The MSI to send.
-     * @param   uEventId    The event ID specified by the device.
      * @param   uTagSrc     The IRQ tag and source (for tracing).
      */
-    DECLR3CALLBACKMEMBER(int, pfnSendMsi, (PVMCC pVM, PCIBDF uBusDevFn, PCMSIMSG pMsi, uint32_t uEventId, uint32_t uTagSrc));
+    DECLR3CALLBACKMEMBER(int, pfnSendMsi, (PVMCC pVM, PCIBDF uBusDevFn, PCMSIMSG pMsi, uint32_t uTagSrc));
 
     /** @name Reserved for future (MBZ).

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

@@ -318 +318 @@
                                            "|IntPinB"
                                            "|IntPinC"
-                                           "|IntPinD", "");
+                                           "|IntPinD"
+                                           "|Msi", "");
 
     int rc = pHlp->pfnCFGMQueryU64Def(pCfg, "MmioEcamBase", &pPciRoot->u64PciConfigMMioAddress, 0);
@@ -344 +345 @@
     AssertRCReturn(rc, PDMDEV_SET_ERROR(pDevIns, rc, N_("Configuration error: Failed to read \"IntPinD\"")));
 
+    bool fMsi;
+    rc = pHlp->pfnCFGMQueryBoolDef(pCfg, "Msi", &fMsi, false);
+    AssertRCReturn(rc, PDMDEV_SET_ERROR(pDevIns, rc, N_("Configuration error: Failed to read \"Msi\"")));
+
     Log(("PCI: fUseIoApic=%RTbool McfgBase=%#RX64 McfgLength=%#RX64 fR0Enabled=%RTbool fRCEnabled=%RTbool\n", pPciRoot->fUseIoApic,
          pPciRoot->u64PciConfigMMioAddress, pPciRoot->u64PciConfigMMioLength, pDevIns->fR0Enabled, pDevIns->fRCEnabled));
-    Log(("PCI: IntPinA=%u IntPinB=%u IntPinC=%u IntPinD=%u\n", pPciRoot->u.GenericEcam.auPciIrqNr[0],
-         pPciRoot->u.GenericEcam.auPciIrqNr[1], pPciRoot->u.GenericEcam.auPciIrqNr[2], pPciRoot->u.GenericEcam.auPciIrqNr[3]));
+    Log(("PCI: IntPinA=%u IntPinB=%u IntPinC=%u IntPinD=%u fMsi=%RTbool\n", pPciRoot->u.GenericEcam.auPciIrqNr[0],
+         pPciRoot->u.GenericEcam.auPciIrqNr[1], pPciRoot->u.GenericEcam.auPciIrqNr[2], pPciRoot->u.GenericEcam.auPciIrqNr[3], fMsi));
 
     /*
@@ -376 +381 @@
     PciBusReg.u32Version                 = PDM_PCIBUSREGCC_VERSION;
     PciBusReg.pfnRegisterR3              = devpciR3CommonRegisterDevice;
-    PciBusReg.pfnRegisterMsiR3           = NULL;
+    PciBusReg.pfnRegisterMsiR3           = fMsi ? devpciR3CommonRegisterMsi : NULL;
     PciBusReg.pfnIORegionRegisterR3      = devpciR3CommonIORegionRegister;
     PciBusReg.pfnInterceptConfigAccesses = devpciR3CommonInterceptConfigAccesses;
@@ -518 +523 @@
      * Validate and read configuration.
      */
-    PDMDEV_VALIDATE_CONFIG_RETURN(pDevIns, "ExpressEnabled|ExpressPortType", "");
+    PDMDEV_VALIDATE_CONFIG_RETURN(pDevIns, "ExpressEnabled|ExpressPortType|Msi", "");
 
     /* check if we're supposed to implement a PCIe bridge. */
@@ -532 +537 @@
     Log(("PCI/bridge#%u: fR0Enabled=%RTbool fRCEnabled=%RTbool fExpress=%RTbool uExpressPortType=%u (%s)\n",
          iInstance, pDevIns->fR0Enabled, pDevIns->fRCEnabled, fExpress, uExpressPortType, szExpressPortType));
+
+    bool fMsi;
+    rc = pHlp->pfnCFGMQueryBoolDef(pCfg, "Msi", &fMsi, false);
+    AssertRCReturn(rc, PDMDEV_SET_ERROR(pDevIns, rc, N_("Configuration error: Failed to query boolean value \"Msi\"")));
 
     /*
@@ -550 +559 @@
     PciBusReg.u32Version                 = PDM_PCIBUSREGCC_VERSION;
     PciBusReg.pfnRegisterR3              = devpcibridgeR3CommonRegisterDevice;
-    PciBusReg.pfnRegisterMsiR3           = NULL;
+    PciBusReg.pfnRegisterMsiR3           = fMsi ? devpciR3CommonRegisterMsi : NULL;
     PciBusReg.pfnIORegionRegisterR3      = devpciR3CommonIORegionRegister;
     PciBusReg.pfnInterceptConfigAccesses = devpciR3CommonInterceptConfigAccesses;

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

@@ -997 +997 @@
 
 
-static DECLCALLBACK(int) ich9pciRegisterMsi(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev, PPDMMSIREG pMsiReg)
+DECLCALLBACK(int) devpciR3CommonRegisterMsi(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev, PPDMMSIREG pMsiReg)
 {
     //PDEVPCIBUS   pBus   = PDMINS_2_DATA(pDevIns, PDEVPCIBUS);
@@ -3387 +3387 @@
     PciBusReg.u32Version                 = PDM_PCIBUSREGCC_VERSION;
     PciBusReg.pfnRegisterR3              = devpciR3CommonRegisterDevice;
-    PciBusReg.pfnRegisterMsiR3           = ich9pciRegisterMsi;
+    PciBusReg.pfnRegisterMsiR3           = devpciR3CommonRegisterMsi;
     PciBusReg.pfnIORegionRegisterR3      = devpciR3CommonIORegionRegister;
     PciBusReg.pfnInterceptConfigAccesses = devpciR3CommonInterceptConfigAccesses;
@@ -3697 +3697 @@
     PciBusReg.u32Version                 = PDM_PCIBUSREGCC_VERSION;
     PciBusReg.pfnRegisterR3              = devpcibridgeR3CommonRegisterDevice;
-    PciBusReg.pfnRegisterMsiR3           = ich9pciRegisterMsi;
+    PciBusReg.pfnRegisterMsiR3           = devpciR3CommonRegisterMsi;
     PciBusReg.pfnIORegionRegisterR3      = devpciR3CommonIORegionRegister;
     PciBusReg.pfnInterceptConfigAccesses = devpciR3CommonInterceptConfigAccesses;

trunk/src/VBox/Devices/Bus/DevPciInternal.h

@@ -272 +272 @@
 DECLCALLBACK(int)  devpcibridgeR3CommonRegisterDevice(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev, uint32_t fFlags,
                                                       uint8_t uPciDevNo, uint8_t uPciFunNo, const char *pszName);
+DECLCALLBACK(int)  devpciR3CommonRegisterMsi(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev, PPDMMSIREG pMsiReg);
 DECLCALLBACK(int)  devpciR3CommonIORegionRegister(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev, uint32_t iRegion,
                                                   RTGCPHYS cbRegion, PCIADDRESSSPACE enmType, uint32_t fFlags,

trunk/src/VBox/Main/src-client/ConsoleImplConfigArmV8.cpp

@@ -469 +469 @@
         InsertConfigNode(pRoot, "Devices", &pDevices);
 
-        InsertConfigNode(pDevices, "pci-generic-ecam-bridge", NULL);
+        InsertConfigNode(pDevices, "pci-generic-ecam-bridge", &pDev);
+        InsertConfigNode(pDev,     "0",                       &pInst);
+        InsertConfigNode(pInst,    "Config",                  &pCfg);
+        if (fGicIts == TRUE)
+            InsertConfigInteger(pCfg,  "Msi", 1);
 
         InsertConfigNode(pDevices, "platform",              &pDev);
@@ -828 +832 @@
         InsertConfigInteger(pCfg,  "IntPinC",        aPinIrqs[2]);
         InsertConfigInteger(pCfg,  "IntPinD",        aPinIrqs[3]);
+        if (fGicIts == TRUE)
+            InsertConfigInteger(pCfg,  "Msi", 1);
         vrc = RTFdtNodeAddF(hFdt, "pcie@%RGp", GCPhysPciMmio);                              VRC();
         vrc = RTFdtNodePropertyAddCellsU32(hFdt, "interrupt-map-mask", 4, 0xf800, 0, 0, 7); VRC();

trunk/src/VBox/VMM/VMMAll/GITSAll.cpp

@@ -1001 +1001 @@
  * @interface_method_impl{PDMGICBACKEND,pfnSendMsi}
  */
-DECL_HIDDEN_CALLBACK(int) gitsSendMsi(PVMCC pVM, PCIBDF uBusDevFn, PCMSIMSG pMsi, uint32_t uEventId, uint32_t uTagSrc)
-{
-    Log4Func(("uBusDevFn=%#RX32 uEventId=%#RX32\n", uBusDevFn, uEventId));
-    RT_NOREF(pVM, uBusDevFn, pMsi, uEventId, uTagSrc);
+DECL_HIDDEN_CALLBACK(int) gitsSendMsi(PVMCC pVM, PCIBDF uBusDevFn, PCMSIMSG pMsi, uint32_t uTagSrc)
+{
+    AssertPtrReturn(pMsi, VERR_INVALID_PARAMETER);
+    Log4Func(("uBusDevFn=%#RX32 Msi.Addr=%#RX64 Msi.Data=%#RX32\n", uBusDevFn, pMsi->Addr.u64, pMsi->Data.u32));
+    RT_NOREF(pVM, uBusDevFn, pMsi, uTagSrc);
+    AssertMsgFailed(("uBusDevFn=%#RX32 Msi.Addr=%#RX64 Msi.Data=%#RX32\n", uBusDevFn, pMsi->Addr.u64, pMsi->Data.u32));
     return VERR_NOT_IMPLEMENTED;
 }

trunk/src/VBox/VMM/VMMAll/PDMAll.cpp

@@ -275 +275 @@
 {
     Log9(("PDMIoApicSendMsi: addr=%#RX64 data=%#RX32 tag=%#x src=%#x\n", pMsi->Addr.u64, pMsi->Data.u32, uTagSrc, uBusDevFn));
+#ifdef VBOX_VMM_TARGET_ARMV8
+    PCPDMGICBACKEND pGic = &pVM->pdm.s.Ic.u.armv8.GicBackend;
+    if (pGic->pfnSendMsi)
+        pGic->pfnSendMsi(pVM, uBusDevFn, pMsi, uTagSrc);
+#else
     PCPDMIOAPIC pIoApic = &pVM->pdm.s.IoApic;
-#ifdef IN_RING0
+# ifdef IN_RING0
     if (pIoApic->pDevInsR0)
         pIoApic->pfnSendMsiR0(pIoApic->pDevInsR0, uBusDevFn, pMsi, uTagSrc);
@@ -295 +300 @@
             AssertMsgFailed(("We're out of devhlp queue items!!!\n"));
     }
-#else
+# else
     if (pIoApic->pDevInsR3)
     {
@@ -301 +306 @@
         pIoApic->pfnSendMsiR3(pIoApic->pDevInsR3, uBusDevFn, pMsi, uTagSrc);
     }
+# endif
 #endif
 }

trunk/src/VBox/VMM/include/GITSInternal.h

@@ -276 +276 @@
 
 DECL_HIDDEN_CALLBACK(void)         gitsInit(PGITSDEV pGitsDev);
-DECL_HIDDEN_CALLBACK(int)          gitsSendMsi(PVMCC pVM, PCIBDF uBusDevFn, PCMSIMSG pMsi, uint32_t uEventId, uint32_t uTagSrc);
+DECL_HIDDEN_CALLBACK(int)          gitsSendMsi(PVMCC pVM, PCIBDF uBusDevFn, PCMSIMSG pMsi, uint32_t uTagSrc);
 DECL_HIDDEN_CALLBACK(uint64_t)     gitsMmioReadCtrl(PCGITSDEV pGitsDev, uint16_t offReg, unsigned cb);
 DECL_HIDDEN_CALLBACK(uint64_t)     gitsMmioReadTranslate(PCGITSDEV pGitsDev, uint16_t offReg, unsigned cb);