On Thu, Jun 01, 2017 at 11:21:15AM +0100, Marc Zyngier wrote: > Add a handler for reading/writing the guest's view of the ICC_PMR_EL1 > register, which is located in the ICH_VMCR_EL2.VPMR field. > > Reviewed-by: Eric Auger <[email protected]> > Signed-off-by: Marc Zyngier <[email protected]>
Acked-by: Christoffer Dall <[email protected]> > --- > virt/kvm/arm/hyp/vgic-v3-sr.c | 27 +++++++++++++++++++++++++++ > 1 file changed, 27 insertions(+) > > diff --git a/virt/kvm/arm/hyp/vgic-v3-sr.c b/virt/kvm/arm/hyp/vgic-v3-sr.c > index 3a5749e6c797..3c6b7d46754a 100644 > --- a/virt/kvm/arm/hyp/vgic-v3-sr.c > +++ b/virt/kvm/arm/hyp/vgic-v3-sr.c > @@ -874,6 +874,27 @@ static void __hyp_text __vgic_v3_read_hppir(struct > kvm_vcpu *vcpu, > vcpu_set_reg(vcpu, rt, lr_val & ICH_LR_VIRTUAL_ID_MASK); > } > > +static void __hyp_text __vgic_v3_read_pmr(struct kvm_vcpu *vcpu, > + u32 vmcr, int rt) > +{ > + vmcr &= ICH_VMCR_PMR_MASK; > + vmcr >>= ICH_VMCR_PMR_SHIFT; > + vcpu_set_reg(vcpu, rt, vmcr); > +} > + > +static void __hyp_text __vgic_v3_write_pmr(struct kvm_vcpu *vcpu, > + u32 vmcr, int rt) > +{ > + u32 val = vcpu_get_reg(vcpu, rt); > + > + val <<= ICH_VMCR_PMR_SHIFT; > + val &= ICH_VMCR_PMR_MASK; > + vmcr &= ~ICH_VMCR_PMR_MASK; > + vmcr |= val; > + > + write_gicreg(vmcr, ICH_VMCR_EL2); > +} > + > static void __hyp_text __vgic_v3_read_rpr(struct kvm_vcpu *vcpu, > u32 vmcr, int rt) > { > @@ -1019,6 +1040,12 @@ int __hyp_text __vgic_v3_perform_cpuif_access(struct > kvm_vcpu *vcpu) > else > fn = __vgic_v3_write_ctlr; > break; > + case SYS_ICC_PMR_EL1: > + if (is_read) > + fn = __vgic_v3_read_pmr; > + else > + fn = __vgic_v3_write_pmr; > + break; > default: > return 0; > } > -- > 2.11.0 > _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
