diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-29 04:13:35 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-29 04:13:35 +0300 |
| commit | e55884d2c6ac3ae50e49a1f6fe38601a91181719 (patch) | |
| tree | 1f59cbfb64dc3d860348d4e6fe3e62a0120bb042 /drivers/vfio/platform/vfio_amba.c | |
| parent | 867900b5ec231b3386304e61a42bfc9b30f9076f (diff) | |
| parent | 0991bbdbf5b85bd14a26e783f087b0f2913c93b1 (diff) | |
| download | linux-e55884d2c6ac3ae50e49a1f6fe38601a91181719.tar.xz | |
Merge tag 'vfio-v4.8-rc1' of git://github.com/awilliam/linux-vfio
Pull VFIO updates from Alex Williamson:
- Enable no-iommu mode for platform devices (Peng Fan)
- Sub-page mmap for exclusive pages (Yongji Xie)
- Use-after-free fix (Ilya Lesokhin)
- Support for ACPI-based platform devices (Sinan Kaya)
* tag 'vfio-v4.8-rc1' of git://github.com/awilliam/linux-vfio:
vfio: platform: check reset call return code during release
vfio: platform: check reset call return code during open
vfio, platform: make reset driver a requirement by default
vfio: platform: call _RST method when using ACPI
vfio: platform: add extra debug info argument to call reset
vfio: platform: add support for ACPI probe
vfio: platform: determine reset capability
vfio: platform: move reset call to a common function
vfio: platform: rename reset function
vfio: fix possible use after free of vfio group
vfio-pci: Allow to mmap sub-page MMIO BARs if the mmio page is exclusive
vfio: platform: support No-IOMMU mode
Diffstat (limited to 'drivers/vfio/platform/vfio_amba.c')
| -rw-r--r-- | drivers/vfio/platform/vfio_amba.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/vfio/platform/vfio_amba.c b/drivers/vfio/platform/vfio_amba.c index a66479bd0edf..31372fbf6c5b 100644 --- a/drivers/vfio/platform/vfio_amba.c +++ b/drivers/vfio/platform/vfio_amba.c @@ -68,6 +68,7 @@ static int vfio_amba_probe(struct amba_device *adev, const struct amba_id *id) vdev->get_resource = get_amba_resource; vdev->get_irq = get_amba_irq; vdev->parent_module = THIS_MODULE; + vdev->reset_required = false; ret = vfio_platform_probe_common(vdev, &adev->dev); if (ret) { |