Commit 8669651c authored by Quentin Perret's avatar Quentin Perret Committed by Oliver Upton
Browse files

KVM: arm64: Provide sanitized SYS_ID_AA64SMFR0_EL1 to nVHE 



We will need a sanitized copy of SYS_ID_AA64SMFR0_EL1 from the nVHE EL2
code shortly, so make sure to provide it with a copy.

Signed-off-by: default avatarQuentin Perret <qperret@google.com>
Acked-by: default avatarMark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20230201103755.1398086-2-qperret@google.com


Signed-off-by: default avatarOliver Upton <oliver.upton@linux.dev>
parent b7bfaa76

arch/arm64/include/asm/kvm_hyp.h

+1 −0
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ extern u64 kvm_nvhe_sym(id_aa64isar2_el1_sys_val); 
extern u64 kvm_nvhe_sym(id_aa64mmfr0_el1_sys_val);

extern u64 kvm_nvhe_sym(id_aa64mmfr1_el1_sys_val);

extern u64 kvm_nvhe_sym(id_aa64mmfr2_el1_sys_val);

extern u64 kvm_nvhe_sym(id_aa64smfr0_el1_sys_val);



extern unsigned long kvm_nvhe_sym(__icache_flags);

extern unsigned int kvm_nvhe_sym(kvm_arm_vmid_bits);

arch/arm64/kvm/arm.c

+1 −0
Original line number Diff line number Diff line
@@ -1887,6 +1887,7 @@ static void kvm_hyp_init_symbols(void) 
	kvm_nvhe_sym(id_aa64mmfr0_el1_sys_val) = read_sanitised_ftr_reg(SYS_ID_AA64MMFR0_EL1);

	kvm_nvhe_sym(id_aa64mmfr1_el1_sys_val) = read_sanitised_ftr_reg(SYS_ID_AA64MMFR1_EL1);

	kvm_nvhe_sym(id_aa64mmfr2_el1_sys_val) = read_sanitised_ftr_reg(SYS_ID_AA64MMFR2_EL1);

	kvm_nvhe_sym(id_aa64smfr0_el1_sys_val) = read_sanitised_ftr_reg(SYS_ID_AA64SMFR0_EL1);

	kvm_nvhe_sym(__icache_flags) = __icache_flags;

	kvm_nvhe_sym(kvm_arm_vmid_bits) = kvm_arm_vmid_bits;

}

arch/arm64/kvm/hyp/nvhe/sys_regs.c

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ u64 id_aa64isar2_el1_sys_val; 
u64 id_aa64mmfr0_el1_sys_val;

u64 id_aa64mmfr1_el1_sys_val;

u64 id_aa64mmfr2_el1_sys_val;

u64 id_aa64smfr0_el1_sys_val;



/*

 * Inject an unknown/undefined exception to an AArch64 guest while most of its