fdec2a9ef8
Currently, the {read,write}_sysreg_el*() accessors for accessing
particular ELs' sysregs in the presence of VHE rely on some local
hacks and define their system register encodings in a way that is
inconsistent with the core definitions in <asm/sysreg.h>.
As a result, it is necessary to add duplicate definitions for any
system register that already needs a definition in sysreg.h for
other reasons.
This is a bit of a maintenance headache, and the reasons for the
_el*() accessors working the way they do is a bit historical.
This patch gets rid of the shadow sysreg definitions in
<asm/kvm_hyp.h>, converts the _el*() accessors to use the core
__msr_s/__mrs_s interface, and converts all call sites to use the
standard sysreg #define names (i.e., upper case, with SYS_ prefix).
This patch will conflict heavily anyway, so the opportunity
to clean up some bad whitespace in the context of the changes is
taken.
The change exposes a few system registers that have no sysreg.h
definition, due to msr_s/mrs_s being used in place of msr/mrs:
additions are made in order to fill in the gaps.
Signed-off-by: Dave Martin <Dave.Martin@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Christoffer Dall <christoffer.dall@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Link: https://www.spinics.net/lists/kvm-arm/msg31717.html
[Rebased to v4.21-rc1]
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
[Rebased to v5.2-rc5, changelog updates]
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
88 lines
2.0 KiB
C
88 lines
2.0 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* Copyright (C) 2012-2015 - ARM Ltd
|
|
* Author: Marc Zyngier <marc.zyngier@arm.com>
|
|
*/
|
|
|
|
#include <linux/compiler.h>
|
|
#include <linux/irqchip/arm-gic.h>
|
|
#include <linux/kvm_host.h>
|
|
#include <linux/swab.h>
|
|
|
|
#include <asm/kvm_emulate.h>
|
|
#include <asm/kvm_hyp.h>
|
|
#include <asm/kvm_mmu.h>
|
|
|
|
static bool __hyp_text __is_be(struct kvm_vcpu *vcpu)
|
|
{
|
|
if (vcpu_mode_is_32bit(vcpu))
|
|
return !!(read_sysreg_el2(SYS_SPSR) & PSR_AA32_E_BIT);
|
|
|
|
return !!(read_sysreg(SCTLR_EL1) & SCTLR_ELx_EE);
|
|
}
|
|
|
|
/*
|
|
* __vgic_v2_perform_cpuif_access -- perform a GICV access on behalf of the
|
|
* guest.
|
|
*
|
|
* @vcpu: the offending vcpu
|
|
*
|
|
* Returns:
|
|
* 1: GICV access successfully performed
|
|
* 0: Not a GICV access
|
|
* -1: Illegal GICV access successfully performed
|
|
*/
|
|
int __hyp_text __vgic_v2_perform_cpuif_access(struct kvm_vcpu *vcpu)
|
|
{
|
|
struct kvm *kvm = kern_hyp_va(vcpu->kvm);
|
|
struct vgic_dist *vgic = &kvm->arch.vgic;
|
|
phys_addr_t fault_ipa;
|
|
void __iomem *addr;
|
|
int rd;
|
|
|
|
/* Build the full address */
|
|
fault_ipa = kvm_vcpu_get_fault_ipa(vcpu);
|
|
fault_ipa |= kvm_vcpu_get_hfar(vcpu) & GENMASK(11, 0);
|
|
|
|
/* If not for GICV, move on */
|
|
if (fault_ipa < vgic->vgic_cpu_base ||
|
|
fault_ipa >= (vgic->vgic_cpu_base + KVM_VGIC_V2_CPU_SIZE))
|
|
return 0;
|
|
|
|
/* Reject anything but a 32bit access */
|
|
if (kvm_vcpu_dabt_get_as(vcpu) != sizeof(u32)) {
|
|
__kvm_skip_instr(vcpu);
|
|
return -1;
|
|
}
|
|
|
|
/* Not aligned? Don't bother */
|
|
if (fault_ipa & 3) {
|
|
__kvm_skip_instr(vcpu);
|
|
return -1;
|
|
}
|
|
|
|
rd = kvm_vcpu_dabt_get_rd(vcpu);
|
|
addr = hyp_symbol_addr(kvm_vgic_global_state)->vcpu_hyp_va;
|
|
addr += fault_ipa - vgic->vgic_cpu_base;
|
|
|
|
if (kvm_vcpu_dabt_iswrite(vcpu)) {
|
|
u32 data = vcpu_get_reg(vcpu, rd);
|
|
if (__is_be(vcpu)) {
|
|
/* guest pre-swabbed data, undo this for writel() */
|
|
data = swab32(data);
|
|
}
|
|
writel_relaxed(data, addr);
|
|
} else {
|
|
u32 data = readl_relaxed(addr);
|
|
if (__is_be(vcpu)) {
|
|
/* guest expects swabbed data */
|
|
data = swab32(data);
|
|
}
|
|
vcpu_set_reg(vcpu, rd, data);
|
|
}
|
|
|
|
__kvm_skip_instr(vcpu);
|
|
|
|
return 1;
|
|
}
|