kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

VFIO: platform: add reset callback

Browse source 
A new reset callback is introduced. If this callback is populated,
the reset is invoked on device first open/last close or upon userspace
ioctl.  The modality is exposed on VFIO_DEVICE_GET_INFO.

Signed-off-by: Eric Auger <eric.auger@linaro.org>
Acked-by: Baptiste Reynal <b.reynal@virtualopensystems.com>
Tested-by: Baptiste Reynal <b.reynal@virtualopensystems.com>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
This commit is contained in:
Eric Auger 2015-06-15 11:09:43 +02:00 committed by Alex Williamson
parent 9f85d8f9fa
commit 813ae66008
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/vfio/platform/vfio_platform_common.c
View file

@ -103,6 +103,8 @@ static void vfio_platform_release(void *device_data)
mutex_lock(&driver_lock); mutex_lock(&driver_lock);
if (!(--vdev->refcnt)) { if (!(--vdev->refcnt)) {
if (vdev->reset)
vdev->reset(vdev);
vfio_platform_regions_cleanup(vdev); vfio_platform_regions_cleanup(vdev);
vfio_platform_irq_cleanup(vdev); vfio_platform_irq_cleanup(vdev);
} }
@ -130,6 +132,9 @@ static int vfio_platform_open(void *device_data)
ret = vfio_platform_irq_init(vdev); ret = vfio_platform_irq_init(vdev);
if (ret) if (ret)
goto err_irq; goto err_irq;
if (vdev->reset)
vdev->reset(vdev);
} }
vdev->refcnt++; vdev->refcnt++;
@ -162,6 +167,8 @@ static long vfio_platform_ioctl(void *device_data,
if (info.argsz < minsz) if (info.argsz < minsz)
return -EINVAL; return -EINVAL;
if (vdev->reset)
vdev->flags |= VFIO_DEVICE_FLAGS_RESET;
info.flags = vdev->flags; info.flags = vdev->flags;
info.num_regions = vdev->num_regions; info.num_regions = vdev->num_regions;
info.num_irqs = vdev->num_irqs; info.num_irqs = vdev->num_irqs;
@ -255,8 +262,12 @@ static long vfio_platform_ioctl(void *device_data,
return ret; return ret;
} else if (cmd == VFIO_DEVICE_RESET) } else if (cmd == VFIO_DEVICE_RESET) {
return -EINVAL; if (vdev->reset)
return vdev->reset(vdev);
else
return -EINVAL;
}
return -ENOTTY; return -ENOTTY;
} }

1
drivers/vfio/platform/vfio_platform_private.h
View file

@ -67,6 +67,7 @@ struct vfio_platform_device {
struct resource* struct resource*
(*get_resource)(struct vfio_platform_device *vdev, int i); (*get_resource)(struct vfio_platform_device *vdev, int i);
int (*get_irq)(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 { struct vfio_platform_reset_combo {