Commit 094a3684 authored by Pasha Tatashin's avatar Pasha Tatashin Committed by Will Deacon
Browse files

arm64: kernel: add helper for booted at EL2 and not VHE 



Replace places that contain logic like this:
	is_hyp_mode_available() && !is_kernel_in_hyp_mode()

With a dedicated boolean function  is_hyp_nvhe(). This will be needed
later in kexec in order to sooner switch back to EL2.

Suggested-by: default avatarJames Morse <james.morse@arm.com>
Signed-off-by: default avatarPasha Tatashin <pasha.tatashin@soleen.com>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Link: https://lore.kernel.org/r/20210930143113.1502553-2-pasha.tatashin@soleen.com


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 5816b3e6

arch/arm64/include/asm/virt.h

+5 −0
Original line number Diff line number Diff line
@@ -128,6 +128,11 @@ static __always_inline bool is_protected_kvm_enabled(void) 
		return cpus_have_final_cap(ARM64_KVM_PROTECTED_MODE);

}



static inline bool is_hyp_nvhe(void)

{

	return is_hyp_mode_available() && !is_kernel_in_hyp_mode();

}



#endif /* __ASSEMBLY__ */



#endif /* ! __ASM__VIRT_H */

arch/arm64/kernel/cpu-reset.h

+1 −2
Original line number Diff line number Diff line
@@ -20,8 +20,7 @@ static inline void __noreturn __nocfi cpu_soft_restart(unsigned long entry, 
{

	typeof(__cpu_soft_restart) *restart;



	unsigned long el2_switch = !is_kernel_in_hyp_mode() &&

		is_hyp_mode_available();

	unsigned long el2_switch = is_hyp_nvhe();

	restart = (void *)__pa_symbol(function_nocfi(__cpu_soft_restart));



	cpu_install_idmap();

arch/arm64/kernel/hibernate.c

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
extern int in_suspend;



/* Do we need to reset el2? */

#define el2_reset_needed() (is_hyp_mode_available() && !is_kernel_in_hyp_mode())

#define el2_reset_needed() (is_hyp_nvhe())



/* temporary el2 vectors in the __hibernate_exit_text section. */

extern char hibernate_el2_vectors[];

arch/arm64/kernel/sdei.c

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ unsigned long sdei_arch_get_entry_point(int conduit) 
	 * dropped to EL1 because we don't support VHE, then we can't support

	 * SDEI.

	 */

	if (is_hyp_mode_available() && !is_kernel_in_hyp_mode()) {

	if (is_hyp_nvhe()) {

		pr_err("Not supported on this hardware/boot configuration\n");

		goto out_err;

	}