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

Commit cd45c995 authored by Vasily Gorbik's avatar Vasily Gorbik Committed by Martin Schwidefsky
Browse files

s390/mem_detect: use SCLP info for continuous memory detection 



When neither SCLP storage info, nor z/VM diag260 "storage configuration"
are available assume a continuous online memory of size specified by
SCLP info.

Reviewed-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Reviewed-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 6e98e643

arch/s390/boot/mem_detect.c

+7 −2
Original line number Diff line number Diff line
@@ -184,8 +184,13 @@ void detect_memory(void) 
		return;

	}



	if (max_physmem_end) {

		add_mem_detect_block(0, max_physmem_end);

		mem_detect.info_source = MEM_DETECT_SCLP_READ_INFO;

		return;

	}



	scan_memory(rzm);

	mem_detect.info_source = MEM_DETECT_TPROT_LOOP;

	if (!max_physmem_end)

	max_physmem_end = get_mem_detect_end();

}

arch/s390/include/asm/mem_detect.h

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ enum mem_info_source { 
	MEM_DETECT_NONE = 0,

	MEM_DETECT_SCLP_STOR_INFO,

	MEM_DETECT_DIAG260,

	MEM_DETECT_SCLP_READ_INFO,

	MEM_DETECT_TPROT_LOOP

};