virtio: sandbox: Fix device features bitfield

The virtio sandbox transport was setting the device features value to
the bit index rather than shifting a bit to the right index. Fix this
using the bit manipulation macros.

Signed-off-by: Andrew Scull <ascull@google.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/drivers/virtio/virtio_sandbox.c b/drivers/virtio/virtio_sandbox.c
index aafb7beb949d2c6d03f79df3d8445d6b53ec31f0..a73b123454452af738356c5f2bc79f952b4d3de7 100644 (file)
--- a/drivers/virtio/virtio_sandbox.c
+++ b/drivers/virtio/virtio_sandbox.c
@@ -160,7 +160,7 @@ static int virtio_sandbox_probe(struct udevice *udev)
        struct virtio_dev_priv *uc_priv = dev_get_uclass_priv(udev);
 
        /* fake some information for testing */
-       priv->device_features = VIRTIO_F_VERSION_1;
+       priv->device_features = BIT_ULL(VIRTIO_F_VERSION_1);
        uc_priv->device = VIRTIO_ID_BLOCK;
        uc_priv->vendor = ('u' << 24) | ('b' << 16) | ('o' << 8) | 't';
 

diff --git a/test/dm/virtio.c b/test/dm/virtio.c
index adef10592ce2ff726158b178e6ca1de9723432b3..aa4e3d778e8bea930f22408d693b6dd5f69a8446 100644 (file)
--- a/test/dm/virtio.c
+++ b/test/dm/virtio.c
@@ -77,7 +77,7 @@ static int dm_test_virtio_all_ops(struct unit_test_state *uts)
        ut_assertok(virtio_get_status(dev, &status));
        ut_asserteq(0, status);
        ut_assertok(virtio_get_features(dev, &features));
-       ut_asserteq(VIRTIO_F_VERSION_1, features);
+       ut_asserteq_64(BIT_ULL(VIRTIO_F_VERSION_1), features);
        ut_assertok(virtio_set_features(dev));
        ut_assertok(virtio_find_vqs(dev, nvqs, vqs));
        ut_assertok(virtio_del_vqs(dev));