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

include/boot: Rename DIAG308 constants

Browse Source 
Add DIAG308_LOAD_NORMAL diag308 subcode (used by FCP/NVMe normal ipl).
Rename other diag308_subcode and diag308_rc constants to be in sync with
kernel naming.

Signed-off-by: Mikhail Zaslonko <zaslonko@linux.ibm.com>
Reviewed-by: Alexander Egorenkov <egorenar@linux.ibm.com>
Reviewed-by: Marc Hartmayer <mhartmay@linux.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
This commit is contained in:
Mikhail Zaslonko
2023-05-31 21:04:24 +02:00
committed by Jan Höppner
parent 53eccc0a3d
commit 2b7df1fcac
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/boot/s390.h
+9 -6
View File
@@ -285,18 +285,21 @@ static __always_inline void __ctl_set_bit(unsigned int cr, unsigned int bit)
* DIAG 308 support * DIAG 308 support
*/ */
enum diag308_subcode { enum diag308_subcode {
DIAG308_REL_HSA = 2, DIAG308_CLEAR_RESET = 0,
DIAG308_IPL = 3, DIAG308_LOAD_NORMAL_RESET = 1,
DIAG308_DUMP = 4, DIAG308_REL_HSA = 2,
DIAG308_SET = 5, DIAG308_LOAD_CLEAR = 3,
DIAG308_STORE = 6, DIAG308_LOAD_NORMAL_DUMP = 4,
DIAG308_SET = 5,
DIAG308_STORE = 6,
DIAG308_LOAD_NORMAL = 7,
DIAG308_SET_PV = 8, DIAG308_SET_PV = 8,
DIAG308_UNPACK_PV = 10, DIAG308_UNPACK_PV = 10,
}; };
enum diag308_rc { enum diag308_rc {
DIAG308_RC_OK = 0x0001, DIAG308_RC_OK = 0x0001,
DIAG308_RC_NO_CONF = 0x0102, DIAG308_RC_NOCONFIG = 0x0102,
}; };
static __always_inline unsigned long diag308(unsigned long subcode, void *addr) static __always_inline unsigned long diag308(unsigned long subcode, void *addr)
zipl/boot/stage2dump.c
+1 -1
View File
@@ -405,7 +405,7 @@ static __noreturn void dump_exit(unsigned long code)
if (ipib_info->ipib_csum != csum) if (ipib_info->ipib_csum != csum)
libc_stop(code); libc_stop(code);
diag308(DIAG308_SET, (void *) ipib_info->ipib); diag308(DIAG308_SET, (void *) ipib_info->ipib);
diag308(DIAG308_IPL, NULL); diag308(DIAG308_LOAD_CLEAR, NULL);
__builtin_unreachable(); __builtin_unreachable();
} }
zipl/boot/stage3.c
+1 -1
View File
@@ -121,7 +121,7 @@ secure_boot_enabled()
rc = pl_hdr->version <= IPL_MAX_SUPPORTED_VERSION && rc = pl_hdr->version <= IPL_MAX_SUPPORTED_VERSION &&
!!(pl_hdr->flags & IPL_FLAG_SECURE); !!(pl_hdr->flags & IPL_FLAG_SECURE);
break; break;
case DIAG308_RC_NO_CONF: case DIAG308_RC_NOCONFIG:
rc = 0; rc = 0;
break; break;
default: default: