Changeset 94275 in vbox for trunk/src

Timestamp:

Mar 16, 2022 5:41:07 PM (3 years ago)

Author:

vboxsync

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

150534

Message:

VirtioCore: "Transitional devices MUST have a PCI Revision ID of 0."
"Non-transitional devices SHOULD have a PCI Revision ID of 1 or
higher." NetBSD (strictly speaking incorrectly) insists on revision
being 1 for non-transitional devices (device id > 0x1040), so obey the
"SHOULD" which we don't really have any reason not to. bugref:9440.

Location:

trunk/src/VBox/Devices/VirtIO

Files:

• VirtioCore.cpp (modified) (1 diff)
• VirtioCore.h (modified) (1 diff)

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

@@ -2378 +2378 @@
     PDMPCIDEV_ASSERT_VALID(pDevIns, pPciDev);
 
-    PDMPciDevSetRevisionId(pPciDev,         DEVICE_PCI_REVISION_ID_VIRTIO);
     PDMPciDevSetVendorId(pPciDev,           DEVICE_PCI_VENDOR_ID_VIRTIO);
     PDMPciDevSetDeviceId(pPciDev,           pPciParams->uDeviceId);
+
+    if (pPciParams->uDeviceId < DEVICE_PCI_DEVICE_ID_VIRTIO_BASE)
+        /* Transitional devices MUST have a PCI Revision ID of 0. */
+        PDMPciDevSetRevisionId(pPciDev,     DEVICE_PCI_REVISION_ID_VIRTIO_TRANS);
+    else
+        /* Non-transitional devices SHOULD have a PCI Revision ID of 1 or higher. */
+        PDMPciDevSetRevisionId(pPciDev,     DEVICE_PCI_REVISION_ID_VIRTIO_V1);
+
     PDMPciDevSetSubSystemId(pPciDev,        DEVICE_PCI_NETWORK_SUBSYSTEM);
     PDMPciDevSetSubSystemVendorId(pPciDev,  DEVICE_PCI_VENDOR_ID_VIRTIO);

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

@@ -183 +183 @@
 #define VIRTIO_ISR_DEVICE_CONFIG             RT_BIT_32(1)        /**< Device configuration changed bit of ISR   */
 #define DEVICE_PCI_NETWORK_SUBSYSTEM                    1        /**< Network Card, per VirtIO legacy spec.     */
+#define DEVICE_PCI_REVISION_ID_VIRTIO_TRANS             0        /**< VirtIO Transitional device revision (MBZ) */
+#define DEVICE_PCI_REVISION_ID_VIRTIO_V1                1        /**< VirtIO device revision (SHOULD be >= 1)   */
+
 #define DEVICE_PCI_VENDOR_ID_VIRTIO                0x1AF4        /**< Guest driver locates dev via (mandatory)  */
-#define DEVICE_PCI_REVISION_ID_VIRTIO                   0        /**< VirtIO Modern Transitional driver rev MBZ */
+
+/**
+ * Start of the PCI device id range for non-transitional devices.
+ *
+ * "Devices ... have the PCI Device ID calculated by adding 0x1040 to
+ * the Virtio Device ID, as indicated in section [Device Types]. ...
+ * Non-transitional devices SHOULD have a PCI Device ID in the range
+ * 0x1040 to 0x107f.
+ */
+#define DEVICE_PCI_DEVICE_ID_VIRTIO_BASE           0x1040
 
 /** Reserved (*negotiated*) Feature Bits (e.g. device independent features, VirtIO 1.0 spec,section 6) */