mirror of
https://github.com/raspberrypi/linux.git
synced 2025-12-21 17:21:59 +00:00
f5e3068061
In order to make it easy to call __adjust_pc() from the EL1 code (in the case of nVHE), rename it to __kvm_adjust_pc() and move it out of line. No expected functional change. Reviewed-by: Alexandru Elisei <alexandru.elisei@arm.com> Reviewed-by: Zenghui Yu <yuzenghui@huawei.com> Tested-by: Zenghui Yu <yuzenghui@huawei.com> Signed-off-by: Marc Zyngier <maz@kernel.org> Cc: stable@vger.kernel.org # 5.11
54 lines
1.2 KiB
C
54 lines
1.2 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* Guest PC manipulation helpers
|
|
*
|
|
* Copyright (C) 2012,2013 - ARM Ltd
|
|
* Copyright (C) 2020 - Google LLC
|
|
* Author: Marc Zyngier <maz@kernel.org>
|
|
*/
|
|
|
|
#ifndef __ARM64_KVM_HYP_ADJUST_PC_H__
|
|
#define __ARM64_KVM_HYP_ADJUST_PC_H__
|
|
|
|
#include <asm/kvm_emulate.h>
|
|
#include <asm/kvm_host.h>
|
|
|
|
static inline void kvm_skip_instr(struct kvm_vcpu *vcpu)
|
|
{
|
|
if (vcpu_mode_is_32bit(vcpu)) {
|
|
kvm_skip_instr32(vcpu);
|
|
} else {
|
|
*vcpu_pc(vcpu) += 4;
|
|
*vcpu_cpsr(vcpu) &= ~PSR_BTYPE_MASK;
|
|
}
|
|
|
|
/* advance the singlestep state machine */
|
|
*vcpu_cpsr(vcpu) &= ~DBG_SPSR_SS;
|
|
}
|
|
|
|
/*
|
|
* Skip an instruction which has been emulated at hyp while most guest sysregs
|
|
* are live.
|
|
*/
|
|
static inline void __kvm_skip_instr(struct kvm_vcpu *vcpu)
|
|
{
|
|
*vcpu_pc(vcpu) = read_sysreg_el2(SYS_ELR);
|
|
vcpu_gp_regs(vcpu)->pstate = read_sysreg_el2(SYS_SPSR);
|
|
|
|
kvm_skip_instr(vcpu);
|
|
|
|
write_sysreg_el2(vcpu_gp_regs(vcpu)->pstate, SYS_SPSR);
|
|
write_sysreg_el2(*vcpu_pc(vcpu), SYS_ELR);
|
|
}
|
|
|
|
/*
|
|
* Skip an instruction while host sysregs are live.
|
|
* Assumes host is always 64-bit.
|
|
*/
|
|
static inline void kvm_skip_host_instr(void)
|
|
{
|
|
write_sysreg_el2(read_sysreg_el2(SYS_ELR) + 4, SYS_ELR);
|
|
}
|
|
|
|
#endif
|