Commit ba9cc435 authored by Paul Burton's avatar Paul Burton Committed by Ralf Baechle
Browse files

MIPS: GIC: Move GIC_LOCAL_INT_* to asm/mips-gic.h 



Move the definition of VP-local interrupts provided by the MIPS Global
Interrupt Controller to the new asm/mips-gic.h header to be alongside
the new accessor functions. Whilst at it, convert to an enum which lends
itself more easily to expansion & documentation.

Signed-off-by: default avatarPaul Burton <paul.burton@imgtec.com>
Acked-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/17037/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 0d0cf58c

arch/mips/include/asm/mips-gic.h

+24 −0
Original line number Diff line number Diff line
@@ -277,6 +277,30 @@ GIC_VX_ACCESSOR_RW(64, 0x0a0, compare) 
/* GIC_Vx_EIC_SHADOW_SET_BASE - Set shadow register set for each interrupt */

GIC_VX_ACCESSOR_RW_INTR_REG(32, 0x100, 0x4, eic_shadow_set)



/**

 * enum mips_gic_local_interrupt - GIC local interrupts

 * @GIC_LOCAL_INT_WD: GIC watchdog timer interrupt

 * @GIC_LOCAL_INT_COMPARE: GIC count/compare interrupt

 * @GIC_LOCAL_INT_TIMER: CP0 count/compare interrupt

 * @GIC_LOCAL_INT_PERFCTR: Performance counter interrupt

 * @GIC_LOCAL_INT_SWINT0: Software interrupt 0

 * @GIC_LOCAL_INT_SWINT1: Software interrupt 1

 * @GIC_LOCAL_INT_FDC: Fast debug channel interrupt

 * @GIC_NUM_LOCAL_INTRS: The number of local interrupts

 *

 * Enumerates interrupts provided by the GIC that are local to a VP.

 */

enum mips_gic_local_interrupt {

	GIC_LOCAL_INT_WD,

	GIC_LOCAL_INT_COMPARE,

	GIC_LOCAL_INT_TIMER,

	GIC_LOCAL_INT_PERFCTR,

	GIC_LOCAL_INT_SWINT0,

	GIC_LOCAL_INT_SWINT1,

	GIC_LOCAL_INT_FDC,

	GIC_NUM_LOCAL_INTRS

};



/**

 * mips_gic_present() - Determine whether a GIC is present

 *

include/linux/irqchip/mips-gic.h

+0 −10
Original line number Diff line number Diff line
@@ -38,16 +38,6 @@ 
/* Mapped interrupt to pin X, then GIC will generate the vector (X+1). */

#define GIC_PIN_TO_VEC_OFFSET	1



/* Local GIC interrupts. */

#define GIC_LOCAL_INT_WD	0 /* GIC watchdog */

#define GIC_LOCAL_INT_COMPARE	1 /* GIC count and compare timer */

#define GIC_LOCAL_INT_TIMER	2 /* CPU timer interrupt */

#define GIC_LOCAL_INT_PERFCTR	3 /* CPU performance counter */

#define GIC_LOCAL_INT_SWINT0	4 /* CPU software interrupt 0 */

#define GIC_LOCAL_INT_SWINT1	5 /* CPU software interrupt 1 */

#define GIC_LOCAL_INT_FDC	6 /* CPU fast debug channel */

#define GIC_NUM_LOCAL_INTRS	7



/* Convert between local/shared IRQ number and GIC HW IRQ number. */

#define GIC_LOCAL_HWIRQ_BASE	0

#define GIC_LOCAL_TO_HWIRQ(x)	(GIC_LOCAL_HWIRQ_BASE + (x))

CRA Git | Maintained and supported by SUSTech CRA and CCSE