Commit 5fb247d7 authored by Vijaya Kumar K's avatar Vijaya Kumar K Committed by Marc Zyngier
Browse files

KVM: arm/arm64: vgic: Introduce VENG0 and VENG1 fields to vmcr struct 



ICC_VMCR_EL2 supports virtual access to ICC_IGRPEN1_EL1.Enable
and ICC_IGRPEN0_EL1.Enable fields. Add grpen0 and grpen1 member
variables to struct vmcr to support read and write of these fields.

Also refactor vgic_set_vmcr and vgic_get_vmcr() code.
Drop ICH_VMCR_CTLR_SHIFT and ICH_VMCR_CTLR_MASK macros and instead
use ICH_VMCR_EOI* and ICH_VMCR_CBPR* macros.

Signed-off-by: default avatarVijaya Kumar K <Vijaya.Kumar@cavium.com>
Reviewed-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Reviewed-by: default avatarEric Auger <eric.auger@redhat.com>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 5c341537

include/linux/irqchip/arm-gic-v3.h

+0 −2
Original line number Diff line number Diff line
@@ -404,8 +404,6 @@ 
#define ICH_HCR_EN			(1 << 0)

#define ICH_HCR_UIE			(1 << 1)



#define ICH_VMCR_CTLR_SHIFT		0

#define ICH_VMCR_CTLR_MASK		(0x21f << ICH_VMCR_CTLR_SHIFT)

#define ICH_VMCR_CBPR_SHIFT		4

#define ICH_VMCR_CBPR_MASK		(1 << ICH_VMCR_CBPR_SHIFT)

#define ICH_VMCR_EOIM_SHIFT		9

virt/kvm/arm/vgic/vgic-mmio-v2.c

+0 −16
Original line number Diff line number Diff line
@@ -213,22 +213,6 @@ static void vgic_mmio_write_sgipends(struct kvm_vcpu *vcpu, 
	}

}



static void vgic_set_vmcr(struct kvm_vcpu *vcpu, struct vgic_vmcr *vmcr)

{

	if (kvm_vgic_global_state.type == VGIC_V2)

		vgic_v2_set_vmcr(vcpu, vmcr);

	else

		vgic_v3_set_vmcr(vcpu, vmcr);

}



static void vgic_get_vmcr(struct kvm_vcpu *vcpu, struct vgic_vmcr *vmcr)

{

	if (kvm_vgic_global_state.type == VGIC_V2)

		vgic_v2_get_vmcr(vcpu, vmcr);

	else

		vgic_v3_get_vmcr(vcpu, vmcr);

}



#define GICC_ARCH_VERSION_V2	0x2



/* These are for userland accesses only, there is no guest-facing emulation. */

virt/kvm/arm/vgic/vgic-mmio.c

+16 −0
Original line number Diff line number Diff line
@@ -385,6 +385,22 @@ vgic_find_mmio_region(const struct vgic_register_region *region, int nr_regions, 
		       sizeof(region[0]), match_region);

}



void vgic_set_vmcr(struct kvm_vcpu *vcpu, struct vgic_vmcr *vmcr)

{

	if (kvm_vgic_global_state.type == VGIC_V2)

		vgic_v2_set_vmcr(vcpu, vmcr);

	else

		vgic_v3_set_vmcr(vcpu, vmcr);

}



void vgic_get_vmcr(struct kvm_vcpu *vcpu, struct vgic_vmcr *vmcr)

{

	if (kvm_vgic_global_state.type == VGIC_V2)

		vgic_v2_get_vmcr(vcpu, vmcr);

	else

		vgic_v3_get_vmcr(vcpu, vmcr);

}



