diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-28 12:32:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-28 12:32:13 -0700 |
| commit | b779157dd3db6199b50e7ad64678a1ceedbeebcf (patch) | |
| tree | d00314f158869d072849f4635f70b80680a04638 /drivers/vfio/platform/vfio_platform_private.h | |
| parent | 4a10a91756ef381bced7b88cfb9232f660b92d93 (diff) | |
| parent | a714ea5fa41623c8d8c42bed0dfb38a4d653451d (diff) | |
| download | linux-stable-b779157dd3db6199b50e7ad64678a1ceedbeebcf.tar.gz linux-stable-b779157dd3db6199b50e7ad64678a1ceedbeebcf.tar.bz2 linux-stable-b779157dd3db6199b50e7ad64678a1ceedbeebcf.zip | |
Merge tag 'vfio-v4.2-rc1' of git://github.com/awilliam/linux-vfio
Pull VFIO updates from Alex Williamson:
- fix race with device reference versus driver release (Alex Williamson)
- add reset hooks and Calxeda xgmac reset for vfio-platform (Eric Auger)
- enable vfio-platform for ARM64 (Eric Auger)
- tag Baptiste Reynal as vfio-platform sub-maintainer (Alex Williamson)
* tag 'vfio-v4.2-rc1' of git://github.com/awilliam/linux-vfio:
MAINTAINERS: Add vfio-platform sub-maintainer
VFIO: platform: enable ARM64 build
VFIO: platform: Calxeda xgmac reset module
VFIO: platform: populate the reset function on probe
VFIO: platform: add reset callback
VFIO: platform: add reset struct and lookup table
vfio/pci: Fix racy vfio_device_get_from_dev() call
Diffstat (limited to 'drivers/vfio/platform/vfio_platform_private.h')
| -rw-r--r-- | drivers/vfio/platform/vfio_platform_private.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/vfio/platform/vfio_platform_private.h b/drivers/vfio/platform/vfio_platform_private.h index 5d31e0473406..1c9b3d59543c 100644 --- a/drivers/vfio/platform/vfio_platform_private.h +++ b/drivers/vfio/platform/vfio_platform_private.h @@ -67,6 +67,13 @@ struct vfio_platform_device { struct resource* (*get_resource)(struct vfio_platform_device *vdev, int i); int (*get_irq)(struct vfio_platform_device *vdev, int i); + int (*reset)(struct vfio_platform_device *vdev); +}; + +struct vfio_platform_reset_combo { + const char *compat; + const char *reset_function_name; + const char *module_name; }; extern int vfio_platform_probe_common(struct vfio_platform_device *vdev, |