Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

Pull second set of s390 patches from Martin Schwidefsky:
 "The second part of Heikos uaccess rework, the page table walker for
  uaccess is now a thing of the past (yay!)

  The code change to fix the theoretical TLB flush problem allows us to
  add a TLB flush optimization for zEC12, this machine has new
  instructions that allow to do CPU local TLB flushes for single pages
  and for all pages of a specific address space.

  Plus the usual bug fixing and some more cleanup"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/uaccess: rework uaccess code - fix locking issues
  s390/mm,tlb: optimize TLB flushing for zEC12
  s390/mm,tlb: safeguard against speculative TLB creation
  s390/irq: Use defines for external interruption codes
  s390/irq: Add defines for external interruption codes
  s390/sclp: add timeout for queued requests
  kvm/s390: also set guest pages back to stable on kexec/kdump
  lcs: Add missing destroy_timer_on_stack()
  s390/tape: Add missing destroy_timer_on_stack()
  s390/tape: Use del_timer_sync()
  s390/3270: fix crash with multiple reset device requests
  s390/bitops,atomic: add missing memory barriers
  s390/zcrypt: add length check for aligned data to avoid overflow in msg-type 6

1 files changed, 13 insertions, 4 deletions

diff --git a/drivers/s390/char/sclp_cmd.c b/drivers/s390/char/sclp_cmd.c
index 49af8eeb90ea..6e8f90f84e49 100644
--- a/drivers/s390/char/sclp_cmd.c
+++ b/drivers/s390/char/sclp_cmd.c
@@ -37,6 +37,11 @@ static void sclp_sync_callback(struct sclp_req *req, void *data)
 
 int sclp_sync_request(sclp_cmdw_t cmd, void *sccb)
 {
+        return sclp_sync_request_timeout(cmd, sccb, 0);
+}
+
+int sclp_sync_request_timeout(sclp_cmdw_t cmd, void *sccb, int timeout)
+{
         struct completion completion;
         struct sclp_req *request;
         int rc;
@@ -44,6 +49,8 @@ int sclp_sync_request(sclp_cmdw_t cmd, void *sccb)
         request = kzalloc(sizeof(*request), GFP_KERNEL);
         if (!request)
                 return -ENOMEM;
+        if (timeout)
+                request->queue_timeout = timeout;
         request->command = cmd;
         request->sccb = sccb;
         request->status = SCLP_REQ_FILLED;
@@ -110,7 +117,8 @@ int sclp_get_cpu_info(struct sclp_cpu_info *info)
         if (!sccb)
                 return -ENOMEM;
         sccb->header.length = sizeof(*sccb);
-        rc = sclp_sync_request(SCLP_CMDW_READ_CPU_INFO, sccb);
+        rc = sclp_sync_request_timeout(SCLP_CMDW_READ_CPU_INFO, sccb,
+                                       SCLP_QUEUE_INTERVAL);
         if (rc)
                 goto out;
         if (sccb->header.response_code != 0x0010) {
@@ -144,7 +152,7 @@ static int do_cpu_configure(sclp_cmdw_t cmd)
         if (!sccb)
                 return -ENOMEM;
         sccb->header.length = sizeof(*sccb);
-        rc = sclp_sync_request(cmd, sccb);
+        rc = sclp_sync_request_timeout(cmd, sccb, SCLP_QUEUE_INTERVAL);
         if (rc)
                 goto out;
         switch (sccb->header.response_code) {
@@ -214,7 +222,7 @@ static int do_assign_storage(sclp_cmdw_t cmd, u16 rn)
                 return -ENOMEM;
         sccb->header.length = PAGE_SIZE;
         sccb->rn = rn;
-        rc = sclp_sync_request(cmd, sccb);
+        rc = sclp_sync_request_timeout(cmd, sccb, SCLP_QUEUE_INTERVAL);
         if (rc)
                 goto out;
         switch (sccb->header.response_code) {
@@ -269,7 +277,8 @@ static int sclp_attach_storage(u8 id)
         if (!sccb)
                 return -ENOMEM;
         sccb->header.length = PAGE_SIZE;
-        rc = sclp_sync_request(0x00080001 | id << 8, sccb);
+        rc = sclp_sync_request_timeout(0x00080001 | id << 8, sccb,
+                                       SCLP_QUEUE_INTERVAL);
         if (rc)
                 goto out;
         switch (sccb->header.response_code) {