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

Pull second s390 update from Martin Schwidefsky:
 "The big thing in this pull request is the UAPI patch from David, and
  worth mentioning is the page table dumper.  The rest are small
  improvements and bug fixes."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/entry: fix svc number for TIF_SYSCALL system call restart
  s390/mm,vmem: fix vmem_add_mem()/vmem_remove_range()
  s390/vmalloc: have separate modules area
  s390/zcrypt: remove duplicated include from zcrypt_pcixcc.c
  s390/css_chars: remove superfluous ifdef
  s390/chsc: make headers usable
  s390/mm: let kernel text section always begin at 1MB
  s390/mm: fix mapping of read-only kernel text section
  s390/mm: add page table dumper
  s390: add support to start the kernel in 64 bit mode.
  s390/mm,pageattr: remove superfluous EXPORT_SYMBOLs
  s390/mm,pageattr: add more page table walk sanity checks
  s390/mm: fix pmd_huge() usage for kernel mapping
  s390/dcssblk: cleanup device attribute usage
  s390/mm: use pfmf instruction to initialize storage keys
  s390/facilities: cleanup PFMF and HPAGE machine facility detection
  UAPI: (Scripted) Disintegrate arch/s390/include/asm

7 files changed, 134 insertions, 54 deletions

diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c
index 00d114445068..1f0eee9e7daa 100644
--- a/arch/s390/kernel/early.c
+++ b/arch/s390/kernel/early.c
@@ -283,14 +283,6 @@ static noinline __init void setup_facility_list(void)
               ARRAY_SIZE(S390_lowcore.stfle_fac_list));
 }
 
