Memory detection fixes.
From: Heiko Carstens <[email protected]>
[S390] Memory detection fixes.
VMALLOC_END on 31bit should be 0x8000000UL instead of 0x7fffffffL. The page mask which is used to make sure memory_end is on 4MB/2MB boundary is wrong and not needed. Therefore remove it. Make sure a vmalloc area does also exist and work on (future) machines with 4TB and more memory.
Signed-off-by Heiko Carstens <[email protected]>
Signed-off-by Martin Schwidefsky <[email protected]>
---
arch/s390/kernel/head31.S | 3 -- arch/s390/kernel/head64.S | 4 --- arch/s390/kernel/setup.c | 49 +++++++++++++++++++++++++++++---------------- include/asm-s390/pgtable.h | 15 +++++++++++-- 4 files changed, 44 insertions(+), 27 deletions(-)
arch/s390/kernel/head31.S +0 -3
@@ -177,8 +177,6 @@ startup_continue: st %r0,4(%r3) # store size of chunk st %r6,8(%r3) # store type of chunk la %r3,12(%r3) - l %r4,.Lmemsize-.LPG1(%r13) # address of variable memory_size - st %r5,0(%r4) # store last end to memory size ahi %r10,-1 # update chunk number .Lchkloop: lr %r6,%r7 # set access code to last cc
@@ -293,7 +291,6 @@ startup_continue: .Lpcmvpg:.long 0x00080000,0x80000000 + .Lchkmvpg .Lpcidte:.long 0x00080000,0x80000000 + .Lchkidte .Lpcdiag9c:.long 0x00080000,0x80000000 + .Lchkdiag9c -.Lmemsize:.long memory_size .Lmchunk:.long memory_chunk .Lmflags:.long machine_flags .Lbss_bgn: .long __bss_start
arch/s390/kernel/head64.S +0 -4
@@ -81,8 +81,6 @@ startup_continue: aghi %r1,1 # size is one more than end larl %r2,memory_chunk stg %r1,8(%r2) # store size of chunk - larl %r2,memory_size - stg %r1,0(%r2) # set memory size j .Ldonemem .Lslowmemdetect:
@@ -188,8 +186,6 @@ startup_continue: stg %r0,8(%r3) # store size of chunk st %r6,20(%r3) # store type of chunk la %r3,24(%r3) - larl %r8,memory_size - stg %r5,0(%r8) # store memory size ahi %r10,-1 # update chunk number .Lchkloop: lr %r6,%r7 # set access code to last cc
arch/s390/kernel/setup.c +32 -17
73 lines not on this page · raw message
include/asm-s390/pgtable.h +12 -3
@@ -110,13 +110,22 @@ extern char empty_zero_page[PAGE_SIZE];#define VMALLOC_OFFSET (8*1024*1024)#define VMALLOC_START (((unsigned long) high_memory + VMALLOC_OFFSET) \ & ~(VMALLOC_OFFSET-1)) + +/* +* We need some free virtual space to be able to do vmalloc. +* VMALLOC_MIN_SIZE defines the minimum size of the vmalloc +* area. On a machine with 2GB memory we make sure that we +* have at least 128MB free space for vmalloc. On a machine +* with 4TB we make sure we have at least 1GB. +*/ #ifndef __s390x__ -# define VMALLOC_END (0x7fffffffL) +#define VMALLOC_MIN_SIZE 0x8000000UL +#define VMALLOC_END 0x80000000UL#else /* __s390x__ */ -# define VMALLOC_END (0x40000000000L) +#define VMALLOC_MIN_SIZE 0x40000000UL +#define VMALLOC_END 0x40000000000UL#endif /* __s390x__ */ -/* * A 31 bit pagetable entry of S390 has following format: * | PFRA | | OS |