9 files changed, 63 insertions, 120 deletions

diff --git a/arch/s390/kernel/compat_wrapper.c b/arch/s390/kernel/compat_wrapper.c
index 09f194052df3..fac4eeddef91 100644
--- a/arch/s390/kernel/compat_wrapper.c
+++ b/arch/s390/kernel/compat_wrapper.c
@@ -176,3 +176,4 @@ COMPAT_SYSCALL_WRAP4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
 COMPAT_SYSCALL_WRAP3(getsockname, int, fd, struct sockaddr __user *, usockaddr, int __user *, usockaddr_len);
 COMPAT_SYSCALL_WRAP3(getpeername, int, fd, struct sockaddr __user *, usockaddr, int __user *, usockaddr_len);
 COMPAT_SYSCALL_WRAP6(sendto, int, fd, void __user *, buff, size_t, len, unsigned int, flags, struct sockaddr __user *, addr, int, addr_len);
+COMPAT_SYSCALL_WRAP3(mlock2, unsigned long, start, size_t, len, int, flags);
diff --git a/arch/s390/kernel/diag.c b/arch/s390/kernel/diag.c
index f98766ede4e1..48b37b8357e6 100644
--- a/arch/s390/kernel/diag.c
+++ b/arch/s390/kernel/diag.c
@@ -121,14 +121,14 @@ device_initcall(show_diag_stat_init);
 void diag_stat_inc(enum diag_stat_enum nr)
 {
         this_cpu_inc(diag_stat.counter[nr]);
-        trace_diagnose(diag_map[nr].code);
+        trace_s390_diagnose(diag_map[nr].code);
 }
 EXPORT_SYMBOL(diag_stat_inc);
 
 void diag_stat_inc_norecursion(enum diag_stat_enum nr)
 {
         this_cpu_inc(diag_stat.counter[nr]);
-        trace_diagnose_norecursion(diag_map[nr].code);
+        trace_s390_diagnose_norecursion(diag_map[nr].code);
 }
 EXPORT_SYMBOL(diag_stat_inc_norecursion);
 
diff --git a/arch/s390/kernel/head.S b/arch/s390/kernel/head.S
index 1255c6c5353e..301ee9c70688 100644
--- a/arch/s390/kernel/head.S
+++ b/arch/s390/kernel/head.S
@@ -26,6 +26,7 @@
 #include <asm/asm-offsets.h>
 #include <asm/thread_info.h>
 #include <asm/page.h>
+#include <asm/ptrace.h>
 
 #define ARCH_OFFSET     4
 
@@ -59,19 +60,6 @@ __HEAD
         .long   0x020006e0,0x20000050
 
         .org    0x200
-#
-# subroutine to set architecture mode
-#
-.Lsetmode:
-        mvi     __LC_AR_MODE_ID,1       # set esame flag
-        slr     %r0,%r0                 # set cpuid to zero
-        lhi     %r1,2                   # mode 2 = esame (dump)
-        sigp    %r1,%r0,0x12            # switch to esame mode
-        bras    %r13,0f
-        .fill   16,4,0x0
-0:      lmh     %r0,%r15,0(%r13)        # clear high-order half of gprs
-        sam31                           # switch to 31 bit addressing mode
-        br      %r14
 
 #
 # subroutine to wait for end I/O
@@ -159,7 +147,14 @@ __HEAD
         .long   0x02200050,0x00000000
 
 iplstart:
-        bas     %r14,.Lsetmode          # Immediately switch to 64 bit mode
+        mvi     __LC_AR_MODE_ID,1       # set esame flag
+        slr     %r0,%r0                 # set cpuid to zero
+        lhi     %r1,2                   # mode 2 = esame (dump)
+        sigp    %r1,%r0,0x12            # switch to esame mode
+        bras    %r13,0f
+        .fill   16,4,0x0
+0:      lmh     %r0,%r15,0(%r13)        # clear high-order half of gprs
+        sam31                           # switch to 31 bit addressing mode
         lh      %r1,0xb8                # test if subchannel number
         bct     %r1,.Lnoload            #  is valid
         l       %r1,0xb8                # load ipl subchannel number
@@ -269,71 +264,6 @@ iplstart:
 .Lcpuid:.fill   8,1,0
 
 #
