History

Merge branch 'virtio-shm' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse into drm-misc-next

Topic pull request for core virtio changes that will be required by the DRM driver.

Maxime Ripard committed 6 years ago

Commit 05e63c62 parents 2f0ddd8 38e89545 files · +164 −1Browse files

Showing the changes to include/uapi (2 of 5 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/virtio_mmio.h +11 −0
  2. include/uapi/linux/virtio_pci.h +10 −1
include/uapi/linux/virtio_mmio.h+11−0
@@ -122,6 +122,17 @@ · 121 unmodified lines
122#define VIRTIO_MMIO_QUEUE_USED_LOW 0x0a0122#define VIRTIO_MMIO_QUEUE_USED_LOW 0x0a0
123#define VIRTIO_MMIO_QUEUE_USED_HIGH 0x0a4123#define VIRTIO_MMIO_QUEUE_USED_HIGH 0x0a4
124 124
125/* Shared memory region id */
126#define VIRTIO_MMIO_SHM_SEL 0x0ac
127
128/* Shared memory region length, 64 bits in two halves */
129#define VIRTIO_MMIO_SHM_LEN_LOW 0x0b0
130#define VIRTIO_MMIO_SHM_LEN_HIGH 0x0b4
131
132/* Shared memory region base address, 64 bits in two halves */
133#define VIRTIO_MMIO_SHM_BASE_LOW 0x0b8
134#define VIRTIO_MMIO_SHM_BASE_HIGH 0x0bc
135
125/* Configuration atomicity value */136/* Configuration atomicity value */
126#define VIRTIO_MMIO_CONFIG_GENERATION 0x0fc137#define VIRTIO_MMIO_CONFIG_GENERATION 0x0fc
127 138
include/uapi/linux/virtio_pci.h+10−1
@@ -113,6 +113,8 @@ · 112 unmodified lines
113#define VIRTIO_PCI_CAP_DEVICE_CFG 4113#define VIRTIO_PCI_CAP_DEVICE_CFG 4
114/* PCI configuration access */114/* PCI configuration access */
115#define VIRTIO_PCI_CAP_PCI_CFG 5115#define VIRTIO_PCI_CAP_PCI_CFG 5
116/* Additional shared memory capability */
117#define VIRTIO_PCI_CAP_SHARED_MEMORY_CFG 8
116 118
117/* This is the PCI capability header: */119/* This is the PCI capability header: */
118struct virtio_pci_cap {120struct virtio_pci_cap {
@@ -121,11 +123,18 @@ struct virtio_pci_cap { · 2 unmodified lines
121 __u8 cap_len; /* Generic PCI field: capability length */123 __u8 cap_len; /* Generic PCI field: capability length */
122 __u8 cfg_type; /* Identifies the structure. */124 __u8 cfg_type; /* Identifies the structure. */
123 __u8 bar; /* Where to find it. */125 __u8 bar; /* Where to find it. */
124 __u8 padding[3]; /* Pad to full dword. */126 __u8 id; /* Multiple capabilities of the same type */
127 __u8 padding[2]; /* Pad to full dword. */
125 __le32 offset; /* Offset within bar. */128 __le32 offset; /* Offset within bar. */
126 __le32 length; /* Length of the structure, in bytes. */129 __le32 length; /* Length of the structure, in bytes. */
127};130};
128 131
132struct virtio_pci_cap64 {
133 struct virtio_pci_cap cap;
134 __le32 offset_hi; /* Most sig 32 bits of offset */
135 __le32 length_hi; /* Most sig 32 bits of length */
136};
137
129struct virtio_pci_notify_cap {138struct virtio_pci_notify_cap {
130 struct virtio_pci_cap cap;139 struct virtio_pci_cap cap;
131 __le32 notify_off_multiplier; /* Multiplier for queue_notify_off. */140 __le32 notify_off_multiplier; /* Multiplier for queue_notify_off. */