From: "Peng Fan (OSS)" <peng.fan@oss.nxp.com>
To: ulf.hansson@linaro.org, shawnguo@kernel.org, s.hauer@pengutronix.de
Cc: kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org,
Peng Fan <peng.fan@nxp.com>
Subject: [PATCH V3 4/8] genpd: imx: scu-pd: do not power off console if no_console_suspend
Date: Mon, 31 Jul 2023 14:47:42 +0800 [thread overview]
Message-ID: <20230731064746.2717684-5-peng.fan@oss.nxp.com> (raw)
In-Reply-To: <20230731064746.2717684-1-peng.fan@oss.nxp.com>
From: Peng Fan <peng.fan@nxp.com>
Do not power off console if no_console_suspend
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
drivers/genpd/imx/scu-pd.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/genpd/imx/scu-pd.c b/drivers/genpd/imx/scu-pd.c
index 08583a10ac62..d69da79d3130 100644
--- a/drivers/genpd/imx/scu-pd.c
+++ b/drivers/genpd/imx/scu-pd.c
@@ -52,6 +52,7 @@
*/
#include <dt-bindings/firmware/imx/rsrc.h>
+#include <linux/console.h>
#include <linux/firmware/imx/sci.h>
#include <linux/firmware/imx/svc/rm.h>
#include <linux/io.h>
@@ -324,6 +325,10 @@ static int imx_sc_pd_power(struct generic_pm_domain *domain, bool power_on)
msg.resource = pd->rsrc;
msg.mode = power_on ? IMX_SC_PM_PW_MODE_ON : IMX_SC_PM_PW_MODE_LP;
+ /* keep uart console power on for no_console_suspend */
+ if (imx_con_rsrc == pd->rsrc && !console_suspend_enabled && !power_on)
+ return -EBUSY;
+
ret = imx_scu_call_rpc(pm_ipc_handle, &msg, true);
if (ret)
dev_err(&domain->dev, "failed to power %s resource %d ret %d\n",
--
2.37.1
next prev parent reply other threads:[~2023-07-31 6:43 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-31 6:47 [PATCH V3 0/8] genpd: imx: relocate scu-pd and misc update Peng Fan (OSS)
2023-07-31 6:47 ` [PATCH V3 1/8] genpd: imx: relocate scu-pd under genpd Peng Fan (OSS)
2023-07-31 6:47 ` [PATCH V3 2/8] genpd: imx: scu-pd: enlarge PD range Peng Fan (OSS)
2023-07-31 6:47 ` [PATCH V3 3/8] genpd: imx: scu-pd: add more PDs Peng Fan (OSS)
2023-07-31 6:47 ` Peng Fan (OSS) [this message]
2023-08-10 14:05 ` [PATCH V3 4/8] genpd: imx: scu-pd: do not power off console if no_console_suspend Ulf Hansson
2023-08-14 10:26 ` Peng Fan
2023-07-31 6:47 ` [PATCH V3 5/8] genpd: imx: scu-pd: Suppress bind attrs Peng Fan (OSS)
2023-07-31 6:47 ` [PATCH V3 6/8] genpd: imx: scu-pd: initialize is_off according to HW state Peng Fan (OSS)
2023-07-31 6:47 ` [PATCH V3 7/8] genpd: imx: scu-pd: add multi states support Peng Fan (OSS)
2023-07-31 6:47 ` [PATCH V3 8/8] genpd: imx: scu-pd: change init level to subsys_initcall Peng Fan (OSS)
2023-08-08 14:57 ` [PATCH V3 0/8] genpd: imx: relocate scu-pd and misc update Ulf Hansson
2023-08-09 1:32 ` Peng Fan
2023-08-11 14:02 ` Shawn Guo
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=20230731064746.2717684-5-peng.fan@oss.nxp.com \
--to=peng.fan@oss.nxp.com \
--cc=festevam@gmail.com \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=peng.fan@nxp.com \
--cc=s.hauer@pengutronix.de \
--cc=shawnguo@kernel.org \
--cc=ulf.hansson@linaro.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