From: Vasily Gorbik <gor@linux.ibm.com>
Date: Wed, 11 Dec 2024 10:59:50 +0000 (+0100)
Subject: s390/boot: Move command line parsing earlier
X-Git-Tag: v6.14-rc1~36^2~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a56827e5a5fa02a5241eab7342f51c840d99ee15;p=thirdparty%2Fkernel%2Flinux.git

s390/boot: Move command line parsing earlier

Reorder the store_ipl_parmblock(), uv_query_info(), and command line
setup calls to occur earlier. This ensures debug printing covers all
memory tracking activities from the start.

Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Acked-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
---

diff --git a/arch/s390/boot/startup.c b/arch/s390/boot/startup.c
index 86693d838e974..89f1d12f1c100 100644
--- a/arch/s390/boot/startup.c
+++ b/arch/s390/boot/startup.c
@@ -411,6 +411,10 @@ void startup_kernel(void)
 	psw_t psw;
 
 	setup_lpp();
+	store_ipl_parmblock();
+	uv_query_info();
+	setup_boot_command_line();
+	parse_boot_command_line();
 
 	/*
 	 * Non-randomized kernel physical start address must be _SEGMENT_SIZE
@@ -430,12 +434,8 @@ void startup_kernel(void)
 	oldmem_data.start = parmarea.oldmem_base;
 	oldmem_data.size = parmarea.oldmem_size;
 
-	store_ipl_parmblock();
 	read_ipl_report();
-	uv_query_info();
 	sclp_early_read_info();
-	setup_boot_command_line();
-	parse_boot_command_line();
 	detect_facilities();
 	cmma_init();
 	sanitize_prot_virt_host();