Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd122e62 authored by Andre Przywara's avatar Andre Przywara Committed by Christoffer Dall
Browse files

KVM: arm/arm64: vgic-new: Add ENABLE registers handlers 



As the enable register handlers are shared between the v2 and v3
emulation, their implementation goes into vgic-mmio.c, to be easily
referenced from the v3 emulation as well later.

Signed-off-by: default avatarAndre Przywara <andre.przywara@arm.com>
Reviewed-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Reviewed-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
parent 2b0cda87

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

+2 −2
Original line number Diff line number Diff line
@@ -72,10 +72,10 @@ static const struct vgic_register_region vgic_v2_dist_registers[] = { 
		vgic_mmio_read_rao, vgic_mmio_write_wi, 1,

		VGIC_ACCESS_32bit),

	REGISTER_DESC_WITH_BITS_PER_IRQ(GIC_DIST_ENABLE_SET,

		vgic_mmio_read_raz, vgic_mmio_write_wi, 1,

		vgic_mmio_read_enable, vgic_mmio_write_senable, 1,

		VGIC_ACCESS_32bit),

	REGISTER_DESC_WITH_BITS_PER_IRQ(GIC_DIST_ENABLE_CLEAR,

		vgic_mmio_read_raz, vgic_mmio_write_wi, 1,

		vgic_mmio_read_enable, vgic_mmio_write_cenable, 1,

		VGIC_ACCESS_32bit),

	REGISTER_DESC_WITH_BITS_PER_IRQ(GIC_DIST_PENDING_SET,

		vgic_mmio_read_raz, vgic_mmio_write_wi, 1,

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

+56 −0
Original line number Diff line number Diff line
@@ -39,6 +39,62 @@ void vgic_mmio_write_wi(struct kvm_vcpu *vcpu, gpa_t addr, 
	/* Ignore */

}



/*

 * Read accesses to both GICD_ICENABLER and GICD_ISENABLER return the value

 * of the enabled bit, so there is only one function for both here.

 */

unsigned long vgic_mmio_read_enable(struct kvm_vcpu *vcpu,

				    gpa_t addr, unsigned int len)

{

	u32 intid = VGIC_ADDR_TO_INTID(addr, 1);

	u32 value = 0;

	int i;



	/* Loop over all IRQs affected by this read */

	for (i = 0; i < len * 8; i++) {

		struct vgic_irq *irq = vgic_get_irq(vcpu->kvm, vcpu, intid + i);



		if (irq->enabled)

			value |= (1U << i);

	}



	return value;

}



void vgic_mmio_write_senable(struct kvm_vcpu *vcpu,

			     gpa_t addr, unsigned int len,

			     unsigned long val)

{

	u32 intid = VGIC_ADDR_TO_INTID(addr, 1);

	int i;



	for_each_set_bit(i, &val, len * 8) {

		struct vgic_irq *irq = vgic_get_irq(vcpu->kvm, vcpu, intid + i);



		spin_lock(&irq->irq_lock);

		irq->enabled = true;

		vgic_queue_irq_unlock(vcpu->kvm, irq);

	}

}



void vgic_mmio_write_cenable(struct kvm_vcpu *vcpu,

			     gpa_t addr, unsigned int len,

			     unsigned long val)

{

	u32 intid = VGIC_ADDR_TO_INTID(addr, 1);

	int i;



	for_each_set_bit(i, &val, len * 8) {

		struct vgic_irq *irq = vgic_get_irq(vcpu->kvm, vcpu, intid + i);



		spin_lock(&irq->irq_lock);



		irq->enabled = false;



		spin_unlock(&irq->irq_lock);

	}

}



static int match_region(const void *key, const void *elt)

{

	const unsigned int offset = (unsigned long)key;

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

+11 −0
Original line number Diff line number Diff line
@@ -96,6 +96,17 @@ unsigned long vgic_mmio_read_rao(struct kvm_vcpu *vcpu, 
void vgic_mmio_write_wi(struct kvm_vcpu *vcpu, gpa_t addr,

			unsigned int len, unsigned long val);



unsigned long vgic_mmio_read_enable(struct kvm_vcpu *vcpu,

				    gpa_t addr, unsigned int len);



void vgic_mmio_write_senable(struct kvm_vcpu *vcpu,

			     gpa_t addr, unsigned int len,

			     unsigned long val);



void vgic_mmio_write_cenable(struct kvm_vcpu *vcpu,

			     gpa_t addr, unsigned int len,

			     unsigned long val);



unsigned int vgic_v2_init_dist_iodev(struct vgic_io_device *dev);



#endif