Commit e7619f2a authored by Marc Zyngier's avatar Marc Zyngier Committed by Oliver Upton
Browse files

KVM: arm64: vgic: Kill VGIC_MAX_PRIVATE definition 



VGIC_MAX_PRIVATE is a pretty useless definition, and is better
replaced with VGIC_NR_PRIVATE_IRQS.

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20241117165757.247686-4-maz@kernel.org


Signed-off-by: default avatarOliver Upton <oliver.upton@linux.dev>
parent add570b3

arch/arm64/kvm/vgic/vgic.c

+2 −2
Original line number Diff line number Diff line
@@ -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];

	}

include/kvm/arm_vgic.h

+0 −1
Original line number Diff line number Diff line
@@ -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