Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp1873064imm; Sat, 18 Aug 2018 06:16:40 -0700 (PDT) X-Google-Smtp-Source: AA+uWPw2c5mW3MHMsO6uBZOqm1tbo43jIpi8HVdpUDMzuqUy2D/oq3WNdwbCnd5CjEfcR5/WxQJl X-Received: by 2002:a17:902:e005:: with SMTP id ca5-v6mr37416290plb.224.1534598200067; Sat, 18 Aug 2018 06:16:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534598200; cv=none; d=google.com; s=arc-20160816; b=zHuk3rNfIPSSqqnjxXUrlGFfVihLk48DtqTcpE9oeuEEJ89v2SLSccxD5Hhy9O33uc FsfIYViKchxbMSAl6w8/yoGB/j1tjAMVnbBdiv9S0DrfzrZsmuhReJuozaMm3B9m88ps ykMsN2RkbIOqzAN2eQCet0DyTbs0DYav4ggSKwTsAO/zQYkUKAIiF8KJcN/cU0/B1WwM 8womF/lqBvr9+OPucvSq7StalkjG/4sLz1wGLmS8bmO34sdJCA2MF1N8rQMC9V+lHx+Q YD0tMGHzL96BWNlDxr7cOPS9yk5rIN9z2dCB1AvUwjbhaUovhVGO3jj7pSYixaQLCx8M 3jnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:organization:user-agent :references:in-reply-to:subject:cc:to:from:message-id:date :arc-authentication-results; bh=linzEEnEve1g7Wk53uyB1gRlwHHGFKXdnH8wYLPNF/o=; b=Bgoh6DB+r1yqdAI6p2OkB/NO4FwP7tVefJgU8qfJTtp2+0L2ueKyBUuMm5NXMWGbu8 LmXiovj+NMy0oP6zmQj7g/nUCxk0nMbG6Q6eaa2sO+vi7jey/Es9p5sCRRXRKgWEStwn oY1RijdbW0/kEu46EtwLwNWCVFFkzCsAC77uYhHOJQK0uziiyBCuzTZ2WelByYSutN5u 75TBoJExRSDbh+bn3FIX5mVsWvURjnHnxZF8GNXSQjg+/KYcXX9CM/qZdo39sM9tEb8B n23uk8OTWNe634+HyE1S1me9g4m3i0Mcz55lNHbfEKva1rE5/J68nEdw9cVTmC0ktcCN 4/cg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v6-v6si4671875plo.264.2018.08.18.06.16.24; Sat, 18 Aug 2018 06:16:40 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726334AbeHRQVc (ORCPT + 99 others); Sat, 18 Aug 2018 12:21:32 -0400 Received: from foss.arm.com ([217.140.101.70]:54136 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726299AbeHRQVc (ORCPT ); Sat, 18 Aug 2018 12:21:32 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 09FD87A9; Sat, 18 Aug 2018 06:13:52 -0700 (PDT) Received: from big-swifty.misterjones.org (usa-sjc-mx-foss1.foss.arm.com [217.140.101.70]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 1C0363F5B3; Sat, 18 Aug 2018 06:13:48 -0700 (PDT) Date: Sat, 18 Aug 2018 14:13:46 +0100 Message-ID: <86a7pjq0l1.wl-marc.zyngier@arm.com> From: Marc Zyngier To: Lina Iyer Cc: bjorn.andersson@linaro.org, sboyd@kernel.org, evgreen@chromium.org, linus.walleij@linaro.org, rplsssn@codeaurora.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, rnayak@codeaurora.org, devicetree@vger.kernel.org, andy.gross@linaro.org, dianders@chromium.org Subject: Re: [PATCH RESEND v1 2/5] drivers: pinctrl: msm: enable PDC interrupt only during suspend In-Reply-To: <20180817191026.32245-3-ilina@codeaurora.org> References: <20180817191026.32245-1-ilina@codeaurora.org> <20180817191026.32245-3-ilina@codeaurora.org> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 EasyPG/1.0.0 Emacs/25.1 (aarch64-unknown-linux-gnu) MULE/6.0 (HANACHIRUSATO) Organization: ARM Ltd MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Lina, On Fri, 17 Aug 2018 20:10:23 +0100, Lina Iyer wrote: > > During suspend the system may power down some of the system rails. As a > result, the TLMM hw block may not be operational anymore and wakeup > capable GPIOs will not be detected. The PDC however will be operational > and the GPIOs that are routed to the PDC as IRQs can wake the system up. > > To avoid being interrupted twice (for TLMM and once for PDC IRQ) when a > GPIO trips, use TLMM for active and switch to PDC for suspend. When > entering suspend, disable the TLMM wakeup interrupt and instead enable > the PDC IRQ and revert upon resume. > > Signed-off-by: Lina Iyer > --- > drivers/pinctrl/qcom/pinctrl-msm.c | 60 +++++++++++++++++++++++++++++- > drivers/pinctrl/qcom/pinctrl-msm.h | 3 ++ > 2 files changed, 62 insertions(+), 1 deletion(-) > > diff --git a/drivers/pinctrl/qcom/pinctrl-msm.c b/drivers/pinctrl/qcom/pinctrl-msm.c > index 03ef1d29d078..17e541f8f09d 100644 > --- a/drivers/pinctrl/qcom/pinctrl-msm.c > +++ b/drivers/pinctrl/qcom/pinctrl-msm.c > @@ -37,6 +37,7 @@ > #include "../pinctrl-utils.h" > > #define MAX_NR_GPIO 300 > +#define MAX_PDC_IRQ 1024 Where is this value coming from? Is it guaranteed to be an architectural maximum? Or something that is likely to vary in future implementations? > #define PS_HOLD_OFFSET 0x820 > > /** > @@ -51,6 +52,7 @@ > * @enabled_irqs: Bitmap of currently enabled irqs. > * @dual_edge_irqs: Bitmap of irqs that need sw emulated dual edge > * detection. > + * @pdc_irqs: Bitmap of wakeup capable irqs. > * @soc; Reference to soc_data of platform specific data. > * @regs: Base address for the TLMM register map. > */ > @@ -68,11 +70,14 @@ struct msm_pinctrl { > > DECLARE_BITMAP(dual_edge_irqs, MAX_NR_GPIO); > DECLARE_BITMAP(enabled_irqs, MAX_NR_GPIO); > + DECLARE_BITMAP(pdc_irqs, MAX_PDC_IRQ); > > const struct msm_pinctrl_soc_data *soc; > void __iomem *regs; > }; > > +static bool in_suspend; > + > static int msm_get_groups_count(struct pinctrl_dev *pctldev) > { > struct msm_pinctrl *pctrl = pinctrl_dev_get_drvdata(pctldev); > @@ -787,8 +792,11 @@ static int msm_gpio_irq_set_wake(struct irq_data *d, unsigned int on) > > raw_spin_lock_irqsave(&pctrl->lock, flags); > > - if (pdc_irqd) > + if (pdc_irqd && !in_suspend) { > irq_set_irq_wake(pdc_irqd->irq, on); > + on ? set_bit(pdc_irqd->irq, pctrl->pdc_irqs) : > + clear_bit(pdc_irqd->irq, pctrl->pdc_irqs); I think we'll all survive the two extra lines if you write this as an 'if' statement (unless you're competing for the next IOCCC, and then you need to up your game a bit). Also, are you indexing the bitmap using a Linux irq number? If so, that's an absolute NACK. Out of the box, a Linux IRQ can be up to NR_IRQS+8196 on arm64, and there are plans to push that to be a much larger space. > + } > > irq_set_irq_wake(pctrl->irq, on); I'm a bit worried by the way you call into the irq subsystem with this spinlock held. Have you run that code with lockdep enabled? > > @@ -920,6 +928,8 @@ static int msm_gpio_pdc_pin_request(struct irq_data *d) > } > > irq_set_handler_data(d->irq, irq_get_irq_data(irq)); > + irq_set_handler_data(irq, d); > + irq_set_status_flags(irq, IRQ_DISABLE_UNLAZY); Could you explain what this is trying to do? I'm trying to understand this code, but this function isn't in 4.18... > disable_irq(irq); > > return 0; > @@ -1070,6 +1080,54 @@ static void msm_pinctrl_setup_pm_reset(struct msm_pinctrl *pctrl) > } > } > > +int __maybe_unused msm_pinctrl_suspend_late(struct device *dev) > +{ > + struct msm_pinctrl *pctrl = dev_get_drvdata(dev); > + struct irq_data *irqd; > + int i; > + > + in_suspend = true; > + for_each_set_bit(i, pctrl->pdc_irqs, MAX_PDC_IRQ) { > + irqd = irq_get_handler_data(i); So this is what I though. You're using the Linux IRQ, and not the pin number (or whatever HW-dependent index that would otherwise make sense). Please fix it. > + /* > + * We don't know if the TLMM will be functional > + * or not, during the suspend. If its functional, > + * we do not want duplicate interrupts from PDC. > + * Hence disable the GPIO IRQ and enable PDC IRQ. > + */ > + if (irqd_is_wakeup_set(irqd)) { > + irq_set_irq_wake(irqd->irq, false); > + disable_irq(irqd->irq); > + enable_irq(i); > + } > + } > + > + return 0; > +} > + > +int __maybe_unused msm_pinctrl_resume_late(struct device *dev) > +{ > + struct msm_pinctrl *pctrl = dev_get_drvdata(dev); > + struct irq_data *irqd; > + int i; > + > + for_each_set_bit(i, pctrl->pdc_irqs, MAX_PDC_IRQ) { > + irqd = irq_get_handler_data(i); > + /* > + * The TLMM will be operational now, so disable > + * the PDC IRQ. > + */ > + if (irqd_is_wakeup_set(irq_get_irq_data(i))) { > + disable_irq_nosync(i); > + irq_set_irq_wake(irqd->irq, true); > + enable_irq(irqd->irq); > + } > + } > + in_suspend = false; > + > + return 0; > +} > + > int msm_pinctrl_probe(struct platform_device *pdev, > const struct msm_pinctrl_soc_data *soc_data) > { > diff --git a/drivers/pinctrl/qcom/pinctrl-msm.h b/drivers/pinctrl/qcom/pinctrl-msm.h > index 9b9feea540ff..21b56fb5dae9 100644 > --- a/drivers/pinctrl/qcom/pinctrl-msm.h > +++ b/drivers/pinctrl/qcom/pinctrl-msm.h > @@ -123,4 +123,7 @@ int msm_pinctrl_probe(struct platform_device *pdev, > const struct msm_pinctrl_soc_data *soc_data); > int msm_pinctrl_remove(struct platform_device *pdev); > > +int msm_pinctrl_suspend_late(struct device *dev); > +int msm_pinctrl_resume_late(struct device *dev); > + > #endif I can't really review this code any further, as it seems that I'm missing some crucial dependencies. But there is a number of things that feel quite wrong in this code, and that need to be addressed anyway. Thanks, M. -- Jazz is not dead, it just smell funny.