From: peng.fan@nxp.com
To: shawnguo@kernel.org, s.hauer@pengutronix.de, sboyd@kernel.org,
robh+dt@kernel.org, viresh.kumar@linaro.org, rjw@rjwysocki.net
Cc: kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com,
Anson.Huang@nxp.com, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, abel.vesa@nxp.com,
Peng Fan <peng.fan@nxp.com>
Subject: [PATCH v2 09/14] ARM: imx: cpuidle-imx7ulp: Stop mode disallowed when HSRUN
Date: Wed, 19 Feb 2020 15:59:52 +0800 [thread overview]
Message-ID: <1582099197-20327-10-git-send-email-peng.fan@nxp.com> (raw)
In-Reply-To: <1582099197-20327-1-git-send-email-peng.fan@nxp.com>
From: Peng Fan <peng.fan@nxp.com>
When cpu runs in HSRUN mode, cpuidle is not allowed to run into
Stop mode. So add imx7ulp_get_mode to get thr cpu run mode,
and use WAIT mode instead, when cpu in HSRUN mode.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
arch/arm/mach-imx/common.h | 1 +
arch/arm/mach-imx/cpuidle-imx7ulp.c | 14 +++++++++++---
arch/arm/mach-imx/pm-imx7ulp.c | 10 ++++++++++
3 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-imx/common.h b/arch/arm/mach-imx/common.h
index 5aa5796cff0e..db542da4fe67 100644
--- a/arch/arm/mach-imx/common.h
+++ b/arch/arm/mach-imx/common.h
@@ -104,6 +104,7 @@ void imx6_set_int_mem_clk_lpm(bool enable);
void imx6sl_set_wait_clk(bool enter);
int imx_mmdc_get_ddr_type(void);
int imx7ulp_set_lpm(enum ulp_cpu_pwr_mode mode);
+u32 imx7ulp_get_mode(void);
void imx_cpu_die(unsigned int cpu);
int imx_cpu_kill(unsigned int cpu);
diff --git a/arch/arm/mach-imx/cpuidle-imx7ulp.c b/arch/arm/mach-imx/cpuidle-imx7ulp.c
index ca86c967d19e..e7009d10b331 100644
--- a/arch/arm/mach-imx/cpuidle-imx7ulp.c
+++ b/arch/arm/mach-imx/cpuidle-imx7ulp.c
@@ -15,10 +15,18 @@
static int imx7ulp_enter_wait(struct cpuidle_device *dev,
struct cpuidle_driver *drv, int index)
{
- if (index == 1)
+ u32 mode;
+
+ if (index == 1) {
imx7ulp_set_lpm(ULP_PM_WAIT);
- else
- imx7ulp_set_lpm(ULP_PM_STOP);
+ } else {
+ mode = imx7ulp_get_mode();
+
+ if (mode == 3)
+ imx7ulp_set_lpm(ULP_PM_WAIT);
+ else
+ imx7ulp_set_lpm(ULP_PM_STOP);
+ }
cpu_do_idle();
diff --git a/arch/arm/mach-imx/pm-imx7ulp.c b/arch/arm/mach-imx/pm-imx7ulp.c
index 393faf1e8382..1410ccfc71bd 100644
--- a/arch/arm/mach-imx/pm-imx7ulp.c
+++ b/arch/arm/mach-imx/pm-imx7ulp.c
@@ -63,6 +63,16 @@ int imx7ulp_set_lpm(enum ulp_cpu_pwr_mode mode)
return 0;
}
+u32 imx7ulp_get_mode(void)
+{
+ u32 mode;
+
+ mode = readl_relaxed(smc1_base + SMC_PMCTRL) & BM_PMCTRL_RUNM;
+ mode >>= BP_PMCTRL_RUNM;
+
+ return mode;
+}
+
void __init imx7ulp_pm_init(void)
{
struct device_node *np;
--
2.16.4
WARNING: multiple messages have this Message-ID (diff)
From: peng.fan@nxp.com
To: shawnguo@kernel.org, s.hauer@pengutronix.de, sboyd@kernel.org,
robh+dt@kernel.org, viresh.kumar@linaro.org, rjw@rjwysocki.net
Cc: Peng Fan <peng.fan@nxp.com>,
abel.vesa@nxp.com, Anson.Huang@nxp.com,
linux-kernel@vger.kernel.org, linux-imx@nxp.com,
kernel@pengutronix.de, festevam@gmail.com,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 09/14] ARM: imx: cpuidle-imx7ulp: Stop mode disallowed when HSRUN
Date: Wed, 19 Feb 2020 15:59:52 +0800 [thread overview]
Message-ID: <1582099197-20327-10-git-send-email-peng.fan@nxp.com> (raw)
In-Reply-To: <1582099197-20327-1-git-send-email-peng.fan@nxp.com>
From: Peng Fan <peng.fan@nxp.com>
When cpu runs in HSRUN mode, cpuidle is not allowed to run into
Stop mode. So add imx7ulp_get_mode to get thr cpu run mode,
and use WAIT mode instead, when cpu in HSRUN mode.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
arch/arm/mach-imx/common.h | 1 +
arch/arm/mach-imx/cpuidle-imx7ulp.c | 14 +++++++++++---
arch/arm/mach-imx/pm-imx7ulp.c | 10 ++++++++++
3 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-imx/common.h b/arch/arm/mach-imx/common.h
index 5aa5796cff0e..db542da4fe67 100644
--- a/arch/arm/mach-imx/common.h
+++ b/arch/arm/mach-imx/common.h
@@ -104,6 +104,7 @@ void imx6_set_int_mem_clk_lpm(bool enable);
void imx6sl_set_wait_clk(bool enter);
int imx_mmdc_get_ddr_type(void);
int imx7ulp_set_lpm(enum ulp_cpu_pwr_mode mode);
+u32 imx7ulp_get_mode(void);
void imx_cpu_die(unsigned int cpu);
int imx_cpu_kill(unsigned int cpu);
diff --git a/arch/arm/mach-imx/cpuidle-imx7ulp.c b/arch/arm/mach-imx/cpuidle-imx7ulp.c
index ca86c967d19e..e7009d10b331 100644
--- a/arch/arm/mach-imx/cpuidle-imx7ulp.c
+++ b/arch/arm/mach-imx/cpuidle-imx7ulp.c
@@ -15,10 +15,18 @@
static int imx7ulp_enter_wait(struct cpuidle_device *dev,
struct cpuidle_driver *drv, int index)
{
- if (index == 1)
+ u32 mode;
+
+ if (index == 1) {
imx7ulp_set_lpm(ULP_PM_WAIT);
- else
- imx7ulp_set_lpm(ULP_PM_STOP);
+ } else {
+ mode = imx7ulp_get_mode();
+
+ if (mode == 3)
+ imx7ulp_set_lpm(ULP_PM_WAIT);
+ else
+ imx7ulp_set_lpm(ULP_PM_STOP);
+ }
cpu_do_idle();
diff --git a/arch/arm/mach-imx/pm-imx7ulp.c b/arch/arm/mach-imx/pm-imx7ulp.c
index 393faf1e8382..1410ccfc71bd 100644
--- a/arch/arm/mach-imx/pm-imx7ulp.c
+++ b/arch/arm/mach-imx/pm-imx7ulp.c
@@ -63,6 +63,16 @@ int imx7ulp_set_lpm(enum ulp_cpu_pwr_mode mode)
return 0;
}
+u32 imx7ulp_get_mode(void)
+{
+ u32 mode;
+
+ mode = readl_relaxed(smc1_base + SMC_PMCTRL) & BM_PMCTRL_RUNM;
+ mode >>= BP_PMCTRL_RUNM;
+
+ return mode;
+}
+
void __init imx7ulp_pm_init(void)
{
struct device_node *np;
--
2.16.4
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-02-19 8:06 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-19 7:59 [PATCH v2 00/14] ARM: imx7ulp: add cpufreq using cpufreq-dt peng.fan
2020-02-19 7:59 ` peng.fan
2020-02-19 7:59 ` [PATCH v2 01/14] dt-bindings: fsl: add i.MX7ULP PMC binding doc peng.fan
2020-02-19 7:59 ` peng.fan
2020-03-10 5:49 ` Shawn Guo
2020-03-10 5:49 ` Shawn Guo
2020-03-10 5:56 ` Peng Fan
2020-03-10 5:56 ` Peng Fan
2020-03-11 7:39 ` Peng Fan
2020-03-11 7:39 ` Peng Fan
2020-03-11 7:39 ` Peng Fan
2020-02-19 7:59 ` [PATCH v2 02/14] ARM: dts: imx7ulp: add pmc node peng.fan
2020-02-19 7:59 ` peng.fan
2020-02-19 7:59 ` [PATCH v2 03/14] clk: imx: Fix division by zero warning on pfdv2 peng.fan
2020-02-19 7:59 ` peng.fan
2020-03-10 5:53 ` Shawn Guo
2020-03-10 5:53 ` Shawn Guo
2020-02-19 7:59 ` [PATCH v2 04/14] clk: imx: pfdv2: switch to use determine_rate peng.fan
2020-02-19 7:59 ` peng.fan
2020-03-10 6:02 ` Shawn Guo
2020-03-10 6:02 ` Shawn Guo
2020-02-19 7:59 ` [PATCH v2 05/14] clk: imx: pfdv2: determine best parent rate peng.fan
2020-02-19 7:59 ` peng.fan
2020-03-10 6:04 ` Shawn Guo
2020-03-10 6:04 ` Shawn Guo
2020-02-19 7:59 ` [PATCH v2 06/14] clk: imx: pllv4: use prepare/unprepare peng.fan
2020-02-19 7:59 ` peng.fan
2020-03-10 6:04 ` Shawn Guo
2020-03-10 6:04 ` Shawn Guo
2020-02-19 7:59 ` [PATCH v2 07/14] clk: imx7ulp: make it easy to change ARM core clk peng.fan
2020-02-19 7:59 ` peng.fan
2020-03-10 6:09 ` Shawn Guo
2020-03-10 6:09 ` Shawn Guo
2020-03-10 6:19 ` Peng Fan
2020-03-10 6:19 ` Peng Fan
2020-02-19 7:59 ` [PATCH v2 08/14] ARM: imx: imx7ulp: support HSRUN mode peng.fan
2020-02-19 7:59 ` peng.fan
2020-02-19 7:59 ` peng.fan [this message]
2020-02-19 7:59 ` [PATCH v2 09/14] ARM: imx: cpuidle-imx7ulp: Stop mode disallowed when HSRUN peng.fan
2020-03-10 6:13 ` Shawn Guo
2020-03-10 6:13 ` Shawn Guo
2020-03-10 7:35 ` Peng Fan
2020-03-10 7:35 ` Peng Fan
2020-02-19 7:59 ` [PATCH v2 10/14] cpufreq: dt: Allow platform specific intermediate callbacks peng.fan
2020-02-19 7:59 ` peng.fan
2020-02-19 9:35 ` Viresh Kumar
2020-02-19 9:35 ` Viresh Kumar
2020-02-19 9:41 ` Peng Fan
2020-02-19 9:41 ` Peng Fan
2020-02-19 9:45 ` Viresh Kumar
2020-02-19 9:45 ` Viresh Kumar
2020-02-19 9:46 ` Viresh Kumar
2020-02-19 9:46 ` Viresh Kumar
2020-02-19 9:55 ` Peng Fan
2020-02-19 9:55 ` Peng Fan
2020-03-12 10:15 ` Viresh Kumar
2020-03-12 10:15 ` Viresh Kumar
2020-02-19 7:59 ` [PATCH v2 11/14] cpufreq: Add i.MX7ULP to cpufreq-dt-platdev blacklist peng.fan
2020-02-19 7:59 ` peng.fan
2020-02-19 7:59 ` [PATCH v2 12/14] cpufreq: imx-cpufreq-dt: support i.MX7ULP peng.fan
2020-02-19 7:59 ` peng.fan
2020-02-19 7:59 ` [PATCH v2 13/14] ARM: imx7ulp: enable cpufreq peng.fan
2020-02-19 7:59 ` peng.fan
2020-02-19 7:59 ` [PATCH v2 14/14] [Do not Apply] ARM: dts: imx7ulp: add cpu OPP points peng.fan
2020-02-19 7:59 ` peng.fan
2020-03-02 1:40 ` [PATCH v2 00/14] ARM: imx7ulp: add cpufreq using cpufreq-dt Peng Fan
2020-03-02 1:40 ` Peng Fan
2020-03-02 17:48 ` Fabio Estevam
2020-03-02 17:48 ` Fabio Estevam
2020-03-03 1:08 ` Peng Fan
2020-03-03 1:08 ` Peng Fan
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=1582099197-20327-10-git-send-email-peng.fan@nxp.com \
--to=peng.fan@nxp.com \
--cc=Anson.Huang@nxp.com \
--cc=abel.vesa@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=rjw@rjwysocki.net \
--cc=robh+dt@kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=sboyd@kernel.org \
--cc=shawnguo@kernel.org \
--cc=viresh.kumar@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.