Subject: [PATCH] [FEAT VS1804] zipl/stage3: make IPL_DEVICE definition consistent with tape0.S From: Marc Hartmayer Summary: genprotimg: Introduce new tool for the creation of PV images Description: genprotimg takes a kernel, host-key documents, optionally an initrd, optionally a file with the kernel command line, and it generates a single, loadable image file. The image consists of a concatenation of a plain text boot loader, the encrypted components for kernel, initrd, and cmdline, and the integrity-protected PV header, containing metadata necessary for running the guest in PV mode. It's possible to use this image file as a kernel for zIPL or for a direct kernel boot using QEMU. Upstream-ID: d884fb8db4c4f383780d6fc8087abd8f80e1c8b8 Problem-ID: VS1804 Upstream-Description: zipl/stage3: make IPL_DEVICE definition consistent with tape0.S Make `IPL_DEVICE` definition consistent with the kernel definition and the definition in tape0.S. This allows us to refactor the code later. Reviewed-by: Philipp Rudo Reviewed-by: Stefan Haberland Signed-off-by: Marc Hartmayer Signed-off-by: Jan Höppner Signed-off-by: Marc Hartmayer --- zipl/boot/stage3.c | 2 +- zipl/boot/stage3.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- a/zipl/boot/stage3.c +++ b/zipl/boot/stage3.c @@ -292,7 +292,7 @@ void start(void) /* store subchannel ID into low core and into new kernel space */ subchannel_id = S390_lowcore.subchannel_id; *(unsigned int *)__LC_IPLDEV = subchannel_id; - *(unsigned int *)IPL_DEVICE = subchannel_id; + *(unsigned long long *)IPL_DEVICE = subchannel_id; /* if valid command line is given, copy it into new kernel space */ if (_parm_addr != UNSPECIFIED_ADDRESS) { --- a/zipl/boot/stage3.h +++ b/zipl/boot/stage3.h @@ -17,7 +17,7 @@ #include "boot/ipl.h" -#define IPL_DEVICE 0x10404UL +#define IPL_DEVICE 0x10400UL #define INITRD_START 0x10408UL #define INITRD_SIZE 0x10410UL #define OLDMEM_BASE 0x10418UL