1 files changed, 19 insertions, 3 deletions

diff --git a/drivers/s390/kvm/kvm_virtio.c b/drivers/s390/kvm/kvm_virtio.c
index 4e8354aa8576..28c90b89f2b4 100644
--- a/drivers/s390/kvm/kvm_virtio.c
+++ b/drivers/s390/kvm/kvm_virtio.c
@@ -299,13 +299,29 @@ static void scan_devices(void)
  */
 static void kvm_extint_handler(u16 code)
 {
-        void *data = (void *) *(long *) __LC_PFAULT_INTPARM;
-        u16 subcode = S390_lowcore.cpu_addr;
+        struct virtqueue *vq;
+        u16 subcode;
+        int config_changed;
 
+        subcode = S390_lowcore.cpu_addr;
         if ((subcode & 0xff00) != VIRTIO_SUBCODE_64)
                 return;
 
-        vring_interrupt(0, data);
+        /* The LSB might be overloaded, we have to mask it */
+        vq = (struct virtqueue *) ((*(long *) __LC_PFAULT_INTPARM) & ~1UL);
+
+        /* We use the LSB of extparam, to decide, if this interrupt is a config
+         * change or a "standard" interrupt */
+        config_changed =  (*(int *)  __LC_EXT_PARAMS & 1);
+
+        if (config_changed) {
+                struct virtio_driver *drv;
+                drv = container_of(vq->vdev->dev.driver,
+                                   struct virtio_driver, driver);
+                if (drv->config_changed)
+                        drv->config_changed(vq->vdev);
+        } else
+                vring_interrupt(0, vq);
 }
 
 /*