diff options
| author | Sinan Kaya <okaya@codeaurora.org> | 2016-07-19 09:01:48 -0400 |
|---|---|---|
| committer | Alex Williamson <alex.williamson@redhat.com> | 2016-07-19 10:54:45 -0600 |
| commit | e99442323f33470677deeed35619313b05837f35 (patch) | |
| tree | 29d35dfccf9a93efdc42ce1c45a0366a23869430 /drivers/vfio | |
| parent | b5add544d677d36386c3559cf5db1485b59c4d7d (diff) | |
| download | talos-obmc-linux-e99442323f33470677deeed35619313b05837f35.tar.gz talos-obmc-linux-e99442323f33470677deeed35619313b05837f35.zip | |
vfio: platform: check reset call return code during open
Open call is ignoring the return code from reset call and can
potentially continue even though reset call failed.
If reset_required module parameter is set, this patch is going
to validate the return code and will abort open if reset fails.
Signed-off-by: Sinan Kaya <okaya@codeaurora.org>
Reviewed-by: Baptiste Reynal <b.reynal@virtualopensystems.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Diffstat (limited to 'drivers/vfio')
| -rw-r--r-- | drivers/vfio/platform/vfio_platform_common.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/vfio/platform/vfio_platform_common.c b/drivers/vfio/platform/vfio_platform_common.c index d8755d2c6053..389d6515bc09 100644 --- a/drivers/vfio/platform/vfio_platform_common.c +++ b/drivers/vfio/platform/vfio_platform_common.c @@ -251,6 +251,8 @@ static int vfio_platform_open(void *device_data) mutex_lock(&driver_lock); if (!vdev->refcnt) { + const char *extra_dbg = NULL; + ret = vfio_platform_regions_init(vdev); if (ret) goto err_reg; @@ -259,7 +261,12 @@ static int vfio_platform_open(void *device_data) if (ret) goto err_irq; - vfio_platform_call_reset(vdev, NULL); + ret = vfio_platform_call_reset(vdev, &extra_dbg); + if (ret && vdev->reset_required) { + dev_warn(vdev->device, "reset driver is required and reset call failed in open (%d) %s\n", + ret, extra_dbg ? extra_dbg : ""); + goto err_rst; + } } vdev->refcnt++; @@ -267,6 +274,8 @@ static int vfio_platform_open(void *device_data) mutex_unlock(&driver_lock); return 0; +err_rst: + vfio_platform_irq_cleanup(vdev); err_irq: vfio_platform_regions_cleanup(vdev); err_reg: |
