Commit 321bd212 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin
Browse files

virtio: VIRTIO_F_IOMMU_PLATFORM -> VIRTIO_F_ACCESS_PLATFORM 



Rename the bit to match latest virtio spec.
Add a compat macro to avoid breaking existing userspace.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
parent bcf87687

arch/um/drivers/virtio_uml.c

+1 −1
Original line number Diff line number Diff line
@@ -385,7 +385,7 @@ static irqreturn_t vu_req_interrupt(int irq, void *data) 
		}

		break;

	case VHOST_USER_SLAVE_IOTLB_MSG:

		/* not supported - VIRTIO_F_IOMMU_PLATFORM */

		/* not supported - VIRTIO_F_ACCESS_PLATFORM */

	case VHOST_USER_SLAVE_VRING_HOST_NOTIFIER_MSG:

		/* not supported - VHOST_USER_PROTOCOL_F_HOST_NOTIFIER */

	default:

drivers/vdpa/ifcvf/ifcvf_base.h

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
		 (1ULL << VIRTIO_F_VERSION_1)			| \

		 (1ULL << VIRTIO_NET_F_STATUS)			| \

		 (1ULL << VIRTIO_F_ORDER_PLATFORM)		| \

		 (1ULL << VIRTIO_F_IOMMU_PLATFORM)		| \

		 (1ULL << VIRTIO_F_ACCESS_PLATFORM)		| \

		 (1ULL << VIRTIO_NET_F_MRG_RXBUF))



/* Only one queue pair for now. */

drivers/vdpa/vdpa_sim/vdpa_sim.c

+2 −2
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ struct vdpasim_virtqueue { 


static u64 vdpasim_features = (1ULL << VIRTIO_F_ANY_LAYOUT) |

			      (1ULL << VIRTIO_F_VERSION_1)  |

			      (1ULL << VIRTIO_F_IOMMU_PLATFORM);

			      (1ULL << VIRTIO_F_ACCESS_PLATFORM);



/* State of each vdpasim device */

struct vdpasim {
@@ -450,7 +450,7 @@ static int vdpasim_set_features(struct vdpa_device *vdpa, u64 features) 
	struct vdpasim *vdpasim = vdpa_to_sim(vdpa);



	/* DMA mapping must be done by driver */

	if (!(features & (1ULL << VIRTIO_F_IOMMU_PLATFORM)))

	if (!(features & (1ULL << VIRTIO_F_ACCESS_PLATFORM)))

		return -EINVAL;



	vdpasim->features = features & vdpasim_features;

drivers/vhost/net.c

+2 −2
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ enum { 
	VHOST_NET_FEATURES = VHOST_FEATURES |

			 (1ULL << VHOST_NET_F_VIRTIO_NET_HDR) |

			 (1ULL << VIRTIO_NET_F_MRG_RXBUF) |

			 (1ULL << VIRTIO_F_IOMMU_PLATFORM)

			 (1ULL << VIRTIO_F_ACCESS_PLATFORM)

};



enum {
@@ -1653,7 +1653,7 @@ static int vhost_net_set_features(struct vhost_net *n, u64 features) 
	    !vhost_log_access_ok(&n->dev))

		goto out_unlock;



	if ((features & (1ULL << VIRTIO_F_IOMMU_PLATFORM))) {

	if ((features & (1ULL << VIRTIO_F_ACCESS_PLATFORM))) {

		if (vhost_init_device_iotlb(&n->dev, true))

			goto out_unlock;

	}

drivers/vhost/vdpa.c

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ enum { 
		(1ULL << VIRTIO_F_NOTIFY_ON_EMPTY) |

		(1ULL << VIRTIO_F_ANY_LAYOUT) |

		(1ULL << VIRTIO_F_VERSION_1) |

		(1ULL << VIRTIO_F_IOMMU_PLATFORM) |

		(1ULL << VIRTIO_F_ACCESS_PLATFORM) |

		(1ULL << VIRTIO_F_RING_PACKED) |

		(1ULL << VIRTIO_F_ORDER_PLATFORM) |

		(1ULL << VIRTIO_RING_F_INDIRECT_DESC) |