Commit 8df3c8f3 authored by Christoffer Dall's avatar Christoffer Dall Committed by Marc Zyngier
Browse files

KVM: arm/arm64: vgic: Add group field to struct irq 



In preparation for proper group 0 and group 1 support in the vgic, we
add a field in the struct irq to store the group of all interrupts.

We initialize the group to group 0 when emulating GICv2 and to group 1
when emulating GICv3, just like we treat them today.  LPIs are always
group 1.  We also continue to ignore writes from the guest, preserving
existing functionality, for now.

Finally, we also add this field to the vgic debug logic to show the
group for all interrupts.

Reviewed-by: default avatarAndrew Jones <drjones@redhat.com>
Signed-off-by: default avatarChristoffer Dall <christoffer.dall@arm.com>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent dd6251e4

include/kvm/arm_vgic.h

+1 −0
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ struct vgic_irq { 
	u8 source;			/* GICv2 SGIs only */

	u8 active_source;		/* GICv2 SGIs only */

	u8 priority;

	u8 group;			/* 0 == group 0, 1 == group 1 */

	enum vgic_irq_config config;	/* Level or edge */



	/*

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

+5 −3
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ static void print_dist_state(struct seq_file *s, struct vgic_dist *dist) 


	seq_printf(s, "P=pending_latch, L=line_level, A=active\n");

	seq_printf(s, "E=enabled, H=hw, C=config (level=1, edge=0)\n");

	seq_printf(s, "G=group\n");

}



static void print_header(struct seq_file *s, struct vgic_irq *irq,
@@ -180,8 +181,8 @@ static void print_header(struct seq_file *s, struct vgic_irq *irq, 
	}



	seq_printf(s, "\n");

	seq_printf(s, "%s%2d TYP   ID TGT_ID PLAEHC     HWID   TARGET SRC PRI VCPU_ID\n", hdr, id);

	seq_printf(s, "---------------------------------------------------------------\n");

	seq_printf(s, "%s%2d TYP   ID TGT_ID PLAEHCG     HWID   TARGET SRC PRI VCPU_ID\n", hdr, id);

	seq_printf(s, "----------------------------------------------------------------\n");

}



static void print_irq_state(struct seq_file *s, struct vgic_irq *irq,
@@ -202,7 +203,7 @@ static void print_irq_state(struct seq_file *s, struct vgic_irq *irq, 


	seq_printf(s, "       %s %4d "

		      "    %2d "

		      "%d%d%d%d%d%d "

		      "%d%d%d%d%d%d%d "

		      "%8d "

		      "%8x "

		      " %2x "
@@ -217,6 +218,7 @@ static void print_irq_state(struct seq_file *s, struct vgic_irq *irq, 
			irq->enabled,

			irq->hw,

			irq->config == VGIC_CONFIG_LEVEL,

			irq->group,

			irq->hwintid,

			irq->mpidr,

			irq->source,

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

+17 −2
Original line number Diff line number Diff line
@@ -175,10 +175,13 @@ static int kvm_vgic_dist_init(struct kvm *kvm, unsigned int nr_spis) 
		irq->vcpu = NULL;

		irq->target_vcpu = vcpu0;

		kref_init(&irq->refcount);

		if (dist->vgic_model == KVM_DEV_TYPE_ARM_VGIC_V2)

		if (dist->vgic_model == KVM_DEV_TYPE_ARM_VGIC_V2) {

			irq->targets = 0;

		else

			irq->group = 0;

		} else {

			irq->mpidr = 0;

			irq->group = 1;

		}

	}

	return 0;

}
@@ -227,6 +230,18 @@ int kvm_vgic_vcpu_init(struct kvm_vcpu *vcpu) 
			/* PPIs */

			irq->config = VGIC_CONFIG_LEVEL;

		}



		/*

		 * GICv3 can only be created via the KVM_DEVICE_CREATE API and

		 * so we always know the emulation type at this point as it's

		 * either explicitly configured as GICv3, or explicitly

		 * configured as GICv2, or not configured yet which also

		 * implies GICv2.

		 */

		if (dist->vgic_model == KVM_DEV_TYPE_ARM_VGIC_V3)

			irq->group = 1;

		else

			irq->group = 0;

	}



	if (!irqchip_in_kernel(vcpu->kvm))

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

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ static struct vgic_irq *vgic_add_lpi(struct kvm *kvm, u32 intid, 
	kref_init(&irq->refcount);

	irq->intid = intid;

	irq->target_vcpu = vcpu;

	irq->group = 1;



	spin_lock_irqsave(&dist->lpi_list_lock, flags);

CRA Git | Maintained and supported by SUSTech CRA and CCSE