s390/ipl: always use load normal for CCW-type re-IPL

heicarst · Martin Schwidefsky · commit 7afbeb6df2aa · 2017-03-02T17:17:15.000+01:00
commit 14890678687c ("s390/ipl: use load normal for LPAR re-ipl")
missed to convert one code path to use load normal semantics for
re-IPL. Convert the missing code path as well.

Fixes: 14890678687c ("s390/ipl: use load normal for LPAR re-ipl")
Reported-by: Michael Holzheu &lt;holzheu@linux.vnet.ibm.com&gt;
Acked-by: Michael Holzheu &lt;holzheu@linux.vnet.ibm.com&gt;
Signed-off-by: Heiko Carstens &lt;heiko.carstens@de.ibm.com&gt;
Signed-off-by: Martin Schwidefsky &lt;schwidefsky@de.ibm.com&gt;
diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c
@@ -564,6 +564,8 @@ static struct kset *ipl_kset;
 
 static void __ipl_run(void *unused)
 {
+	if (MACHINE_IS_LPAR && ipl_info.type == IPL_TYPE_CCW)
+		diag308(DIAG308_LOAD_NORMAL_DUMP, NULL);
 	diag308(DIAG308_LOAD_CLEAR, NULL);
 	if (MACHINE_IS_VM)
 		__cpcmd("IPL", NULL, 0, NULL);

Original file line number	Diff line number	Diff line change
`@@ -564,6 +564,8 @@ static struct kset *ipl_kset;`
`564`	`564`
`565`	`565`	`static void __ipl_run(void *unused)`
`566`	`566`	`{`
	`567`	`+ if (MACHINE_IS_LPAR && ipl_info.type == IPL_TYPE_CCW)`
	`568`	`+ diag308(DIAG308_LOAD_NORMAL_DUMP, NULL);`
`567`	`569`	`diag308(DIAG308_LOAD_CLEAR, NULL);`
`568`	`570`	`if (MACHINE_IS_VM)`
`569`	`571`	`__cpcmd("IPL", NULL, 0, NULL);`