diff options
| author | Marc Zyngier <maz@kernel.org> | 2021-12-16 13:24:24 +0000 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2021-12-16 13:24:24 +0000 |
| commit | 16e3613a39fd14d0a8888160acee612a31dd1a2a (patch) | |
| tree | ac8d9effe81e76e400447cc456cd85b2b0707530 /include | |
| parent | 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 (diff) | |
| parent | 835f442fdbce33a47a6bde356643fd7e3ef7ec1b (diff) | |
Merge branch irq/its-kexec-rt into irq/irqchip-next
* irq/its-kexec-rt:
: .
: Series from Valentin Schneider, aiming at fixing the issues
: the ITS driver has with PREEMPT_RT whilst trying to reserve
: memory at early boot to support kexec.
: .
irqchip/gic-v3-its: Limit memreserve cpuhp state lifetime
irqchip/gic-v3-its: Postpone LPI pending table freeing and memreserve
irqchip/gic-v3-its: Give the percpu rdist struct its own flags field
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/irqchip/arm-gic-v3.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/irqchip/arm-gic-v3.h b/include/linux/irqchip/arm-gic-v3.h index 81cbf85f73de..12d91f0dedf9 100644 --- a/include/linux/irqchip/arm-gic-v3.h +++ b/include/linux/irqchip/arm-gic-v3.h @@ -615,7 +615,7 @@ struct rdists { void __iomem *rd_base; struct page *pend_page; phys_addr_t phys_base; - bool lpi_enabled; + u64 flags; cpumask_t *vpe_table_mask; void *vpe_l1_base; } __percpu *rdist; @@ -624,6 +624,7 @@ struct rdists { u64 flags; u32 gicd_typer; u32 gicd_typer2; + int cpuhp_memreserve_state; bool has_vlpis; bool has_rvpeid; bool has_direct_lpi; @@ -632,6 +633,7 @@ struct rdists { struct irq_domain; struct fwnode_handle; +int __init its_lpi_memreserve_init(void); int its_cpu_init(void); int its_init(struct fwnode_handle *handle, struct rdists *rdists, struct irq_domain *domain); |