Changeset eda41a9e in mainline

Timestamp:

2018-05-22T19:06:50Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0180c67

Parents:

2d4faf7

git-author:

Jakub Jermar <jakub@…> (2018-05-06 06:39:52)

git-committer:

Jakub Jermar <jakub@…> (2018-05-22 19:06:50)

Message:

Calculate the notification address for each virtq

Location:

uspace/lib/virtio

Files:

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

uspace/lib/virtio/virtio-pci.h

@@ -149 +149 @@
          */
         void **buffers;
+
+        /** Address of the queue's notification register */
+        ioport16_t *notify;
 } virtq_t;
 
@@ -163 +166 @@
 
         /** Notification base address */
-        ioport16_t *notify_base;
+        void *notify_base;
         /** Notification offset multiplier */
         uint32_t notify_off_multiplier;

uspace/lib/virtio/virtio.c

@@ -119 +119 @@
             num, q->virt, (void *) q->phys, q->size);
 
+        /* Determine virtq's notification address */
+        q->notify = vdev->notify_base +
+            pio_read_16(&cfg->queue_notif_off) * vdev->notify_off_multiplier;
+
+        ddf_msg(LVL_NOTE, "notification register: %p", q->notify);
+
         return rc;
 }
@@ -171 +177 @@
         pio_write_8(&cfg->device_status, status);
 
-        /* 6. Test if the device supports our feature subset */ 
+        /* 6. Test if the device supports our feature subset */
         status = pio_read_8(&cfg->device_status);
         if (!(status & VIRTIO_DEV_STATUS_FEATURES_OK))