3 files changed, 239 insertions, 200 deletions

diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c
index 3ba611419759..559a9dcdb15d 100644
--- a/drivers/s390/crypto/ap_bus.c
+++ b/drivers/s390/crypto/ap_bus.c
@@ -60,7 +60,7 @@ static int __ap_poll_device(struct ap_device *ap_dev, unsigned long *flags);
 static int ap_device_remove(struct device *dev);
 static int ap_device_probe(struct device *dev);
 static void ap_interrupt_handler(struct airq_struct *airq);
-static void ap_reset(struct ap_device *ap_dev);
+static void ap_reset(struct ap_device *ap_dev, unsigned long *flags);
 static void ap_config_timeout(unsigned long ptr);
 static int ap_select_domain(void);
 static void ap_query_configuration(void);
@@ -310,35 +310,26 @@ static inline int __ap_query_configuration(struct ap_config_info *config)
 static int ap_query_functions(ap_qid_t qid, unsigned int *functions)
 {
         struct ap_queue_status status;
-        int i;
+
         status = __ap_query_functions(qid, functions);
 
-        for (i = 0; i < AP_MAX_RESET; i++) {
-                if (ap_queue_status_invalid_test(&status))
-                        return -ENODEV;
+        if (ap_queue_status_invalid_test(&status))
+                return -ENODEV;
 
-                switch (status.response_code) {
-                case AP_RESPONSE_NORMAL:
-                        return 0;
-                case AP_RESPONSE_RESET_IN_PROGRESS:
-                case AP_RESPONSE_BUSY:
-                        break;
-                case AP_RESPONSE_Q_NOT_AVAIL:
-                case AP_RESPONSE_DECONFIGURED:
-                case AP_RESPONSE_CHECKSTOPPED:
-                case AP_RESPONSE_INVALID_ADDRESS:
-                        return -ENODEV;
-                case AP_RESPONSE_OTHERWISE_CHANGED:
-                        break;
-                default:
-                        break;
-                }
-                if (i < AP_MAX_RESET - 1) {
-                        udelay(5);
-                        status = __ap_query_functions(qid, functions);
-                }
+        switch (status.response_code) {
+        case AP_RESPONSE_NORMAL:
+                return 0;
+        case AP_RESPONSE_Q_NOT_AVAIL:
+        case AP_RESPONSE_DECONFIGURED:
+        case AP_RESPONSE_CHECKSTOPPED:
+        case AP_RESPONSE_INVALID_ADDRESS:
+                return -ENODEV;
+        case AP_RESPONSE_RESET_IN_PROGRESS:
+        case AP_RESPONSE_BUSY:
+        case AP_RESPONSE_OTHERWISE_CHANGED:
+        default:
+                return -EBUSY;
         }
-        return -EBUSY;
 }
 
 /**
@@ -350,47 +341,25 @@ static int ap_query_functions(ap_qid_t qid, unsigned int *functions)
  * on the return value it waits a while and tests the AP queue if interrupts
  * have been switched on using ap_test_queue().
  */
-static int ap_queue_enable_interruption(ap_qid_t qid, void *ind)
+static int ap_queue_enable_interruption(struct ap_device *ap_dev, void *ind)
 {
         struct ap_queue_status status;
-        int t_depth, t_device_type, rc, i;
 
-        rc = -EBUSY;
-        status = ap_queue_interruption_control(qid, ind);
-
-        for (i = 0; i < AP_MAX_RESET; i++) {
-                switch (status.response_code) {
-                case AP_RESPONSE_NORMAL:
-                        if (status.int_enabled)
-                                return 0;
-                        break;
-                case AP_RESPONSE_RESET_IN_PROGRESS:
-                case AP_RESPONSE_BUSY:
-                        if (i < AP_MAX_RESET - 1) {
-                                udelay(5);
-                                status = ap_queue_interruption_control(qid,
-                                                                       ind);
-                                continue;
-                        }
-                        break;
-                case AP_RESPONSE_Q_NOT_AVAIL:
-                case AP_RESPONSE_DECONFIGURED:
-                case AP_RESPONSE_CHECKSTOPPED:
-                case AP_RESPONSE_INVALID_ADDRESS:
-                        return -ENODEV;
-                case AP_RESPONSE_OTHERWISE_CHANGED:
-                        if (status.int_enabled)
-                                return 0;
-                        break;
-                default:
-                        break;
-                }
-                if (i < AP_MAX_RESET - 1) {
-                        udelay(5);
-                        status = ap_test_queue(qid, &t_depth, &t_device_type);
-                }
+        status = ap_queue_interruption_control(ap_dev->qid, ind);
+        switch (status.response_code) {
+        case AP_RESPONSE_NORMAL:
+        case AP_RESPONSE_OTHERWISE_CHANGED:
+                return 0;
+        case AP_RESPONSE_Q_NOT_AVAIL:
+        case AP_RESPONSE_DECONFIGURED:
+        case AP_RESPONSE_CHECKSTOPPED:
+        case AP_RESPONSE_INVALID_ADDRESS:
+                return -ENODEV;
+        case AP_RESPONSE_RESET_IN_PROGRESS:
+        case AP_RESPONSE_BUSY:
+        default:
+                return -EBUSY;
         }
-        return rc;
 }
 
 /**
@@ -511,109 +480,94 @@ int ap_recv(ap_qid_t qid, unsigned long long *psmid, void *msg, size_t length)
 EXPORT_SYMBOL(ap_recv);
 
 /**
+ * __ap_schedule_poll_timer(): Schedule poll timer.
+ *
+ * Set up the timer to run the poll tasklet
+ */
+static inline void __ap_schedule_poll_timer(void)
+{
+        ktime_t hr_time;
+
+        spin_lock_bh(&ap_poll_timer_lock);
+        if (!hrtimer_is_queued(&ap_poll_timer) && !ap_suspend_flag) {
+                hr_time = ktime_set(0, poll_timeout);
+                hrtimer_forward_now(&ap_poll_timer, hr_time);
+                hrtimer_restart(&ap_poll_timer);
+        }
+        spin_unlock_bh(&ap_poll_timer_lock);
+}
+
+/**
+ * ap_schedule_poll_timer(): Schedule poll timer.
+ *
+ * Set up the timer to run the poll tasklet
+ */
+static inline void ap_schedule_poll_timer(void)
+{
+        if (ap_using_interrupts())
+                return;
+        __ap_schedule_poll_timer();
+}
+
+
+/**
  * ap_query_queue(): Check if an AP queue is available.
  * @qid: The AP queue number
  * @queue_depth: Pointer to queue depth value
  * @device_type: Pointer to device type value
- *
- * The test is repeated for AP_MAX_RESET times.
  */
 static int ap_query_queue(ap_qid_t qid, int *queue_depth, int *device_type)
 {
         struct ap_queue_status status;
-        int t_depth, t_device_type, rc, i;
+        int t_depth, t_device_type;
 
-        rc = -EBUSY;
-        for (i = 0; i < AP_MAX_RESET; i++) {
-                status = ap_test_queue(qid, &t_depth, &t_device_type);
-                switch (status.response_code) {
-                case AP_RESPONSE_NORMAL:
-                        *queue_depth = t_depth + 1;
-                        *device_type = t_device_type;
-                        rc = 0;
-                        break;
-                case AP_RESPONSE_Q_NOT_AVAIL:
-                        rc = -ENODEV;
-                        break;
-                case AP_RESPONSE_RESET_IN_PROGRESS:
-                        break;
-                case AP_RESPONSE_DECONFIGURED:
-                        rc = -ENODEV;
-                        break;
-                case AP_RESPONSE_CHECKSTOPPED:
-                        rc = -ENODEV;
+        status = ap_test_queue(qid, &t_depth, &t_device_type);
+        switch (status.response_code) {
+        case AP_RESPONSE_NORMAL:
+                *queue_depth = t_depth + 1;
+                *device_type = t_device_type;
+                return 0;
+        case AP_RESPONSE_Q_NOT_AVAIL:
+        case AP_RESPONSE_DECONFIGURED:
+        case AP_RESPONSE_CHECKSTOPPED:
+        case AP_RESPONSE_INVALID_ADDRESS:
+                return -ENODEV;
+        case AP_RESPONSE_RESET_IN_PROGRESS:
+        case AP_RESPONSE_OTHERWISE_CHANGED:
+        case AP_RESPONSE_BUSY:
+                return -EBUSY;
+        default:
+                BUG();