Commit 42c89439 authored by Alexander Egorenkov's avatar Alexander Egorenkov Committed by Heiko Carstens
Browse files

s390/boot: disable Secure Execution in dump mode 



A dump kernel is neither required nor able to support Secure Execution.

Signed-off-by: default avatarAlexander Egorenkov <egorenar@linux.ibm.com>
Reviewed-by: default avatarVasily Gorbik <gor@linux.ibm.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent c5cf5054

arch/s390/boot/startup.c

+1 −0
Original line number Diff line number Diff line
@@ -292,6 +292,7 @@ void startup_kernel(void) 
	sclp_early_read_info();

	setup_boot_command_line();

	parse_boot_command_line();

	sanitize_prot_virt_host();

	setup_ident_map_size(detect_memory());

	setup_vmalloc_size();

	setup_kernel_memory_layout();

arch/s390/boot/uv.c

+8 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include <asm/uv.h>

#include <asm/boot_data.h>

#include <asm/facility.h>

#include <asm/sections.h>



#include "boot.h"

#include "uv.h"



/* will be used in arch/s390/kernel/uv.c */
@@ -71,4 +73,10 @@ void adjust_to_uv_max(unsigned long *vmax) 
	if (has_uv_sec_stor_limit())

		*vmax = min_t(unsigned long, *vmax, uv_info.max_sec_stor_addr);

}



void sanitize_prot_virt_host(void)

{

	if (OLDMEM_BASE || (ipl_block_valid && is_ipl_block_dump()))

		prot_virt_host = 0;

}

#endif

arch/s390/boot/uv.h

+2 −0
Original line number Diff line number Diff line
@@ -4,8 +4,10 @@ 


#if IS_ENABLED(CONFIG_KVM)

void adjust_to_uv_max(unsigned long *vmax);

void sanitize_prot_virt_host(void);

#else

static inline void adjust_to_uv_max(unsigned long *vmax) {}

static inline void sanitize_prot_virt_host(void) {}

#endif



#if defined(CONFIG_PROTECTED_VIRTUALIZATION_GUEST) || IS_ENABLED(CONFIG_KVM)