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

Timestamp:

Aug 8, 2019 5:36:15 PM (5 years ago)

Author:

vboxsync

Message:

Fix doxygen burn and fixed MMIO related macros, and notification area configuration

Location:

trunk/src/VBox/Devices

Files:

• Storage/DevVirtioSCSI.cpp (modified) (1 diff)
• VirtIO/Virtio_1_0.cpp (modified) (8 diffs)
• VirtIO/Virtio_1_0_impl.h (modified) (5 diffs)

trunk/src/VBox/Devices/Storage/DevVirtioSCSI.cpp

@@ -67 +67 @@
  *
  * @param   member   - Member of VIRTIO_PCI_COMMON_CFG_T
- * @param   uOffset  - Implied parameter: Offset into VIRTIO_PCI_COMMON_CFG_T
- * @param   cb       - Implied parameter: Number of bytes to access
  * @result           - true or false
  */
 #define MATCH_SCSI_CONFIG(member) \
-            (RT_SIZEOFMEMB(VIRTIO_SCSI_CONFIG_T, member) == 64 \
+            (RT_SIZEOFMEMB(VIRTIO_SCSI_CONFIG_T, member) == 8 \
              && (   uOffset == RT_OFFSETOF(VIRTIO_SCSI_CONFIG_T, member) \
                  || uOffset == RT_OFFSETOF(VIRTIO_SCSI_CONFIG_T, member) + sizeof(uint32_t)) \

trunk/src/VBox/Devices/VirtIO/Virtio_1_0.cpp

@@ -771 +771 @@
     else
     {
-        LogFunc(("Bad access by guest to virtio_pci_common_cfg: uOffset=%d, cb=%d\n", uOffset, cb));
+        LogFunc(("Bad guest %s access to virtio_pci_common_cfg: uOffset=%d, cb=%d\n",
+            fWrite ? "write" : "read ", uOffset, cb));
         rc = VERR_ACCESS_DENIED;
     }
@@ -1209 +1210 @@
 
     PVIRTIO_PCI_CAP_T pCfg;
-
-    /* Common capability (VirtIO 1.0 spec) */
+    uint32_t cbRegion = 0;
+
+    /* Common capability (VirtIO 1.0 spec, section 4.1.4.3) */
     pCfg = (PVIRTIO_PCI_CAP_T)&pVirtio->dev.abConfig[0x40];
     pCfg->uCfgType = VIRTIO_PCI_CAP_COMMON_CFG;
@@ -1219 +1221 @@
     pCfg->uOffset  = 0;
     pCfg->uLength  = sizeof(VIRTIO_PCI_COMMON_CFG_T);
+    cbRegion += pCfg->uLength;
     pVirtio->pCommonCfgCap = pCfg;
 
-    /* Notify capability (VirtIO 1.0 spec) */
+    /* Notify capability (VirtIO 1.0 spec, section 4.1.4.4). Note: uLength is based on assumption
+     * that each queue's uQueueNotifyOff is set equal to uQueueSelect's ordinal
+     * value of the queue */
     pCfg = (PVIRTIO_PCI_CAP_T)&pVirtio->dev.abConfig[pCfg->uCapNext];
     pCfg->uCfgType = VIRTIO_PCI_CAP_NOTIFY_CFG;
@@ -1229 +1234 @@
     pCfg->uBar     = uVirtioCapBar;
     pCfg->uOffset  = pVirtio->pCommonCfgCap->uOffset + pVirtio->pCommonCfgCap->uLength;
-    pCfg->uLength  = 4; /* This needs to be calculated differently */
+    pCfg->uLength  = VIRTIO_MAX_QUEUES * uNotifyOffMultiplier + 2;  /* will change in VirtIO 1.1 */
+    cbRegion += pCfg->uLength;
     pVirtio->pNotifyCap = (PVIRTIO_PCI_NOTIFY_CAP_T)pCfg;
     pVirtio->pNotifyCap->uNotifyOffMultiplier = uNotifyOffMultiplier;
 
-    /* ISR capability (VirtIO 1.0 spec) */
+    /* ISR capability (VirtIO 1.0 spec, section 4.1.4.5) */
     pCfg = (PVIRTIO_PCI_CAP_T)&pVirtio->dev.abConfig[pCfg->uCapNext];
     pCfg->uCfgType = VIRTIO_PCI_CAP_ISR_CFG;
@@ -1242 +1248 @@
     pCfg->uOffset  = pVirtio->pNotifyCap->pciCap.uOffset + pVirtio->pNotifyCap->pciCap.uLength;
     pCfg->uLength  = sizeof(uint32_t);
+    cbRegion += pCfg->uLength;
     pVirtio->pIsrCap = pCfg;
 
-    /* PCI Cfg capability (VirtIO 1.0 spec) */
+    /* PCI Cfg capability (VirtIO 1.0 spec, section 4.1.4.7) */
     pCfg = (PVIRTIO_PCI_CAP_T)&pVirtio->dev.abConfig[pCfg->uCapNext];
     pCfg->uCfgType = VIRTIO_PCI_CAP_PCI_CFG;
@@ -1253 +1260 @@
     pCfg->uOffset  = pVirtio->pIsrCap->uOffset + pVirtio->pIsrCap->uLength;
     pCfg->uLength  = 4;  /* Initialize a non-zero 4-byte aligned so Linux virtio_pci module recognizes this cap */
+    cbRegion += pCfg->uLength;
     pVirtio->pPciCfgCap = (PVIRTIO_PCI_CFG_CAP_T)pCfg;
 
     if (pVirtio->pDevSpecificCap)
     {
-        /* Following capability mapped via VirtIO 1.0: struct virtio_pci_dev_cap (VIRTIODEVCAP)*/
+        /* Following capability (via VirtIO 1.0, section 4.1.4.6). Client defines the
+         * device specific configuration struct and passes its params to this constructor */
         pCfg = (PVIRTIO_PCI_CAP_T)&pVirtio->dev.abConfig[pCfg->uCapNext];
         pCfg->uCfgType = VIRTIO_PCI_CAP_DEVICE_CFG;
@@ -1266 +1275 @@
         pCfg->uOffset  = pVirtio->pIsrCap->uOffset + pVirtio->pIsrCap->uLength;
         pCfg->uLength  = cbDevSpecificCap;
+        cbRegion += pCfg->uLength;
         pVirtio->pDeviceCap = pCfg;
     }
@@ -1287 +1297 @@
     }
 
-    rc = PDMDevHlpPCIIORegionRegister(pDevIns, uVirtioCapBar, 4096,
+    Log(("cbRegion = %d (0x%x)\n", cbRegion, cbRegion));
+    rc = PDMDevHlpPCIIORegionRegister(pDevIns, uVirtioCapBar, cbRegion,
                                       PCI_ADDRESS_SPACE_MEM, virtioR3Map);
     if (RT_FAILURE(rc))

trunk/src/VBox/Devices/VirtIO/Virtio_1_0_impl.h

@@ -269 +269 @@
  */
 #define COMMON_CFG(member) \
-        (RT_SIZEOFMEMB(VIRTIO_PCI_COMMON_CFG_T, member) == 64 \
+        (RT_SIZEOFMEMB(VIRTIO_PCI_COMMON_CFG_T, member) == 8 \
          && (   uOffset == RT_OFFSETOF(VIRTIO_PCI_COMMON_CFG_T, member) \
              || uOffset == RT_OFFSETOF(VIRTIO_PCI_COMMON_CFG_T, member) + sizeof(uint32_t)) \
@@ -286 +286 @@
         uint32_t uIntraOff = uOffset - RT_OFFSETOF(VIRTIO_PCI_COMMON_CFG_T, member); \
         if (fWrite) \
-            memcpy(((char *)&pVirtio->member) + uOffset, (const char *)pv, cb); \
+            memcpy(((char *)&pVirtio->member) + uIntraOff, (const char *)pv, cb); \
         else \
-            memcpy((char *)pv, (const char *)(((char *)&pVirtio->member) + uOffset), cb); \
+            memcpy((char *)pv, (const char *)(((char *)&pVirtio->member) + uIntraOff), cb); \
         LOG_ACCESSOR(member); \
     }
@@ -296 +296 @@
         uint32_t uIntraOff = uOffset - RT_OFFSETOF(VIRTIO_PCI_COMMON_CFG_T, member); \
         if (fWrite) \
-            memcpy(((char *)(pVirtio->member + idx)) + uOffset, (const char *)pv, cb); \
+            memcpy(((char *)(pVirtio->member + idx)) + uIntraOff, (const char *)pv, cb); \
         else \
-            memcpy((char *)pv, (const char *)(((char *)(pVirtio->member + idx)) + uOffset), cb); \
+            memcpy((char *)pv, (const char *)(((char *)(pVirtio->member + idx)) + uIntraOff), cb); \
         LOG_INDEXED_ACCESSOR(member, idx); \
     }
@@ -309 +309 @@
         else \
         { \
-            memcpy((char *)pv, (const char *)(((char *)&pVirtio->member) + uOffset), cb); \
+            memcpy((char *)pv, (const char *)(((char *)&pVirtio->member) + uIntraOff), cb); \
             LOG_ACCESSOR(member); \
         } \
@@ -351 +351 @@
         if (status & VIRTIO_STATUS_DRIVER)
             Log(("%sDRIVER",      primed++ ? " | " : ""));
+        if (status & VIRTIO_STATUS_FEATURES_OK)
+            Log(("%sFEATURES_OK", primed++ ? " | " : ""));
         if (status & VIRTIO_STATUS_DRIVER_OK)
             Log(("%sDRIVER_OK",   primed++ ? " | " : ""));
-        if (status & VIRTIO_STATUS_FEATURES_OK)
-            Log(("%sFEATURES_OK", primed++ ? " | " : ""));
         if (status & VIRTIO_STATUS_FAILED)
             Log(("%sFAILED",      primed++ ? " | " : ""));