2021-01-25 04:20:29

by mtk15103

Subject: [PATCH V3] pinctrl: mediatek: Fix trigger type setting follow for unexpected interrupt

When flipping the polarity will be generated interrupt under certain
circumstances, but GPIO external signal has not changed.
Then, mask the interrupt before polarity setting, and clear the
unexpected interrupt after trigger type setting completed.

Remove mtk_eint_flip_edge: because mtk_eint_unmask already calls it.

Signed-off-by: Hailong Fan <[email protected]>
Reviewed-by: Nicolas Boichat <[email protected]>
---
drivers/pinctrl/mediatek/mtk-eint.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/drivers/pinctrl/mediatek/mtk-eint.c b/drivers/pinctrl/mediatek/mtk-eint.c
index 22736f60c16c..3b9b5dbd7968 100644
--- a/drivers/pinctrl/mediatek/mtk-eint.c
+++ b/drivers/pinctrl/mediatek/mtk-eint.c
@@ -157,6 +157,7 @@ static void mtk_eint_ack(struct irq_data *d)
static int mtk_eint_set_type(struct irq_data *d, unsigned int type)
{
struct mtk_eint *eint = irq_data_get_irq_chip_data(d);
+ bool masked;
u32 mask = BIT(d->hwirq & 0x1f);
void __iomem *reg;

@@ -173,6 +174,13 @@ static int mtk_eint_set_type(struct irq_data *d, unsigned int type)
else
eint->dual_edge[d->hwirq] = 0;

+ if (!mtk_eint_get_mask(eint, d->hwirq)) {
+ mtk_eint_mask(d);
+ masked = false;
+ } else {
+ masked = true;
+ }
+
if (type & (IRQ_TYPE_LEVEL_LOW | IRQ_TYPE_EDGE_FALLING)) {
reg = mtk_eint_get_offset(eint, d->hwirq, eint->regs->pol_clr);
writel(mask, reg);
@@ -189,8 +197,9 @@ static int mtk_eint_set_type(struct irq_data *d, unsigned int type)
writel(mask, reg);
}

- if (eint->dual_edge[d->hwirq])
- mtk_eint_flip_edge(eint, d->hwirq);
+ mtk_eint_ack(d);
+ if (!masked)
+ mtk_eint_unmask(d);

return 0;
}
--
2.18.0

2021-01-25 13:26:15

by Linus Walleij

Subject: Re: [PATCH V3] pinctrl: mediatek: Fix trigger type setting follow for unexpected interrupt

On Mon, Jan 25, 2021 at 5:18 AM Hailong Fan <[email protected]> wrote:

> When flipping the polarity will be generated interrupt under certain
> circumstances, but GPIO external signal has not changed.
> Then, mask the interrupt before polarity setting, and clear the
> unexpected interrupt after trigger type setting completed.
>
> Remove mtk_eint_flip_edge: because mtk_eint_unmask already calls it.
>
> Signed-off-by: Hailong Fan <[email protected]>
> Reviewed-by: Nicolas Boichat <[email protected]>

Took out v2 and applied this v3 instead.
(No idea what the difference is, you don't say.)

Yours,
Linus Walleij

2021-01-26 10:21:16

by mtk15103

Subject: Re: [PATCH V3] pinctrl: mediatek: Fix trigger type setting follow for unexpected interrupt

On Mon, 2021-01-25 at 14:11 +0100, Linus Walleij wrote:
> On Mon, Jan 25, 2021 at 5:18 AM Hailong Fan <[email protected]> wrote:
>
> > When flipping the polarity will be generated interrupt under certain
> > circumstances, but GPIO external signal has not changed.
> > Then, mask the interrupt before polarity setting, and clear the
> > unexpected interrupt after trigger type setting completed.
> >
> > Remove mtk_eint_flip_edge: because mtk_eint_unmask already calls it.
> >
> > Signed-off-by: Hailong Fan <[email protected]>
> > Reviewed-by: Nicolas Boichat <[email protected]>
>
> Took out v2 and applied this v3 instead.
> (No idea what the difference is, you don't say.)
V3 only add commit message "Remove mtk_eint_flip_edge: because mtk_eint_unmask already calls it."
Compared to V2, the patch has not changed.
Thanks.

> Yours,
> Linus Walleij