--- zzzz-none-000/linux-4.4.60/drivers/virtio/virtio_ring.c 2017-04-08 07:53:53.000000000 +0000 +++ scorpion-7490-727/linux-4.4.60/drivers/virtio/virtio_ring.c 2021-02-04 17:41:59.000000000 +0000 @@ -730,6 +730,7 @@ unsigned int vring_align, struct virtio_device *vdev, bool weak_barriers, + bool context, void *pages, bool (*notify)(struct virtqueue *), void (*callback)(struct virtqueue *), @@ -767,7 +768,7 @@ vq->last_add_time_valid = false; #endif - vq->indirect = virtio_has_feature(vdev, VIRTIO_RING_F_INDIRECT_DESC); + vq->indirect = virtio_has_feature(vdev, VIRTIO_RING_F_INDIRECT_DESC) && !context; vq->event = virtio_has_feature(vdev, VIRTIO_RING_F_EVENT_IDX); /* No callback? Tell other side not to bother us. */