irqchip/stm32: Retrigger both in eoi and unmask callbacks
Subsystems (4)
PATCH 1/1 irqchip/stm32: Retrigger both in eoi and unmask callbacks
Sampling the IRQ line state in EOI and retriggering the interrupt to work around missing level-triggered interrupt support only works for non-threaded interrupts. Threaded interrupts must be retriggered the same way in unmask callback.
--- drivers/pinctrl/stm32/pinctrl-stm32.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
drivers/pinctrl/stm32/pinctrl-stm32.c +14 -4
@@ -304,18 +304,22 @@ static const struct gpio_chip stm32_gpio_template = { .get_direction = stm32_gpio_get_direction, }; -void stm32_gpio_irq_eoi (struct irq_data *d) +static void stm32_gpio_irq_trigger (struct irq_data *d) {struct stm32_gpio_bank *bank = d->domain->host_data;int level; -irq_chip_eoi_parent (d); -/* If level interrupt type then retrig */ level =stm32_gpio_get (&bank->gpio_chip, d->hwirq);if ((level ==0 && bank->irq_type[d->hwirq] ==IRQ_TYPE_LEVEL_LOW ) || (level ==1 && bank->irq_type[d->hwirq] ==IRQ_TYPE_LEVEL_HIGH ))irq_chip_retrigger_hierarchy (d); +} + +void stm32_gpio_irq_eoi (struct irq_data *d) +{ +irq_chip_eoi_parent (d); +stm32_gpio_irq_trigger (d); };static int stm32_gpio_set_type (struct irq_data *d,unsigned int type)
@@ -371,12 +375,18 @@ static void stm32_gpio_irq_release_resources(struct irq_data *irq_data)gpiochip_unlock_as_irq (&bank->gpio_chip, irq_data->hwirq); } +static void stm32_gpio_irq_unmask (struct irq_data *d) +{ +irq_chip_unmask_parent (d); +stm32_gpio_irq_trigger (d); +} +static struct irq_chip stm32_gpio_irq_chip = { .name ="stm32gpio" , .irq_eoi = stm32_gpio_irq_eoi, .irq_ack = irq_chip_ack_parent, .irq_mask = irq_chip_mask_parent, - .irq_unmask = irq_chip_unmask_parent, + .irq_unmask = stm32_gpio_irq_unmask, .irq_set_type = stm32_gpio_set_type, .irq_set_wake = irq_chip_set_wake_parent, .irq_request_resources = stm32_gpio_irq_request_resources,
Signature · 1 line
2.25.1
Quoted 31 lines · On Tue, 24 Mar 2020 00:51:32 +0100 Marek Vasut <[email protected]> wrote:
Sampling the IRQ line state in EOI and retriggering the interrupt to work around missing level-triggered interrupt support only works for non-threaded interrupts. Threaded interrupts must be retriggered the same way in unmask callback.
Signed-off-by Marek Vasut <[email protected]>Cc Alexandre Torgue <[email protected]>Cc Jason Cooper <[email protected]>Cc Linus Walleij <[email protected]>Cc Marc Zyngier <[email protected]>,Cc Thomas Gleixner <[email protected]>--- drivers/pinctrl/stm32/pinctrl-stm32.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)drivers/pinctrl/stm32/pinctrl-stm32.c +1
-1@@ -304,18 +304,22 @@ static const struct gpio_chip stm32_gpio_template = { .get_direction = stm32_gpio_get_direction, }; -void stm32_gpio_irq_eoi (struct irq_data *d) +static void stm32_gpio_irq_trigger (struct irq_data *d) {struct stm32_gpio_bank *bank = d->domain->host_data;int level;
drivers/pinctrl/stm32/pinctrl-stm32.c static const struct gpio_chip stm32_gpio_template = { · line 319
Quoted 10 lines
drivers/pinctrl/stm32/pinctrl-stm32.c +3
-2-irq_chip_eoi_parent (d); -/* If level interrupt type then retrig */ level =stm32_gpio_get (&bank->gpio_chip, d->hwirq);if ((level ==0 && bank->irq_type[d->hwirq] ==IRQ_TYPE_LEVEL_LOW ) || (level ==1 && bank->irq_type[d->hwirq] ==IRQ_TYPE_LEVEL_HIGH ))irq_chip_retrigger_hierarchy (d); +} + +void stm32_gpio_irq_eoi (struct irq_data *d)
This should obviously be static. I'll amend it locally.
Quoted 16 lines
drivers/pinctrl/stm32/pinctrl-stm32.c +9
-0+{ +irq_chip_eoi_parent (d); +stm32_gpio_irq_trigger (d); };static int stm32_gpio_set_type (struct irq_data *d,unsigned int type)@@ -371,12 +375,18 @@ static void stm32_gpio_irq_release_resources(struct irq_data *irq_data)gpiochip_unlock_as_irq (&bank->gpio_chip, irq_data->hwirq); } +static void stm32_gpio_irq_unmask (struct irq_data *d) +{ +irq_chip_unmask_parent (d); +stm32_gpio_irq_trigger (d); +} +
drivers/pinctrl/stm32/pinctrl-stm32.c static void stm32_gpio_irq_release_resources(struct irq_data *irq_data) · line 392
Quoted 10 lines
drivers/pinctrl/stm32/pinctrl-stm32.c +1
-1static struct irq_chip stm32_gpio_irq_chip = { .name ="stm32gpio" , .irq_eoi = stm32_gpio_irq_eoi, .irq_ack = irq_chip_ack_parent, .irq_mask = irq_chip_mask_parent, - .irq_unmask = irq_chip_unmask_parent, + .irq_unmask = stm32_gpio_irq_unmask, .irq_set_type = stm32_gpio_set_type, .irq_set_wake = irq_chip_set_wake_parent, .irq_request_resources = stm32_gpio_irq_request_resources,
I'll queue this for 5.7.
Thanks,
M.
Signature · 1 line
Jazz is not dead. It just smells funny...
The following commit has been merged into the irq/core branch of tip:
The following commit has been merged into the irq/core branch of tip:
Commit-ID: 00760d3cd9de2ccee6b73e30b53e71704a99209e Gitweb: https://git.kernel.org/tip/00760d3cd9de2ccee6b73e30b53e71704a99209e Author: Marek Vasut <[email protected]> AuthorDate: Tue, 24 Mar 2020 00:51:32 +01:00 Committer: Marc Zyngier <[email protected]> CommitterDate: Tue, 24 Mar 2020 11:12:34
irqchip/stm32: Retrigger both in eoi and unmask callbacks
Sampling the IRQ line state in EOI and retriggering the interrupt to work around missing level-triggered interrupt support only works for non-threaded interrupts. Threaded interrupts must be retriggered the same way in unmask callback.
--- drivers/pinctrl/stm32/pinctrl-stm32.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
drivers/pinctrl/stm32/pinctrl-stm32.c +14 -4
@@ -304,18 +304,22 @@ static const struct gpio_chip stm32_gpio_template = { .get_direction = stm32_gpio_get_direction, }; -void stm32_gpio_irq_eoi (struct irq_data *d) +static void stm32_gpio_irq_trigger (struct irq_data *d) {struct stm32_gpio_bank *bank = d->domain->host_data;int level; -irq_chip_eoi_parent (d); -/* If level interrupt type then retrig */ level =stm32_gpio_get (&bank->gpio_chip, d->hwirq);if ((level ==0 && bank->irq_type[d->hwirq] ==IRQ_TYPE_LEVEL_LOW ) || (level ==1 && bank->irq_type[d->hwirq] ==IRQ_TYPE_LEVEL_HIGH ))irq_chip_retrigger_hierarchy (d); +} + +static void stm32_gpio_irq_eoi (struct irq_data *d) +{ +irq_chip_eoi_parent (d); +stm32_gpio_irq_trigger (d); };static int stm32_gpio_set_type (struct irq_data *d,unsigned int type)
@@ -371,12 +375,18 @@ static void stm32_gpio_irq_release_resources(struct irq_data *irq_data)gpiochip_unlock_as_irq (&bank->gpio_chip, irq_data->hwirq); } +static void stm32_gpio_irq_unmask (struct irq_data *d) +{ +irq_chip_unmask_parent (d); +stm32_gpio_irq_trigger (d); +} +static struct irq_chip stm32_gpio_irq_chip = { .name ="stm32gpio" , .irq_eoi = stm32_gpio_irq_eoi, .irq_ack = irq_chip_ack_parent, .irq_mask = irq_chip_mask_parent, - .irq_unmask = irq_chip_unmask_parent, + .irq_unmask = stm32_gpio_irq_unmask, .irq_set_type = stm32_gpio_set_type, .irq_set_wake = irq_chip_set_wake_parent, .irq_request_resources = stm32_gpio_irq_request_resources,