diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-26 14:48:30 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-26 14:48:30 -0800 |
| commit | 515d01f7726b9ba4838787d247115e1b259e1cc7 (patch) | |
| tree | d791be958b963215eefe96b33498269879932191 /include | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| parent | drivers/vfio: remove depends on CONFIG_EXPERIMENTAL (diff) | |
| download | linux-dev-515d01f7726b9ba4838787d247115e1b259e1cc7.tar.xz linux-dev-515d01f7726b9ba4838787d247115e1b259e1cc7.zip | |
Merge tag 'vfio-v3.9-rc1' of git://github.com/awilliam/linux-vfio
Pull VFIO updates from Alex Williamson:
- Fixes PCIe v1 extended capability support
- Cleans up read/write access functions
- Fix Removal test to properly wait until devices are unused
- Enable pcieport driver usage for non-accessible devices w/in groups
- Extensions for PCI VGA support
* tag 'vfio-v3.9-rc1' of git://github.com/awilliam/linux-vfio:
drivers/vfio: remove depends on CONFIG_EXPERIMENTAL
vfio-pci: Add support for VGA region access
vfio-pci: Manage user power state transitions
vfio: whitelist pcieport
vfio: Protect vfio_dev_present against device_del
vfio-pci: Cleanup BAR access
vfio-pci: Cleanup read/write functions
vfio-pci: Enable PCIe extended capabilities on v1
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/vfio.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/uapi/linux/vfio.h b/include/uapi/linux/vfio.h index 4758d1bfcf41..4f41f309911e 100644 --- a/include/uapi/linux/vfio.h +++ b/include/uapi/linux/vfio.h @@ -303,6 +303,15 @@ enum { VFIO_PCI_BAR5_REGION_INDEX, VFIO_PCI_ROM_REGION_INDEX, VFIO_PCI_CONFIG_REGION_INDEX, + /* + * Expose VGA regions defined for PCI base class 03, subclass 00. + * This includes I/O port ranges 0x3b0 to 0x3bb and 0x3c0 to 0x3df + * as well as the MMIO range 0xa0000 to 0xbffff. Each implemented + * range is found at it's identity mapped offset from the region + * offset, for example 0x3b0 is region_info.offset + 0x3b0. Areas + * between described ranges are unimplemented. + */ + VFIO_PCI_VGA_REGION_INDEX, VFIO_PCI_NUM_REGIONS }; |