Commit a78738ed authored by Marc Zyngier's avatar Marc Zyngier
Browse files

KVM: arm64: Turn __KVM_HOST_SMCCC_FUNC_* into an enum (mostly) 



__KVM_HOST_SMCCC_FUNC_* is a royal pain, as there is a fair amount
of churn around these #defines, and we avoid making it an enum
only for the sake of the early init, low level code that requires
__KVM_HOST_SMCCC_FUNC___kvm_hyp_init to be usable from assembly.

Let's be brave and turn everything but this symbol into an enum,
using a bit of arithmetic to avoid any overlap.

Acked-by: default avatarWill Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/877depq9gw.wl-maz@kernel.org


Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Signed-off-by: default avatarWill Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20211008135839.1193-2-will@kernel.org
parent 9e1ff307

arch/arm64/include/asm/kvm_asm.h

+24 −20
Original line number Diff line number Diff line
@@ -44,31 +44,35 @@ 
#define KVM_HOST_SMCCC_FUNC(name) KVM_HOST_SMCCC_ID(__KVM_HOST_SMCCC_FUNC_##name)



#define __KVM_HOST_SMCCC_FUNC___kvm_hyp_init			0

#define __KVM_HOST_SMCCC_FUNC___kvm_vcpu_run			1

#define __KVM_HOST_SMCCC_FUNC___kvm_flush_vm_context		2

#define __KVM_HOST_SMCCC_FUNC___kvm_tlb_flush_vmid_ipa		3

#define __KVM_HOST_SMCCC_FUNC___kvm_tlb_flush_vmid		4

#define __KVM_HOST_SMCCC_FUNC___kvm_flush_cpu_context		5

#define __KVM_HOST_SMCCC_FUNC___kvm_timer_set_cntvoff		6

#define __KVM_HOST_SMCCC_FUNC___kvm_enable_ssbs			7

#define __KVM_HOST_SMCCC_FUNC___vgic_v3_get_gic_config		8

#define __KVM_HOST_SMCCC_FUNC___vgic_v3_read_vmcr		9

#define __KVM_HOST_SMCCC_FUNC___vgic_v3_write_vmcr		10

#define __KVM_HOST_SMCCC_FUNC___vgic_v3_init_lrs		11

#define __KVM_HOST_SMCCC_FUNC___kvm_get_mdcr_el2		12

#define __KVM_HOST_SMCCC_FUNC___vgic_v3_save_aprs		13

#define __KVM_HOST_SMCCC_FUNC___vgic_v3_restore_aprs		14

#define __KVM_HOST_SMCCC_FUNC___pkvm_init			15

#define __KVM_HOST_SMCCC_FUNC___pkvm_host_share_hyp		16

#define __KVM_HOST_SMCCC_FUNC___pkvm_create_private_mapping	17

#define __KVM_HOST_SMCCC_FUNC___pkvm_cpu_set_vector		18

#define __KVM_HOST_SMCCC_FUNC___pkvm_prot_finalize		19

#define __KVM_HOST_SMCCC_FUNC___kvm_adjust_pc			20



#ifndef __ASSEMBLY__



#include <linux/mm.h>



enum __kvm_host_smccc_func {

	/* __KVM_HOST_SMCCC_FUNC___kvm_hyp_init */

	__KVM_HOST_SMCCC_FUNC___kvm_vcpu_run = __KVM_HOST_SMCCC_FUNC___kvm_hyp_init + 1,

	__KVM_HOST_SMCCC_FUNC___kvm_flush_vm_context,

	__KVM_HOST_SMCCC_FUNC___kvm_tlb_flush_vmid_ipa,

	__KVM_HOST_SMCCC_FUNC___kvm_tlb_flush_vmid,

	__KVM_HOST_SMCCC_FUNC___kvm_flush_cpu_context,

	__KVM_HOST_SMCCC_FUNC___kvm_timer_set_cntvoff,

	__KVM_HOST_SMCCC_FUNC___kvm_enable_ssbs,

	__KVM_HOST_SMCCC_FUNC___vgic_v3_get_gic_config,

	__KVM_HOST_SMCCC_FUNC___vgic_v3_read_vmcr,

	__KVM_HOST_SMCCC_FUNC___vgic_v3_write_vmcr,

	__KVM_HOST_SMCCC_FUNC___vgic_v3_init_lrs,

	__KVM_HOST_SMCCC_FUNC___kvm_get_mdcr_el2,

	__KVM_HOST_SMCCC_FUNC___vgic_v3_save_aprs,

	__KVM_HOST_SMCCC_FUNC___vgic_v3_restore_aprs,

	__KVM_HOST_SMCCC_FUNC___pkvm_init,

	__KVM_HOST_SMCCC_FUNC___pkvm_host_share_hyp,

	__KVM_HOST_SMCCC_FUNC___pkvm_create_private_mapping,

	__KVM_HOST_SMCCC_FUNC___pkvm_cpu_set_vector,

	__KVM_HOST_SMCCC_FUNC___pkvm_prot_finalize,

	__KVM_HOST_SMCCC_FUNC___kvm_adjust_pc,

};



#define DECLARE_KVM_VHE_SYM(sym)	extern char sym[]

#define DECLARE_KVM_NVHE_SYM(sym)	extern char kvm_nvhe_sym(sym)[]