Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Heiko Carstens <heiko.carstens@de.ibm.com>
Reviewed-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

authored by

Vasily Gorbik and committed by
Martin Schwidefsky
cd45c995 6e98e643

+8 -2
+7 -2
arch/s390/boot/mem_detect.c
··· 184 184 return; 185 185 } 186 186 187 + if (max_physmem_end) { 188 + add_mem_detect_block(0, max_physmem_end); 189 + mem_detect.info_source = MEM_DETECT_SCLP_READ_INFO; 190 + return; 191 + } 192 + 187 193 scan_memory(rzm); 188 194 mem_detect.info_source = MEM_DETECT_TPROT_LOOP; 189 - if (!max_physmem_end) 190 - max_physmem_end = get_mem_detect_end(); 195 + max_physmem_end = get_mem_detect_end(); 191 196 }
+1
arch/s390/include/asm/mem_detect.h
··· 8 8 MEM_DETECT_NONE = 0, 9 9 MEM_DETECT_SCLP_STOR_INFO, 10 10 MEM_DETECT_DIAG260, 11 + MEM_DETECT_SCLP_READ_INFO, 11 12 MEM_DETECT_TPROT_LOOP 12 13 }; 13 14