diff options
| author |   Tiwei Bie <tiwei.bie@intel.com> | 2018-11-21 18:03:29 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-11-26 22:17:40 -0800 |
| commit | 3a814fdf271552a5c4641f812ff7e2dd8ad09ee4 (patch) | |
| tree | 42a1efcb992dc5eda98e69804d9beba7b788047a /drivers/s390/virtio | |
| parent | virtio_ring: leverage event idx in packed ring (diff) | |
| download | linux-dev-3a814fdf271552a5c4641f812ff7e2dd8ad09ee4.tar.xz linux-dev-3a814fdf271552a5c4641f812ff7e2dd8ad09ee4.zip | |
virtio_ring: disable packed ring on unsupported transports
Currently, ccw, vop and remoteproc need some legacy virtio
APIs to create or access virtio rings, which are not supported
by packed ring. So disable packed ring on these transports
for now.
Signed-off-by: Tiwei Bie <tiwei.bie@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/s390/virtio')
| -rw-r--r-- | drivers/s390/virtio/virtio_ccw.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/s390/virtio/virtio_ccw.c b/drivers/s390/virtio/virtio_ccw.c index 97b6f197f007..406d1f64ad65 100644 --- a/drivers/s390/virtio/virtio_ccw.c +++ b/drivers/s390/virtio/virtio_ccw.c @@ -765,6 +765,17 @@ out_free: return rc; } +static void ccw_transport_features(struct virtio_device *vdev) +{ + /* + * Packed ring isn't enabled on virtio_ccw for now, + * because virtio_ccw uses some legacy accessors, + * e.g. virtqueue_get_avail() and virtqueue_get_used() + * which aren't available in packed ring currently. + */ + __virtio_clear_bit(vdev, VIRTIO_F_RING_PACKED); +} + static int virtio_ccw_finalize_features(struct virtio_device *vdev) { struct virtio_ccw_device *vcdev = to_vc_device(vdev); @@ -791,6 +802,9 @@ static int virtio_ccw_finalize_features(struct virtio_device *vdev) /* Give virtio_ring a chance to accept features. */ vring_transport_features(vdev); + /* Give virtio_ccw a chance to accept features. */ + ccw_transport_features(vdev); + features->index = 0; features->features = cpu_to_le32((u32)vdev->features); /* Write the first half of the feature bits to the host. */ |