Changeset ab936440 in mainline for uspace/lib/virtio/virtio.c

Timestamp:

2019-02-12T20:42:42Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Branches:

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

Children:

f31ca47

Parents:

7f7817a9 (diff), 4805495 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:26:18)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:42:42)

Message:

Merge branch 'master' into bdsh_alias

Conflicts:

uspace/app/bdsh/Makefile
uspace/app/bdsh/cmds/modules/modules.h

Ccheck correction and removing header which includes itself

File:

• uspace/lib/virtio/virtio.c (modified) (5 diffs)

uspace/lib/virtio/virtio.c

@@ -50 +50 @@
  *                     buffers.
  *
- * The buffers can be deallocated by virtio_net_teardown_bufs().
+ * The buffers can be deallocated by virtio_teardown_dma_bufs().
  *
  * @return  EOK on success or error code.
@@ -63 +63 @@
         uintptr_t phys;
         errno_t rc = dmamem_map_anonymous(buffers * size, 0,
-            write ? AS_AREA_WRITE : AS_AREA_READ, 0, &phys, &virt);
+            write ? AS_AREA_WRITE | AS_AREA_READ : AS_AREA_READ, 0, &phys,
+            &virt);
         if (rc != EOK)
                 return rc;
@@ -83 +84 @@
  *
  * @param buf[in]  Array holding the virtual addresses of the DMA buffers
- *                 previously allocated by virtio_net_setup_bufs().
- */
-extern void virtio_teardown_dma_bufs(void *buf[])
+ *                 previously allocated by virtio_setup_dma_bufs().
+ */
+void virtio_teardown_dma_bufs(void *buf[])
 {
         if (buf[0]) {
@@ -319 +320 @@
         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 +331 @@
         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 */