From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS, USER_AGENT_MUTT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 913F0C43387 for ; Fri, 11 Jan 2019 03:15:53 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 614002173B for ; Fri, 11 Jan 2019 03:15:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="CZ3L3c5L"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="sXLMbhyw" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 614002173B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Q3w9qJ+GhX73FEiu4axa+tj4pugWN3raYnyo2Zq+crE=; b=CZ3L3c5LcnO56J D0E4L6pnu/TlU7eklA+2sRPa2lhx9tAaqCiIj7AWlOSqUdNGfIoROv72R1Xp0b6rMMmNrQeH7SgwW VWZEpJE7+y9Q1i/DCFnIn+YWaY7cbN6dS1RZXH01jVbfVFyQAC3neC89r+NVjrsYt6Awz43z54/22 exiVFHAgcL8CUIyXPtWTNv3olLPdqc4lMjfSFlrt6Su7Y3kSGUpPjFw5bwROAIHUBipp/fS8+Z1/G 5cr/ryL510PplzYTLyHjZPfHiB8XZc8yR5zeUJNNS6DTKUXmUyfDcIx2I2YOZp4nuRCJ2M0QyODVM 5dPBB/yOqMCHxR0/qpmg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1ghnIV-0004Uh-U7; Fri, 11 Jan 2019 03:15:51 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1ghnIR-0004UD-Tw for linux-arm-kernel@lists.infradead.org; Fri, 11 Jan 2019 03:15:49 +0000 Received: from dragon (61-216-91-114.HINET-IP.hinet.net [61.216.91.114]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 363C320660; Fri, 11 Jan 2019 03:15:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547176547; bh=GP7Yxy8QOP+6agn6GqxfZavIxV+4koyeXHQsZfKg+P0=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=sXLMbhywwpxCi+dQyZwHPOngK0uEDlBVt0lSA6DD9oqAr8TUyhuzb/uZIvvKYD6gc J9quu3GFiFVRQO/2HYiqNRnHXYGpmp+sQ5NzmbN4VcDy15zxIqGfGTx1MKd1kOZq0R VGocQGboV6Xri88VGLWf2g7WiNp28NqOzLbQ7fhc= Date: Fri, 11 Jan 2019 11:15:35 +0800 From: Shawn Guo To: Anson Huang Subject: Re: [PATCH] ARM: imx: add i.MX7ULP cpuidle support Message-ID: <20190111031533.GI25218@dragon> References: <1544775444-31544-1-git-send-email-Anson.Huang@nxp.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1544775444-31544-1-git-send-email-Anson.Huang@nxp.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190110_191548_003864_8404FC98 X-CRM114-Status: GOOD ( 25.53 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "s.hauer@pengutronix.de" , "linux-kernel@vger.kernel.org" , "linux@armlinux.org.uk" , dl-linux-imx , "kernel@pengutronix.de" , Fabio Estevam , "linux-arm-kernel@lists.infradead.org" Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, Dec 14, 2018 at 08:23:25AM +0000, Anson Huang wrote: > This patch adds cpuidle support for i.MX7ULP, 3 cpuidle > states supported as below: > > 1. WFI, just ARM wfi; > 2. WAIT mode, mapped to SoC's partial stop mode #3; > 3. STOP mode, mapped to SoC's partial stop mode #1. > > In WAIT mode, system clock and bus clock will be enabled; > In STOP mode, system clock and bus clock will be disabled. > > Signed-off-by: Anson Huang > --- > arch/arm/mach-imx/Makefile | 1 + > arch/arm/mach-imx/common.h | 10 +++++++ > arch/arm/mach-imx/cpuidle-imx7ulp.c | 60 +++++++++++++++++++++++++++++++++++++ > arch/arm/mach-imx/cpuidle.h | 5 ++++ > arch/arm/mach-imx/mach-imx7ulp.c | 7 +++++ > arch/arm/mach-imx/pm-imx7ulp.c | 49 ++++++++++++++++++++++++++---- > 6 files changed, 127 insertions(+), 5 deletions(-) > create mode 100644 arch/arm/mach-imx/cpuidle-imx7ulp.c > > diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile > index 8af2f7e..12aa44a 100644 > --- a/arch/arm/mach-imx/Makefile > +++ b/arch/arm/mach-imx/Makefile > @@ -29,6 +29,7 @@ obj-$(CONFIG_SOC_IMX6SL) += cpuidle-imx6sl.o > obj-$(CONFIG_SOC_IMX6SLL) += cpuidle-imx6sx.o > obj-$(CONFIG_SOC_IMX6SX) += cpuidle-imx6sx.o > obj-$(CONFIG_SOC_IMX6UL) += cpuidle-imx6sx.o > +obj-$(CONFIG_SOC_IMX7ULP) += cpuidle-imx7ulp.o > endif > > ifdef CONFIG_SND_IMX_SOC > diff --git a/arch/arm/mach-imx/common.h b/arch/arm/mach-imx/common.h > index bc915e5..a87fab1 100644 > --- a/arch/arm/mach-imx/common.h > +++ b/arch/arm/mach-imx/common.h > @@ -72,6 +72,15 @@ enum mxc_cpu_pwr_mode { > STOP_POWER_OFF, /* STOP + SRPG */ > }; > > +enum ulp_cpu_pwr_mode { > + HSRUN, /* High speed run mode */ > + RUN, /* Run mode */ > + WAIT, /* Wait mode */ > + STOP, /* Stop mode */ > + VLPS, /* Very low power stop mode */ > + VLLS, /* very low leakage stop mode */ Can we prefix these enums a little bit, like UPL_PM_XXX? > +}; > + > void imx_enable_cpu(int cpu, bool enable); > void imx_set_cpu_jump(int cpu, void *jump_addr); > u32 imx_get_cpu_arg(int cpu); > @@ -98,6 +107,7 @@ int imx6_set_lpm(enum mxc_cpu_pwr_mode mode); > 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); > > 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 > new file mode 100644 > index 0000000..a59df93 > --- /dev/null > +++ b/arch/arm/mach-imx/cpuidle-imx7ulp.c > @@ -0,0 +1,60 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +/* > + * Copyright (C) 2016 Freescale Semiconductor, Inc. > + * Copyright 2017-2018 NXP > + * Anson Huang > + */ > + > +#include > +#include > +#include > + > +#include "common.h" > +#include "cpuidle.h" > + > +static int imx7ulp_enter_wait(struct cpuidle_device *dev, > + struct cpuidle_driver *drv, int index) > +{ > + if (index == 1) > + imx7ulp_set_lpm(WAIT); > + else > + imx7ulp_set_lpm(STOP); > + > + cpu_do_idle(); > + > + imx7ulp_set_lpm(RUN); > + > + return index; > +} > + > +static struct cpuidle_driver imx7ulp_cpuidle_driver = { > + .name = "imx7ulp_cpuidle", > + .owner = THIS_MODULE, > + .states = { > + /* WFI */ > + ARM_CPUIDLE_WFI_STATE, > + /* WAIT */ > + { > + .exit_latency = 50, > + .target_residency = 75, > + .enter = imx7ulp_enter_wait, > + .name = "WAIT", > + .desc = "PSTOP2", > + }, > + /* STOP */ > + { > + .exit_latency = 100, > + .target_residency = 150, > + .enter = imx7ulp_enter_wait, > + .name = "STOP", > + .desc = "PSTOP1", > + }, > + }, > + .state_count = 3, > + .safe_state_index = 0, > +}; > + > +int __init imx7ulp_cpuidle_init(void) > +{ > + return cpuidle_register(&imx7ulp_cpuidle_driver, NULL); > +} > diff --git a/arch/arm/mach-imx/cpuidle.h b/arch/arm/mach-imx/cpuidle.h > index f914012..7694c8f 100644 > --- a/arch/arm/mach-imx/cpuidle.h > +++ b/arch/arm/mach-imx/cpuidle.h > @@ -15,6 +15,7 @@ extern int imx5_cpuidle_init(void); > extern int imx6q_cpuidle_init(void); > extern int imx6sl_cpuidle_init(void); > extern int imx6sx_cpuidle_init(void); > +extern int imx7ulp_cpuidle_init(void); > #else > static inline int imx5_cpuidle_init(void) > { > @@ -32,4 +33,8 @@ static inline int imx6sx_cpuidle_init(void) > { > return 0; > } > +static inline int imx7ulp_cpuidle_init(void) > +{ > + return 0; > +} > #endif > diff --git a/arch/arm/mach-imx/mach-imx7ulp.c b/arch/arm/mach-imx/mach-imx7ulp.c > index 16b295b..95efb2d 100644 > --- a/arch/arm/mach-imx/mach-imx7ulp.c > +++ b/arch/arm/mach-imx/mach-imx7ulp.c > @@ -12,6 +12,7 @@ > #include > > #include "common.h" > +#include "cpuidle.h" > #include "hardware.h" > > #define SIM_JTAG_ID_REG 0x8c > @@ -64,7 +65,13 @@ static const char *const imx7ulp_dt_compat[] __initconst = { > NULL, > }; > > +static void __init imx7ulp_init_late(void) > +{ > + imx7ulp_cpuidle_init(); > +} > + > DT_MACHINE_START(IMX7ulp, "Freescale i.MX7ULP (Device Tree)") > .init_machine = imx7ulp_init_machine, > .dt_compat = imx7ulp_dt_compat, > + .init_late = imx7ulp_init_late, Please use tab instead of space. > MACHINE_END > diff --git a/arch/arm/mach-imx/pm-imx7ulp.c b/arch/arm/mach-imx/pm-imx7ulp.c > index cf6a380..9551e1f 100644 > --- a/arch/arm/mach-imx/pm-imx7ulp.c > +++ b/arch/arm/mach-imx/pm-imx7ulp.c > @@ -9,21 +9,60 @@ > #include > #include > > +#include "common.h" > + > #define SMC_PMCTRL 0x10 > #define BP_PMCTRL_PSTOPO 16 > #define PSTOPO_PSTOP3 0x3 > +#define PSTOPO_PSTOP2 0x2 > +#define PSTOPO_PSTOP1 0x1 > +#define BP_PMCTRL_RUNM 8 > +#define RUNM_RUN 0 > +#define BP_PMCTRL_STOPM 0 > +#define STOPM_STOP 0 Use tab instead space. Shawn > + > +#define BM_PMCTRL_PSTOPO (3 << BP_PMCTRL_PSTOPO) > +#define BM_PMCTRL_RUNM (3 << BP_PMCTRL_RUNM) > +#define BM_PMCTRL_STOPM (7 << BP_PMCTRL_STOPM) > + > +static void __iomem *smc1_base; > + > +int imx7ulp_set_lpm(enum ulp_cpu_pwr_mode mode) > +{ > + u32 val = readl_relaxed(smc1_base + SMC_PMCTRL); > + > + /* clear all */ > + val &= ~(BM_PMCTRL_RUNM | BM_PMCTRL_STOPM | BM_PMCTRL_PSTOPO); > + > + switch (mode) { > + case RUN: > + /* system/bus clock enabled */ > + val |= PSTOPO_PSTOP3 << BP_PMCTRL_PSTOPO; > + break; > + case WAIT: > + /* system clock disabled, bus clock enabled */ > + val |= PSTOPO_PSTOP2 << BP_PMCTRL_PSTOPO; > + break; > + case STOP: > + /* system/bus clock disabled */ > + val |= PSTOPO_PSTOP1 << BP_PMCTRL_PSTOPO; > + break; > + default: > + return -EINVAL; > + } > + > + writel_relaxed(val, smc1_base + SMC_PMCTRL); > + > + return 0; > +} > > void __init imx7ulp_pm_init(void) > { > struct device_node *np; > - void __iomem *smc1_base; > > np = of_find_compatible_node(NULL, NULL, "fsl,imx7ulp-smc1"); > smc1_base = of_iomap(np, 0); > WARN_ON(!smc1_base); > > - /* Partial Stop mode 3 with system/bus clock enabled */ > - writel_relaxed(PSTOPO_PSTOP3 << BP_PMCTRL_PSTOPO, > - smc1_base + SMC_PMCTRL); > - iounmap(smc1_base); > + imx7ulp_set_lpm(RUN); > } > -- > 2.7.4 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel