Changeset 64450 in vbox for trunk/src/VBox/Devices

Timestamp:

Oct 28, 2016 10:10:53 AM (8 years ago)

Author:

vboxsync

Message:

DevPci: Share I/O region regstration code.

Location:

trunk/src/VBox/Devices/Bus

Files:

• DevPCI.cpp (modified) (3 diffs)
• DevPciIch9.cpp (modified) (12 diffs)
• DevPciInternal.h (modified) (1 diff)

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

@@ -1510 +1510 @@
 /* -=-=-=-=-=- PCI Bus Interface Methods (PDMPCIBUSREG) -=-=-=-=-=- */
 
-
-/**
- * @interface_method_impl{PDMPCIBUSREG,pfnIORegionRegisterR3}
- */
-static DECLCALLBACK(int) pciR3CommonIORegionRegister(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev, int iRegion, RTGCPHYS cbRegion,
-                                                     PCIADDRESSSPACE enmType, PFNPCIIOREGIONMAP pfnCallback)
-{
-    NOREF(pDevIns);
-
-    /*
-     * Validate.
-     */
-    AssertMsgReturn(   enmType == PCI_ADDRESS_SPACE_MEM
-                    || enmType == PCI_ADDRESS_SPACE_IO
-                    || enmType == PCI_ADDRESS_SPACE_MEM_PREFETCH,
-                    ("Invalid enmType=%#x? Or was this a bitmask after all...\n", enmType),
-                    VERR_INVALID_PARAMETER);
-    AssertMsgReturn((unsigned)iRegion < PCI_NUM_REGIONS,
-                    ("Invalid iRegion=%d PCI_NUM_REGIONS=%d\n", iRegion, PCI_NUM_REGIONS),
-                    VERR_INVALID_PARAMETER);
-    int iLastSet = ASMBitLastSetU64(cbRegion);
-    AssertMsgReturn(    iLastSet != 0
-                    &&  RT_BIT_64(iLastSet - 1) == cbRegion,
-                    ("Invalid cbRegion=%RGp iLastSet=%#x (not a power of 2 or 0)\n", cbRegion, iLastSet),
-                    VERR_INVALID_PARAMETER);
-
-    /*
-     * Register the I/O region.
-     */
-    PPCIIOREGION pRegion = &pPciDev->Int.s.aIORegions[iRegion];
-    pRegion->addr        = ~0U;
-    pRegion->size        = cbRegion;
-    pRegion->type        = enmType;
-    pRegion->map_func    = pfnCallback;
-
-    /* Set type in the config space. */
-    AssertCompile(PCI_ADDRESS_SPACE_MEM          == 0);
-    AssertCompile(PCI_ADDRESS_SPACE_IO           == 1);
-    AssertCompile(PCI_ADDRESS_SPACE_MEM_PREFETCH == RT_BIT_32(3));
-    PCIDevSetDWord(pPciDev, 0x10 + iRegion * 4, enmType);
-
-    return VINF_SUCCESS;
-}
-
-
 /**
  * @interface_method_impl{PDMPCIBUSREG,pfnSetConfigCallbacksR3}
@@ -1739 +1694 @@
     PciBusReg.pfnRegisterR3           = pciR3MergedRegister;
     PciBusReg.pfnRegisterMsiR3        = NULL;
-    PciBusReg.pfnIORegionRegisterR3   = pciR3CommonIORegionRegister;
+    PciBusReg.pfnIORegionRegisterR3   = devpciR3CommonIORegionRegister;
     PciBusReg.pfnSetConfigCallbacksR3 = pciR3CommonSetConfigCallbacks;
     PciBusReg.pfnSetIrqR3             = pciSetIrq;
@@ -2076 +2031 @@
     PciBusReg.pfnRegisterR3           = pcibridgeR3MergedRegisterDevice;
     PciBusReg.pfnRegisterMsiR3        = NULL;
-    PciBusReg.pfnIORegionRegisterR3   = pciR3CommonIORegionRegister;
+    PciBusReg.pfnIORegionRegisterR3   = devpciR3CommonIORegionRegister;
     PciBusReg.pfnSetConfigCallbacksR3 = pciR3CommonSetConfigCallbacks;
     PciBusReg.pfnSetIrqR3             = pcibridgeSetIrq;

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

@@ -782 +782 @@
 
     int iCmd = ich9pciGetWord(pDev, VBOX_PCI_COMMAND);
-    for (int iRegion = 0; iRegion < PCI_NUM_REGIONS; iRegion++)
+    for (int iRegion = 0; iRegion < VBOX_PCI_NUM_REGIONS; iRegion++)
     {
         PCIIORegion* pRegion = &pDev->Int.s.aIORegions[iRegion];
@@ -862 +862 @@
 
 
+/* -=-=-=-=-=- PCI Bus Interface Methods (PDMPCIBUSREG) -=-=-=-=-=- */
+
+
 static DECLCALLBACK(int) ich9pciRegisterMsi(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev, PPDMMSIREG pMsiReg)
 {
@@ -879 +882 @@
 
 
-static DECLCALLBACK(int) ich9pciIORegionRegister(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev, int iRegion, RTGCPHYS cbRegion,
+/**
+ * @interface_method_impl{PDMPCIBUSREG,pfnIORegionRegisterR3}
+ */
+DECLCALLBACK(int) devpciR3CommonIORegionRegister(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev, int iRegion, RTGCPHYS cbRegion,
                                                  PCIADDRESSSPACE enmType, PFNPCIIOREGIONMAP pfnCallback)
 {
@@ -895 +901 @@
                     ("Invalid enmType=%#x? Or was this a bitmask after all...\n", enmType),
                     VERR_INVALID_PARAMETER);
-    AssertMsgReturn((unsigned)iRegion < PCI_NUM_REGIONS,
-                    ("Invalid iRegion=%d PCI_NUM_REGIONS=%d\n", iRegion, PCI_NUM_REGIONS),
+    AssertMsgReturn((unsigned)iRegion < VBOX_PCI_NUM_REGIONS,
+                    ("Invalid iRegion=%d VBOX_PCI_NUM_REGIONS=%d\n", iRegion, VBOX_PCI_NUM_REGIONS),
                     VERR_INVALID_PARAMETER);
     int iLastSet = ASMBitLastSetU64(cbRegion);
@@ -904 +910 @@
                     VERR_INVALID_PARAMETER);
 
-    Log(("ich9pciIORegionRegister: %s region %d size %RGp type %x\n",
+    Log(("devpciR3CommonIORegionRegister: %s region %d size %RGp type %x\n",
          pPciDev->pszNameR3, iRegion, cbRegion, enmType));
 
@@ -922 +928 @@
     {
         /* VBOX_PCI_BASE_ADDRESS_5 and VBOX_PCI_ROM_ADDRESS are excluded. */
-        AssertMsgReturn(iRegion < PCI_NUM_REGIONS - 2,
+        AssertMsgReturn(iRegion < VBOX_PCI_NUM_REGIONS - 2,
                         ("Region %d cannot be 64-bit\n", iRegion),
                         VERR_INVALID_PARAMETER);
@@ -930 +936 @@
 
     /* Set type in the PCI config space. */
+    AssertCompile(PCI_ADDRESS_SPACE_MEM          == 0);
+    AssertCompile(PCI_ADDRESS_SPACE_IO           == 1);
+    AssertCompile(PCI_ADDRESS_SPACE_BAR64        == RT_BIT_32(2));
+    AssertCompile(PCI_ADDRESS_SPACE_MEM_PREFETCH == RT_BIT_32(3));
     uint32_t u32Value   = (uint32_t)enmType & (PCI_ADDRESS_SPACE_IO | PCI_ADDRESS_SPACE_BAR64 | PCI_ADDRESS_SPACE_MEM_PREFETCH);
     PCIDevSetDWord(pPciDev, ich9pciGetRegionReg(iRegion), u32Value);
@@ -1630 +1640 @@
              * We ignore ROM region here.
              */
-            for (int iRegion = 0; iRegion < (PCI_NUM_REGIONS-1); iRegion++)
+            for (int iRegion = 0; iRegion < VBOX_PCI_NUM_REGIONS - 1; iRegion++)
             {
                 uint32_t u32Address = ich9pciGetRegionReg(iRegion);
@@ -2198 +2208 @@
             if ((iCmd & (VBOX_PCI_COMMAND_IO | VBOX_PCI_COMMAND_MEMORY)) != 0)
             {
-                for (unsigned iRegion = 0; iRegion < PCI_NUM_REGIONS; iRegion++)
+                for (unsigned iRegion = 0; iRegion < VBOX_PCI_NUM_REGIONS; iRegion++)
                 {
                     PCIIORegion const *pRegion  = &pPciDev->Int.s.aIORegions[iRegion];
@@ -2389 +2399 @@
     PciBusReg.pfnRegisterR3           = pciR3MergedRegister;
     PciBusReg.pfnRegisterMsiR3        = ich9pciRegisterMsi;
-    PciBusReg.pfnIORegionRegisterR3   = ich9pciIORegionRegister;
+    PciBusReg.pfnIORegionRegisterR3   = devpciR3CommonIORegionRegister;
     PciBusReg.pfnSetConfigCallbacksR3 = ich9pciSetConfigCallbacks;
     PciBusReg.pfnSetIrqR3             = ich9pciSetIrq;
@@ -2504 +2514 @@
 {
     /* Clear regions */
-    for (int iRegion = 0; iRegion < PCI_NUM_REGIONS; iRegion++)
+    for (int iRegion = 0; iRegion < VBOX_PCI_NUM_REGIONS; iRegion++)
     {
         PCIIORegion* pRegion = &pDev->Int.s.aIORegions[iRegion];
@@ -2661 +2671 @@
     PciBusReg.pfnRegisterR3           = pcibridgeR3MergedRegisterDevice;
     PciBusReg.pfnRegisterMsiR3        = ich9pciRegisterMsi;
-    PciBusReg.pfnIORegionRegisterR3   = ich9pciIORegionRegister;
+    PciBusReg.pfnIORegionRegisterR3   = devpciR3CommonIORegionRegister;
     PciBusReg.pfnSetConfigCallbacksR3 = ich9pciSetConfigCallbacks;
     PciBusReg.pfnSetIrqR3             = ich9pcibridgeSetIrq;

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

@@ -185 +185 @@
 DECLCALLBACK(void) devpciR3InfoPci(PPDMDEVINS pDevIns, PCDBGFINFOHLP pHlp, const char *pszArgs);
 DECLCALLBACK(void) devpciR3InfoPciIrq(PPDMDEVINS pDevIns, PCDBGFINFOHLP pHlp, const char *pszArgs);
+DECLCALLBACK(int)  devpciR3CommonIORegionRegister(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev, int iRegion, RTGCPHYS cbRegion,
+                                                  PCIADDRESSSPACE enmType, PFNPCIIOREGIONMAP pfnCallback);
 
 #endif