Pull virtio fixes from Michael S Tsirkin: "virtio 1.0 related fixes Most importantly, this fixes using virtio_pci as a module. Further, the big virtio 1.0 conversion missed a couple of places. This fixes them up. This isn't 100% sparse-clean yet because on many architectures get_user triggers sparse warnings when used with __bitwise tag (when same tag is on both pointer and value read). I posted a patchset to fix it up by adding __force on all arches that don't already have it (many do), when that's merged these warnings will go away" * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: virtio_pci: restore module attributes mic/host: fix up virtio 1.0 APIs vringh: update for virtio 1.0 APIs vringh: 64 bit features tools/virtio: add virtio 1.0 in vringh_test tools/virtio: add virtio 1.0 in virtio_test tools/virtio: enable -Werror tools/virtio: 64 bit features tools/virtio: fix vringh test tools/virtio: more stubs virtio: core support for config generation virtio_pci: add VIRTIO_PCI_NO_LEGACY virtio_pci: move probe to common file virtio_pci_common.h: drop VIRTIO_PCI_NO_LEGACY virtio_config: fix virtio_cread_bytes virtio: set VIRTIO_CONFIG_S_FEATURES_OK on restore
Showing the changes to include/uapi/linux (1 of 16 files). Show all
Unified · Split
| @@ -41,6 +41,8 @@ · 40 unmodified lines | ||
| 41 | 41 | |
| 42 | 42 | #include <linux/virtio_config.h> |
| 43 | 43 | |
| 44 | +#ifndef VIRTIO_PCI_NO_LEGACY | |
| 45 | + | |
| 44 | 46 | /* A 32-bit r/o bitmask of the features supported by the host */ |
| 45 | 47 | #define VIRTIO_PCI_HOST_FEATURES 0 |
| 46 | 48 | |
| @@ -67,16 +69,11 @@ · 20 unmodified lines | ||
| 67 | 69 | * a read-and-acknowledge. */ |
| 68 | 70 | #define VIRTIO_PCI_ISR 19 |
| 69 | 71 | |
| 70 | −/* The bit of the ISR which indicates a device configuration change. */ | |
| 71 | −#define VIRTIO_PCI_ISR_CONFIG 0x2 | |
| 72 | − | |
| 73 | 72 | /* MSI-X registers: only enabled if MSI-X is enabled. */ |
| 74 | 73 | /* A 16-bit vector for configuration changes. */ |
| 75 | 74 | #define VIRTIO_MSI_CONFIG_VECTOR 20 |
| 76 | 75 | /* A 16-bit vector for selected queue notifications. */ |
| 77 | 76 | #define VIRTIO_MSI_QUEUE_VECTOR 22 |
| 78 | −/* Vector value used to disable MSI for queue */ | |
| 79 | −#define VIRTIO_MSI_NO_VECTOR 0xffff | |
| 80 | 77 | |
| 81 | 78 | /* The remaining space is defined by each driver as the per-driver |
| 82 | 79 | * configuration space */ |
| @@ -94,4 +91,12 @@ · 11 unmodified lines | ||
| 94 | 91 | /* The alignment to use between consumer and producer parts of vring. |
| 95 | 92 | * x86 pagesize again. */ |
| 96 | 93 | #define VIRTIO_PCI_VRING_ALIGN 4096 |
| 94 | + | |
| 95 | +#endif /* VIRTIO_PCI_NO_LEGACY */ | |
| 96 | + | |
| 97 | +/* The bit of the ISR which indicates a device configuration change. */ | |
| 98 | +#define VIRTIO_PCI_ISR_CONFIG 0x2 | |
| 99 | +/* Vector value used to disable MSI for queue */ | |
| 100 | +#define VIRTIO_MSI_NO_VECTOR 0xffff | |
| 101 | + | |
| 97 | 102 | #endif |