Commit c107d613 authored Sep 18, 2019 by Zenghui Yu Committed by Marc Zyngier Sep 18, 2019

irqchip/gic-v3: Fix GIC_LINE_NR accessor



As per GIC spec, ITLinesNumber indicates the maximum SPI INTID that
the GIC implementation supports. And the maximum SPI INTID an
implementation might support is 1019 (field value 11111).

max(GICD_TYPER_SPIS(...), 1020) is not what we actually want for
GIC_LINE_NR. Fix it to min(GICD_TYPER_SPIS(...), 1020).

Signed-off-by: Zenghui Yu <yuzenghui@huawei.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/1568789850-14080-1-git-send-email-yuzenghui@huawei.com

parent 212fbf2c

drivers/irqchip/irq-gic-v3.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -59,7 +59,7 @@ static struct gic_chip_data gic_data __read_mostly;
		static DEFINE_STATIC_KEY_TRUE(supports_deactivate_key);

		#define GIC_ID_NR (1U << GICD_TYPER_ID_BITS(gic_data.rdists.gicd_typer))
		#define GIC_LINE_NR max(GICD_TYPER_SPIS(gic_data.rdists.gicd_typer), 1020U)
		#define GIC_LINE_NR min(GICD_TYPER_SPIS(gic_data.rdists.gicd_typer), 1020U)
		#define GIC_ESPI_NR GICD_TYPER_ESPIS(gic_data.rdists.gicd_typer)

		/*