From patchwork Tue Jul 26 08:32:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kepplinger X-Patchwork-Id: 12929026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id C5C4CC43334 for ; Tue, 26 Jul 2022 08:35:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=OM8CgXS8YKUoe2Y6J1uTbPeQ4L0U6h8uH9q/kjnGNdA=; b=JijlnvMuwS7c2j j3Um3IcD/HYW7kdpJDKQSruhFDtTmSmcdmrMKwD7gbVeEYmItnJA/dBWsCs31zswKgRBYw/Rbs2Mw AY07Yk2Gina3c7cRz3uXG+++9M7RiNF1wYJnuod7nDLlls24lV+do0oc0zRuFRBAq1NG4+9AHNt/o hwsPxl+zmmY0Tergxd0dC90KUCLYvpYgURDKMZj1kriJh4g+uGd+xqEQ5wfJMCZXljsZLDIv3/dp4 iNU4/nuwUeC0ROyVDJaf4tgZiCfFRrzJA5x55q4LbHjduaP12k6/QRxS9EgtlKqkk/kh+wFEhDsES u4gBhpfmDvOMy1Ct/K5A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oGG11-00AHR5-1s; Tue, 26 Jul 2022 08:34:07 +0000 Received: from comms.puri.sm ([159.203.221.185]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oGG0c-00AH6E-1I for linux-arm-kernel@lists.infradead.org; Tue, 26 Jul 2022 08:33:43 +0000 Received: from localhost (localhost [127.0.0.1]) by comms.puri.sm (Postfix) with ESMTP id 50486DFD55; Tue, 26 Jul 2022 01:33:11 -0700 (PDT) Received: from comms.puri.sm ([127.0.0.1]) by localhost (comms.puri.sm [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id L9ens6mJboms; Tue, 26 Jul 2022 01:33:10 -0700 (PDT) From: Martin Kepplinger DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=puri.sm; s=comms; t=1658824390; bh=CtZHJaWb605GvXh6ITYJsJOpwsFY2AdI1ZfEZejnCUY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TYee2IzqBrFb+coRiZ+mLMST3G8YOOjBKdivuBC+tOe+iE5P1jHPzlC9B5PYjVnPr 84kVNjFtIaiNBMzpu95e29+0lz7Uj7Sfh2Awaqm477V41HaSe4Bn1Qd6xbRMg7mNGk 7Lfr+WFZ29JoN98BiJQw7jZT7jS0IpH9ZTRlLaVzGO254/jZoLSPNJGPsyjcSyVoNj MmhgDU/+r27L0MAXGVpgtQDD9ET0KnElWu+mXGMI7JFZZPZExqMjuUwQKFjuvZ9UWO jgvX7XJU9fLx+kN15K8nk5QEepqPo4jH9CTnjkN1IGYMK0V7e9c2bR/ckRh9gZJJfs /F2YGAD6WK7xw== To: rafael@kernel.org, khilman@kernel.org, ulf.hansson@linaro.org, robh@kernel.org, krzysztof.kozlowski@linaro.org, shawnguo@kernel.org, s.hauer@pengutronix.de, festevam@gmail.com, pavel@ucw.cz Cc: kernel@puri.sm, linux-imx@nxp.com, broonie@kernel.org, l.stach@pengutronix.de, aford173@gmail.com, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Martin Kepplinger Subject: [PATCH v6 1/2] power: domain: handle genpd correctly when needing interrupts Date: Tue, 26 Jul 2022 10:32:56 +0200 Message-Id: <20220726083257.1730630-2-martin.kepplinger@puri.sm> In-Reply-To: <20220726083257.1730630-1-martin.kepplinger@puri.sm> References: <20220726083257.1730630-1-martin.kepplinger@puri.sm> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220726_013342_107607_EF8F03AA X-CRM114-Status: GOOD ( 15.82 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org If for example the power-domains' power-supply node (regulator) needs interrupts to work, the current setup with noirq callbacks cannot work; for example a pmic regulator on i2c, when suspending, usually already times out during suspend_noirq: [ 41.024193] buck4: failed to disable: -ETIMEDOUT So fix system suspend and resume for these power-domains by using the "outer" suspend/resume callbacks instead. Tested on the imx8mq-librem5 board, but by looking at the dts, this will fix imx8mq-evk and possibly many other boards too. This is designed so that genpd providers just say "this genpd needs interrupts" (by setting the flag) - without implying an implementation. Initially system suspend problems had been discussed at https://lore.kernel.org/linux-arm-kernel/20211002005954.1367653-8-l.stach@pengutronix.de/ which led to discussing the pmic that contains the regulators which serve as power-domain power-supplies: https://lore.kernel.org/linux-pm/573166b75e524517782471c2b7f96e03fd93d175.camel@puri.sm/T/ Signed-off-by: Martin Kepplinger --- drivers/base/power/domain.c | 13 +++++++++++-- include/linux/pm_domain.h | 5 +++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index 5a2e0232862e..58376752a4de 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -130,6 +130,7 @@ static const struct genpd_lock_ops genpd_spin_ops = { #define genpd_is_active_wakeup(genpd) (genpd->flags & GENPD_FLAG_ACTIVE_WAKEUP) #define genpd_is_cpu_domain(genpd) (genpd->flags & GENPD_FLAG_CPU_DOMAIN) #define genpd_is_rpm_always_on(genpd) (genpd->flags & GENPD_FLAG_RPM_ALWAYS_ON) +#define genpd_irq_on(genpd) (genpd->flags & GENPD_FLAG_IRQ_ON) static inline bool irq_safe_dev_in_sleep_domain(struct device *dev, const struct generic_pm_domain *genpd) @@ -2065,8 +2066,15 @@ int pm_genpd_init(struct generic_pm_domain *genpd, genpd->domain.ops.runtime_suspend = genpd_runtime_suspend; genpd->domain.ops.runtime_resume = genpd_runtime_resume; genpd->domain.ops.prepare = genpd_prepare; - genpd->domain.ops.suspend_noirq = genpd_suspend_noirq; - genpd->domain.ops.resume_noirq = genpd_resume_noirq; + + if (genpd_irq_on(genpd)) { + genpd->domain.ops.suspend = genpd_suspend_noirq; + genpd->domain.ops.resume = genpd_resume_noirq; + } else { + genpd->domain.ops.suspend_noirq = genpd_suspend_noirq; + genpd->domain.ops.resume_noirq = genpd_resume_noirq; + } + genpd->domain.ops.freeze_noirq = genpd_freeze_noirq; genpd->domain.ops.thaw_noirq = genpd_thaw_noirq; genpd->domain.ops.poweroff_noirq = genpd_poweroff_noirq; @@ -2769,6 +2777,7 @@ static int __genpd_dev_pm_attach(struct device *dev, struct device *base_dev, goto err; dev_gpd_data(dev)->default_pstate = pstate; } + return 1; err: diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h index ebc351698090..9cdedbc21158 100644 --- a/include/linux/pm_domain.h +++ b/include/linux/pm_domain.h @@ -60,6 +60,10 @@ * GENPD_FLAG_MIN_RESIDENCY: Enable the genpd governor to consider its * components' next wakeup when determining the * optimal idle state. + * + * GENPD_FLAG_IRQ_ON: genpd needs irqs to be able to manage power + * on/off. Use the outer suspend/resume callbacks + * instead of noirq for example. */ #define GENPD_FLAG_PM_CLK (1U << 0) #define GENPD_FLAG_IRQ_SAFE (1U << 1) @@ -68,6 +72,7 @@ #define GENPD_FLAG_CPU_DOMAIN (1U << 4) #define GENPD_FLAG_RPM_ALWAYS_ON (1U << 5) #define GENPD_FLAG_MIN_RESIDENCY (1U << 6) +#define GENPD_FLAG_IRQ_ON (1U << 7) enum gpd_status { GENPD_STATE_ON = 0, /* PM domain is on */ From patchwork Tue Jul 26 08:32:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kepplinger X-Patchwork-Id: 12929025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id DF3B9C43334 for ; Tue, 26 Jul 2022 08:34:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Ph8L1GFIjB9AKQAH0OdYOrgc/5/xiclN4IkIsT1EUTQ=; b=uoGppJCcL4v4cS xWi3RSVSnRYpZZ8ZOK7KzjZfs9931U3gAqBEMqvOsD6ynCe5JPO6bdIy5AYLeyX6KdC6HH33ivF/f Kh8VLhM3MCqNy1mrp+JJNMpnNZZCYQogTfuLsZHF6xTFHseQKK92FRdGmfL/57C0ey5t4qX3kHGZj Tg5lTaYWta0XbFMx8gZeRD0taI3FbeOZ265qeJCWpzjFUuxXWFt+a3Edp3w72R3ZPiGEbpYt9ZZ5d dC9TEcfZHMkl6SV6ajdwILQ6Nac3LpiTGTfDVt0XU3hGhcoi3aKRbrm1l9AAOOurJdoXpCssoxMIK hLtSDEC2uU65kvSPC9gQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oGG0Z-00AH3o-Hz; Tue, 26 Jul 2022 08:33:39 +0000 Received: from comms.puri.sm ([159.203.221.185]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oGG0B-00AGjV-Va for linux-arm-kernel@lists.infradead.org; Tue, 26 Jul 2022 08:33:17 +0000 Received: from localhost (localhost [127.0.0.1]) by comms.puri.sm (Postfix) with ESMTP id D1509DFD7B; Tue, 26 Jul 2022 01:33:15 -0700 (PDT) Received: from comms.puri.sm ([127.0.0.1]) by localhost (comms.puri.sm [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id D02DUHP9NRY1; Tue, 26 Jul 2022 01:33:15 -0700 (PDT) From: Martin Kepplinger DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=puri.sm; s=comms; t=1658824395; bh=85peDTtgZNpuR8CVV06JKnQ8YE3l4H7dqTVa9ek/70Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HrmlhUiMonVdYsnG7cM3pJjmGaTVJKMWpHvXVq284dVRtG6f7miqVxj7W6Di6qafn GoM3aaRiICss6PwgT47zP/TufgMDOK9eH7JkuBtnXdxnAziUTaofB9K809ano2+Gw9 aH9YzgPajfytUXtngcX/703EJKRUpAoU75RIU6QyEScqfb4WASq0oPCoQpdS1L3zdm ryixrHkmwqdnMjht7RD1Ib4mWjY5Y69Y10/XqWO6WYaq3s6izKQl5l1rr9sYHsc0k1 xjhetCBmHhfLuePtYn7uyi7gGcdtet1CnuVQ+Ucm3JV7YaAZa7+mKaO1T9Y9FJHxp3 U6cCE1GHNDH4w== To: rafael@kernel.org, khilman@kernel.org, ulf.hansson@linaro.org, robh@kernel.org, krzysztof.kozlowski@linaro.org, shawnguo@kernel.org, s.hauer@pengutronix.de, festevam@gmail.com, pavel@ucw.cz Cc: kernel@puri.sm, linux-imx@nxp.com, broonie@kernel.org, l.stach@pengutronix.de, aford173@gmail.com, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Martin Kepplinger Subject: [PATCH v6 2/2] soc: imx: gpcv2: fix suspend/resume by setting GENPD_FLAG_IRQ_ON Date: Tue, 26 Jul 2022 10:32:57 +0200 Message-Id: <20220726083257.1730630-3-martin.kepplinger@puri.sm> In-Reply-To: <20220726083257.1730630-1-martin.kepplinger@puri.sm> References: <20220726083257.1730630-1-martin.kepplinger@puri.sm> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220726_013316_061959_F809E447 X-CRM114-Status: UNSURE ( 9.92 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org For boards that use power-domains' power-supplies that need interrupts to work (like regulator over i2c), set GENPD_FLAG_IRQ_ON. This will tell genpd to adjust accordingly. Currently it "only" sets the correct suspend/resume callbacks. This fixes suspend/resume on imx8mq-librem5 boards (tested) and imx8mq-evk (by looking at dts) and possibly more. Signed-off-by: Martin Kepplinger Reviewed-by: Ulf Hansson --- drivers/soc/imx/gpcv2.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/soc/imx/gpcv2.c b/drivers/soc/imx/gpcv2.c index 6383a4edc360..199a621d8186 100644 --- a/drivers/soc/imx/gpcv2.c +++ b/drivers/soc/imx/gpcv2.c @@ -1337,6 +1337,9 @@ static int imx_pgc_domain_probe(struct platform_device *pdev) regmap_update_bits(domain->regmap, domain->regs->map, domain->bits.map, domain->bits.map); + if (of_property_read_bool(domain->dev->of_node, "power-supply")) + domain->genpd.flags |= GENPD_FLAG_IRQ_ON; + ret = pm_genpd_init(&domain->genpd, NULL, true); if (ret) { dev_err(domain->dev, "Failed to init power domain\n");