kata-containers/s390-tools
1
0
Fork 0
mirror of https://github.com/ibm-s390-linux/s390-tools.git synced 2026-08-05 02:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

zipl/boot: Move MVDUMP_TOOL_SIZE to loaders_layout.h

Browse Source 
Move MVDUMP_TOOL_SIZE contsant to loaders_layout.h and rename it
to STAGE2_DUMPER_SIZE_MV.

Signed-off-by: Mikhail Zaslonko <zaslonko@linux.ibm.com>
Reviewed-by: Alexander Egorenkov <egorenar@linux.ibm.com>
Signed-off-by: Steffen Eiden <seiden@linux.ibm.com>
This commit is contained in:
Mikhail Zaslonko
2024-10-07 15:08:08 +02:00
committed by Steffen Eiden
parent 25aac53d52
commit 8d2290977b
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/boot/loaders_layout.h
View File

@@ -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)

6
zipl/boot/eckd2dump_mv.c
View File

@@ -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