/*

 * kvm_mmio_read_buf() returns a value in a format where it can be converted

 * to a byte array and be directly observed as the guest wanted it to appear

virt/kvm/arm/vgic/vgic-v3.c

+18 −2
Original line number Diff line number Diff line
@@ -175,10 +175,18 @@ void vgic_v3_set_vmcr(struct kvm_vcpu *vcpu, struct vgic_vmcr *vmcrp) 
{

	u32 vmcr;



	vmcr  = (vmcrp->ctlr << ICH_VMCR_CTLR_SHIFT) & ICH_VMCR_CTLR_MASK;

	/*

	 * Ignore the FIQen bit, because GIC emulation always implies

	 * SRE=1 which means the vFIQEn bit is also RES1.

	 */

	vmcr = ((vmcrp->ctlr >> ICC_CTLR_EL1_EOImode_SHIFT) <<

		 ICH_VMCR_EOIM_SHIFT) & ICH_VMCR_EOIM_MASK;

	vmcr |= (vmcrp->ctlr << ICH_VMCR_CBPR_SHIFT) & ICH_VMCR_CBPR_MASK;

	vmcr |= (vmcrp->abpr << ICH_VMCR_BPR1_SHIFT) & ICH_VMCR_BPR1_MASK;

	vmcr |= (vmcrp->bpr << ICH_VMCR_BPR0_SHIFT) & ICH_VMCR_BPR0_MASK;

	vmcr |= (vmcrp->pmr << ICH_VMCR_PMR_SHIFT) & ICH_VMCR_PMR_MASK;

	vmcr |= (vmcrp->grpen0 << ICH_VMCR_ENG0_SHIFT) & ICH_VMCR_ENG0_MASK;

	vmcr |= (vmcrp->grpen1 << ICH_VMCR_ENG1_SHIFT) & ICH_VMCR_ENG1_MASK;



	vcpu->arch.vgic_cpu.vgic_v3.vgic_vmcr = vmcr;

}
@@ -187,10 +195,18 @@ void vgic_v3_get_vmcr(struct kvm_vcpu *vcpu, struct vgic_vmcr *vmcrp) 
{

	u32 vmcr = vcpu->arch.vgic_cpu.vgic_v3.vgic_vmcr;



	vmcrp->ctlr = (vmcr & ICH_VMCR_CTLR_MASK) >> ICH_VMCR_CTLR_SHIFT;

	/*

	 * Ignore the FIQen bit, because GIC emulation always implies

	 * SRE=1 which means the vFIQEn bit is also RES1.

	 */

	vmcrp->ctlr = ((vmcr >> ICH_VMCR_EOIM_SHIFT) <<

			ICC_CTLR_EL1_EOImode_SHIFT) & ICC_CTLR_EL1_EOImode_MASK;

	vmcrp->ctlr |= (vmcr & ICH_VMCR_CBPR_MASK) >> ICH_VMCR_CBPR_SHIFT;

	vmcrp->abpr = (vmcr & ICH_VMCR_BPR1_MASK) >> ICH_VMCR_BPR1_SHIFT;

	vmcrp->bpr  = (vmcr & ICH_VMCR_BPR0_MASK) >> ICH_VMCR_BPR0_SHIFT;

	vmcrp->pmr  = (vmcr & ICH_VMCR_PMR_MASK) >> ICH_VMCR_PMR_SHIFT;

	vmcrp->grpen0 = (vmcr & ICH_VMCR_ENG0_MASK) >> ICH_VMCR_ENG0_SHIFT;

	vmcrp->grpen1 = (vmcr & ICH_VMCR_ENG1_MASK) >> ICH_VMCR_ENG1_SHIFT;

}



#define INITIAL_PENDBASER_VALUE						  \

virt/kvm/arm/vgic/vgic.h

+5 −0
Original line number Diff line number Diff line
@@ -65,6 +65,9 @@ struct vgic_vmcr { 
	u32	abpr;

	u32	bpr;

	u32	pmr;

	/* Below member variable are valid only for GICv3 */

	u32	grpen0;

	u32	grpen1;

};



struct vgic_reg_attr {
@@ -137,6 +140,8 @@ int vgic_v3_dist_uaccess(struct kvm_vcpu *vcpu, bool is_write, 
int vgic_v3_redist_uaccess(struct kvm_vcpu *vcpu, bool is_write,

			 int offset, u32 *val);

int kvm_register_vgic_device(unsigned long type);

void vgic_set_vmcr(struct kvm_vcpu *vcpu, struct vgic_vmcr *vmcr);

void vgic_get_vmcr(struct kvm_vcpu *vcpu, struct vgic_vmcr *vmcr);

int vgic_lazy_init(struct kvm *kvm);

int vgic_init(struct kvm *kvm);

CRA Git | Maintained and supported by SUSTech CRA and CCSE