Pull virtio updates from Michael Tsirkin: "virtio, vhost: features, fixes - PCI virtual function support for virtio - DMA barriers for virtio strong barriers - bugfixes" * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: virtio: update the comments for transport features virtio_pci: support enabling VFs vhost: fix info leak due to uninitialized memory virtio_ring: switch to dma_XX barriers for rpmsg
Showing the changes to include/uapi/linux (1 of 5 files). Show all
Unified · Split
| @@ -45,11 +45,14 @@ · 44 unmodified lines | ||
| 45 | 45 | /* We've given up on this device. */ |
| 46 | 46 | #define VIRTIO_CONFIG_S_FAILED 0x80 |
| 47 | 47 | |
| 48 | −/* Some virtio feature bits (currently bits 28 through 32) are reserved for the | |
| 49 | − * transport being used (eg. virtio_ring), the rest are per-device feature | |
| 50 | − * bits. */ | |
| 48 | +/* | |
| 49 | + * Virtio feature bits VIRTIO_TRANSPORT_F_START through | |
| 50 | + * VIRTIO_TRANSPORT_F_END are reserved for the transport | |
| 51 | + * being used (e.g. virtio_ring, virtio_pci etc.), the | |
| 52 | + * rest are per-device feature bits. | |
| 53 | + */ | |
| 51 | 54 | #define VIRTIO_TRANSPORT_F_START 28 |
| 52 | −#define VIRTIO_TRANSPORT_F_END 34 | |
| 55 | +#define VIRTIO_TRANSPORT_F_END 38 | |
| 53 | 56 | |
| 54 | 57 | #ifndef VIRTIO_CONFIG_NO_LEGACY |
| 55 | 58 | /* Do we get callbacks when the ring is completely used, even if we've |
| @@ -71,4 +74,9 @@ · 15 unmodified lines | ||
| 71 | 74 | * this is for compatibility with legacy systems. |
| 72 | 75 | */ |
| 73 | 76 | #define VIRTIO_F_IOMMU_PLATFORM 33 |
| 77 | + | |
| 78 | +/* | |
| 79 | + * Does the device support Single Root I/O Virtualization? | |
| 80 | + */ | |
| 81 | +#define VIRTIO_F_SR_IOV 37 | |
| 74 | 82 | #endif /* _UAPI_LINUX_VIRTIO_CONFIG_H */ |