-# SALIPL loader support. Based on a patch by Rob van der Heij.
-# This entry point is called directly from the SALIPL loader and
-# doesn't need a builtin ipl record.
-#
-        .org    0x800
-ENTRY(start)
-        stm     %r0,%r15,0x07b0         # store registers
-        bas     %r14,.Lsetmode          # Immediately switch to 64 bit mode
-        basr    %r12,%r0
-.base:
-        l       %r11,.parm
-        l       %r8,.cmd                # pointer to command buffer
-
-        ltr     %r9,%r9                 # do we have SALIPL parameters?
-        bp      .sk8x8
-
-        mvc     0(64,%r8),0x00b0        # copy saved registers
-        xc      64(240-64,%r8),0(%r8)   # remainder of buffer
-        tr      0(64,%r8),.lowcase
-        b       .gotr
-.sk8x8:
-        mvc     0(240,%r8),0(%r9)       # copy iplparms into buffer
-.gotr:
-        slr     %r0,%r0
-        st      %r0,INITRD_SIZE+ARCH_OFFSET-PARMAREA(%r11)
-        st      %r0,INITRD_START+ARCH_OFFSET-PARMAREA(%r11)
-        j       startup                 # continue with startup
-.cmd:   .long   COMMAND_LINE            # address of command line buffer
-.parm:  .long   PARMAREA
-.lowcase:
-        .byte 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07
-        .byte 0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f
-        .byte 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17
-        .byte 0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f
-        .byte 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27
-        .byte 0x28,0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f
-        .byte 0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37
-        .byte 0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f
-        .byte 0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47
-        .byte 0x48,0x49,0x4a,0x4b,0x4c,0x4d,0x4e,0x4f
-        .byte 0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57
-        .byte 0x58,0x59,0x5a,0x5b,0x5c,0x5d,0x5e,0x5f
-        .byte 0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67
-        .byte 0x68,0x69,0x6a,0x6b,0x6c,0x6d,0x6e,0x6f
-        .byte 0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77
-        .byte 0x78,0x79,0x7a,0x7b,0x7c,0x7d,0x7e,0x7f
-
-        .byte 0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87
-        .byte 0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f
-        .byte 0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97
-        .byte 0x98,0x99,0x9a,0x9b,0x9c,0x9d,0x9e,0x9f
-        .byte 0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7
-        .byte 0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf
-        .byte 0xb0,0xb1,0xb2,0xb3,0xb4,0xb5,0xb6,0xb7
-        .byte 0xb8,0xb9,0xba,0xbb,0xbc,0xbd,0xbe,0xbf
-        .byte 0xc0,0x81,0x82,0x83,0x84,0x85,0x86,0x87   # .abcdefg
-        .byte 0x88,0x89,0xca,0xcb,0xcc,0xcd,0xce,0xcf   # hi
-        .byte 0xd0,0x91,0x92,0x93,0x94,0x95,0x96,0x97   # .jklmnop
-        .byte 0x98,0x99,0xda,0xdb,0xdc,0xdd,0xde,0xdf   # qr
-        .byte 0xe0,0xe1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7   # ..stuvwx
-        .byte 0xa8,0xa9,0xea,0xeb,0xec,0xed,0xee,0xef   # yz
-        .byte 0xf0,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7
-        .byte 0xf8,0xf9,0xfa,0xfb,0xfc,0xfd,0xfe,0xff
-
-#
 # startup-code at 0x10000, running in absolute addressing mode
 # this is called either by the ipl loader or directly by PSW restart
 # or linload or SALIPL
@@ -364,7 +294,7 @@ ENTRY(startup_kdump)
         bras    %r13,0f
         .fill   16,4,0x0
 0:      lmh     %r0,%r15,0(%r13)        # clear high-order half of gprs
-        sam31                           # switch to 31 bit addressing mode
+        sam64                           # switch to 64 bit addressing mode
         basr    %r13,0                  # get base
 .LPG0:
         xc      0x200(256),0x200        # partially clear lowcore
@@ -395,7 +325,7 @@ ENTRY(startup_kdump)
         jnz     1b
         j       4f
 2:      l       %r15,.Lstack-.LPG0(%r13)
-        ahi     %r15,-96
+        ahi     %r15,-STACK_FRAME_OVERHEAD
         la      %r2,.Lals_string-.LPG0(%r13)
         l       %r3,.Lsclp_print-.LPG0(%r13)
         basr    %r14,%r3
@@ -429,8 +359,7 @@ ENTRY(startup_kdump)
         .long 1, 0xc0000000
 #endif
 4:
