Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12978664 authored by Michael Holzheu's avatar Michael Holzheu Committed by Sasha Levin
Browse files

Revert "s390/kdump: Clear subchannel ID to signal non-CCW/SCSI IPL" 



[ Upstream commit 5419447e2142d6ed68c9f5c1a28630b3a290a845 ]

This reverts commit 852ffd0f.

There are use cases where an intermediate boot kernel (1) uses kexec
to boot the final production kernel (2). For this scenario we should
provide the original boot information to the production kernel (2).
Therefore clearing the boot information during kexec() should not
be done.

Cc: stable@vger.kernel.org # v3.17+
Reported-by: default avatarSteffen Maier <maier@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Holzheu <holzheu@linux.vnet.ibm.com>
Reviewed-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent c59ed1ff

arch/s390/kernel/ipl.c

+0 −7
Original line number Diff line number Diff line
@@ -2102,13 +2102,6 @@ void s390_reset_system(void (*func)(void *), void *data) 
	S390_lowcore.program_new_psw.addr =

		PSW_ADDR_AMODE | (unsigned long) s390_base_pgm_handler;



	/*

	 * Clear subchannel ID and number to signal new kernel that no CCW or

	 * SCSI IPL has been done (for kexec and kdump)

	 */

	S390_lowcore.subchannel_id = 0;

	S390_lowcore.subchannel_nr = 0;



	/* Store status at absolute zero */

	store_status();