-static noinline __init void setup_hpage(void)
-{
-        if (!test_facility(2) || !test_facility(8))
-                return;
-        S390_lowcore.machine_flags |= MACHINE_FLAG_HPAGE;
-        __ctl_set_bit(0, 23);
-}
-
 static __init void detect_mvpg(void)
 {
 #ifndef CONFIG_64BIT
@@ -378,10 +370,14 @@ static __init void detect_diag44(void)
 static __init void detect_machine_facilities(void)
 {
 #ifdef CONFIG_64BIT
+        if (test_facility(8)) {
+                S390_lowcore.machine_flags |= MACHINE_FLAG_EDAT1;
+                __ctl_set_bit(0, 23);
+        }
+        if (test_facility(78))
+                S390_lowcore.machine_flags |= MACHINE_FLAG_EDAT2;
         if (test_facility(3))
                 S390_lowcore.machine_flags |= MACHINE_FLAG_IDTE;
-        if (test_facility(8))
-                S390_lowcore.machine_flags |= MACHINE_FLAG_PFMF;
         if (test_facility(27))
                 S390_lowcore.machine_flags |= MACHINE_FLAG_MVCOS;
         if (test_facility(40))
@@ -484,7 +480,6 @@ void __init startup_init(void)
         detect_diag9c();
         detect_diag44();
         detect_machine_facilities();
-        setup_hpage();
         setup_topology();
         sclp_facilities_detect();
         detect_memory_layout(memory_chunk);
diff --git a/arch/s390/kernel/entry64.S b/arch/s390/kernel/entry64.S
index f9761f806c9e..07d8de353984 100644
--- a/arch/s390/kernel/entry64.S
+++ b/arch/s390/kernel/entry64.S
@@ -295,7 +295,7 @@ sysc_sigpending:
         jno     sysc_return
         lmg     %r2,%r7,__PT_R2(%r11)   # load svc arguments
         lghi    %r8,0                   # svc 0 returns -ENOSYS
-        lh      %r1,__PT_INT_CODE+2(%r11)       # load new svc number
+        llgh    %r1,__PT_INT_CODE+2(%r11)       # load new svc number
         cghi    %r1,NR_syscalls
         jnl     sysc_nr_ok              # invalid svc number -> do svc 0
         slag    %r8,%r1,2
diff --git a/arch/s390/kernel/head.S b/arch/s390/kernel/head.S
index 805b6686b641..984726cbce16 100644
--- a/arch/s390/kernel/head.S
+++ b/arch/s390/kernel/head.S
@@ -52,7 +52,7 @@ __HEAD
         .long   0x02000370,0x60000050           # the channel program the PSW
         .long   0x020003c0,0x60000050           # at location 0 is loaded.
         .long   0x02000410,0x60000050           # Initial processing starts
-        .long   0x02000460,0x60000050           # at 0xf0 = iplstart.
+        .long   0x02000460,0x60000050           # at 0x200 = iplstart.
         .long   0x020004b0,0x60000050
         .long   0x02000500,0x60000050
         .long   0x02000550,0x60000050
@@ -62,11 +62,54 @@ __HEAD
         .long   0x02000690,0x60000050
         .long   0x020006e0,0x20000050
 
-        .org    0xf0
+        .org    0x200
+#
+# subroutine to set architecture mode
+#
+.Lsetmode:
+#ifdef CONFIG_64BIT
+        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
+#else
+        mvi     __LC_AR_MODE_ID,0       # set ESA flag (mode 0)
+#endif
+        br      %r14
+
+#
+# subroutine to wait for end I/O
+#
+.Lirqwait:
+#ifdef CONFIG_64BIT
+        mvc     0x1f0(16),.Lnewpsw      # set up IO interrupt psw
+        lpsw    .Lwaitpsw
+.Lioint:
+        br      %r14
+        .align  8
+.Lnewpsw:
+        .quad   0x0000000080000000,.Lioint
+#else
+        mvc     0x78(8),.Lnewpsw        # set up IO interrupt psw
+        lpsw    .Lwaitpsw
+.Lioint:
+        br      %r14
+        .align  8
+.Lnewpsw:
+        .long   0x00080000,0x80000000+.Lioint
+#endif
+.Lwaitpsw:
+        .long   0x020a0000,0x80000000+.Lioint
+
 #
 # subroutine for loading cards from the reader
 #
 .Lloader:
+        la      %r4,0(%r14)
         la      %r3,.Lorb               # r2 = address of orb into r2
         la      %r5,.Lirb               # r4 = address of irb
         la      %r6,.Lccws
@@ -83,9 +126,7 @@ __HEAD
         ssch    0(%r3)                  # load chunk of 1600 bytes
         bnz     .Llderr
 .Lwait4irq:
-        mvc     0x78(8),.Lnewpsw        # set up IO interrupt psw
-        lpsw    .Lwaitpsw
-.Lioint:
+        bas     %r14,.Lirqwait
         c       %r1,0xb8                # compare subchannel number
         bne     .Lwait4irq
         tsch    0(%r5)
@@ -104,7 +145,7 @@ __HEAD
         sr      %r0,%r3                 # #ccws*80-residual=#bytes read
         ar      %r2,%r0
 
-        br      %r14                    # r2 contains the total size
+        br      %r4                     # r2 contains the total size
 
 .Lcont:
         ahi     %r2,0x640               # add 0x640 to total size
@@ -128,10 +169,6 @@ __HEAD
 .Lloadp:.long   0,0
         .align  8
 .Lcrash:.long   0x000a0000,0x00000000
-.Lnewpsw:
-        .long   0x00080000,0x80000000+.Lioint
-.Lwaitpsw:
-        .long   0x020a0000,0x80000000+.Lioint
 
         .align  8
 .Lccws: .rept   19
@@ -140,6 +177,7 @@ __HEAD
         .long   0x02200050,0x00000000
 
 iplstart:
+        bas     %r14,.Lsetmode          # Immediately switch to 64 bit mode
         lh      %r1,0xb8                # test if subchannel number
         bct     %r1,.Lnoload            #  is valid
         l       %r1,0xb8                # load ipl subchannel number
@@ -209,8 +247,8 @@ iplstart:
 #
 # reset files in VM reader
 #
-        stidp   __LC_SAVE_AREA_SYNC     # store cpuid
-        tm      __LC_SAVE_AREA_SYNC,0xff# running VM ?
+        stidp   .Lcpuid                 # store cpuid
+        tm      .Lcpuid,0xff            # running VM ?
         bno     .Lnoreset
         la      %r2,.Lreset
         lhi     %r3,26
@@ -222,23 +260,14 @@ iplstart:
         tm      31(%r5),0xff            # bits is set in the schib
         bz      .Lnoreset
 .Lwaitforirq:
-        mvc     0x78(8),.Lrdrnewpsw     # set up IO interrupt psw
-.Lwaitrdrirq:
-        lpsw    .Lrdrwaitpsw
-.Lrdrint:
+        bas     %r14,.Lirqwait          # wait for IO interrupt
         c       %r1,0xb8                # compare subchannel number
-        bne     .Lwaitrdrirq
+        bne     .Lwaitforirq
         la      %r5,.Lirb
         tsch    0(%r5)
 .Lnoreset:
         b       .Lnoload
 
-        .align  8
-.Lrdrnewpsw:
-        .long   0x00080000,0x80000000+.Lrdrint
-.Lrdrwaitpsw:
-        .long   0x020a0000,0x80000000+.Lrdrint
-
 #
 # everything loaded, go for it
 #
@@ -254,6 +283,8 @@ iplstart:
         .byte   0xc8,0xd6,0xd3,0xc4     # "change rdr all keep nohold"
 .L_eof: .long   0xc5d6c600       /* C'EOF' */
 .L_hdr: .long   0xc8c4d900       /* C'HDR' */
+        .align  8
+.Lcpuid:.fill   8,1,0
 
 #
 # SALIPL loader support. Based on a patch by Rob van der Heij.
@@ -263,6 +294,7 @@ iplstart:
         .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
@@ -343,6 +375,18 @@ ENTRY(startup)
 ENTRY(startup_kdump)
         j       .Lep_startup_kdump
 .Lep_startup_normal:
+#ifdef CONFIG_64BIT
+        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
+#else
+        mvi     __LC_AR_MODE_ID,0       # set ESA flag (mode 0)
+#endif
         basr    %r13,0                  # get base
 .LPG0:
         xc      0x200(256),0x200        # partially clear lowcore
@@ -410,22 +454,17 @@ ENTRY(startup_kdump)
 #endif
 
 #ifdef CONFIG_64BIT
-        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
+        /* Continue with 64bit startup code in head64.S */
         sam64                           # switch to 64 bit mode
-        larl    %r13,4f
-        lmh     %r0,%r15,0(%r13)        # clear high-order half
         jg      startup_continue
-4:      .fill   16,4,0x0
 #else
-        mvi     __LC_AR_MODE_ID,0       # set ESA flag (mode 0)
+        /* Continue with 31bit startup code in head31.S */
         l       %r13,4f-.LPG0(%r13)
         b       0(%r13)
         .align  8
 4:      .long   startup_continue
 #endif
+
         .align  8
 5:      .long   0x7fffffff,0xffffffff
 
diff --git a/arch/s390/kernel/head31.S b/arch/s390/kernel/head31.S
index a1372ae24ae1..9a99856df1c9 100644
--- a/arch/s390/kernel/head31.S
+++ b/arch/s390/kernel/head31.S
@@ -78,10 +78,7 @@ ENTRY(startup_continue)
 
 ENTRY(_ehead)
 
-#ifdef CONFIG_SHARED_KERNEL
         .org    0x100000 - 0x11000      # head.o ends at 0x11000
-#endif
-
 #
 # startup-code, running in absolute addressing mode
 #
diff --git a/arch/s390/kernel/head64.S b/arch/s390/kernel/head64.S
index c108af28bbe8..b9e25ae2579c 100644
--- a/arch/s390/kernel/head64.S
+++ b/arch/s390/kernel/head64.S
@@ -76,10 +76,7 @@ ENTRY(startup_continue)
 
 ENTRY(_ehead)
 
-#ifdef CONFIG_SHARED_KERNEL
         .org    0x100000 - 0x11000      # head.o ends at 0x11000
-#endif
-
 #
 # startup-code, running in absolute addressing mode
 #
diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
index 46412b1d7e1e..4610deafd953 100644
--- a/arch/s390/kernel/module.c
+++ b/arch/s390/kernel/module.c
@@ -44,6 +44,17 @@
 #define PLT_ENTRY_SIZE 20
 #endif /* CONFIG_64BIT */
 
+#ifdef CONFIG_64BIT
+void *module_alloc(unsigned long size)
+{
+        if (PAGE_ALIGN(size) > MODULES_LEN)
+                return NULL;
+        return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
+                                    GFP_KERNEL, PAGE_KERNEL, -1,
+                                    __builtin_return_address(0));
+}
+#endif
+
 /* Free memory returned from module_alloc */
 void module_free(struct module *mod, void *module_region)
 {
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index afa9fdba200e..b1f2be9aaaad 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -105,6 +105,11 @@ EXPORT_SYMBOL(VMALLOC_END);
 struct page *vmemmap;
 EXPORT_SYMBOL(vmemmap);
 
+#ifdef CONFIG_64BIT
+unsigned long MODULES_VADDR;
+unsigned long MODULES_END;
+#endif
+
 /* An array with a pointer to the lowcore of every CPU. */
 struct _lowcore *lowcore_ptr[NR_CPUS];
 EXPORT_SYMBOL(lowcore_ptr);
@@ -544,19 +549,23 @@ static void __init setup_memory_end(void)
 
         /* Choose kernel address space layout: 2, 3, or 4 levels. */
 #ifdef CONFIG_64BIT
-        vmalloc_size = VMALLOC_END ?: 128UL << 30;
+        vmalloc_size = VMALLOC_END ?: (128UL << 30) - MODULES_LEN;
         tmp = (memory_end ?: real_memory_size) / PAGE_SIZE;
         tmp = tmp * (sizeof(struct page) + PAGE_SIZE) + vmalloc_size;
         if (tmp <= (1UL << 42))
                 vmax = 1UL << 42;       /* 3-level kernel page table */
         else
                 vmax = 1UL << 53;       /* 4-level kernel page table */
+        /* module area is at the end of the kernel address space. */
+        MODULES_END = vmax;
+        MODULES_VADDR = MODULES_END - MODULES_LEN;
+        VMALLOC_END = MODULES_VADDR;
 #else
         vmalloc_size = VMALLOC_END ?: 96UL << 20;
         vmax = 1UL << 31;               /* 2-level kernel page table */
-#endif
         /* vmalloc area is at the end of the kernel address space. */
         VMALLOC_END = vmax;
+#endif
         VMALLOC_START = vmax - vmalloc_size;
 
         /* Split remaining virtual space between 1:1 mapping & vmemmap array */
@@ -768,6 +777,40 @@ static void __init reserve_crashkernel(void)
 #endif
 }
 
+static void __init init_storage_keys(unsigned long start, unsigned long end)
+{
+        unsigned long boundary, function, size;
+
+        while (start < end) {
+                if (MACHINE_HAS_EDAT2) {
+                        /* set storage keys for a 2GB frame */
+                        function = 0x22000 | PAGE_DEFAULT_KEY;
+                        size = 1UL << 31;
+                        boundary = (start + size) & ~(size - 1);
+                        if (boundary <= end) {
+                                do {
+                                        start = pfmf(function, start);
+                                } while (start < boundary);
+                                continue;
+                        }
+                }
+                if (MACHINE_HAS_EDAT1) {
+                        /* set storage keys for a 1MB frame */
+                        function = 0x21000 | PAGE_DEFAULT_KEY;
+                        size = 1UL << 20;
+                        boundary = (start + size) & ~(size - 1);
+                        if (boundary <= end) {
+                                do {
+                                        start = pfmf(function, start);
+                                } while (start < boundary);
+                                continue;
+                        }
+                }
+                page_set_storage_key(start, PAGE_DEFAULT_KEY, 0);
+                start += PAGE_SIZE;
+        }
+}
+
 static void __init setup_memory(void)
 {
         unsigned long bootmap_size;
@@ -846,9 +889,7 @@ static void __init setup_memory(void)
                 memblock_add_node(PFN_PHYS(start_chunk),
                                   PFN_PHYS(end_chunk - start_chunk), 0);
                 pfn = max(start_chunk, start_pfn);
-                for (; pfn < end_chunk; pfn++)
-                        page_set_storage_key(PFN_PHYS(pfn),
-                                             PAGE_DEFAULT_KEY, 0);
+                init_storage_keys(PFN_PHYS(pfn), PFN_PHYS(end_chunk));
         }
 
         psw_set_key(PAGE_DEFAULT_KEY);