summaryrefslogtreecommitdiffstats
path: root/arch/s390/boot
diff options
context:
space:
mode:
authorVasily Gorbik <gor@linux.ibm.com>2018-04-11 18:42:37 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2018-10-09 11:21:09 +0200
commitfddbaa5c423f7ca0a187f88e0b1d98a5c8b4edcf (patch)
tree46a7d3abb256fd904cae502a76409be1f1b4afd9 /arch/s390/boot
parent251b72a440fa8c550d64d9a9f35e6e1b5b9637df (diff)
downloadlinux-fddbaa5c423f7ca0a187f88e0b1d98a5c8b4edcf.tar.gz
linux-fddbaa5c423f7ca0a187f88e0b1d98a5c8b4edcf.tar.bz2
linux-fddbaa5c423f7ca0a187f88e0b1d98a5c8b4edcf.zip
s390/mem_detect: introduce SCLP storage info
SCLP storage info allows to detect continuous and non-continuous online memory under LPAR, z/VM and KVM, when standby memory is defined. 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>
Diffstat (limited to 'arch/s390/boot')
-rw-r--r--arch/s390/boot/mem_detect.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/s390/boot/mem_detect.c b/arch/s390/boot/mem_detect.c
index 920e6fee75de..8974e3dde1e4 100644
--- a/arch/s390/boot/mem_detect.c
+++ b/arch/s390/boot/mem_detect.c
@@ -126,6 +126,12 @@ void detect_memory(void)
unsigned long rzm;
sclp_early_get_meminfo(&max_physmem_end, &rzm);
+
+ if (!sclp_early_read_storage_info()) {
+ mem_detect.info_source = MEM_DETECT_SCLP_STOR_INFO;
+ return;
+ }
+
scan_memory(rzm);
mem_detect.info_source = MEM_DETECT_TPROT_LOOP;
if (!max_physmem_end)