From 8d2290977b53c3119fa898e94fef583f46162391 Mon Sep 17 00:00:00 2001 From: Mikhail Zaslonko Date: Mon, 7 Oct 2024 15:08:08 +0200 Subject: [PATCH] zipl/boot: Move MVDUMP_TOOL_SIZE to loaders_layout.h Move MVDUMP_TOOL_SIZE contsant to loaders_layout.h and rename it to STAGE2_DUMPER_SIZE_MV. Signed-off-by: Mikhail Zaslonko Reviewed-by: Alexander Egorenkov Signed-off-by: Steffen Eiden --- include/boot/loaders_layout.h | 1 + zipl/boot/eckd2dump_mv.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/boot/loaders_layout.h b/include/boot/loaders_layout.h index 9ae55303..c85fcca9 100644 --- a/include/boot/loaders_layout.h +++ b/include/boot/loaders_layout.h @@ -33,6 +33,7 @@ #define STAGE2_DUMPER_SIZE_V1 _AC(0x1000, UL) #define STAGE2_DUMPER_SIZE_V2 _AC(0x2000, UL) #define STAGE2_DUMPER_SIZE_V3 _AC(0x3000, UL) +#define STAGE2_DUMPER_SIZE_MV _AC(0x3000, UL) #define STAGE2_DUMPER_SIZE_ZLIB _AC(0x8000, UL) #define STAGE3_ENTRY _AC(0xa000, UL) diff --git a/zipl/boot/eckd2dump_mv.c b/zipl/boot/eckd2dump_mv.c index c873fe69..37f222b7 100644 --- a/zipl/boot/eckd2dump_mv.c +++ b/zipl/boot/eckd2dump_mv.c @@ -11,12 +11,12 @@ #include "lib/zt_common.h" #include "boot/error.h" +#include "boot/loaders_layout.h" #include "dump/s390_dump.h" #include "eckd2dump.h" #include "stage2dump.h" -#define MVDUMP_TOOL_SIZE 0x3000 /* Size of dump record */ #define MAX_DUMP_VOLUMES 32 /* Up to 32 dump volumes possible */ /* @@ -205,10 +205,10 @@ static void check_volume(void) * Check whether parameter table on dump device has a valid * time stamp. The parameter table is located right behind * the dump tool, the corresponding block number is: - * MAGIC_BLK_ECKD + (MVDUMP_TOOL_SIZE / blocksize) + * MAGIC_BLK_ECKD + (STAGE2_DUMPER_SIZE_MV / blocksize) */ mvdump_table_new = (void *) page; - readblock(DF_S390_MAGIC_BLK_ECKD + m2b(MVDUMP_TOOL_SIZE), + readblock(DF_S390_MAGIC_BLK_ECKD + m2b(STAGE2_DUMPER_SIZE_MV), __pa(mvdump_table_new), 1); /* * Check if time stamps match