lkml.org 
[lkml]   [2020]   [Mar]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH v2 09/14] ARM: imx: cpuidle-imx7ulp: Stop mode disallowed when HSRUN
    On Wed, Feb 19, 2020 at 03:59:52PM +0800, peng.fan@nxp.com wrote:
    > 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>

    Why do you have cpuidle patches in a series titled as adding cpufreq
    support?

    Shawn

    > ---
    > 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
    >

    \
     
     \ /
      Last update: 2020-03-10 07:14    [W:5.858 / U:0.188 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site