* [PATCH] pinctrl: rockchip: add irq_enable & irq_disable ops
@ 2017-03-02 5:56 Jeffy Chen
2017-03-14 15:03 ` Linus Walleij
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Jeffy Chen @ 2017-03-02 5:56 UTC (permalink / raw)
To: linux-arm-kernel
Currently we are trying to enable/disable the clk of irq's gpio bank when
unmask/mask irq. But the kernel's "lazy disable approach" will skip masking
irq when the irq chip doesn't support irq_disable ops.
So we may hit this case:
irq_enable-> enable clk
irq_disable-> noop
irq_enable-> enable clk again
irq_disable-> noop
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
---
drivers/pinctrl/pinctrl-rockchip.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c
index 7813599..a9a7dfa 100644
--- a/drivers/pinctrl/pinctrl-rockchip.c
+++ b/drivers/pinctrl/pinctrl-rockchip.c
@@ -2061,7 +2061,7 @@ static void rockchip_irq_resume(struct irq_data *d)
clk_disable(bank->clk);
}
-static void rockchip_irq_gc_mask_clr_bit(struct irq_data *d)
+static void rockchip_irq_enable(struct irq_data *d)
{
struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
struct rockchip_pin_bank *bank = gc->private;
@@ -2070,7 +2070,7 @@ static void rockchip_irq_gc_mask_clr_bit(struct irq_data *d)
irq_gc_mask_clr_bit(d);
}
-static void rockchip_irq_gc_mask_set_bit(struct irq_data *d)
+static void rockchip_irq_disable(struct irq_data *d)
{
struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
struct rockchip_pin_bank *bank = gc->private;
@@ -2137,9 +2137,10 @@ static int rockchip_interrupts_register(struct platform_device *pdev,
gc->chip_types[0].regs.mask = GPIO_INTMASK;
gc->chip_types[0].regs.ack = GPIO_PORTS_EOI;
gc->chip_types[0].chip.irq_ack = irq_gc_ack_set_bit;
- gc->chip_types[0].chip.irq_mask = rockchip_irq_gc_mask_set_bit;
- gc->chip_types[0].chip.irq_unmask =
- rockchip_irq_gc_mask_clr_bit;
+ gc->chip_types[0].chip.irq_mask = irq_gc_mask_set_bit;
+ gc->chip_types[0].chip.irq_unmask = irq_gc_mask_clr_bit;
+ gc->chip_types[0].chip.irq_enable = rockchip_irq_enable;
+ gc->chip_types[0].chip.irq_disable = rockchip_irq_disable;
gc->chip_types[0].chip.irq_set_wake = irq_gc_set_wake;
gc->chip_types[0].chip.irq_suspend = rockchip_irq_suspend;
gc->chip_types[0].chip.irq_resume = rockchip_irq_resume;
--
2.1.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH] pinctrl: rockchip: add irq_enable & irq_disable ops
2017-03-02 5:56 [PATCH] pinctrl: rockchip: add irq_enable & irq_disable ops Jeffy Chen
@ 2017-03-14 15:03 ` Linus Walleij
2017-03-14 15:06 ` Heiko Stübner
2017-03-15 17:46 ` Heiko Stuebner
2017-03-23 9:05 ` Linus Walleij
2 siblings, 1 reply; 5+ messages in thread
From: Linus Walleij @ 2017-03-14 15:03 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Mar 2, 2017 at 6:56 AM, Jeffy Chen <jeffy.chen@rock-chips.com> wrote:
> Currently we are trying to enable/disable the clk of irq's gpio bank when
> unmask/mask irq. But the kernel's "lazy disable approach" will skip masking
> irq when the irq chip doesn't support irq_disable ops.
>
> So we may hit this case:
> irq_enable-> enable clk
> irq_disable-> noop
> irq_enable-> enable clk again
> irq_disable-> noop
>
> Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Heiko, can you look at this patch?
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] pinctrl: rockchip: add irq_enable & irq_disable ops
2017-03-14 15:03 ` Linus Walleij
@ 2017-03-14 15:06 ` Heiko Stübner
0 siblings, 0 replies; 5+ messages in thread
From: Heiko Stübner @ 2017-03-14 15:06 UTC (permalink / raw)
To: linux-arm-kernel
Hi Linus,
Am Dienstag, 14. M?rz 2017, 16:03:48 CET schrieb Linus Walleij:
> On Thu, Mar 2, 2017 at 6:56 AM, Jeffy Chen <jeffy.chen@rock-chips.com>
wrote:
> > Currently we are trying to enable/disable the clk of irq's gpio bank when
> > unmask/mask irq. But the kernel's "lazy disable approach" will skip
> > masking
> > irq when the irq chip doesn't support irq_disable ops.
> >
> > So we may hit this case:
> > irq_enable-> enable clk
> > irq_disable-> noop
> > irq_enable-> enable clk again
> > irq_disable-> noop
> >
> > Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
>
> Heiko, can you look at this patch?
This (and all the other pending pinctrl patches) are in my queue, but right
now I'm still hunting rockchip regressions in 4.11-rc, so haven't found the
time to review yet.
Heiko
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] pinctrl: rockchip: add irq_enable & irq_disable ops
2017-03-02 5:56 [PATCH] pinctrl: rockchip: add irq_enable & irq_disable ops Jeffy Chen
2017-03-14 15:03 ` Linus Walleij
@ 2017-03-15 17:46 ` Heiko Stuebner
2017-03-23 9:05 ` Linus Walleij
2 siblings, 0 replies; 5+ messages in thread
From: Heiko Stuebner @ 2017-03-15 17:46 UTC (permalink / raw)
To: linux-arm-kernel
Am Donnerstag, 2. M?rz 2017, 13:56:52 CET schrieb Jeffy Chen:
> Currently we are trying to enable/disable the clk of irq's gpio bank when
> unmask/mask irq. But the kernel's "lazy disable approach" will skip masking
> irq when the irq chip doesn't support irq_disable ops.
>
> So we may hit this case:
> irq_enable-> enable clk
> irq_disable-> noop
> irq_enable-> enable clk again
> irq_disable-> noop
>
> Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
While I'm not that versed in irqchip details, reading through some other
irqchips makes this look correct handling, so also makes sense in the context
of the pinctrl irqs here
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
> ---
>
> drivers/pinctrl/pinctrl-rockchip.c | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/pinctrl/pinctrl-rockchip.c
> b/drivers/pinctrl/pinctrl-rockchip.c index 7813599..a9a7dfa 100644
> --- a/drivers/pinctrl/pinctrl-rockchip.c
> +++ b/drivers/pinctrl/pinctrl-rockchip.c
> @@ -2061,7 +2061,7 @@ static void rockchip_irq_resume(struct irq_data *d)
> clk_disable(bank->clk);
> }
>
> -static void rockchip_irq_gc_mask_clr_bit(struct irq_data *d)
> +static void rockchip_irq_enable(struct irq_data *d)
> {
> struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
> struct rockchip_pin_bank *bank = gc->private;
> @@ -2070,7 +2070,7 @@ static void rockchip_irq_gc_mask_clr_bit(struct
> irq_data *d) irq_gc_mask_clr_bit(d);
> }
>
> -static void rockchip_irq_gc_mask_set_bit(struct irq_data *d)
> +static void rockchip_irq_disable(struct irq_data *d)
> {
> struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
> struct rockchip_pin_bank *bank = gc->private;
> @@ -2137,9 +2137,10 @@ static int rockchip_interrupts_register(struct
> platform_device *pdev, gc->chip_types[0].regs.mask = GPIO_INTMASK;
> gc->chip_types[0].regs.ack = GPIO_PORTS_EOI;
> gc->chip_types[0].chip.irq_ack = irq_gc_ack_set_bit;
> - gc->chip_types[0].chip.irq_mask = rockchip_irq_gc_mask_set_bit;
> - gc->chip_types[0].chip.irq_unmask =
> - rockchip_irq_gc_mask_clr_bit;
> + gc->chip_types[0].chip.irq_mask = irq_gc_mask_set_bit;
> + gc->chip_types[0].chip.irq_unmask = irq_gc_mask_clr_bit;
> + gc->chip_types[0].chip.irq_enable = rockchip_irq_enable;
> + gc->chip_types[0].chip.irq_disable = rockchip_irq_disable;
> gc->chip_types[0].chip.irq_set_wake = irq_gc_set_wake;
> gc->chip_types[0].chip.irq_suspend = rockchip_irq_suspend;
> gc->chip_types[0].chip.irq_resume = rockchip_irq_resume;
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] pinctrl: rockchip: add irq_enable & irq_disable ops
2017-03-02 5:56 [PATCH] pinctrl: rockchip: add irq_enable & irq_disable ops Jeffy Chen
2017-03-14 15:03 ` Linus Walleij
2017-03-15 17:46 ` Heiko Stuebner
@ 2017-03-23 9:05 ` Linus Walleij
2 siblings, 0 replies; 5+ messages in thread
From: Linus Walleij @ 2017-03-23 9:05 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Mar 2, 2017 at 6:56 AM, Jeffy Chen <jeffy.chen@rock-chips.com> wrote:
> Currently we are trying to enable/disable the clk of irq's gpio bank when
> unmask/mask irq. But the kernel's "lazy disable approach" will skip masking
> irq when the irq chip doesn't support irq_disable ops.
>
> So we may hit this case:
> irq_enable-> enable clk
> irq_disable-> noop
> irq_enable-> enable clk again
> irq_disable-> noop
>
> Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Patch applied with Heiko's review tag.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-03-23 9:05 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-02 5:56 [PATCH] pinctrl: rockchip: add irq_enable & irq_disable ops Jeffy Chen
2017-03-14 15:03 ` Linus Walleij
2017-03-14 15:06 ` Heiko Stübner
2017-03-15 17:46 ` Heiko Stuebner
2017-03-23 9:05 ` Linus Walleij
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).