From: Nicolas Boichat <drinkcat@chromium.org> To: linux-mediatek@lists.infradead.org Cc: Sean Wang <sean.wang@kernel.org>, Linus Walleij <linus.walleij@linaro.org>, Matthias Brugger <matthias.bgg@gmail.com>, linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Chuanjia Liu <Chuanjia.Liu@mediatek.com>, evgreen@chromium.org, swboyd@chromium.org Subject: [PATCH 2/2] pinctrl: mediatek: Update cur_mask in mask/mask ops Date: Mon, 29 Apr 2019 11:55:15 +0800 [thread overview] Message-ID: <20190429035515.73611-3-drinkcat@chromium.org> (raw) In-Reply-To: <20190429035515.73611-1-drinkcat@chromium.org> During suspend/resume, mtk_eint_mask may be called while wake_mask is active. For example, this happens if a wake-source with an active interrupt handler wakes the system: irq/pm.c:irq_pm_check_wakeup would disable the interrupt, so that it can be handled later on in the resume flow. However, this may happen before mtk_eint_do_resume is called: in this case, wake_mask is loaded, and cur_mask is restored from an older copy, re-enabling the interrupt, and causing an interrupt storm (especially for level interrupts). Instead, we just record mask/unmask changes in cur_mask. This also avoids the need to read the current mask in eint_do_suspend, and we can remove mtk_eint_chip_read_mask function. Signed-off-by: Nicolas Boichat <drinkcat@chromium.org> --- drivers/pinctrl/mediatek/mtk-eint.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/drivers/pinctrl/mediatek/mtk-eint.c b/drivers/pinctrl/mediatek/mtk-eint.c index 737385e86beb807..7e526bcf5e0b55c 100644 --- a/drivers/pinctrl/mediatek/mtk-eint.c +++ b/drivers/pinctrl/mediatek/mtk-eint.c @@ -113,6 +113,8 @@ static void mtk_eint_mask(struct irq_data *d) void __iomem *reg = mtk_eint_get_offset(eint, d->hwirq, eint->regs->mask_set); + eint->cur_mask[d->hwirq >> 5] &= ~mask; + writel(mask, reg); } @@ -123,6 +125,8 @@ static void mtk_eint_unmask(struct irq_data *d) void __iomem *reg = mtk_eint_get_offset(eint, d->hwirq, eint->regs->mask_clr); + eint->cur_mask[d->hwirq >> 5] |= mask; + writel(mask, reg); if (eint->dual_edge[d->hwirq]) @@ -217,19 +221,6 @@ static void mtk_eint_chip_write_mask(const struct mtk_eint *eint, } } -static void mtk_eint_chip_read_mask(const struct mtk_eint *eint, - void __iomem *base, u32 *buf) -{ - int port; - void __iomem *reg; - - for (port = 0; port < eint->hw->ports; port++) { - reg = base + eint->regs->mask + (port << 2); - buf[port] = ~readl_relaxed(reg); - /* Mask is 0 when irq is enabled, and 1 when disabled. */ - } -} - static int mtk_eint_irq_request_resources(struct irq_data *d) { struct mtk_eint *eint = irq_data_get_irq_chip_data(d); @@ -384,7 +375,6 @@ static void mtk_eint_irq_handler(struct irq_desc *desc) int mtk_eint_do_suspend(struct mtk_eint *eint) { - mtk_eint_chip_read_mask(eint, eint->base, eint->cur_mask); mtk_eint_chip_write_mask(eint, eint->base, eint->wake_mask); return 0; -- 2.21.0.593.g511ec345e18-goog
WARNING: multiple messages have this Message-ID (diff)
From: Nicolas Boichat <drinkcat@chromium.org> To: linux-mediatek@lists.infradead.org Cc: Chuanjia Liu <Chuanjia.Liu@mediatek.com>, Linus Walleij <linus.walleij@linaro.org>, Sean Wang <sean.wang@kernel.org>, linux-kernel@vger.kernel.org, evgreen@chromium.org, swboyd@chromium.org, linux-gpio@vger.kernel.org, Matthias Brugger <matthias.bgg@gmail.com>, linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/2] pinctrl: mediatek: Update cur_mask in mask/mask ops Date: Mon, 29 Apr 2019 11:55:15 +0800 [thread overview] Message-ID: <20190429035515.73611-3-drinkcat@chromium.org> (raw) In-Reply-To: <20190429035515.73611-1-drinkcat@chromium.org> During suspend/resume, mtk_eint_mask may be called while wake_mask is active. For example, this happens if a wake-source with an active interrupt handler wakes the system: irq/pm.c:irq_pm_check_wakeup would disable the interrupt, so that it can be handled later on in the resume flow. However, this may happen before mtk_eint_do_resume is called: in this case, wake_mask is loaded, and cur_mask is restored from an older copy, re-enabling the interrupt, and causing an interrupt storm (especially for level interrupts). Instead, we just record mask/unmask changes in cur_mask. This also avoids the need to read the current mask in eint_do_suspend, and we can remove mtk_eint_chip_read_mask function. Signed-off-by: Nicolas Boichat <drinkcat@chromium.org> --- drivers/pinctrl/mediatek/mtk-eint.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/drivers/pinctrl/mediatek/mtk-eint.c b/drivers/pinctrl/mediatek/mtk-eint.c index 737385e86beb807..7e526bcf5e0b55c 100644 --- a/drivers/pinctrl/mediatek/mtk-eint.c +++ b/drivers/pinctrl/mediatek/mtk-eint.c @@ -113,6 +113,8 @@ static void mtk_eint_mask(struct irq_data *d) void __iomem *reg = mtk_eint_get_offset(eint, d->hwirq, eint->regs->mask_set); + eint->cur_mask[d->hwirq >> 5] &= ~mask; + writel(mask, reg); } @@ -123,6 +125,8 @@ static void mtk_eint_unmask(struct irq_data *d) void __iomem *reg = mtk_eint_get_offset(eint, d->hwirq, eint->regs->mask_clr); + eint->cur_mask[d->hwirq >> 5] |= mask; + writel(mask, reg); if (eint->dual_edge[d->hwirq]) @@ -217,19 +221,6 @@ static void mtk_eint_chip_write_mask(const struct mtk_eint *eint, } } -static void mtk_eint_chip_read_mask(const struct mtk_eint *eint, - void __iomem *base, u32 *buf) -{ - int port; - void __iomem *reg; - - for (port = 0; port < eint->hw->ports; port++) { - reg = base + eint->regs->mask + (port << 2); - buf[port] = ~readl_relaxed(reg); - /* Mask is 0 when irq is enabled, and 1 when disabled. */ - } -} - static int mtk_eint_irq_request_resources(struct irq_data *d) { struct mtk_eint *eint = irq_data_get_irq_chip_data(d); @@ -384,7 +375,6 @@ static void mtk_eint_irq_handler(struct irq_desc *desc) int mtk_eint_do_suspend(struct mtk_eint *eint) { - mtk_eint_chip_read_mask(eint, eint->base, eint->cur_mask); mtk_eint_chip_write_mask(eint, eint->base, eint->wake_mask); return 0; -- 2.21.0.593.g511ec345e18-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-04-29 3:55 UTC|newest] Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-04-29 3:55 [PATCH 0/2] pinctrl: mediatek: Fix 2 issues related to resume from wake sources Nicolas Boichat 2019-04-29 3:55 ` Nicolas Boichat 2019-04-29 3:55 ` [PATCH 1/2] pinctrl: mediatek: Ignore interrupts that are wake only during resume Nicolas Boichat 2019-04-29 3:55 ` Nicolas Boichat 2019-06-21 4:47 ` Sean Wang 2019-06-21 4:47 ` Sean Wang 2019-06-21 4:47 ` Sean Wang 2019-06-25 13:50 ` Linus Walleij 2019-06-25 13:50 ` Linus Walleij 2019-06-25 13:50 ` Linus Walleij 2019-04-29 3:55 ` Nicolas Boichat [this message] 2019-04-29 3:55 ` [PATCH 2/2] pinctrl: mediatek: Update cur_mask in mask/mask ops Nicolas Boichat 2019-05-13 22:29 ` Stephen Boyd 2019-05-13 22:29 ` Stephen Boyd 2019-05-14 1:37 ` Nicolas Boichat 2019-05-14 1:37 ` Nicolas Boichat 2019-05-14 1:37 ` Nicolas Boichat 2019-05-14 20:14 ` Stephen Boyd 2019-05-14 20:14 ` Stephen Boyd 2019-05-14 20:14 ` Stephen Boyd 2019-05-15 8:04 ` Nicolas Boichat 2019-05-15 8:04 ` Nicolas Boichat 2019-05-15 8:04 ` Nicolas Boichat 2019-05-30 17:12 ` Evan Green 2019-05-30 17:12 ` Evan Green 2019-05-30 17:12 ` Evan Green 2019-05-31 8:05 ` Chuanjia Liu 2019-05-31 8:05 ` Chuanjia Liu 2019-05-31 8:05 ` Chuanjia Liu 2019-05-31 17:17 ` Evan Green 2019-05-31 17:17 ` Evan Green 2019-05-31 17:17 ` Evan Green 2019-06-03 8:01 ` Chuanjia Liu 2019-06-03 8:01 ` Chuanjia Liu 2019-06-03 8:01 ` Chuanjia Liu 2019-06-04 0:57 ` Nicolas Boichat 2019-06-04 0:57 ` Nicolas Boichat 2019-06-04 0:57 ` Nicolas Boichat 2019-06-05 7:11 ` Chuanjia Liu 2019-06-05 7:11 ` Chuanjia Liu 2019-06-05 7:11 ` Chuanjia Liu 2019-06-10 22:25 ` Stephen Boyd 2019-06-10 22:25 ` Stephen Boyd 2019-06-10 22:25 ` Stephen Boyd 2019-06-21 4:20 ` Sean Wang 2019-06-21 4:20 ` Sean Wang 2019-06-21 4:20 ` Sean Wang 2019-06-25 13:52 ` Linus Walleij 2019-06-25 13:52 ` Linus Walleij 2019-06-25 13:52 ` Linus Walleij
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190429035515.73611-3-drinkcat@chromium.org \ --to=drinkcat@chromium.org \ --cc=Chuanjia.Liu@mediatek.com \ --cc=evgreen@chromium.org \ --cc=linus.walleij@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-gpio@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mediatek@lists.infradead.org \ --cc=matthias.bgg@gmail.com \ --cc=sean.wang@kernel.org \ --cc=swboyd@chromium.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.