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>

diff --git a/arch/s390/boot/mem_detect.c b/arch/s390/boot/mem_detect.c
index 42b0cd23f04aea3e78decad33279ee407ac913a9..3becf6bbe4c7e6e117fa0b2419e4a0a9a501c134 100644 (file)
--- a/arch/s390/boot/mem_detect.c
+++ b/arch/s390/boot/mem_detect.c
@@ -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();
+       max_physmem_end = get_mem_detect_end();
 }

diff --git a/arch/s390/include/asm/mem_detect.h b/arch/s390/include/asm/mem_detect.h
index 6047a28656f5a360761e9273a8721c67cc7765d7..153c3542fa8a47e6511fabf14ebba824a860fc66 100644 (file)
--- a/arch/s390/include/asm/mem_detect.h
+++ b/arch/s390/include/asm/mem_detect.h
@@ -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
 };