Commit cf19cc57 authored Sep 04, 2024 by Will Deacon

Merge remote-tracking branch 'kvmarm/arm64-shared-6.12' into for-next/poe

Pull in the AT instruction conversion patch from the KVM arm64 tree, as
this is a shared dependency between the POE series from Joey and the AT
emulation series for Nested Virtualisation from Marc.

parents 7c626ce4 69231a6f

arch/arm64/include/asm/kvm_asm.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@
		#include <asm/hyp_image.h>
		#include <asm/insn.h>
		#include <asm/virt.h>
		#include <asm/sysreg.h>

		#define ARM_EXIT_WITH_SERROR_BIT 31
		#define ARM_EXCEPTION_CODE(x) ((x) & ~(1U << ARM_EXIT_WITH_SERROR_BIT))
		@@ -259,7 +260,7 @@ extern u64 __kvm_get_mdcr_el2(void);
		asm volatile( \
		" mrs %1, spsr_el2\n" \
		" mrs %2, elr_el2\n" \
		"1: at "at_op", %3\n" \
		"1: " __msr_s(at_op, "%3") "\n" \
		" isb\n" \
		" b 9f\n" \
		"2: msr spsr_el2, %1\n" \

arch/arm64/kvm/hyp/include/hyp/fault.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@ static inline bool __translate_far_to_hpfar(u64 far, u64 *hpfar)
		* saved the guest context yet, and we may return early...
		*/
		par = read_sysreg_par();
		if (!__kvm_at("s1e1r", far))
		if (!__kvm_at(OP_AT_S1E1R, far))
		tmp = read_sysreg_par();
		else
		tmp = SYS_PAR_EL1_F; /* back to the guest */