virtio: mmio: Allow instantiation via platform data

The m68k QEMU virt machine doesn't use devicetree, yet, so
allow it to create virtio-mmio instances via platform data.

Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Kuan-Wei Chiu <visitorckw@gmail.com>
Reviewed-by: Angelo Dureghello <angelo@kernel-space.org>
Signed-off-by: Daniel Palmer <daniel@thingy.jp>

diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c
index d90d8309f991af856434e8927b25af737f01086b..975f98cd9e5b65c7348119d3ca532bd08e9eca5b 100644 (file)
--- a/drivers/virtio/virtio_mmio.c
+++ b/drivers/virtio/virtio_mmio.c
@@ -12,6 +12,7 @@
 #include <virtio_types.h>
 #include <virtio.h>
 #include <virtio_ring.h>
+#include <virtio_mmio.h>
 #include <linux/bug.h>
 #include <linux/compat.h>
 #include <linux/err.h>
@@ -335,21 +336,28 @@ static int virtio_mmio_notify(struct udevice *udev, struct virtqueue *vq)
 
 static int virtio_mmio_of_to_plat(struct udevice *udev)
 {
-       struct virtio_mmio_priv *priv = dev_get_priv(udev);
+       struct virtio_mmio_plat *plat = dev_get_plat(udev);
+       fdt_addr_t addr;
+
+       addr = dev_read_addr(udev);
 
-       priv->base = (void __iomem *)(ulong)dev_read_addr(udev);
-       if (priv->base == (void __iomem *)FDT_ADDR_T_NONE)
+       if (addr == FDT_ADDR_T_NONE)
                return -EINVAL;
 
+       plat->base = addr;
+
        return 0;
 }
 
 static int virtio_mmio_probe(struct udevice *udev)
 {
+       struct virtio_mmio_plat *plat = dev_get_plat(udev);
        struct virtio_mmio_priv *priv = dev_get_priv(udev);
        struct virtio_dev_priv *uc_priv = dev_get_uclass_priv(udev);
        u32 magic;
 
+       priv->base = (void __iomem *)(uintptr_t)plat->base;
+
        /* Check magic value */
        magic = readl(priv->base + VIRTIO_MMIO_MAGIC_VALUE);
        if (magic != ('v' | 'i' << 8 | 'r' << 16 | 't' << 24)) {
@@ -405,11 +413,12 @@ static const struct udevice_id virtio_mmio_ids[] = {
 };
 
 U_BOOT_DRIVER(virtio_mmio) = {
-       .name   = "virtio-mmio",
-       .id     = UCLASS_VIRTIO,
-       .of_match = virtio_mmio_ids,
-       .ops    = &virtio_mmio_ops,
-       .probe  = virtio_mmio_probe,
+       .name       = "virtio-mmio",
+       .id         = UCLASS_VIRTIO,
+       .of_match   = virtio_mmio_ids,
+       .ops        = &virtio_mmio_ops,
+       .probe      = virtio_mmio_probe,
        .of_to_plat = virtio_mmio_of_to_plat,
-       .priv_auto      = sizeof(struct virtio_mmio_priv),
+       .priv_auto  = sizeof(struct virtio_mmio_priv),
+       .plat_auto  = sizeof(struct virtio_mmio_plat),
 };

diff --git a/include/virtio_mmio.h b/include/virtio_mmio.h
new file mode 100644 (file)
index 0000000..8c07282
--- /dev/null
+++ b/include/virtio_mmio.h
@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+
+#ifndef __VIRTIO_MMIO_H__
+#define __VIRTIO_MMIO_H__
+
+#include <linux/types.h>
+
+struct virtio_mmio_plat {
+       phys_addr_t base;
+};
+
+#endif /* __VIRTIO_MMIO_H__ */