Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23d75d9c authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

[S390] fix "mem=" handling in case of standby memory 



Standby memory detected with the sclp interface gets always registered
with add_memory calls without considering the limitationt that the
"mem=" kernel paramater implies.
So fix this and only register standby memory that is below the specified
limit.
This fixes zfcpdump since it uses "mem=32M". In case there is appr.
2GB standby memory present all of usable memory would be used for the
struct pages needed for standby memory.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent d5cd0343

arch/s390/include/asm/setup.h

+2 −0
Original line number Diff line number Diff line
@@ -43,6 +43,8 @@ struct mem_chunk { 


extern struct mem_chunk memory_chunk[];

extern unsigned long real_memory_size;

extern int memory_end_set;

extern unsigned long memory_end;



void detect_memory_layout(struct mem_chunk chunk[]);

arch/s390/kernel/setup.c

+7 −2
Original line number Diff line number Diff line
@@ -82,7 +82,9 @@ char elf_platform[ELF_PLATFORM_SIZE]; 


struct mem_chunk __initdata memory_chunk[MEMORY_CHUNKS];

volatile int __cpu_logical_map[NR_CPUS]; /* logical cpu to cpu address */

static unsigned long __initdata memory_end;



int __initdata memory_end_set;

unsigned long __initdata memory_end;



/*

 * This is set up by the setup-routine at boot-time
@@ -281,6 +283,7 @@ void (*pm_power_off)(void) = machine_power_off; 
static int __init early_parse_mem(char *p)

{

	memory_end = memparse(p, &p);

	memory_end_set = 1;

	return 0;

}

early_param("mem", early_parse_mem);
@@ -508,8 +511,10 @@ static void __init setup_memory_end(void) 
	int i;



#if defined(CONFIG_ZFCPDUMP) || defined(CONFIG_ZFCPDUMP_MODULE)

	if (ipl_info.type == IPL_TYPE_FCP_DUMP)

	if (ipl_info.type == IPL_TYPE_FCP_DUMP) {

		memory_end = ZFCPDUMP_HSA_SIZE;

		memory_end_set = 1;

	}

#endif

	memory_size = 0;

	memory_end &= PAGE_MASK;

drivers/s390/char/sclp_cmd.c

+5 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/memory.h>

#include <asm/chpid.h>

#include <asm/sclp.h>

#include <asm/setup.h>



#include "sclp.h"
@@ -474,6 +475,10 @@ static void __init add_memory_merged(u16 rn) 
		goto skip_add;

	if (start + size > VMEM_MAX_PHYS)

		size = VMEM_MAX_PHYS - start;

	if (memory_end_set && (start >= memory_end))

		goto skip_add;

	if (memory_end_set && (start + size > memory_end))

		size = memory_end - start;

	add_memory(0, start, size);

skip_add:

	first_rn = rn;