Changeset b8ef198b in mainline for uspace/lib/virtio

Timestamp:

2018-06-20T18:58:44Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9afd2a8

Parents:

3d135e9

Message:

Implement virtio-net interrupt handler

Location:

uspace/lib/virtio

Files:

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

uspace/lib/virtio/virtio-pci.h

@@ -143 +143 @@
         /** Virtual address of the used ring */
         virtq_used_t *used;
+        uint16_t used_last_idx;
 
         /** Address of the queue's notification register */
@@ -182 +183 @@
 
 extern void virtio_virtq_produce_available(virtio_dev_t *, uint16_t, uint16_t);
+extern bool virtio_virtq_consume_used(virtio_dev_t *, uint16_t, uint16_t *,
+    uint32_t *);
 
 extern errno_t virtio_virtq_setup(virtio_dev_t *, uint16_t, uint16_t);

uspace/lib/virtio/virtio.c

@@ -71 +71 @@
 }
 
+bool virtio_virtq_consume_used(virtio_dev_t *vdev, uint16_t num,
+    uint16_t *descno, uint32_t *len)
+{
+        virtq_t *q = &vdev->queues[num];
+
+        uint16_t last_idx = q->used_last_idx % q->queue_size;
+        if (last_idx == (pio_read_le16(&q->used->idx) % q->queue_size))
+                return false;
+
+        *descno = (uint16_t) pio_read_le32(&q->used->ring[last_idx].id);
+        *len = pio_read_le32(&q->used->ring[last_idx].len);
+
+        q->used_last_idx++;
+
+        return true;
+}
+
 errno_t virtio_virtq_setup(virtio_dev_t *vdev, uint16_t num, uint16_t size)
 {
@@ -120 +137 @@
         q->avail = q->virt + avail_offset;
         q->used = q->virt + used_offset;
+        q->used_last_idx = 0;
 
         memset(q->virt, 0, q->size);