From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 00222C43219 for ; Mon, 29 Apr 2019 03:55:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C8347206BF for ; Mon, 29 Apr 2019 03:55:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="e6r9RTIN" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727271AbfD2Dze (ORCPT ); Sun, 28 Apr 2019 23:55:34 -0400 Received: from mail-pf1-f196.google.com ([209.85.210.196]:34769 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727231AbfD2Dza (ORCPT ); Sun, 28 Apr 2019 23:55:30 -0400 Received: by mail-pf1-f196.google.com with SMTP id b3so4652935pfd.1 for ; Sun, 28 Apr 2019 20:55:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7lsB7l68Q2QXqBhtOyTwuTtF7RZuXTpMIg50jCRbpi0=; b=e6r9RTINdTkzBfmhCn0Zd/uS9VD+tKpBrRTZLnWJRhIaRQGsTalHikdiV1rFz9XJwT YG3UGzwrhVYHjCSpiCl9rA2tJ6OfZ4pgofHmyQ36rynN9F8Rqzjt+iFzzoZfg2lklROm 8z/efRXO4gc+tbSEyy5VY+144Yd6nv2H+fBoM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7lsB7l68Q2QXqBhtOyTwuTtF7RZuXTpMIg50jCRbpi0=; b=nLHrCpRfJTrteoRQ4mkTJ92+Hj48JVoGTSe53HSJVQYfMEchhpLDVS0FfXq3WrVAAF WreoIcfTjVouOxitXqNyrp8kvrL+8DDRoGysYB/3JaEdVIOSZVMpMqenI80OemYCa4rf h7TO2jV3tysDULCVTYXTXnXy9RmM3UKDWbY1zIV8+GUI6eyGZLCyyUVC/ovALzgn/ZoH YwNdn+UqD4JZMt1x6ts51gbb/oODCEfvdtpm/3GRpkRrssOZ7NgxHWtiqI+SXE8aUIM0 AoSNe1YKgcFBE1y9Q+IfNq2v76MCFU4G/N5pabchumKsFUVoBKxXmj4OcDblZFX7c774 zyew== X-Gm-Message-State: APjAAAXCSxBI9DwQAHzHtrBgMB9poEjgH+XCXCNMB4rr9ZlG/I4iMONl rpmgSTNpFdr8vP8nRa+M+bp7KQ== X-Google-Smtp-Source: APXvYqwtzrtpO7ganaV1Gc2uDvzrWfkie1Ma+Bpr6cXgpqNo8hY6cYwwk1o8w1b/+Ox9y8r8j8wwBw== X-Received: by 2002:aa7:9116:: with SMTP id 22mr53588470pfh.165.1556510129598; Sun, 28 Apr 2019 20:55:29 -0700 (PDT) Received: from drinkcat2.tpe.corp.google.com ([2401:fa00:1:b:d8b7:33af:adcb:b648]) by smtp.gmail.com with ESMTPSA id x128sm55433585pfx.103.2019.04.28.20.55.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Apr 2019 20:55:29 -0700 (PDT) From: Nicolas Boichat To: linux-mediatek@lists.infradead.org Cc: Sean Wang , Linus Walleij , Matthias Brugger , linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Chuanjia Liu , evgreen@chromium.org, swboyd@chromium.org Subject: [PATCH 1/2] pinctrl: mediatek: Ignore interrupts that are wake only during resume Date: Mon, 29 Apr 2019 11:55:14 +0800 Message-Id: <20190429035515.73611-2-drinkcat@chromium.org> X-Mailer: git-send-email 2.21.0.593.g511ec345e18-goog In-Reply-To: <20190429035515.73611-1-drinkcat@chromium.org> References: <20190429035515.73611-1-drinkcat@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Before suspending, mtk-eint would set the interrupt mask to the one in wake_mask. However, some of these interrupts may not have a corresponding interrupt handler, or the interrupt may be disabled. On resume, the eint irq handler would trigger nevertheless, and irq/pm.c:irq_pm_check_wakeup would be called, which would try to call irq_disable. However, if the interrupt is not enabled (irqd_irq_disabled(&desc->irq_data) is true), the call does nothing, and the interrupt is left enabled in the eint driver. Especially for level-sensitive interrupts, this will lead to an interrupt storm on resume. If we detect that an interrupt is only in wake_mask, but not in cur_mask, we can just mask it out immediately (as mtk_eint_resume would do anyway at a later stage in the resume sequence, when restoring cur_mask). Fixes: bf22ff45bed ("genirq: Avoid unnecessary low level irq function calls") Signed-off-by: Nicolas Boichat --- drivers/pinctrl/mediatek/mtk-eint.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/drivers/pinctrl/mediatek/mtk-eint.c b/drivers/pinctrl/mediatek/mtk-eint.c index f464f8cd274b75c..737385e86beb807 100644 --- a/drivers/pinctrl/mediatek/mtk-eint.c +++ b/drivers/pinctrl/mediatek/mtk-eint.c @@ -318,7 +318,7 @@ static void mtk_eint_irq_handler(struct irq_desc *desc) struct irq_chip *chip = irq_desc_get_chip(desc); struct mtk_eint *eint = irq_desc_get_handler_data(desc); unsigned int status, eint_num; - int offset, index, virq; + int offset, mask_offset, index, virq; void __iomem *reg = mtk_eint_get_offset(eint, 0, eint->regs->stat); int dual_edge, start_level, curr_level; @@ -328,10 +328,24 @@ static void mtk_eint_irq_handler(struct irq_desc *desc) status = readl(reg); while (status) { offset = __ffs(status); + mask_offset = eint_num >> 5; index = eint_num + offset; virq = irq_find_mapping(eint->domain, index); status &= ~BIT(offset); + /* + * If we get an interrupt on pin that was only required + * for wake (but no real interrupt requested), mask the + * interrupt (as would mtk_eint_resume do anyway later + * in the resume sequence). + */ + if (eint->wake_mask[mask_offset] & BIT(offset) && + !(eint->cur_mask[mask_offset] & BIT(offset))) { + writel_relaxed(BIT(offset), reg - + eint->regs->stat + + eint->regs->mask_set); + } + dual_edge = eint->dual_edge[index]; if (dual_edge) { /* -- 2.21.0.593.g511ec345e18-goog From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DB22FC43219 for ; Mon, 29 Apr 2019 03:55:55 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8526421473 for ; Mon, 29 Apr 2019 03:55:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="O3NxhCLp"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="e6r9RTIN" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8526421473 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=a0GxymInOwfGt9SV2Hyi9b/lDqmeJ9FIIQBtOb5oo48=; b=O3NxhCLpjZJ+oj 1emd+bL8vKbCXyjbZpeGrS/jaJBKczOsIWWqnhnO3IlGX5EMYshDZCHlxV+4Dj9KI21kTgW6QG8XQ /XETkqdytptGbNXWfp0lRHuIhhCLO58iz1hS+Ro65PQIcWEepwMZjYDvlPdOa4ZDfY2oa4TFpXZq+ uiU1h9T2kZU1ODw9p+EyPOlDJjkc6+H6a9ihLAJiyUJk0jFKKBZCLtWNBIHOE8VfHMdoCYu74SNJa B9LTS1zeRsch595QD5VTmAvUdX+6FwhS8I3y7Ioo8bBjK3NZmAVTQNosg9t+KwF4Se7vLWMYTWpZ/ 6GoqtB2pvP2ds8VKAMQQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hKxON-0006Nf-LC; Mon, 29 Apr 2019 03:55:47 +0000 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hKxO6-00065D-99 for linux-arm-kernel@lists.infradead.org; Mon, 29 Apr 2019 03:55:31 +0000 Received: by mail-pg1-x541.google.com with SMTP id z16so4485063pgv.11 for ; Sun, 28 Apr 2019 20:55:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7lsB7l68Q2QXqBhtOyTwuTtF7RZuXTpMIg50jCRbpi0=; b=e6r9RTINdTkzBfmhCn0Zd/uS9VD+tKpBrRTZLnWJRhIaRQGsTalHikdiV1rFz9XJwT YG3UGzwrhVYHjCSpiCl9rA2tJ6OfZ4pgofHmyQ36rynN9F8Rqzjt+iFzzoZfg2lklROm 8z/efRXO4gc+tbSEyy5VY+144Yd6nv2H+fBoM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7lsB7l68Q2QXqBhtOyTwuTtF7RZuXTpMIg50jCRbpi0=; b=KO9pOKfwdjdxZMU8JUzOt2Ez3XgOsuIMJPUeRvdCowDvJbBgL7VVe8Cw+iaZIA4Ubg NaTvpOBimRmOe83TMduxvacAXfvZoMNL+dgia+pmAovkHP5V2hfWJX/gpsBDq5DnvtN8 K3MnQS97A+aN6VuDtMPigjE1Tbvb1EWhuInegK0LTfmn46JCiHK9miudrzCINc8zoyAC mjsCaMAKBLBy8PPbHUfK0mSYoLB9ZLwiZyLAf4z7yLJRheY0H0tJYw8Y/tUH16HbZ97J JvV9uNAOfzQ93apjlyUjc1ScGsHbSYf2Xh6GUuwqjWWfccA3KJU2rT6uaf4l5FNPxSHK v0lw== X-Gm-Message-State: APjAAAVIqlyKCm+LhlCjC/rrDxR2ZmB/T2WSVRjsdm4wgi7qXhF+YXGg sbHMiBX6eZ7DMvo3QWldkfgyPg== X-Google-Smtp-Source: APXvYqwtzrtpO7ganaV1Gc2uDvzrWfkie1Ma+Bpr6cXgpqNo8hY6cYwwk1o8w1b/+Ox9y8r8j8wwBw== X-Received: by 2002:aa7:9116:: with SMTP id 22mr53588470pfh.165.1556510129598; Sun, 28 Apr 2019 20:55:29 -0700 (PDT) Received: from drinkcat2.tpe.corp.google.com ([2401:fa00:1:b:d8b7:33af:adcb:b648]) by smtp.gmail.com with ESMTPSA id x128sm55433585pfx.103.2019.04.28.20.55.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Apr 2019 20:55:29 -0700 (PDT) From: Nicolas Boichat To: linux-mediatek@lists.infradead.org Subject: [PATCH 1/2] pinctrl: mediatek: Ignore interrupts that are wake only during resume Date: Mon, 29 Apr 2019 11:55:14 +0800 Message-Id: <20190429035515.73611-2-drinkcat@chromium.org> X-Mailer: git-send-email 2.21.0.593.g511ec345e18-goog In-Reply-To: <20190429035515.73611-1-drinkcat@chromium.org> References: <20190429035515.73611-1-drinkcat@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190428_205530_316863_E3AF41C9 X-CRM114-Status: GOOD ( 15.83 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Chuanjia Liu , Linus Walleij , Sean Wang , linux-kernel@vger.kernel.org, evgreen@chromium.org, swboyd@chromium.org, linux-gpio@vger.kernel.org, Matthias Brugger , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Before suspending, mtk-eint would set the interrupt mask to the one in wake_mask. However, some of these interrupts may not have a corresponding interrupt handler, or the interrupt may be disabled. On resume, the eint irq handler would trigger nevertheless, and irq/pm.c:irq_pm_check_wakeup would be called, which would try to call irq_disable. However, if the interrupt is not enabled (irqd_irq_disabled(&desc->irq_data) is true), the call does nothing, and the interrupt is left enabled in the eint driver. Especially for level-sensitive interrupts, this will lead to an interrupt storm on resume. If we detect that an interrupt is only in wake_mask, but not in cur_mask, we can just mask it out immediately (as mtk_eint_resume would do anyway at a later stage in the resume sequence, when restoring cur_mask). Fixes: bf22ff45bed ("genirq: Avoid unnecessary low level irq function calls") Signed-off-by: Nicolas Boichat --- drivers/pinctrl/mediatek/mtk-eint.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/drivers/pinctrl/mediatek/mtk-eint.c b/drivers/pinctrl/mediatek/mtk-eint.c index f464f8cd274b75c..737385e86beb807 100644 --- a/drivers/pinctrl/mediatek/mtk-eint.c +++ b/drivers/pinctrl/mediatek/mtk-eint.c @@ -318,7 +318,7 @@ static void mtk_eint_irq_handler(struct irq_desc *desc) struct irq_chip *chip = irq_desc_get_chip(desc); struct mtk_eint *eint = irq_desc_get_handler_data(desc); unsigned int status, eint_num; - int offset, index, virq; + int offset, mask_offset, index, virq; void __iomem *reg = mtk_eint_get_offset(eint, 0, eint->regs->stat); int dual_edge, start_level, curr_level; @@ -328,10 +328,24 @@ static void mtk_eint_irq_handler(struct irq_desc *desc) status = readl(reg); while (status) { offset = __ffs(status); + mask_offset = eint_num >> 5; index = eint_num + offset; virq = irq_find_mapping(eint->domain, index); status &= ~BIT(offset); + /* + * If we get an interrupt on pin that was only required + * for wake (but no real interrupt requested), mask the + * interrupt (as would mtk_eint_resume do anyway later + * in the resume sequence). + */ + if (eint->wake_mask[mask_offset] & BIT(offset) && + !(eint->cur_mask[mask_offset] & BIT(offset))) { + writel_relaxed(BIT(offset), reg - + eint->regs->stat + + eint->regs->mask_set); + } + dual_edge = eint->dual_edge[index]; if (dual_edge) { /* -- 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