Changeset 2d4faf7 in mainline

Timestamp:

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

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

eda41a9e

Parents:

341df5f

git-author:

Jakub Jermar <jakub@…> (2018-05-05 20:44:09)

git-committer:

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

Message:

Split generic and PCI specific virtio code

Location:

uspace/lib/virtio

Files:

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

uspace/lib/virtio/Makefile

@@ -32 +32 @@
 
 SOURCES = \
+        virtio.c \
         virtio-pci.c
 

uspace/lib/virtio/virtio-pci.c

@@ -32 +32 @@
 #include "virtio-pci.h"
 
-#include <as.h>
-#include <align.h>
-#include <macros.h>
-
 #include <ddf/driver.h>
 #include <ddf/log.h>
@@ -179 +175 @@
 }
 
-errno_t virtio_virtq_setup(virtio_dev_t *vdev, uint16_t num, uint16_t size,
-    size_t buf_size, uint16_t buf_flags)
-{
-        virtq_t *q = &vdev->queues[num];
-        virtio_pci_common_cfg_t *cfg = vdev->common_cfg;
-
-        /* Program the queue of our interest */
-        pio_write_16(&cfg->queue_select, num);
-
-        /* Trim the size of the queue as needed */
-        size = min(pio_read_16(&cfg->queue_size), size);
-        pio_write_16(&cfg->queue_size, size);
-        ddf_msg(LVL_NOTE, "Virtq %u: %u buffers", num, (unsigned) size);
-
-        /* Allocate array to hold virtual addresses of DMA buffers */
-        void **buffers = calloc(sizeof(void *), size);
-        if (!buffers)
-                return ENOMEM;
-
-        size_t avail_offset = 0;
-        size_t used_offset = 0;
-        size_t buffers_offset = 0;
-
-        /*
-         * Compute the size of the needed DMA memory and also the offsets of
-         * the individual components
-         */
-        size_t mem_size = sizeof(virtq_desc_t[size]);
-        mem_size = ALIGN_UP(mem_size, _Alignof(virtq_avail_t));
-        avail_offset = mem_size;
-        mem_size += sizeof(virtq_avail_t) + sizeof(ioport16_t[size]) +
-            sizeof(ioport16_t);
-        mem_size = ALIGN_UP(mem_size, _Alignof(virtq_used_t));
-        used_offset = mem_size;
-        mem_size += sizeof(virtq_used_t) + sizeof(virtq_used_elem_t[size]) +
-            sizeof(ioport16_t);
-        buffers_offset = mem_size;
-        mem_size += size * buf_size;
-
-        /*
-         * Allocate DMA memory for the virtqueues and the buffers
-         */
-        q->virt = AS_AREA_ANY;
-        errno_t rc = dmamem_map_anonymous(mem_size, DMAMEM_4GiB,
-            AS_AREA_READ | AS_AREA_WRITE, 0, &q->phys, &q->virt);
-        if (rc != EOK) {
-                free(buffers);
-                q->virt = NULL;
-                return rc;
-        }
-
-        q->size = mem_size;
-        q->queue_size = size;
-        q->desc = q->virt;
-        q->avail = q->virt + avail_offset;
-        q->used = q->virt + used_offset;
-        q->buffers = buffers;
-
-        memset(q->virt, 0, q->size);
-
-        /*
-         * Initialize the descriptor table and the buffers array
-         */
-        for (unsigned i = 0; i < size; i++) {
-                q->desc[i].addr = q->phys + buffers_offset + i * buf_size;
-                q->desc[i].len = buf_size;
-                q->desc[i].flags = buf_flags;
-
-                q->buffers[i] = q->virt + buffers_offset + i * buf_size;
-        }
-
-        /*
-         * Write the configured addresses to device's common config
-         */
-        pio_write_64(&cfg->queue_desc, q->phys);
-        pio_write_64(&cfg->queue_avail, q->phys + avail_offset);
-        pio_write_64(&cfg->queue_used, q->phys + used_offset);
-
-        ddf_msg(LVL_NOTE, "DMA memory for virtq %d: virt=%p, phys=%p, size=%zu",
-            num, q->virt, (void *) q->phys, q->size);
-
-        return rc;
-}
-
-void virtio_virtq_teardown(virtio_dev_t *vdev, uint16_t num)
-{
-        virtq_t *q = &vdev->queues[num];
-        if (q->size)
-                dmamem_unmap_anonymous(q->virt);
-        if (q->buffers)
-                free(q->buffers);
-}
-
-/**
- * Perform device initialization as described in section 3.1.1 of the
- * specification, steps 1 - 6.
- */
-errno_t virtio_device_setup_start(virtio_dev_t *vdev, uint32_t features)
-{
-        virtio_pci_common_cfg_t *cfg = vdev->common_cfg;
-
-        /* 1. Reset the device */
-        uint8_t status = VIRTIO_DEV_STATUS_RESET;
-        pio_write_8(&cfg->device_status, status);
-
-        /* 2. Acknowledge we found the device */
-        status |= VIRTIO_DEV_STATUS_ACKNOWLEDGE;
-        pio_write_8(&cfg->device_status, status);
-
-        /* 3. We know how to drive the device */
-        status |= VIRTIO_DEV_STATUS_DRIVER;
-        pio_write_8(&cfg->device_status, status);
-
-        /* 4. Read the offered feature flags */
-        pio_write_32(&cfg->device_feature_select, VIRTIO_FEATURES_0_31);
-        uint32_t device_features = pio_read_32(&cfg->device_feature);
-
-        ddf_msg(LVL_NOTE, "offered features %x", device_features);
-        features &= device_features;
-
-        if (!features)
-                return ENOTSUP;
-
-        /* 4. Write the accepted feature flags */
-        pio_write_32(&cfg->driver_feature_select, VIRTIO_FEATURES_0_31);
-        pio_write_32(&cfg->driver_feature, features);
-
-        ddf_msg(LVL_NOTE, "accepted features %x", features);
-
-        /* 5. Set FEATURES_OK */
-        status |= VIRTIO_DEV_STATUS_FEATURES_OK;
-        pio_write_8(&cfg->device_status, status);
-
-        /* 6. Test if the device supports our feature subset */ 
-        status = pio_read_8(&cfg->device_status);
-        if (!(status & VIRTIO_DEV_STATUS_FEATURES_OK))
-                return ENOTSUP;
-
-        return EOK;
-}
-
-/**
- * Perform device initialization as described in section 3.1.1 of the
- * specification, step 8 (go live).
- */
-void virtio_device_setup_finalize(virtio_dev_t *vdev)
-{
-        virtio_pci_common_cfg_t *cfg = vdev->common_cfg;
-
-        /* 8. Go live */
-        uint8_t status = pio_read_8(&cfg->device_status);
-        pio_write_8(&cfg->device_status, status | VIRTIO_DEV_STATUS_DRIVER_OK);
-}
-
-void virtio_device_setup_fail(virtio_dev_t *vdev)
-{
-        virtio_pci_common_cfg_t *cfg = vdev->common_cfg;
-
-        uint8_t status = pio_read_8(&cfg->device_status);
-        pio_write_8(&cfg->device_status, status | VIRTIO_DEV_STATUS_FAILED);
-}
-
 errno_t virtio_pci_dev_initialize(ddf_dev_t *dev, virtio_dev_t *vdev)
 {