Commit 6dc2e98d authored by Janosch Frank's avatar Janosch Frank Committed by Vasily Gorbik
Browse files

s390: Remove protvirt and kvm config guards for uv code 



Removing the CONFIG_PROTECTED_VIRTUALIZATION_GUEST ifdefs and config
option as well as CONFIG_KVM ifdefs in uv files.

Having this configurable has been more of a pain than a help.
It's time to remove the ifdefs and the config option.

Signed-off-by: default avatarJanosch Frank <frankja@linux.ibm.com>
Acked-by: default avatarChristian Borntraeger <borntraeger@linux.ibm.com>
Acked-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent 8f1e70ad

arch/s390/Kconfig

+0 −11
Original line number Diff line number Diff line
@@ -799,17 +799,6 @@ config HAVE_PNETID 


menu "Virtualization"



config PROTECTED_VIRTUALIZATION_GUEST

	def_bool n

	prompt "Protected virtualization guest support"

	help

	  Select this option, if you want to be able to run this

	  kernel as a protected virtualization KVM guest.

	  Protected virtualization capable machines have a mini hypervisor

	  located at machine level (an ultravisor). With help of the

	  Ultravisor, KVM will be able to run "protected" VMs, special

	  VMs whose memory and management data are unavailable to KVM.



config PFAULT

	def_bool y

	prompt "Pseudo page fault support"

arch/s390/boot/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -39,8 +39,7 @@ CFLAGS_sclp_early_core.o += -I$(srctree)/drivers/s390/char 


obj-y	:= head.o als.o startup.o physmem_info.o ipl_parm.o ipl_report.o vmem.o

obj-y	+= string.o ebcdic.o sclp_early_core.o mem.o ipl_vmparm.o cmdline.o

obj-y	+= version.o pgm_check_info.o ctype.o ipl_data.o relocs.o alternative.o

obj-$(findstring y, $(CONFIG_PROTECTED_VIRTUALIZATION_GUEST) $(CONFIG_PGSTE))	+= uv.o

obj-y	+= version.o pgm_check_info.o ctype.o ipl_data.o relocs.o alternative.o uv.o

obj-$(CONFIG_RANDOMIZE_BASE)	+= kaslr.o

obj-y	+= $(if $(CONFIG_KERNEL_UNCOMPRESSED),,decompressor.o) info.o

obj-$(CONFIG_KERNEL_ZSTD) += clz_ctz.o

arch/s390/boot/uv.c

+0 −8
Original line number Diff line number Diff line
@@ -8,12 +8,8 @@ 
#include "uv.h"



/* will be used in arch/s390/kernel/uv.c */

#ifdef CONFIG_PROTECTED_VIRTUALIZATION_GUEST

int __bootdata_preserved(prot_virt_guest);

#endif

#if IS_ENABLED(CONFIG_KVM)

int __bootdata_preserved(prot_virt_host);

#endif

struct uv_info __bootdata_preserved(uv_info);



void uv_query_info(void)
@@ -53,14 +49,11 @@ void uv_query_info(void) 
		uv_info.max_secrets = uvcb.max_secrets;

	}



#ifdef CONFIG_PROTECTED_VIRTUALIZATION_GUEST

	if (test_bit_inv(BIT_UVC_CMD_SET_SHARED_ACCESS, (unsigned long *)uvcb.inst_calls_list) &&

	    test_bit_inv(BIT_UVC_CMD_REMOVE_SHARED_ACCESS, (unsigned long *)uvcb.inst_calls_list))

		prot_virt_guest = 1;

#endif

}



#if IS_ENABLED(CONFIG_KVM)

unsigned long adjust_to_uv_max(unsigned long limit)

{

	if (is_prot_virt_host() && uv_info.max_sec_stor_addr)
@@ -92,4 +85,3 @@ void sanitize_prot_virt_host(void) 
{

	prot_virt_host = is_prot_virt_host_capable();

}
 
#endif

arch/s390/boot/uv.h

+0 −13
Original line number Diff line number Diff line
@@ -2,21 +2,8 @@ 
#ifndef BOOT_UV_H

#define BOOT_UV_H



#if IS_ENABLED(CONFIG_KVM)

unsigned long adjust_to_uv_max(unsigned long limit);

void sanitize_prot_virt_host(void);

#else

static inline unsigned long adjust_to_uv_max(unsigned long limit)

{

	return limit;

}

static inline void sanitize_prot_virt_host(void) {}

#endif



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

void uv_query_info(void);

#else

static inline void uv_query_info(void) {}

#endif



#endif /* BOOT_UV_H */

arch/s390/configs/debug_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ CONFIG_EXPOLINE_AUTO=y 
CONFIG_CHSC_SCH=y

CONFIG_VFIO_CCW=m

CONFIG_VFIO_AP=m

CONFIG_PROTECTED_VIRTUALIZATION_GUEST=y

CONFIG_CMM=m

CONFIG_APPLDATA_BASE=y

CONFIG_S390_HYPFS_FS=y