diff options
| author | Miklos Szeredi <mszeredi@redhat.com> | 2020-09-10 11:34:14 +0200 |
|---|---|---|
| committer | Miklos Szeredi <mszeredi@redhat.com> | 2020-09-10 11:34:14 +0200 |
| commit | 27bd6129a4c5b1269540c925bfda1c280cbb9f1d (patch) | |
| tree | 83e9d30e4466daa69e589318f683b8076d1ed809 /include/uapi | |
| parent | c1b0c62715102be326e534ea382e8b1ef87ccb9c (diff) | |
| parent | 38e895487afc2ed42c11045853cbb3fa20b52b6e (diff) | |
| download | linux-stable-27bd6129a4c5b1269540c925bfda1c280cbb9f1d.tar.gz linux-stable-27bd6129a4c5b1269540c925bfda1c280cbb9f1d.tar.bz2 linux-stable-27bd6129a4c5b1269540c925bfda1c280cbb9f1d.zip | |
Merge branch 'virtio-shm' into for-next
Pull virtio shared memory region patches for virtiofs shared memory
(DAX) support.
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/virtio_mmio.h | 11 | ||||
| -rw-r--r-- | include/uapi/linux/virtio_pci.h | 11 |
2 files changed, 21 insertions, 1 deletions
diff --git a/include/uapi/linux/virtio_mmio.h b/include/uapi/linux/virtio_mmio.h index c4b09689ab64..0650f91bea6c 100644 --- a/include/uapi/linux/virtio_mmio.h +++ b/include/uapi/linux/virtio_mmio.h @@ -122,6 +122,17 @@ #define VIRTIO_MMIO_QUEUE_USED_LOW 0x0a0 #define VIRTIO_MMIO_QUEUE_USED_HIGH 0x0a4 +/* Shared memory region id */ +#define VIRTIO_MMIO_SHM_SEL 0x0ac + +/* Shared memory region length, 64 bits in two halves */ +#define VIRTIO_MMIO_SHM_LEN_LOW 0x0b0 +#define VIRTIO_MMIO_SHM_LEN_HIGH 0x0b4 + +/* Shared memory region base address, 64 bits in two halves */ +#define VIRTIO_MMIO_SHM_BASE_LOW 0x0b8 +#define VIRTIO_MMIO_SHM_BASE_HIGH 0x0bc + /* Configuration atomicity value */ #define VIRTIO_MMIO_CONFIG_GENERATION 0x0fc diff --git a/include/uapi/linux/virtio_pci.h b/include/uapi/linux/virtio_pci.h index 90007a1abcab..3a86f36d7e3d 100644 --- a/include/uapi/linux/virtio_pci.h +++ b/include/uapi/linux/virtio_pci.h @@ -113,6 +113,8 @@ #define VIRTIO_PCI_CAP_DEVICE_CFG 4 /* PCI configuration access */ #define VIRTIO_PCI_CAP_PCI_CFG 5 +/* Additional shared memory capability */ +#define VIRTIO_PCI_CAP_SHARED_MEMORY_CFG 8 /* This is the PCI capability header: */ struct virtio_pci_cap { @@ -121,11 +123,18 @@ struct virtio_pci_cap { __u8 cap_len; /* Generic PCI field: capability length */ __u8 cfg_type; /* Identifies the structure. */ __u8 bar; /* Where to find it. */ - __u8 padding[3]; /* Pad to full dword. */ + __u8 id; /* Multiple capabilities of the same type */ + __u8 padding[2]; /* Pad to full dword. */ __le32 offset; /* Offset within bar. */ __le32 length; /* Length of the structure, in bytes. */ }; +struct virtio_pci_cap64 { + struct virtio_pci_cap cap; + __le32 offset_hi; /* Most sig 32 bits of offset */ + __le32 length_hi; /* Most sig 32 bits of length */ +}; + struct virtio_pci_notify_cap { struct virtio_pci_cap cap; __le32 notify_off_multiplier; /* Multiplier for queue_notify_off. */ |