virtio: Add a block device

The test code for virtio is fairly simplistic and does not actually create
a block device. Add a way to specify the device type in the device tree.
Add a block device so that we can do more testing.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts
index 2e580f9..9d96e47 100644 (file)
--- a/arch/sandbox/dts/test.dts
+++ b/arch/sandbox/dts/test.dts
@@ -1527,12 +1527,18 @@
 
        sandbox_virtio1 {
                compatible = "sandbox,virtio1";
+               virtio-type = <4>;      /* rng */
        };
 
        sandbox_virtio2 {
                compatible = "sandbox,virtio2";
        };
 
+       sandbox-virtio-blk {
+               compatible = "sandbox,virtio1";
+               virtio-type = <2>;      /* block */
+       };
+
        sandbox_scmi {
                compatible = "sandbox,scmi-devices";
                clocks = <&clk_scmi 2>, <&clk_scmi 0>;

diff --git a/drivers/virtio/virtio_sandbox.c b/drivers/virtio/virtio_sandbox.c
index cf7761c..b34f1d6 100644 (file)
--- a/drivers/virtio/virtio_sandbox.c
+++ b/drivers/virtio/virtio_sandbox.c
@@ -161,7 +161,8 @@ static int virtio_sandbox_probe(struct udevice *udev)
 
        /* fake some information for testing */
        priv->device_features = BIT_ULL(VIRTIO_F_VERSION_1);
-       uc_priv->device = VIRTIO_ID_RNG;
+       uc_priv->device = dev_read_u32_default(udev, "virtio-type",
+                                              VIRTIO_ID_RNG);
        uc_priv->vendor = ('u' << 24) | ('b' << 16) | ('o' << 8) | 't';
 
        return 0;