Commit 2130b789 authored by Julien Thierry's avatar Julien Thierry Committed by Marc Zyngier
Browse files

irqchip/gic: Unify GIC priority definitions 



LPIs use the same priority value as other GIC interrupts.

Make the GIC default priority definition visible to ITS implementation
and use this same definition for LPI priorities.

Tested-by: default avatarDaniel Thompson <daniel.thompson@linaro.org>
Signed-off-by: default avatarJulien Thierry <julien.thierry@arm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 342677d7

drivers/irqchip/irq-gic-v3-its.c

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ static u32 lpi_id_bits; 
#define LPI_PROPBASE_SZ		ALIGN(BIT(LPI_NRBITS), SZ_64K)

#define LPI_PENDBASE_SZ		ALIGN(BIT(LPI_NRBITS) / 8, SZ_64K)



#define LPI_PROP_DEFAULT_PRIO	0xa0

#define LPI_PROP_DEFAULT_PRIO	GICD_INT_DEF_PRI



/*

 * Collection structure - just an ID, and a redistributor address to

include/linux/irqchip/arm-gic-common.h

+6 −0
Original line number Diff line number Diff line
@@ -13,6 +13,12 @@ 
#include <linux/types.h>

#include <linux/ioport.h>



#define GICD_INT_DEF_PRI		0xa0

#define GICD_INT_DEF_PRI_X4		((GICD_INT_DEF_PRI << 24) |\

					(GICD_INT_DEF_PRI << 16) |\

					(GICD_INT_DEF_PRI << 8) |\

					GICD_INT_DEF_PRI)



enum gic_type {

	GIC_V2,

	GIC_V3,

include/linux/irqchip/arm-gic.h

+0 −5
Original line number Diff line number Diff line
@@ -65,11 +65,6 @@ 
#define GICD_INT_EN_CLR_X32		0xffffffff

#define GICD_INT_EN_SET_SGI		0x0000ffff

#define GICD_INT_EN_CLR_PPI		0xffff0000

#define GICD_INT_DEF_PRI		0xa0

#define GICD_INT_DEF_PRI_X4		((GICD_INT_DEF_PRI << 24) |\

					(GICD_INT_DEF_PRI << 16) |\

					(GICD_INT_DEF_PRI << 8) |\

					GICD_INT_DEF_PRI)



#define GICD_IIDR_IMPLEMENTER_SHIFT	0

#define GICD_IIDR_IMPLEMENTER_MASK	(0xfff << GICD_IIDR_IMPLEMENTER_SHIFT)

CRA Git | Maintained and supported by SUSTech CRA and CCSE