Changeset d80fa05 in mainline

Timestamp:

2019-02-05T20:25:14Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a1f173d

Parents:

d066259

git-author:

Jakub Jermar <jakub@…> (2019-02-05 20:12:07)

git-committer:

Jakub Jermar <jakub@…> (2019-02-05 20:25:14)

Message:

Accept VIRTIO_F_VERSION_1

Location:

uspace/lib/virtio

Files:

• virtio-pci.h (modified) (1 diff)
• virtio.c (modified) (2 diffs)

uspace/lib/virtio/virtio-pci.h

@@ -60 +60 @@
 
 #define VIRTIO_FEATURES_0_31    0
+#define VIRTIO_FEATURES_32_63   1
+
+#define VIRTIO_F_VERSION_1      1
 
 /** Common configuration structure layout according to VIRTIO version 1.0 */

uspace/lib/virtio/virtio.c

@@ -319 +319 @@
         uint32_t device_features = pio_read_le32(&cfg->device_feature);
 
-        ddf_msg(LVL_NOTE, "offered features %x", device_features);
+        uint32_t reserved_features = VIRTIO_F_VERSION_1;
+        pio_write_le32(&cfg->device_feature_select, VIRTIO_FEATURES_32_63);
+        uint32_t device_reserved_features = pio_read_le32(&cfg->device_feature);
+
+        ddf_msg(LVL_NOTE, "offered features %x, reserved features %x",
+            device_features, device_reserved_features);
 
         if (features != (features & device_features))
@@ -325 +330 @@
         features &= device_features;
 
+        if (reserved_features != (reserved_features & device_reserved_features))
+                return ENOTSUP;
+        reserved_features &= device_reserved_features;
+
         /* 4. Write the accepted feature flags */
         pio_write_le32(&cfg->driver_feature_select, VIRTIO_FEATURES_0_31);
         pio_write_le32(&cfg->driver_feature, features);
-
-        ddf_msg(LVL_NOTE, "accepted features %x", features);
+        pio_write_le32(&cfg->driver_feature_select, VIRTIO_FEATURES_32_63);
+        pio_write_le32(&cfg->driver_feature, reserved_features);
+
+        ddf_msg(LVL_NOTE, "accepted features %x, reserved features %x",
+            features, reserved_features);
 
         /* 5. Set FEATURES_OK */