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

Reorganize boot-loader header files

Browse Source 
include/boot/s390.h relies on s390 specific kernel headers. However,
some tools used this header for non-s390 code (outside of boot-loaders).
To solve this the PSW and PAGE_SIZE definitions are now in separate
header files. All includes for s390.h which are not in boot-loader code
are replaced with one of psw.h or page.h.

This fixes the compilation failure on ppc64le due to conflicting types
for `__vector128`.

Fixes: https://github.com/ibm-s390-linux/s390-tools/issues/151
Reviewed-by: Jan Höppner <hoeppner@linux.ibm.com>
Reviewed-by: Marc Hartmayer <mhartmay@linux.ibm.com>
Signed-off-by: Steffen Eiden <seiden@linux.ibm.com>
This commit is contained in:
Steffen Eiden
2023-06-21 12:29:57 +02:00
parent bb8e0e1047
commit 8058921f58
23 changed files with 64 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/boot/ipl.h
+1 -1
View File
@@ -11,7 +11,7 @@
#define IPL_H
#include "lib/zt_common.h"
#include "s390.h"
#include "page.h"
#define IPL_FLAG_SECURE 0x40
include/boot/page.h
+15
View File
@@ -0,0 +1,15 @@
/*
* Page related definitions and functions.
*
* Copyright IBM Corp. 2023
*
* s390-tools is free software; you can redistribute it and/or modify
* it under the terms of the MIT license. See LICENSE for details.
*/
#ifndef BOOT_PAGE_H
#define BOOT_PAGE_H
#include "lib/zt_common.h"
#define PAGE_SIZE _AC(4096, UL)
#endif
include/boot/psw.h
+31
View File
@@ -0,0 +1,31 @@
/*
* Program Status Word related definitions and functions.
*
* Copyright IBM Corp. 2023
*
* s390-tools is free software; you can redistribute it and/or modify
* it under the terms of the MIT license. See LICENSE for details.
*/
#ifndef BOOT_PSW_H
#define BOOT_PSW_H
#include "lib/zt_common.h"
#define PSW32_ADDR_MASK _AC(0x000000007fffffff, UL)
#define PSW_MASK_BA _AC(0x0000000080000000, UL)
#define PSW_MASK_EA _AC(0x0000000100000000, UL)
#define PSW_MASK_BIT_12 _AC(0x0008000000000000, UL)
#define PSW_LOAD _AC(0x0008000080000000, UL)
#define PSW_DISABLED_WAIT _AC(0x000a000000000000, UL)
#ifndef __ASSEMBLER__
#include <stdint.h>
struct psw_t {
uint64_t mask;
uint64_t addr;
} __aligned(8);
#endif
#endif
include/boot/s390.h
+5 -21
View File
@@ -1,7 +1,8 @@
/*
* s390 related definitions and functions.
* Should only be used for code targeting s390 (bootloader code)
*
* Copyright IBM Corp. 2013, 2020
* Copyright IBM Corp. 2013, 2023
*
* s390-tools is free software; you can redistribute it and/or modify
* it under the terms of the MIT license. See LICENSE for details.
@@ -12,29 +13,22 @@
#include "lib/zt_common.h"
#include "boot/sigp.h"
#include "boot/psw.h"
#include "boot/page.h"
#define __LC_IPLDEV 0x0c6c
#define __LC_OS_INFO 0x0e18
#define LOWCORE_SIZE _AC(0x2000, UL)
#define PAGE_SIZE _AC(4096, UL)
/* Minimum size of a stack frame in bytes */
#define STACK_FRAME_OVERHEAD _AC(160, U)
/* Facilities */
#define UNPACK_FACILITY _AC(161, U)
#define PSW32_ADDR_MASK _AC(0x000000007fffffff, UL)
#define PSW_MASK_BA _AC(0x0000000080000000, UL)
#define PSW_MASK_EA _AC(0x0000000100000000, UL)
#define PSW_MASK_BIT_12 _AC(0x0008000000000000, UL)
#define PSW_LOAD _AC(0x0008000080000000, UL)
#define PSW_DISABLED_WAIT _AC(0x000a000000000000, UL)
#ifndef __ASSEMBLER__
#include <stdint.h>
/*
* Helper macro for exception table entries
@@ -46,16 +40,6 @@
".long (" #_target ")\n" \
".previous\n"
struct psw_t {
uint64_t mask;
uint64_t addr;
} __aligned(8);
struct psw32_t {
uint32_t mask;
uint32_t addr;
} __aligned(8);
void load_wait_psw(uint64_t, struct psw_t *);
struct subchannel_id {