-        /* Continue with 64bit startup code in head64.S */
-        sam64                           # switch to 64 bit mode
+        /* Continue with startup code in head64.S */
         jg      startup_continue
 
         .align  8
diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c
index f6d8acd7e136..b1f0a90f933b 100644
--- a/arch/s390/kernel/ipl.c
+++ b/arch/s390/kernel/ipl.c
@@ -121,6 +121,7 @@ static char *dump_type_str(enum dump_type type)
  * Must be in data section since the bss section
  * is not cleared when these are accessed.
  */
+static u8 ipl_ssid __attribute__((__section__(".data"))) = 0;
 static u16 ipl_devno __attribute__((__section__(".data"))) = 0;
 u32 ipl_flags __attribute__((__section__(".data"))) = 0;
 
@@ -197,6 +198,33 @@ static ssize_t sys_##_prefix##_##_name##_show(struct kobject *kobj,	\
         return snprintf(page, PAGE_SIZE, _format, ##args);              \
 }
 
+#define IPL_ATTR_CCW_STORE_FN(_prefix, _name, _ipl_blk)                 \
+static ssize_t sys_##_prefix##_##_name##_store(struct kobject *kobj,    \
+                struct kobj_attribute *attr,                            \
+                const char *buf, size_t len)                            \
+{                                                                       \
+        unsigned long long ssid, devno;                                 \
+                                                                        \
+        if (sscanf(buf, "0.%llx.%llx\n", &ssid, &devno) != 2)           \
+                return -EINVAL;                                         \
+                                                                        \
+        if (ssid > __MAX_SSID || devno > __MAX_SUBCHANNEL)              \
+                return -EINVAL;                                         \
+                                                                        \
+        _ipl_blk.ssid = ssid;                                           \
+        _ipl_blk.devno = devno;                                         \
+        return len;                                                     \
+}
+
+#define DEFINE_IPL_CCW_ATTR_RW(_prefix, _name, _ipl_blk)                \
+IPL_ATTR_SHOW_FN(_prefix, _name, "0.%x.%04x\n",                         \
+                 _ipl_blk.ssid, _ipl_blk.devno);                        \
+IPL_ATTR_CCW_STORE_FN(_prefix, _name, _ipl_blk);                        \
+static struct kobj_attribute sys_##_prefix##_##_name##_attr =           \
+        __ATTR(_name, (S_IRUGO | S_IWUSR),                              \
+               sys_##_prefix##_##_name##_show,                          \
+               sys_##_prefix##_##_name##_store)                         \
+
 #define DEFINE_IPL_ATTR_RO(_prefix, _name, _format, _value)             \
 IPL_ATTR_SHOW_FN(_prefix, _name, _format, _value)                       \
 static struct kobj_attribute sys_##_prefix##_##_name##_attr =           \
@@ -395,7 +423,7 @@ static ssize_t sys_ipl_device_show(struct kobject *kobj,
 
         switch (ipl_info.type) {
         case IPL_TYPE_CCW:
-                return sprintf(page, "0.0.%04x\n", ipl_devno);
+                return sprintf(page, "0.%x.%04x\n", ipl_ssid, ipl_devno);
         case IPL_TYPE_FCP:
         case IPL_TYPE_FCP_DUMP:
                 return sprintf(page, "0.0.%04x\n", ipl->ipl_info.fcp.devno);
@@ -687,21 +715,14 @@ static ssize_t reipl_fcp_scpdata_write(struct file *filp, struct kobject *kobj,
                                        struct bin_attribute *attr,
                                        char *buf, loff_t off, size_t count)
 {
+        size_t scpdata_len = count;
         size_t padding;
-        size_t scpdata_len;
-
-        if (off < 0)
-                return -EINVAL;
 
-        if (off >= DIAG308_SCPDATA_SIZE)
-                return -ENOSPC;
 
-        if (count > DIAG308_SCPDATA_SIZE - off)
-                count = DIAG308_SCPDATA_SIZE - off;
-
-        memcpy(reipl_block_fcp->ipl_info.fcp.scp_data, buf + off, count);
-        scpdata_len = off + count;
+        if (off)
+                return -EINVAL;
 
+        memcpy(reipl_block_fcp->ipl_info.fcp.scp_data, buf, count);
         if (scpdata_len % 8) {
                 padding = 8 - (scpdata_len % 8);
                 memset(reipl_block_fcp->ipl_info.fcp.scp_data + scpdata_len,
@@ -717,7 +738,7 @@ static ssize_t reipl_fcp_scpdata_write(struct file *filp, struct kobject *kobj,
 }
 static struct bin_attribute sys_reipl_fcp_scp_data_attr =
         __BIN_ATTR(scp_data, (S_IRUGO | S_IWUSR), reipl_fcp_scpdata_read,
-                   reipl_fcp_scpdata_write, PAGE_SIZE);
+                   reipl_fcp_scpdata_write, DIAG308_SCPDATA_SIZE);
 
 static struct bin_attribute *reipl_fcp_bin_attrs[] = {
         &sys_reipl_fcp_scp_data_attr,
@@ -814,9 +835,7 @@ static struct attribute_group reipl_fcp_attr_group = {
 };
 
 /* CCW reipl device attributes */
-
-DEFINE_IPL_ATTR_RW(reipl_ccw, device, "0.0.%04llx\n", "0.0.%llx\n",
-        reipl_block_ccw->ipl_info.ccw.devno);
+DEFINE_IPL_CCW_ATTR_RW(reipl_ccw, device, reipl_block_ccw->ipl_info.ccw);
 
 /* NSS wrapper */
 static ssize_t reipl_nss_loadparm_show(struct kobject *kobj,
@@ -1056,8 +1075,8 @@ static void __reipl_run(void *unused)
 
         switch (reipl_method) {
         case REIPL_METHOD_CCW_CIO:
+                devid.ssid  = reipl_block_ccw->ipl_info.ccw.ssid;
                 devid.devno = reipl_block_ccw->ipl_info.ccw.devno;
-                devid.ssid  = 0;
                 reipl_ccw_dev(&devid);
                 break;
         case REIPL_METHOD_CCW_VM:
@@ -1192,6 +1211,7 @@ static int __init reipl_ccw_init(void)
 
         reipl_block_ccw_init(reipl_block_ccw);
         if (ipl_info.type == IPL_TYPE_CCW) {
+                reipl_block_ccw->ipl_info.ccw.ssid = ipl_ssid;
                 reipl_block_ccw->ipl_info.ccw.devno = ipl_devno;
                 reipl_block_ccw_fill_parms(reipl_block_ccw);
         }
@@ -1336,9 +1356,7 @@ static struct attribute_group dump_fcp_attr_group = {
 };
 
 /* CCW dump device attributes */
-
-DEFINE_IPL_ATTR_RW(dump_ccw, device, "0.0.%04llx\n", "0.0.%llx\n",
-                   dump_block_ccw->ipl_info.ccw.devno);
+DEFINE_IPL_CCW_ATTR_RW(dump_ccw, device, dump_block_ccw->ipl_info.ccw);
 
 static struct attribute *dump_ccw_attrs[] = {
         &sys_dump_ccw_device_attr.attr,
@@ -1418,8 +1436,8 @@ static void __dump_run(void *unused)
 
         switch (dump_method) {
         case DUMP_METHOD_CCW_CIO:
+                devid.ssid  = dump_block_ccw->ipl_info.ccw.ssid;
                 devid.devno = dump_block_ccw->ipl_info.ccw.devno;
-                devid.ssid  = 0;
                 reipl_ccw_dev(&devid);
                 break;
         case DUMP_METHOD_CCW_VM:
@@ -1939,14 +1957,14 @@ void __init setup_ipl(void)
         ipl_info.type = get_ipl_type();
         switch (ipl_info.type) {
         case IPL_TYPE_CCW:
+                ipl_info.data.ccw.dev_id.ssid = ipl_ssid;
                 ipl_info.data.ccw.dev_id.devno = ipl_devno;
-                ipl_info.data.ccw.dev_id.ssid = 0;
                 break;
         case IPL_TYPE_FCP:
         case IPL_TYPE_FCP_DUMP:
+                ipl_info.data.fcp.dev_id.ssid = 0;
                 ipl_info.data.fcp.dev_id.devno =
                         IPL_PARMBLOCK_START->ipl_info.fcp.devno;
-                ipl_info.data.fcp.dev_id.ssid = 0;
                 ipl_info.data.fcp.wwpn = IPL_PARMBLOCK_START->ipl_info.fcp.wwpn;
                 ipl_info.data.fcp.lun = IPL_PARMBLOCK_START->ipl_info.fcp.lun;
                 break;
@@ -1978,6 +1996,7 @@ void __init ipl_save_parameters(void)
         if (cio_get_iplinfo(&iplinfo))
                 return;
 
+        ipl_ssid = iplinfo.ssid;
         ipl_devno = iplinfo.devno;
         ipl_flags |= IPL_DEVNO_VALID;
         if (!iplinfo.is_qdio)
diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
index 688a3aad9c79..114ee8b96f17 100644
--- a/arch/s390/kernel/process.c
+++ b/arch/s390/kernel/process.c
@@ -243,11 +243,7 @@ unsigned long arch_align_stack(unsigned long sp)
 
 static inline unsigned long brk_rnd(void)
 {
-        /* 8MB for 32bit, 1GB for 64bit */
-        if (is_32bit_task())
-                return (get_random_int() & 0x7ffUL) << PAGE_SHIFT;
-        else
-                return (get_random_int() & 0x3ffffUL) << PAGE_SHIFT;
+        return (get_random_int() & BRK_RND_MASK) << PAGE_SHIFT;
 }
 
 unsigned long arch_randomize_brk(struct mm_struct *mm)
diff --git a/arch/s390/kernel/sclp.c b/arch/s390/kernel/sclp.c
index fa0bdff1d413..9fe7781a45cd 100644
--- a/arch/s390/kernel/sclp.c
+++ b/arch/s390/kernel/sclp.c
@@ -21,7 +21,7 @@ static void _sclp_wait_int(void)
         __ctl_load(cr0_new, 0, 0);
 
         psw_ext_save = S390_lowcore.external_new_psw;
-        psw_mask = __extract_psw() & (PSW_MASK_EA | PSW_MASK_BA);
+        psw_mask = __extract_psw();
         S390_lowcore.external_new_psw.mask = psw_mask;
         psw_wait.mask = psw_mask | PSW_MASK_EXT | PSW_MASK_WAIT;
         S390_lowcore.ext_int_code = 0;
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index ce0cbd6ba7ca..c837bcacf218 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -764,9 +764,6 @@ static int __init setup_hwcaps(void)
         get_cpu_id(&cpu_id);
         add_device_randomness(&cpu_id, sizeof(cpu_id));
         switch (cpu_id.machine) {
-        case 0x9672:
-                strcpy(elf_platform, "g5");
-                break;
         case 0x2064:
         case 0x2066:
         default:        /* Use "z900" as default for 64 bit kernels. */
diff --git a/arch/s390/kernel/syscalls.S b/arch/s390/kernel/syscalls.S
index 8c56929c8d82..5378c3ea1b98 100644
--- a/arch/s390/kernel/syscalls.S
+++ b/arch/s390/kernel/syscalls.S
@@ -382,3 +382,4 @@ SYSCALL(sys_sendmsg,compat_sys_sendmsg)			/* 370 */
 SYSCALL(sys_recvfrom,compat_sys_recvfrom)
 SYSCALL(sys_recvmsg,compat_sys_recvmsg)
 SYSCALL(sys_shutdown,sys_shutdown)
+SYSCALL(sys_mlock2,compat_sys_mlock2)
diff --git a/arch/s390/kernel/trace.c b/arch/s390/kernel/trace.c
index 73239bb576c4..21a5df99552b 100644
--- a/arch/s390/kernel/trace.c
+++ b/arch/s390/kernel/trace.c
@@ -9,11 +9,11 @@
 #define CREATE_TRACE_POINTS
 #include <asm/trace/diag.h>
 
-EXPORT_TRACEPOINT_SYMBOL(diagnose);
+EXPORT_TRACEPOINT_SYMBOL(s390_diagnose);
 
 static DEFINE_PER_CPU(unsigned int, diagnose_trace_depth);
 
-void trace_diagnose_norecursion(int diag_nr)
+void trace_s390_diagnose_norecursion(int diag_nr)
 {
         unsigned long flags;
         unsigned int *depth;
@@ -22,7 +22,7 @@ void trace_diagnose_norecursion(int diag_nr)
         depth = this_cpu_ptr(&diagnose_trace_depth);
         if (*depth == 0) {
                 (*depth)++;
-                trace_diagnose(diag_nr);
+                trace_s390_diagnose(diag_nr);
                 (*depth)--;
         }
         local_irq_restore(flags);