From patchwork Wed Jul 20 04:34:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kepplinger X-Patchwork-Id: 592067 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0F102C43334 for ; Wed, 20 Jul 2022 04:35:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229489AbiGTEfk (ORCPT ); Wed, 20 Jul 2022 00:35:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44136 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229446AbiGTEfj (ORCPT ); Wed, 20 Jul 2022 00:35:39 -0400 Received: from comms.puri.sm (comms.puri.sm [159.203.221.185]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E766120BF8; Tue, 19 Jul 2022 21:35:38 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by comms.puri.sm (Postfix) with ESMTP id 7452ADF456; Tue, 19 Jul 2022 21:35:38 -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 qwdJKEvluK8Y; Tue, 19 Jul 2022 21:35:37 -0700 (PDT) From: Martin Kepplinger DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=puri.sm; s=comms; t=1658291737; bh=21EHlEvYJ6/Hi/7Okv0PsHmdiPx2MiVdNJTM4K+9T7Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qX0ldwsiE19jOVKlsa3YGJWhCA88bEzN/ErndtjGqEMjtGL2AvAASabdxLXT4Egj3 1vAUmo82JK6Hl8SNwrnV5wvNjo16xzw1vV8c6An/X+mDl3eQBO+6kuFZqSwy44WxM/ Fh+pMXhy0rhbWVU+OmrCMIw8eyAS+etgudu1nixouizB6E9P5VCPM/A/Hz+CcX7Y80 jSpcIrvfBcwojvF+IZhVa9Vx9ay/8HJDL4xOU3Mjd81Va2JvQNHn8sfJVevKnYhUNG ycrTBAwHu6YkecSQG8bu9/vZ3A2xMsQ2Ode8GkqOg63NXaLSNyIwp89/gzhBnDNIzd T8ex3n9Mv/4qg== 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 v4 1/3] PM: domain: fix indentation and use BIT macro for flags Date: Wed, 20 Jul 2022 06:34:42 +0200 Message-Id: <20220720043444.1289952-2-martin.kepplinger@puri.sm> In-Reply-To: <20220720043444.1289952-1-martin.kepplinger@puri.sm> References: <20220720043444.1289952-1-martin.kepplinger@puri.sm> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Use the BIT macro for flags and simply do 2 tags indentation. Signed-off-by: Martin Kepplinger --- include/linux/pm_domain.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h index ebc351698090..76bc9e3ef5ff 100644 --- a/include/linux/pm_domain.h +++ b/include/linux/pm_domain.h @@ -8,6 +8,7 @@ #ifndef _LINUX_PM_DOMAIN_H #define _LINUX_PM_DOMAIN_H +#include #include #include #include @@ -61,13 +62,13 @@ * components' next wakeup when determining the * optimal idle state. */ -#define GENPD_FLAG_PM_CLK (1U << 0) -#define GENPD_FLAG_IRQ_SAFE (1U << 1) -#define GENPD_FLAG_ALWAYS_ON (1U << 2) -#define GENPD_FLAG_ACTIVE_WAKEUP (1U << 3) -#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_PM_CLK BIT(0) +#define GENPD_FLAG_IRQ_SAFE BIT(1) +#define GENPD_FLAG_ALWAYS_ON BIT(2) +#define GENPD_FLAG_ACTIVE_WAKEUP BIT(3) +#define GENPD_FLAG_CPU_DOMAIN BIT(4) +#define GENPD_FLAG_RPM_ALWAYS_ON BIT(5) +#define GENPD_FLAG_MIN_RESIDENCY BIT(6) enum gpd_status { GENPD_STATE_ON = 0, /* PM domain is on */ From patchwork Wed Jul 20 04:34:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kepplinger X-Patchwork-Id: 592066 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7F434C43334 for ; Wed, 20 Jul 2022 04:36:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236175AbiGTEgT (ORCPT ); Wed, 20 Jul 2022 00:36:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44766 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236335AbiGTEgS (ORCPT ); Wed, 20 Jul 2022 00:36:18 -0400 Received: from comms.puri.sm (comms.puri.sm [159.203.221.185]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1FB0A371AB; Tue, 19 Jul 2022 21:36:15 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by comms.puri.sm (Postfix) with ESMTP id F3A0DDFF57; Tue, 19 Jul 2022 21:35:44 -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 6iBEMZdunAGx; Tue, 19 Jul 2022 21:35:44 -0700 (PDT) From: Martin Kepplinger DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=puri.sm; s=comms; t=1658291744; bh=jqOo37x4uFbD+zkK8dBPu6T7uX27EbIdMfsNQPA9bLo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qX1yNPqQDzcEUzERq3Wbck6SydsQbv6QmMltZMU/2Oogf39Y/lSfwDju+PtmyUNFu 2S/STXvXerifxRXcZ9AaIkli5IXcWmFRD25v493SMR4FxN4FRND/711mgVJhClrM9k fYdsV1NR6uVrCqCWxP2oXdYuN0HCy190UusrrdST2btMeCD37mOCVoBMmVqa3N6vNs g+fMEPrYwsY3I1sOz+7TqidEEcYL1JbqNbl5vtE95LfahpFpXU/KfV/UkB3Tzazik2 zYl04VyPI1uGUqjfB2T5gh43Jb1zvZtrYWzZRxxEFnOghCSA5JpSWVwPItR4+TyrRO YnO0mmZqHMayg== 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 v4 2/3] power: domain: handle genpd correctly when needing interrupts Date: Wed, 20 Jul 2022 06:34:43 +0200 Message-Id: <20220720043444.1289952-3-martin.kepplinger@puri.sm> In-Reply-To: <20220720043444.1289952-1-martin.kepplinger@puri.sm> References: <20220720043444.1289952-1-martin.kepplinger@puri.sm> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.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, 18 insertions(+) diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index 739e52cd4aba..76ea39e960f3 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) @@ -2076,6 +2077,13 @@ int pm_genpd_init(struct generic_pm_domain *genpd, genpd->dev_ops.start = pm_clk_resume; } + if (genpd_irq_on(genpd)) { + genpd->domain.ops.suspend = genpd_suspend_noirq; + genpd->domain.ops.resume = genpd_resume_noirq; + genpd->domain.ops.suspend_noirq = NULL; + genpd->domain.ops.resume_noirq = NULL; + } + /* The always-on governor works better with the corresponding flag. */ if (gov == &pm_domain_always_on_gov) genpd->flags |= GENPD_FLAG_RPM_ALWAYS_ON; @@ -2766,6 +2774,11 @@ static int __genpd_dev_pm_attach(struct device *dev, struct device *base_dev, goto err; dev_gpd_data(dev)->default_pstate = pstate; } + + if (pd->domain.ops.suspend_noirq && (pd->flags & GENPD_FLAG_IRQ_ON)) + dev_err(dev, "PM domain %s needs irqs but uses noirq suspend\n", + pd->name); + return 1; err: diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h index 76bc9e3ef5ff..03bb86e43550 100644 --- a/include/linux/pm_domain.h +++ b/include/linux/pm_domain.h @@ -61,6 +61,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 BIT(0) #define GENPD_FLAG_IRQ_SAFE BIT(1) @@ -69,6 +73,7 @@ #define GENPD_FLAG_CPU_DOMAIN BIT(4) #define GENPD_FLAG_RPM_ALWAYS_ON BIT(5) #define GENPD_FLAG_MIN_RESIDENCY BIT(6) +#define GENPD_FLAG_IRQ_ON BIT(7) enum gpd_status { GENPD_STATE_ON = 0, /* PM domain is on */ From patchwork Wed Jul 20 04:34:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kepplinger X-Patchwork-Id: 592751 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 425FECCA483 for ; Wed, 20 Jul 2022 04:36:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237481AbiGTEgW (ORCPT ); Wed, 20 Jul 2022 00:36:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44766 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238057AbiGTEgU (ORCPT ); Wed, 20 Jul 2022 00:36:20 -0400 Received: from comms.puri.sm (comms.puri.sm [159.203.221.185]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A330C2CDD0; Tue, 19 Jul 2022 21:36:19 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by comms.puri.sm (Postfix) with ESMTP id 69A90DFF7B; Tue, 19 Jul 2022 21:35:49 -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 Oeqpp57CYaXJ; Tue, 19 Jul 2022 21:35:48 -0700 (PDT) From: Martin Kepplinger DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=puri.sm; s=comms; t=1658291748; bh=cKfjsoRcWsaq1BiSf8wfxCOkxO8OBT+dw6FA+RdONSg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MhOpSk469URVTq/qzhbzDBrb1obyApeVgx6oareYHG0KOfLR/sGNlqPir80WQa0S3 vZ/LVBE9diDaIKhJiqlnNAs1Fs/2AfNy6Ro5KlJP57ctMne3k37jVD9nimn1uH0zHi 4KcnjG11tpk2DFz12Lk8DUUD9mbudTH/HRa+L+Taf+90vU2nD+OrcXNaf8AOOh8M3D 1WRqNaB28DwQCK/DJECQuil8L5nOd4MogK62x/IZUhvRuXKQy3aRUX7TzPec7SSBS1 UkPbmCAg3DvA5V6DN7vF80kT/RM0bY/VPEczuyOU3qfa3EUj54c9OwlgyFuH1j1Rts Xs9gA7P+ynP0Q== 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 v4 3/3] soc: imx: gpcv2: fix suspend/resume by setting GENPD_FLAG_IRQ_ON Date: Wed, 20 Jul 2022 06:34:44 +0200 Message-Id: <20220720043444.1289952-4-martin.kepplinger@puri.sm> In-Reply-To: <20220720043444.1289952-1-martin.kepplinger@puri.sm> References: <20220720043444.1289952-1-martin.kepplinger@puri.sm> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.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 --- drivers/soc/imx/gpcv2.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/soc/imx/gpcv2.c b/drivers/soc/imx/gpcv2.c index 85aa86e1338a..46d2ead2352b 100644 --- a/drivers/soc/imx/gpcv2.c +++ b/drivers/soc/imx/gpcv2.c @@ -1303,6 +1303,7 @@ static const struct imx_pgc_domain_data imx8mn_pgc_domain_data = { static int imx_pgc_domain_probe(struct platform_device *pdev) { struct imx_pgc_domain *domain = pdev->dev.platform_data; + struct device_node *dn; int ret; domain->dev = &pdev->dev; @@ -1333,6 +1334,14 @@ static int imx_pgc_domain_probe(struct platform_device *pdev) regmap_update_bits(domain->regmap, domain->regs->map, domain->bits.map, domain->bits.map); + dn = of_parse_phandle(domain->dev->of_node, "power-supply", 0); + if (dn) { + while ((dn = of_get_next_parent(dn))) { + if (of_get_property(dn, "interrupts", NULL)) + 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");