From a9f4ae2db3fa513941244956e323cb6ce214ca5f Mon Sep 17 00:00:00 2001 From: Stefan Haberland Date: Wed, 7 Aug 2019 16:59:20 +0200 Subject: [PATCH] zipl: fix zfcp dump image location MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The zfcp dumper fails with the following error: MLOPDM003I: Machine loader finished, moving data to final storage location. uncompression error --- System halted HCPGIR450W CP entered; disabled wait PSW 00020001 80000000 00000000 DEADBEEF The zipl command shows overlapping components when installing the dumper to a zfcp disk: zipl -d /dev/sda1 Building bootmap directly on partition '/dev/sda1' Adding dump section kernel image......: /lib/s390-tools/zfcpdump/zfcpdump-image kernel parmline...: 'root=/dev/ram0 dump_mem=1 possible_cpus=1 cgroup_disable=memory ' component address: heap area.......: 0x00002000-0x00005fff stack area......: 0x0000f000-0x0000ffff internal loader.: 0x0000a000-0x0000dfff parameters......: 0x00009000-0x000091ff kernel image....: 0x00010000-0x005761ff ^^^^^^ parmline........: 0x00567000-0x005671ff ^^^^^^ Preparing boot device: sda. Done. With the secure IPL patchset the offset of the kernel image has been removed for the normal IPL case but it has not been removed for the dump image which leads to the overlap of 0x10000. Fix by removing the offset for the dump case. Signed-off-by: Stefan Haberland Reviewd-by: Mikhail Zaslonko Tested-by: Mikhail Zaslonko Signed-off-by: Jan Höppner --- zipl/src/job.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zipl/src/job.c b/zipl/src/job.c index 2d8de8f1..e68d1b76 100644 --- a/zipl/src/job.c +++ b/zipl/src/job.c @@ -559,7 +559,7 @@ get_dump_components(struct job_dump_data *dump, /* Fill in component data */ num = 0; rc = set_cl_element(&cl[num++], "kernel image", dump->image, - &dump->image_addr, 0, 0x10000, + &dump->image_addr, 0, 0x0, MAXIMUM_PHYSICAL_BLOCKSIZE); if (rc) goto error;