From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Nicolas Boichat <drinkcat@chromium.org>,
Sean Wang <sean.wang@kernel.org>,
Linus Walleij <linus.walleij@linaro.org>,
Sasha Levin <sashal@kernel.org>,
linux-gpio@vger.kernel.org
Subject: [PATCH AUTOSEL 5.1 36/39] pinctrl: mediatek: Update cur_mask in mask/mask ops
Date: Tue, 2 Jul 2019 22:15:11 -0400 [thread overview]
Message-ID: <20190703021514.17727-36-sashal@kernel.org> (raw)
In-Reply-To: <20190703021514.17727-1-sashal@kernel.org>
From: Nicolas Boichat <drinkcat@chromium.org>
[ Upstream commit 9d957a959bc8c3dfe37572ac8e99affb5a885965 ]
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).
Step by step, for a line that has both wake and interrupt enabled:
1. cur_mask[irq] = 1; wake_mask[irq] = 1; EINT_EN[irq] = 1 (interrupt
enabled at hardware level)
2. System suspends, resumes due to that line (at this stage EINT_EN
== wake_mask)
3. irq_pm_check_wakeup is called, and disables the interrupt =>
EINT_EN[irq] = 0, but we still have cur_mask[irq] = 1
4. mtk_eint_do_resume is called, and restores EINT_EN = cur_mask, so
it reenables EINT_EN[irq] = 1 => interrupt storm as the driver
is not yet ready to handle the interrupt.
This patch fixes the issue in step 3, by recording all 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.
The interrupt will be re-enabled properly later on, sometimes after
mtk_eint_do_resume, when the driver is ready to handle it.
Fixes: 58a5e1b64bb0 ("pinctrl: mediatek: Implement wake handler and suspend resume")
Signed-off-by: Nicolas Boichat <drinkcat@chromium.org>
Acked-by: Sean Wang <sean.wang@kernel.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.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 737385e86beb..7e526bcf5e0b 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.20.1
next prev parent reply other threads:[~2019-07-03 2:16 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-03 2:14 [PATCH AUTOSEL 5.1 01/39] ARM: dts: meson8: fix GPU interrupts and drop an undocumented property Sasha Levin
2019-07-03 2:14 ` [PATCH AUTOSEL 5.1 02/39] ARM: dts: meson8b: fix the operating voltage of the Mali GPU Sasha Levin
2019-07-03 2:14 ` [PATCH AUTOSEL 5.1 03/39] idr: Fix idr_get_next race with idr_remove Sasha Levin
2019-07-03 2:14 ` [PATCH AUTOSEL 5.1 04/39] irqchip/irq-csky-mpintc: Support auto irq deliver to all cpus Sasha Levin
2019-07-03 2:14 ` [PATCH AUTOSEL 5.1 05/39] irqchip/gic-v3-its: Fix command queue pointer comparison bug Sasha Levin
2019-07-03 2:14 ` [PATCH AUTOSEL 5.1 06/39] clk: ti: clkctrl: Fix returning uninitialized data Sasha Levin
2019-07-03 2:14 ` [PATCH AUTOSEL 5.1 07/39] efi/bgrt: Drop BGRT status field reserved bits check Sasha Levin
2019-07-03 2:14 ` [PATCH AUTOSEL 5.1 08/39] arm64: dts: ls1028a: Fix CPU idle fail Sasha Levin
2019-07-11 5:04 ` Ran Wang
2019-07-11 6:43 ` Greg KH
2019-07-03 2:14 ` [PATCH AUTOSEL 5.1 09/39] selftests/powerpc: Add test of fork with mapping above 512TB Sasha Levin
2019-07-03 2:14 ` [PATCH AUTOSEL 5.1 10/39] perf/core: Fix perf_sample_regs_user() mm check Sasha Levin
2019-07-03 2:14 ` [PATCH AUTOSEL 5.1 11/39] ARM: dts: gemini Fix up DNS-313 compatible string Sasha Levin
2019-07-03 2:14 ` [PATCH AUTOSEL 5.1 12/39] ARM: omap2: remove incorrect __init annotation Sasha Levin
2019-07-03 2:14 ` [PATCH AUTOSEL 5.1 13/39] afs: Fix uninitialised spinlock afs_volume::cb_break_lock Sasha Levin
2019-07-03 2:14 ` [PATCH AUTOSEL 5.1 14/39] x86/efi: fix a -Wtype-limits compilation warning Sasha Levin
2019-07-03 2:14 ` [PATCH AUTOSEL 5.1 15/39] x86/apic: Fix integer overflow on 10 bit left shift of cpu_khz Sasha Levin
2019-07-03 2:14 ` [PATCH AUTOSEL 5.1 16/39] be2net: fix link failure after ethtool offline test Sasha Levin
2019-07-03 2:14 ` [PATCH AUTOSEL 5.1 17/39] ppp: mppe: Add softdep to arc4 Sasha Levin
2019-07-03 2:14 ` [PATCH AUTOSEL 5.1 18/39] net: stmmac: fixed new system time seconds value calculation Sasha Levin
2019-07-03 2:14 ` [PATCH AUTOSEL 5.1 19/39] net: stmmac: set IC bit when transmitting frames with HW timestamp Sasha Levin
2019-07-03 2:14 ` [PATCH AUTOSEL 5.1 20/39] sis900: fix TX completion Sasha Levin
2019-07-03 2:14 ` [PATCH AUTOSEL 5.1 21/39] ARM: dts: imx6ul: fix PWM[1-4] interrupts Sasha Levin
2019-07-03 2:14 ` [PATCH AUTOSEL 5.1 22/39] qmi_wwan: Fix out-of-bounds read Sasha Levin
2019-07-03 2:14 ` [PATCH AUTOSEL 5.1 23/39] pinctrl: mcp23s08: Fix add_data and irqchip_add_nested call order Sasha Levin
2019-07-03 2:14 ` [PATCH AUTOSEL 5.1 24/39] pinctrl: ocelot: fix gpio direction for pins after 31 Sasha Levin
2019-07-03 2:15 ` [PATCH AUTOSEL 5.1 25/39] pinctrl: ocelot: fix pinmuxing " Sasha Levin
2019-07-03 2:15 ` [PATCH AUTOSEL 5.1 26/39] dm table: don't copy from a NULL pointer in realloc_argv() Sasha Levin
2019-07-03 2:15 ` [PATCH AUTOSEL 5.1 27/39] dm verity: use message limit for data block corruption message Sasha Levin
2019-07-03 2:15 ` [PATCH AUTOSEL 5.1 28/39] x86/boot/64: Fix crash if kernel image crosses page table boundary Sasha Levin
2019-07-03 2:15 ` [PATCH AUTOSEL 5.1 29/39] x86/boot/64: Add missing fixup_pointer() for next_early_pgt access Sasha Levin
2019-07-03 2:15 ` [PATCH AUTOSEL 5.1 30/39] HID: chicony: add another quirk for PixArt mouse Sasha Levin
2019-07-03 2:15 ` [PATCH AUTOSEL 5.1 31/39] HID: uclogic: Add support for Huion HS64 tablet Sasha Levin
2019-07-03 2:15 ` [PATCH AUTOSEL 5.1 32/39] HID: multitouch: Add pointstick support for ALPS Touchpad Sasha Levin
2019-07-03 2:15 ` [PATCH AUTOSEL 5.1 33/39] pinctrl: mediatek: Ignore interrupts that are wake only during resume Sasha Levin
2019-07-03 2:15 ` [PATCH AUTOSEL 5.1 34/39] net: aquantia: fix vlans not working over bridged network Sasha Levin
2019-07-03 2:15 ` [PATCH AUTOSEL 5.1 35/39] cpu/hotplug: Fix out-of-bounds read when setting fail state Sasha Levin
2019-07-03 2:15 ` Sasha Levin [this message]
2019-07-03 2:15 ` [PATCH AUTOSEL 5.1 37/39] mm/oom_kill.c: fix uninitialized oc->constraint Sasha Levin
2019-07-03 2:15 ` [PATCH AUTOSEL 5.1 38/39] fork,memcg: alloc_thread_stack_node needs to set tsk->stack Sasha Levin
2019-07-03 2:15 ` [PATCH AUTOSEL 5.1 39/39] linux/kernel.h: fix overflow for DIV_ROUND_UP_ULL Sasha Levin
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=20190703021514.17727-36-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=drinkcat@chromium.org \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sean.wang@kernel.org \
--cc=stable@vger.kernel.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).