Merge branches 'clockevents/4.4-fixes' and 'clockevents/4.5-fixes' of http://git.linaro.org/people/daniel.lezcano/linux into timers/urgent

Pull in fixes from Daniel Lezcano:

 - Fix the vt8500 timer leading to a system lock up when dealing with too
   small delta (Roman Volkov)

 - Select the CLKSRC_MMIO when the fsl_ftm_timer is enabled with COMPILE_TEST
   (Daniel Lezcano)

 - Prevent to compile timers using the 'iomem' API when the architecture has
   not HAS_IOMEM set (Richard Weinberger)

2 files changed, 40 insertions, 26 deletions

diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c
index 61f768518a34..24ec282e15d8 100644
--- a/drivers/s390/crypto/ap_bus.c
+++ b/drivers/s390/crypto/ap_bus.c
@@ -599,8 +599,10 @@ static enum ap_wait ap_sm_read(struct ap_device *ap_dev)
         status = ap_sm_recv(ap_dev);
         switch (status.response_code) {
         case AP_RESPONSE_NORMAL:
-                if (ap_dev->queue_count > 0)
+                if (ap_dev->queue_count > 0) {
+                        ap_dev->state = AP_STATE_WORKING;
                         return AP_WAIT_AGAIN;
+                }
                 ap_dev->state = AP_STATE_IDLE;
                 return AP_WAIT_NONE;
         case AP_RESPONSE_NO_PENDING_REPLY:
diff --git a/drivers/s390/virtio/virtio_ccw.c b/drivers/s390/virtio/virtio_ccw.c
index b2a1a81e6fc8..1b831598df7c 100644
--- a/drivers/s390/virtio/virtio_ccw.c
+++ b/drivers/s390/virtio/virtio_ccw.c
@@ -984,6 +984,36 @@ static struct virtqueue *virtio_ccw_vq_by_ind(struct virtio_ccw_device *vcdev,
         return vq;
 }
 
+static void virtio_ccw_check_activity(struct virtio_ccw_device *vcdev,
+                                      __u32 activity)
+{
+        if (vcdev->curr_io & activity) {
+                switch (activity) {
+                case VIRTIO_CCW_DOING_READ_FEAT:
+                case VIRTIO_CCW_DOING_WRITE_FEAT:
+                case VIRTIO_CCW_DOING_READ_CONFIG:
+                case VIRTIO_CCW_DOING_WRITE_CONFIG:
+                case VIRTIO_CCW_DOING_WRITE_STATUS:
+                case VIRTIO_CCW_DOING_SET_VQ:
+                case VIRTIO_CCW_DOING_SET_IND:
+                case VIRTIO_CCW_DOING_SET_CONF_IND:
+                case VIRTIO_CCW_DOING_RESET:
+                case VIRTIO_CCW_DOING_READ_VQ_CONF:
+                case VIRTIO_CCW_DOING_SET_IND_ADAPTER:
+                case VIRTIO_CCW_DOING_SET_VIRTIO_REV:
+                        vcdev->curr_io &= ~activity;
+                        wake_up(&vcdev->wait_q);
+                        break;
+                default:
+                        /* don't know what to do... */
+                        dev_warn(&vcdev->cdev->dev,
+                                 "Suspicious activity '%08x'\n", activity);
+                        WARN_ON(1);
+                        break;
+                }
+        }
+}
+
 static void virtio_ccw_int_handler(struct ccw_device *cdev,
                                    unsigned long intparm,
                                    struct irb *irb)
@@ -995,6 +1025,12 @@ static void virtio_ccw_int_handler(struct ccw_device *cdev,
 
         if (!vcdev)
                 return;
+        if (IS_ERR(irb)) {
+                vcdev->err = PTR_ERR(irb);
+                virtio_ccw_check_activity(vcdev, activity);
+                /* Don't poke around indicators, something's wrong. */
+                return;
+        }
         /* Check if it's a notification from the host. */
         if ((intparm == 0) &&
             (scsw_stctl(&irb->scsw) ==
@@ -1010,31 +1046,7 @@ static void virtio_ccw_int_handler(struct ccw_device *cdev,
                         /* Map everything else to -EIO. */
                         vcdev->err = -EIO;
         }
-        if (vcdev->curr_io & activity) {
-                switch (activity) {
-                case VIRTIO_CCW_DOING_READ_FEAT:
-                case VIRTIO_CCW_DOING_WRITE_FEAT:
-                case VIRTIO_CCW_DOING_READ_CONFIG:
-                case VIRTIO_CCW_DOING_WRITE_CONFIG:
-                case VIRTIO_CCW_DOING_WRITE_STATUS:
-                case VIRTIO_CCW_DOING_SET_VQ:
-                case VIRTIO_CCW_DOING_SET_IND:
-                case VIRTIO_CCW_DOING_SET_CONF_IND:
-                case VIRTIO_CCW_DOING_RESET:
-                case VIRTIO_CCW_DOING_READ_VQ_CONF:
-                case VIRTIO_CCW_DOING_SET_IND_ADAPTER:
-                case VIRTIO_CCW_DOING_SET_VIRTIO_REV:
-                        vcdev->curr_io &= ~activity;
-                        wake_up(&vcdev->wait_q);
-                        break;
-                default:
-                        /* don't know what to do... */
-                        dev_warn(&cdev->dev, "Suspicious activity '%08x'\n",
-                                 activity);
-                        WARN_ON(1);
-                        break;
-                }
-        }
+        virtio_ccw_check_activity(vcdev, activity);
         for_each_set_bit(i, &vcdev->indicators,
                          sizeof(vcdev->indicators) * BITS_PER_BYTE) {
                 /* The bit clear must happen before the vring kick. */