Merge tag 'block-5.14-2021-07-24' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / drivers / virtio / virtio_vdpa.c

diff --git a/drivers/virtio/virtio_vdpa.c b/drivers/virtio/virtio_vdpa.c
index e28acf4..e1a1411 100644 (file)
--- a/drivers/virtio/virtio_vdpa.c
+++ b/drivers/virtio/virtio_vdpa.c
@@ -142,6 +142,8 @@ virtio_vdpa_setup_vq(struct virtio_device *vdev, unsigned int index,
        struct vdpa_callback cb;
        struct virtqueue *vq;
        u64 desc_addr, driver_addr, device_addr;
+       /* Assume split virtqueue, switch to packed if necessary */
+       struct vdpa_vq_state state = {0};
        unsigned long flags;
        u32 align, num;
        int err;
@@ -191,6 +193,19 @@ virtio_vdpa_setup_vq(struct virtio_device *vdev, unsigned int index,
                goto err_vq;
        }
 
+       /* reset virtqueue state index */
+       if (virtio_has_feature(vdev, VIRTIO_F_RING_PACKED)) {
+               struct vdpa_vq_state_packed *s = &state.packed;
+
+               s->last_avail_counter = 1;
+               s->last_avail_idx = 0;
+               s->last_used_counter = 1;
+               s->last_used_idx = 0;
+       }
+       err = ops->set_vq_state(vdpa, index, &state);
+       if (err)
+               goto err_vq;
+
        ops->set_vq_ready(vdpa, index, 1);
 
        vq->priv = info;