diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-08-02 00:53:02 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-08-02 00:53:02 -0400 |
| commit | b58979bfd73c95d96245671d18a15908640afb5c (patch) | |
| tree | e09b668dcac117ed6ec82d50641fe5e1033a8476 | |
| parent | 22c48281c60e7b160c3392731d73d62d33361155 (diff) | |
| download | longterm-queue-4.18-b58979bfd73c95d96245671d18a15908640afb5c.tar.gz | |
vfio: ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/vfio-ccw-Release-any-channel-program-when-releasing-.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/queue/vfio-ccw-Release-any-channel-program-when-releasing-.patch b/queue/vfio-ccw-Release-any-channel-program-when-releasing-.patch index 2bc4a75..26c2e7f 100644 --- a/queue/vfio-ccw-Release-any-channel-program-when-releasing-.patch +++ b/queue/vfio-ccw-Release-any-channel-program-when-releasing-.patch @@ -1,4 +1,4 @@ -From b49bdc8602b7c9c7a977758bee4125683f73e59f Mon Sep 17 00:00:00 2001 +From 7de7ee37b88aef9982d82e5afcf10b134b93a9e9 Mon Sep 17 00:00:00 2001 From: Farhan Ali <alifm@linux.ibm.com> Date: Mon, 8 Apr 2019 17:05:33 -0400 Subject: [PATCH] vfio-ccw: Release any channel program when releasing/removing @@ -54,10 +54,10 @@ Acked-by: Eric Farman <farman@linux.ibm.com> Signed-off-by: Cornelia Huck <cohuck@redhat.com> diff --git a/drivers/s390/cio/vfio_ccw_ops.c b/drivers/s390/cio/vfio_ccw_ops.c -index 3e2802a4a43d..5eb61116ca6f 100644 +index 41eeb57d68a3..560013c8d2a4 100644 --- a/drivers/s390/cio/vfio_ccw_ops.c +++ b/drivers/s390/cio/vfio_ccw_ops.c -@@ -134,11 +134,12 @@ static int vfio_ccw_mdev_remove(struct mdev_device *mdev) +@@ -130,11 +130,12 @@ static int vfio_ccw_mdev_remove(struct mdev_device *mdev) if ((private->state != VFIO_CCW_STATE_NOT_OPER) && (private->state != VFIO_CCW_STATE_STANDBY)) { @@ -71,9 +71,9 @@ index 3e2802a4a43d..5eb61116ca6f 100644 private->mdev = NULL; atomic_inc(&private->avail); -@@ -172,6 +173,14 @@ static void vfio_ccw_mdev_release(struct mdev_device *mdev) +@@ -158,6 +159,14 @@ static void vfio_ccw_mdev_release(struct mdev_device *mdev) + struct vfio_ccw_private *private = dev_get_drvdata(mdev_parent_dev(mdev)); - int i; + if ((private->state != VFIO_CCW_STATE_NOT_OPER) && + (private->state != VFIO_CCW_STATE_STANDBY)) { @@ -85,7 +85,7 @@ index 3e2802a4a43d..5eb61116ca6f 100644 + cp_free(&private->cp); vfio_unregister_notifier(mdev_dev(mdev), VFIO_IOMMU_NOTIFY, &private->nb); - + } -- 2.7.4 |