Commit de5c2827 authored by Marc Zyngier's avatar Marc Zyngier Committed by Oliver Upton
Browse files

KVM: arm64: Add save/restore support for POR_EL2 



POR_EL2 needs saving when the guest is VHE, and restoring in
any case.

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20241023145345.1613824-33-maz@kernel.org


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

arch/arm64/kvm/hyp/vhe/sysreg-sr.c

+6 −0
Original line number Diff line number Diff line
@@ -58,6 +58,9 @@ static void __sysreg_save_vel2_state(struct kvm_vcpu *vcpu) 
				__vcpu_sys_reg(vcpu, PIRE0_EL2) = read_sysreg_el1(SYS_PIRE0);

				__vcpu_sys_reg(vcpu, PIR_EL2) = read_sysreg_el1(SYS_PIR);

			}



			if (ctxt_has_s1poe(&vcpu->arch.ctxt))

				__vcpu_sys_reg(vcpu, POR_EL2) = read_sysreg_el1(SYS_POR);

		}



		/*
@@ -123,6 +126,9 @@ static void __sysreg_restore_vel2_state(struct kvm_vcpu *vcpu) 
			write_sysreg_el1(__vcpu_sys_reg(vcpu, PIR_EL2), SYS_PIR);

			write_sysreg_el1(__vcpu_sys_reg(vcpu, PIRE0_EL2), SYS_PIRE0);

		}



		if (ctxt_has_s1poe(&vcpu->arch.ctxt))

			write_sysreg_el1(__vcpu_sys_reg(vcpu, POR_EL2), SYS_POR);

	}



	write_sysreg_el1(__vcpu_sys_reg(vcpu, ESR_EL2),		SYS_ESR);