| Message ID | 20190206151521.6574-1-linus.walleij@linaro.org |
|---|---|
| State | Accepted |
| Commit | 5aa5bd563ce041d931c0dc1fc436dd18c27c60a7 |
| Headers | show |
| Series | genirq: introduce irq_chip_mask_ack_parent() | expand |
On 06/02/2019 15:15, Linus Walleij wrote: > The hierarchical irqchip never before ran into a situation > where the parent is not "simple", i.e. does not implement > .irq_ack() and .irq_mask() like most, but the qcom-pm8xxx.c > happens to implement only .irq_mask_ack(). > > Since we want to make ssbi-gpio a hierarchical child of this > irqchip, it must *also* only implement .irq_mask_ack() > and call down to the parent, and for this we of course > need irq_chip_mask_ack_parent(). > > Cc: Brian Masney <masneyb@onstation.org> > Cc: Marc Zyngier <marc.zyngier@arm.com> > Cc: Thomas Gleixner <tglx@linutronix.de> > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Marc Zyngier <marc.zyngier@arm.com> M. -- Jazz is not dead. It just smells funny...
diff --git a/include/linux/irq.h b/include/linux/irq.h index def2b2aac8b1..9a1a67d2e07d 100644 --- a/include/linux/irq.h +++ b/include/linux/irq.h @@ -605,6 +605,7 @@ extern void irq_chip_disable_parent(struct irq_data *data); extern void irq_chip_ack_parent(struct irq_data *data); extern int irq_chip_retrigger_hierarchy(struct irq_data *data); extern void irq_chip_mask_parent(struct irq_data *data); +extern void irq_chip_mask_ack_parent(struct irq_data *data); extern void irq_chip_unmask_parent(struct irq_data *data); extern void irq_chip_eoi_parent(struct irq_data *data); extern int irq_chip_set_affinity_parent(struct irq_data *data, diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index 4a30beb7ac2d..aeacd58ed7fb 100644 --- a/kernel/irq/chip.c +++ b/kernel/irq/chip.c @@ -1279,6 +1279,17 @@ void irq_chip_mask_parent(struct irq_data *data) } EXPORT_SYMBOL_GPL(irq_chip_mask_parent); +/** + * irq_chip_mask_ack_parent - Mask and acknowledge the parent interrupt + * @data: Pointer to interrupt specific data + */ +void irq_chip_mask_ack_parent(struct irq_data *data) +{ + data = data->parent_data; + data->chip->irq_mask_ack(data); +} +EXPORT_SYMBOL_GPL(irq_chip_mask_ack_parent); + /** * irq_chip_unmask_parent - Unmask the parent interrupt * @data: Pointer to interrupt specific data
The hierarchical irqchip never before ran into a situation where the parent is not "simple", i.e. does not implement .irq_ack() and .irq_mask() like most, but the qcom-pm8xxx.c happens to implement only .irq_mask_ack(). Since we want to make ssbi-gpio a hierarchical child of this irqchip, it must *also* only implement .irq_mask_ack() and call down to the parent, and for this we of course need irq_chip_mask_ack_parent(). Cc: Brian Masney <masneyb@onstation.org> Cc: Marc Zyngier <marc.zyngier@arm.com> Cc: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- Marc/Tglx: can you please ACK this so that I can include it when fixing up the SSBI GPIO hierarchy. Brian: please add this to your patch series so you can fix up the hierarchy on the SSBI GPIO (will send patch). --- include/linux/irq.h | 1 + kernel/irq/chip.c | 11 +++++++++++ 2 files changed, 12 insertions(+) -- 2.20.1