diff options
| author | James Morse <james.morse@arm.com> | 2021-04-19 11:50:19 +0100 |
|---|---|---|
| committer | James Morse <james.morse@arm.com> | 2021-11-12 19:01:15 +0000 |
| commit | d69569a733100394b3e22e7fcef6f5013827ac3b (patch) | |
| tree | 570020f0d825a4c40c69d16903471857726cfbb9 | |
| parent | ca8fbf7b75dd6127b414d9079b8e0a14844c6e01 (diff) | |
| download | linux-d69569a733100394b3e22e7fcef6f5013827ac3b.tar.gz | |
arm64: irq: Collect GIC_IRQ_TYPE definitions into one place
To pass a GIC_IRQ_TYPE_ value via ACPI's fwspec in acpi_register_gsi(),
the value needs to be defined in a header that exists for ia64 and x86.
Instead of adding a third place that GIC_IRQ_TYPE_s are defined, move
the two existing ones to asm/irq.h.
Signed-off-by: James Morse <james.morse@arm.com>
| -rw-r--r-- | arch/arm64/include/asm/irq.h | 7 | ||||
| -rw-r--r-- | drivers/irqchip/irq-gic-v3.c | 2 | ||||
| -rw-r--r-- | include/linux/irqchip/arm-gic-v3.h | 6 |
3 files changed, 7 insertions, 8 deletions
diff --git a/arch/arm64/include/asm/irq.h b/arch/arm64/include/asm/irq.h index fac08e18bcd51..dc1e73509e1ce 100644 --- a/arch/arm64/include/asm/irq.h +++ b/arch/arm64/include/asm/irq.h @@ -6,6 +6,13 @@ #include <asm-generic/irq.h> +/* + * We need a value to serve as a irq-type for LPIs. Choose one that will + * hopefully pique the interest of the reviewer. + */ +#define GIC_IRQ_TYPE_LPI 0xa110c8ed +#define GIC_IRQ_TYPE_PARTITION (GIC_IRQ_TYPE_LPI + 1) + struct pt_regs; int set_handle_irq(void (*handle_irq)(struct pt_regs *)); diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c index 6337f0ce7ef99..e13492b194881 100644 --- a/drivers/irqchip/irq-gic-v3.c +++ b/drivers/irqchip/irq-gic-v3.c @@ -36,8 +36,6 @@ #define FLAGS_WORKAROUND_GICR_WAKER_MSM8996 (1ULL << 0) #define FLAGS_WORKAROUND_CAVIUM_ERRATUM_38539 (1ULL << 1) -#define GIC_IRQ_TYPE_PARTITION (GIC_IRQ_TYPE_LPI + 1) - struct redist_region { void __iomem *redist_base; phys_addr_t phys_base; diff --git a/include/linux/irqchip/arm-gic-v3.h b/include/linux/irqchip/arm-gic-v3.h index 81cbf85f73def..36bf4a4fcbbc4 100644 --- a/include/linux/irqchip/arm-gic-v3.h +++ b/include/linux/irqchip/arm-gic-v3.h @@ -603,12 +603,6 @@ #ifndef __ASSEMBLY__ -/* - * We need a value to serve as a irq-type for LPIs. Choose one that will - * hopefully pique the interest of the reviewer. - */ -#define GIC_IRQ_TYPE_LPI 0xa110c8ed - struct rdists { struct { raw_spinlock_t rd_lock; |