Changeset 6ccc424 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:

a86174ec

Parents:

00192cde

git-author:

Jakub Jermar <jakub@…> (2018-04-21 22:14:00)

git-committer:

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

Message:

Process VIRTIO PCI configuration structures

Location:

uspace/lib

Files:

• drv/include/pci_dev_iface.h (modified) (1 diff)
• virtio/virtio-pci.c (modified) (2 diffs)
• virtio/virtio-pci.h (modified) (3 diffs)

uspace/lib/drv/include/pci_dev_iface.h

@@ -45 +45 @@
 #define PCI_SUB_CLASS   0x0A
 #define PCI_BASE_CLASS  0x0B
+#define PCI_BAR0        0x10
 #define PCI_CAP_PTR     0x34
+
+#define PCI_BAR_COUNT   6
 
 #define PCI_STATUS_CAP_LIST     (1 << 4)

uspace/lib/virtio/virtio-pci.c

@@ -33 +33 @@
 
 #include <ddf/driver.h>
+#include <ddf/log.h>
 #include <pci_dev_iface.h>
 
-static void virtio_pci_common_cfg(virtio_dev_t *vdev, hw_resource_list_t *res,
-    uint8_t bar, uint32_t offset, uint32_t length)
-{
-        /* Proceed only if we don't have common config structure yet */
+static bool check_bar(virtio_dev_t *vdev, uint8_t bar)
+{
+        /* We must ignore the capability if bar is greater than 5 */
+        if (bar >= PCI_BAR_COUNT)
+                return false;
+
+        /* This is not a mapped BAR */
+        if (!vdev->bar[bar].mapped)
+                return false;
+
+        return true;
+}
+
+static void virtio_pci_common_cfg(virtio_dev_t *vdev, uint8_t bar,
+    uint32_t offset, uint32_t length)
+{
         if (vdev->common_cfg)
                 return;
 
-        /* We must ignore the capability if bar is greater than 5 */
-        if (bar > 5)
-                return;
+        if (!check_bar(vdev, bar))
+                return;
+
+        vdev->common_cfg = vdev->bar[bar].mapped_base + offset;
+
+        ddf_msg(LVL_NOTE, "common_cfg=%p", vdev->common_cfg);
+}
+
+static void virtio_pci_notify_cfg(virtio_dev_t *vdev, uint8_t bar,
+    uint32_t offset, uint32_t length, uint32_t multiplier)
+{
+        if (vdev->notify_base)
+                return;
+
+        if (!check_bar(vdev, bar))
+                return;
+
+        vdev->notify_base = vdev->bar[bar].mapped_base + offset;
+        vdev->notify_off_multiplier = multiplier;
+
+        ddf_msg(LVL_NOTE, "notify_base=%p, off_multiplier=%u",
+            vdev->notify_base, vdev->notify_off_multiplier);
+}
+
+static void virtio_pci_isr_cfg(virtio_dev_t *vdev, uint8_t bar, uint32_t offset,
+    uint32_t length)
+{
+        if (vdev->isr)
+                return;
+
+        if (!check_bar(vdev, bar))
+                return;
+
+        vdev->isr = vdev->bar[bar].mapped_base + offset;
+
+        ddf_msg(LVL_NOTE, "isr=%p", vdev->isr);
+}
+
+static void virtio_pci_device_cfg(virtio_dev_t *vdev, uint8_t bar,
+    uint32_t offset, uint32_t length)
+{
+        if (vdev->device_cfg)
+                return;
+
+        if (!check_bar(vdev, bar))
+                return;
+
+        vdev->device_cfg = vdev->bar[bar].mapped_base + offset;
+
+        ddf_msg(LVL_NOTE, "device_cfg=%p", vdev->device_cfg);
 }
 
 errno_t virtio_pci_dev_init(ddf_dev_t *dev, virtio_dev_t *vdev)
 {
+        memset(vdev, 0, sizeof(virtio_dev_t));
+
         async_sess_t *pci_sess = ddf_dev_parent_sess_get(dev);
         if (!pci_sess)
                 return ENOENT;
 
-        errno_t rc;
+        pio_window_t pio_window;
+        errno_t rc = pio_window_get(pci_sess, &pio_window);
+        if (rc != EOK)
+                return rc;
+
         hw_resource_list_t hw_res;
         rc = hw_res_get_resource_list(pci_sess, &hw_res);
         if (rc != EOK)
                 return rc;
+
+        /*
+         * Enable resources and reconstruct the mapping between BAR and resource
+         * indices. We are going to need this later when the VIRTIO PCI
+         * capabilities refer to specific BARs.
+         *
+         * XXX: The mapping should probably be provided by the PCI driver
+         *      itself.
+         */
+        for (unsigned i = 0, j = 0; i < PCI_BAR_COUNT && j < hw_res.count;
+            i++) {
+                /* Detect and skip unused BARs */
+                uint32_t bar;
+                rc = pci_config_space_read_32(pci_sess,
+                    PCI_BAR0 + i * sizeof(uint32_t), &bar);
+                if (!bar)
+                        continue;
+
+                rc = pio_enable_resource(&pio_window, &hw_res.resources[j],
+                    &vdev->bar[i].mapped_base);
+                if (rc == EOK)
+                        vdev->bar[i].mapped = true;
+                j++;
+        }
 
         /*
@@ -92 +182 @@
                                 return rc;
 
+                        uint32_t multiplier;
                         switch (type) {
                         case VIRTIO_PCI_CAP_COMMON_CFG:
-                                virtio_pci_common_cfg(vdev, &hw_res, bar,
-                                    offset, length);
+                                virtio_pci_common_cfg(vdev, bar, offset,
+                                    length);
                                 break;
                         case VIRTIO_PCI_CAP_NOTIFY_CFG:
+                                rc = pci_config_space_read_32(pci_sess,
+                                    VIRTIO_PCI_CAP_END(c), &multiplier);
+                                if (rc != EOK)
+                                        return rc;
+                                virtio_pci_notify_cfg(vdev, bar, offset, length,
+                                    multiplier);
                                 break;
                         case VIRTIO_PCI_CAP_ISR_CFG:
+                                virtio_pci_isr_cfg(vdev, bar, offset, length);
                                 break;
                         case VIRTIO_PCI_CAP_DEVICE_CFG:
+                                virtio_pci_device_cfg(vdev, bar, offset,
+                                    length);
                                 break;
                         case VIRTIO_PCI_CAP_PCI_CFG:

uspace/lib/virtio/virtio-pci.h

@@ -34 +34 @@
 
 #include <ddf/driver.h>
+#include <pci_dev_iface.h>
 #include <ddi.h>
 
@@ -40 +41 @@
 #define VIRTIO_PCI_CAP_OFFSET(c)        ((c) + 8)
 #define VIRTIO_PCI_CAP_LENGTH(c)        ((c) + 12)
+#define VIRTIO_PCI_CAP_END(c)           ((c) + 16)
 
 #define VIRTIO_PCI_CAP_COMMON_CFG       1
@@ -68 +70 @@
 
 typedef struct {
+        struct {
+                bool mapped;
+                void *mapped_base;
+        } bar[PCI_BAR_COUNT];
+
+        /** Commong configuration structure */
         virtio_pci_common_cfg_t *common_cfg;
+
+        /** Notification base address */
+        ioport8_t *notify_base;
+        /** Notification offset multiplier */
+        uint32_t notify_off_multiplier;
+
+        /** INT#x interrupt ISR register */
+        ioport8_t *isr;
+
+        /** Device-specific configuration */
+        void *device_cfg;
 } virtio_dev_t;