KVM: arm64: vgic: Kill VGIC_MAX_PRIVATE definition

Marc Zyngier · oupton · commit e7619f2a2f8f · 2024-11-20T17:21:08.000-08:00
VGIC_MAX_PRIVATE is a pretty useless definition, and is better replaced with VGIC_NR_PRIVATE_IRQS. Signed-off-by: Marc Zyngier <maz@kernel.org> Link: https://lore.kernel.org/r/20241117165757.247686-4-maz@kernel.org Signed-off-by: Oliver Upton <oliver.upton@linux.dev>
diff --git a/arch/arm64/kvm/vgic/vgic.c b/arch/arm64/kvm/vgic/vgic.c
@@ -106,8 +106,8 @@ struct vgic_irq *vgic_get_vcpu_irq(struct kvm_vcpu *vcpu, u32 intid)
 		return NULL;
 
 	/* SGIs and PPIs */
-	if (intid <= VGIC_MAX_PRIVATE) {
-		intid = array_index_nospec(intid, VGIC_MAX_PRIVATE + 1);
+	if (intid < VGIC_NR_PRIVATE_IRQS) {
+		intid = array_index_nospec(intid, VGIC_NR_PRIVATE_IRQS);
 		return &vcpu->arch.vgic_cpu.private_irqs[intid];
 	}
 
diff --git a/include/kvm/arm_vgic.h b/include/kvm/arm_vgic.h
@@ -26,7 +26,6 @@
 #define VGIC_NR_SGIS		16
 #define VGIC_NR_PPIS		16
 #define VGIC_NR_PRIVATE_IRQS	(VGIC_NR_SGIS + VGIC_NR_PPIS)
-#define VGIC_MAX_PRIVATE	(VGIC_NR_PRIVATE_IRQS - 1)
 #define VGIC_MAX_SPI		1019
 #define VGIC_MAX_RESERVED	1023
 #define VGIC_MIN_LPI		8192

Original file line number	Diff line number	Diff line change
`@@ -106,8 +106,8 @@ struct vgic_irq vgic_get_vcpu_irq(struct kvm_vcpu vcpu, u32 intid)`
`106`	`106`	`return NULL;`
`107`	`107`
`108`	`108`	`/* SGIs and PPIs */`
`109`		`- if (intid <= VGIC_MAX_PRIVATE) {`
`110`		`- intid = array_index_nospec(intid, VGIC_MAX_PRIVATE + 1);`
	`109`	`+ if (intid < VGIC_NR_PRIVATE_IRQS) {`
	`110`	`+ intid = array_index_nospec(intid, VGIC_NR_PRIVATE_IRQS);`
`111`	`111`	`return &vcpu->arch.vgic_cpu.private_irqs[intid];`
`112`	`112`	`}`
`113`	`113`