cpuidle driver for QCOM SoCs: 8064, 8074, 8084
Subsystems (6)
v12 cover cpuidle driver for QCOM SoCs: 8064, 8074, 8084
Dependent patchsets -
https://lkml.org/lkml/2014/8/4/767 http://www.spinics.net/lists/linux-arm-msm/msg10799.html http://www.spinics.net/lists/linux-arm-msm/msg10795.html
Changes since v11:
- Address review comments on spm.c
- Commenting style fixes
- Added Reviewed-by
Changes since v10:
[ https://www.mail-archive.com/devicetree at vger.kernel.org/msg51880.html ]
- Address review comments
- Added Acked-by and Reviewed-by
Changes since v9:
[ https://www.mail-archive.com/linux-arm-msm at vger.kernel.org/msg11714.html ]
- Address review comments on v9
Changes since v8:
[ https://www.mail-archive.com/linux-arm-msm at vger.kernel.org/msg11473.html ]
- Flatten out the file structure - merge pm.c into spm.c after discussions
- Add a new function to set warm boot address, in scm-boot.c
- Support for 8064 (New)
- Tested on 8074, 8084. 8064 was tested with a WIP tree
- Address review comments from v8
- Looking into possiblility of initializing the cpuidle device for a cpu, only when the corresponding spm device is probed successfully.
Changes since v7:
[ https://www.mail-archive.com/linux-arm-msm at vger.kernel.org/msg11199.html ]
- Address review comments
- Tested on 8974 but not 8084
- WFI renamed to Standby
- Update commit text with original author and link to the downstream tree
Changes since v6:
[ https://www.mail-archive.com/linux-arm-msm at vger.kernel.org/msg11012.html ]
- SPM device nodes merged with existing SAW DT nodes
- SPM register information is handled within the driver
- Clean up from using 'msm' to 'qcom'
- Shorten some enumerations as well
- Review comments from v6 addressed
- New: Support for 8084 SoC
- Not tested. I do not have a board with this SoC, but the SPM configuration should be identical for WFI and SPC
Changes since v5:
[ https://www.mail-archive.com/linux-arm-msm at vger.kernel.org/msg10559.html ]
- Merge spm-devices.c and spm.c into one file and one patch
- Simplify implementation of the driver.
- Update documentation mapping the DT properties with corresponding SPM register information.
- Removed scm-boot changes for quad core warmboot, its has been pulled in.
Changes since v4:
[ https://www.mail-archive.com/linux-arm-msm at vger.kernel.org/msg10327.html ]
- Update to the v8 of ARM generic idle states patches
- Use platform device model for cpuidle-qcom
- Clean up msm-pm.c to remove unnecessary include files and functions
- Update commit text and documentation for all idle states
- Remove scm-boot relocate patch from this series, submitted earlier [ https://www.mail-archive.com/linux-arm-msm at vger.kernel.org/msg10518.html ]
Changes since v3:
[ https://www.mail-archive.com/linux-arm-msm at vger.kernel.org/msg10288.html ]
- Fix CONFIG_QCOM_PM Kconfig as bool
- More clean ups in spm.c and spm-devices.c
- Removed and re-organized data structures to make initialization simple
- Remove export of sequence flush functions
- Updated commit text
- Comments for use of barriers.
- Rebase on top of 3.17-rc1
Changes since v2:
[ https://www.mail-archive.com/linux-arm-msm at vger.kernel.org/msg10148.html ]
- Prune all the drivers to support basic WFI and power down cpuidle functionality. Remove debug code.
- Integrate KConfig changes into the drivers' patches.
- Use Lorenzo's ARM idle-states patches as the basis for reading cpuidle c-states from DT.
[ http://marc.info/?l=linux-pm&m=140794514812383&w=2 ]
- Incorporate review comments
- Rebase on top of 3.16
Changes since v1/RFC:
[ https://www.mail-archive.com/linux-arm-msm at vger.kernel.org/msg10065.html ]
- Remove hotplug from the patch series. Will submit it separately.
- Fix SPM drivers per the review comments
- Modify patch sequence to compile SPM drivers independent of msm-pm, so as to allow wfi() calls to use SPM even without SoC interface driver.
8074/8084/8064 like any ARM SoC can do architectural clock gating, that helps save on power, but not enough of leakage power. Leakage power of the SoC can be further reduced by turning off power to the core. To aid this, every core (cpu and L2) is accompanied by a Sub-system Power Manager (SPM), that can be configured to indicate the low power mode, the core would be put into and the SPM programs the peripheral h/w accordingly to enter low power and turn off the power rail to the core.
The idle invocation hierarchy -
CPUIDLE
|
cpuidle-qcom.c [CPUIdle driver]
|
------> spm.c [SPM driver]
|
------> scm-boot.c [SCM interface layer]
|
------------------------|--------------------------
(EL) Secure Monitor Code
|
|
wfi();
------------------------|--------------------------
(HW) [CPU] {clock gate}
|
-----> [SPM] {statemachine}The patchset does the following -
- Introduce the SPM driver to control power to the core
- Add device bindings for 8974, 8084, 8064 CPU SPM devices
- Add cpuidle driver for QCOM cpus, using ARM generic idle state definitions.
- Add device bindings for 8974, 8084, 8064 idle-states - WFI and SPC
Thanks,
Lina
Lina Iyer (10):
qcom: scm: Move scm-boot files to drivers/soc/qcom/ and
include/soc/qcom
qcom: scm: Add SCM warmboot support for quad core SoCs
qcom: spm: Add Subsystem Power Manager driver
arm: dts: qcom: Add power-controller device node for 8074 Krait CPUs
arm: dts: qcom: Add power-controller device node for 8084 Krait CPUs
arm: dts: qcom: Update power-controller device node for 8064 Krait
CPUs
qcom: cpuidle: Add cpuidle driver for QCOM cpus
arm: dts: qcom: Add idle states device nodes for 8074
arm: dts: qcom: Add idle states device nodes for 8084
arm: dts: qcom: Add idle state device nodes for 8064
.../bindings/arm/msm/qcom,idle-state.txt | 81 +++++
.../devicetree/bindings/arm/msm/qcom,saw2.txt | 31 +-
arch/arm/boot/dts/qcom-apq8064.dtsi | 36 ++-
arch/arm/boot/dts/qcom-apq8084.dtsi | 46 ++-
arch/arm/boot/dts/qcom-msm8974.dtsi | 46 ++-
arch/arm/mach-qcom/Makefile | 1 -
arch/arm/mach-qcom/platsmp.c | 2 +-
drivers/cpuidle/Kconfig.arm | 7 +
drivers/cpuidle/Makefile | 1 +
drivers/cpuidle/cpuidle-qcom.c | 78 +++++
drivers/soc/qcom/Kconfig | 8 +
drivers/soc/qcom/Makefile | 3 +-
.../arm/mach-qcom => drivers/soc/qcom}/scm-boot.c | 37 ++-
drivers/soc/qcom/spm.c | 328 +++++++++++++++++++++
include/soc/qcom/pm.h | 31 ++
.../arm/mach-qcom => include/soc/qcom}/scm-boot.h | 3 +-
16 files changed, 717 insertions(+), 22 deletions(-)
create mode 100644 Documentation/devicetree/bindings/arm/msm/qcom,idle-state.txt
create mode 100644 drivers/cpuidle/cpuidle-qcom.c
rename {arch/arm/mach-qcom => drivers/soc/qcom}/scm-boot.c (59%)
create mode 100644 drivers/soc/qcom/spm.c
create mode 100644 include/soc/qcom/pm.h
rename {arch/arm/mach-qcom => include/soc/qcom}/scm-boot.h (91%)Signature · 1 line
2.1.0
PATCH v12 1/10 qcom: scm: Move scm-boot files to drivers/soc/qcom/ and include/soc/qcom
Follow the scm.c and move scm-boot files to drivers/soc/qcom. The guidance is to clean files out from mach-qcom and move to drivers/soc area.
---
arch/arm/mach-qcom/Makefile | 1 -
arch/arm/mach-qcom/platsmp.c | 2 +-
drivers/soc/qcom/Makefile | 2 +-
{arch/arm/mach-qcom => drivers/soc/qcom}/scm-boot.c | 4 ++--
{arch/arm/mach-qcom => include/soc/qcom}/scm-boot.h | 0
5 files changed, 4 insertions(+), 5 deletions(-)
rename {arch/arm/mach-qcom => drivers/soc/qcom}/scm-boot.c (97%)
rename {arch/arm/mach-qcom => include/soc/qcom}/scm-boot.h (100%)arch/arm/mach-qcom/Makefile +0 -1
@@ -1,3 +1,2 @@ obj-y := board.o obj-$(CONFIG_SMP) += platsmp.o -obj-$(CONFIG_QCOM_SCM) += scm-boot.o
arch/arm/mach-qcom/platsmp.c +1 -1
@@ -20,7 +20,7 @@#include <asm/smp_plat.h> -#include "scm-boot.h" +#include <soc/qcom/scm-boot.h> #define VDD_SC1_ARRAY_CLAMP_GFS_CTL 0x35a0#define SCSS_CPU1CORE_RESET 0x2d80
drivers/soc/qcom/Makefile +1 -1
@@ -1,3 +1,3 @@ obj-$(CONFIG_QCOM_GSBI) += qcom_gsbi.o CFLAGS_scm.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1) -obj-$(CONFIG_QCOM_SCM) += scm.o +obj-$(CONFIG_QCOM_SCM) += scm.o scm-boot.o
drivers/soc/qcom/scm-boot.c renamed from arch/arm/mach-qcom/scm-boot.c +2 -2
@@ -17,9 +17,9 @@#include <linux/module.h> #include <linux/slab.h> -#include <soc/qcom/scm.h> -#include "scm-boot.h" +#include <soc/qcom/scm.h> +#include <soc/qcom/scm-boot.h> /* * Set the cold/warm boot address for one of the CPU cores.
include/soc/qcom/scm-boot.h renamed from arch/arm/mach-qcom/scm-boot.h +0 -0
Signature · 1 line
2.1.0
PATCH v12 2/10 qcom: scm: Add SCM warmboot support for quad core SoCs
In reply to Lina IyerQuad core SoCs like APQ8074, APQ8064, APQ8084 need SCM support set up warm boot addresses in the Secure Monitor. Extend the SCM flags to support warm boot addresses for secondary cores.
We do not need to export the warmboot flags. Move them into the implementation file.
--- drivers/soc/qcom/scm-boot.c | 35 +++++++++++++++++++++++++++++++++++ include/soc/qcom/scm-boot.h | 3 +-- 2 files changed, 36 insertions(+), 2 deletions(-)
drivers/soc/qcom/scm-boot.c +35 -0
@@ -21,6 +21,23 @@#include <soc/qcom/scm.h> #include <soc/qcom/scm-boot.h> +#define SCM_FLAG_WARMBOOT_CPU0 0x04 +#define SCM_FLAG_WARMBOOT_CPU1 0x02 +#define SCM_FLAG_WARMBOOT_CPU2 0x10 +#define SCM_FLAG_WARMBOOT_CPU3 0x40 + +struct scm_warmboot { +int flag; +void *entry; +}; + +static struct scm_warmboot scm_flags[] = { + { .flag =SCM_FLAG_WARMBOOT_CPU0 }, + { .flag =SCM_FLAG_WARMBOOT_CPU1 }, + { .flag =SCM_FLAG_WARMBOOT_CPU2 }, + { .flag =SCM_FLAG_WARMBOOT_CPU3 }, +}; +/* * Set the cold/warm boot address for one of the CPU cores. */
@@ -37,3 +54,21 @@ int scm_set_boot_addr(phys_addr_t addr, int flags) &cmd, sizeof(cmd), NULL, 0); }EXPORT_SYMBOL (scm_set_boot_addr); + +int scm_set_warm_boot_addr (void *entry,int cpu) +{ +int ret; + +/* +* Reassign only if we are switching from hotplug entry point +* to cpuidle entry point or vice versa. +*/ +if (entry == scm_flags[cpu].entry) +return 0 ; + + ret =scm_set_boot_addr (virt_to_phys (entry), scm_flags[cpu].flag); +if (!ret) + scm_flags[cpu].entry = entry; + +return ret; +}
include/soc/qcom/scm-boot.h +1 -2
@@ -16,9 +16,8 @@#define SCM_FLAG_COLDBOOT_CPU1 0x01#define SCM_FLAG_COLDBOOT_CPU2 0x08#define SCM_FLAG_COLDBOOT_CPU3 0x20 -#define SCM_FLAG_WARMBOOT_CPU0 0x04 -#define SCM_FLAG_WARMBOOT_CPU1 0x02int scm_set_boot_addr (phys_addr_t addr,int flags); +int scm_set_warm_boot_addr (void *entry,int cpu);#endif
Signature · 1 line
2.1.0
PATCH v12 2/10 qcom: scm: Add SCM warmboot support for quad core SoCs
Quoted 10 lines · Lina Iyer
Quad core SoCs like APQ8074, APQ8064, APQ8084 need SCM support set up warm boot addresses in the Secure Monitor. Extend the SCM flags to support warm boot addresses for secondary cores.
We do not need to export the warmboot flags. Move them into the implementation file.
Signed-off-by Lina Iyer <[email protected]>Acked-by Daniel Lezcano <[email protected]>
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v12 3/10 qcom: spm: Add Subsystem Power Manager driver
In reply to Lina IyerSPM is a hardware block that controls the peripheral logic surrounding the application cores (cpu/l$). When the core executes WFI instruction, the SPM takes over the putting the core in low power state as configured. The wake up for the SPM is an interrupt at the GIC, which then completes the rest of low power mode sequence and brings the core out of low power mode.
The SPM has a set of control registers that configure the SPMs individually based on the type of the core and the runtime conditions. SPM is a finite state machine block to which a sequence is provided and it interprets the bytes and executes them in sequence. Each low power mode that the core can enter into is provided to the SPM as a sequence.
Configure the SPM to set the core (cpu or L2) into its low power mode, the index of the first command in the sequence is set in the SPM_CTL register. When the core executes ARM wfi instruction, it triggers the SPM state machine to start executing from that index. The SPM state machine waits until the interrupt occurs and starts executing the rest of the sequence until it hits the end of the sequence. The end of the sequence jumps the core out of its low power mode.
Add support for an idle driver to set up the SPM to place the core in Standby or Standalone power collapse mode when the core is idle.
Based on work by: Mahesh Sivasubramanian <[email protected]>, Ai Li <[email protected]>, Praveen Chidambaram <[email protected]> Original tree available at -git://codeaurora.org/quic/la/kernel/msm-3.10.git
--- .../devicetree/bindings/arm/msm/qcom,saw2.txt | 31 +- drivers/soc/qcom/Kconfig | 8 + drivers/soc/qcom/Makefile | 1 + drivers/soc/qcom/spm.c | 328 +++++++++++++++++++++ include/soc/qcom/pm.h | 31 ++ 5 files changed, 393 insertions(+), 6 deletions(-) create mode 100644 drivers/soc/qcom/spm.c create mode 100644 include/soc/qcom/pm.h
Documentation/devicetree/bindings/arm/msm/qcom,saw2.txt +25 -6
@@ -2,11 +2,20 @@ SPM AVS Wrapper 2 (SAW2) The SAW2 is a wrapper around the Subsystem Power Manager (SPM) and the Adaptive Voltage Scaling (AVS) hardware. The SPM is a programmable -micro-controller that transitions a piece of hardware (like a processor or +power-controller that transitions a piece of hardware (like a processor or subsystem) into and out of low power modes via a direct connection to the PMIC. It can also be wired up to interact with other processors in the system, notifying them when a low power state is entered or exited. +Multiple revisions of the SAW hardware are supported using these Device Nodes. +SAW2 revisions differ in the register offset and configuration data. Also, the +same revision of the SAW in different SoCs may have different configuration +data due the the differences in hardware capabilities. Hence the SoC name, the +version of the SAW hardware in that SoC and the distinction between cpu (big +or Little) or cache, may be needed to uniquely identify the SAW register +configuration and initialization data. The compatible string is used to +indicate this parameter. + PROPERTIES - compatible:
@@ -14,10 +23,13 @@ PROPERTIES Value type: <string> Definition: shall contain "qcom,saw2". A more specific value should be one of: - "qcom,saw2-v1" - "qcom,saw2-v1.1" - "qcom,saw2-v2" - "qcom,saw2-v2.1" + "qcom,saw2-v1" + "qcom,saw2-v1.1" + "qcom,saw2-v2" + "qcom,saw2-v2.1" + "qcom,apq8064-saw2-v1.1-cpu" + "qcom,msm8974-saw2-v2.1-cpu" + "qcom,apq8084-saw2-v2.1-cpu" - reg: Usage: required
@@ -26,10 +38,17 @@ PROPERTIES the register region. An optional second element specifies the base address and size of the alias register region. +- regulator: + Usage: optional + Value type: boolean + Definition: Indicates that this SPM device acts as a regulator device + device for the core (CPU or Cache) the SPM is attached + to. Example: - regulator at 2099000 { + power-controller at 2099000 { compatible = "qcom,saw2"; reg = <0x02099000 0x1000>, <0x02009000 0x1000>; + regulator; };
drivers/soc/qcom/Kconfig +8 -0
@@ -11,3 +11,11 @@ config QCOM_GSBI config QCOM_SCM bool + +config QCOM_PM + bool "Qualcomm Power Management" + depends on ARCH_QCOM + help + QCOM Platform specific power driver to manage cores and L2 low power + modes. It interface with various system drivers to put the cores in + low power modes.
drivers/soc/qcom/Makefile +1 -0
@@ -1,3 +1,4 @@ obj-$(CONFIG_QCOM_GSBI) += qcom_gsbi.o +obj-$(CONFIG_QCOM_PM) += spm.o CFLAGS_scm.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1) obj-$(CONFIG_QCOM_SCM) += scm.o scm-boot.o
drivers/soc/qcom/spm.c new file +328 -0
328 lines not on this page · raw message
include/soc/qcom/pm.h new file +31 -0
@@ -0,0 +1,31 @@ +/* +* Copyright (c) 2009-2014, The Linux Foundation. All rights reserved. +* +* This software is licensed under the terms of the GNU General Public +* License version 2, as published by the Free Software Foundation, and +* may be copied, distributed, and modified under those terms. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +*/ + +#ifndef __QCOM_PM_H +#define __QCOM_PM_H + +enum pm_sleep_mode { +PM_SLEEP_MODE_STBY , +PM_SLEEP_MODE_RET , +PM_SLEEP_MODE_SPC , +PM_SLEEP_MODE_PC , +PM_SLEEP_MODE_NR , +}; + +struct qcom_cpu_pm_ops { +int (*standby)(void *data); +int (*spc)(void *data); +}; + +#endif /* __QCOM_PM_H */
Signature · 1 line
2.1.0
PATCH v12 3/10 qcom: spm: Add Subsystem Power Manager driver
Quoted 197 lines · Lina Iyer
SPM is a hardware block that controls the peripheral logic surrounding the application cores (cpu/l$). When the core executes WFI instruction, the SPM takes over the putting the core in low power state as configured. The wake up for the SPM is an interrupt at the GIC, which then completes the rest of low power mode sequence and brings the core out of low power mode.
The SPM has a set of control registers that configure the SPMs individually based on the type of the core and the runtime conditions. SPM is a finite state machine block to which a sequence is provided and it interprets the bytes and executes them in sequence. Each low power mode that the core can enter into is provided to the SPM as a sequence.
Configure the SPM to set the core (cpu or L2) into its low power mode, the index of the first command in the sequence is set in the
SPM_CTLregister. When the core executes ARM wfi instruction, it triggers the SPM state machine to start executing from that index. The SPM state machine waits until the interrupt occurs and starts executing the rest of the sequence until it hits the end of the sequence. The end of the sequence jumps the core out of its low power mode.Add support for an idle driver to set up the SPM to place the core in Standby or Standalone power collapse mode when the core is idle.
Based on work by: Mahesh Sivasubramanian <[email protected]>, Ai Li <[email protected]>, Praveen Chidambaram <[email protected]> Original tree available at -
git://codeaurora.org/quic/la/kernel/msm-3.10.gitSigned-off-by Lina Iyer <[email protected]>---
.../devicetree/bindings/arm/msm/qcom,saw2.txt | 31 +- drivers/soc/qcom/Kconfig | 8 + drivers/soc/qcom/Makefile | 1 + drivers/soc/qcom/spm.c | 328 +++++++++++++++++++++ include/soc/qcom/pm.h | 31 ++ 5 files changed, 393 insertions(+), 6 deletions(-)create mode 100644
drivers/soc/qcom/spm.c
create mode 100644include/soc/qcom/pm.hDocumentation/devicetree/bindings/arm/msm/qcom,saw2.txt +0
-0@@ -2,11 +2,20 @@ SPM AVS Wrapper 2 (SAW2)The SAW2 is a wrapper around the Subsystem Power Manager (SPM) and the Adaptive Voltage Scaling (AVS) hardware. The SPM is a programmable
Documentation/devicetree/bindings/arm/msm/qcom,saw2.txt +1
-1-micro-controller that transitions a piece of hardware (like a processor or +power-controller that transitions a piece of hardware (like a processor orsubsystem) into and out of low power modes via a direct connection to the PMIC. It can also be wired up to interact with other processors in the system, notifying them when a low power state is entered or exited.
Documentation/devicetree/bindings/arm/msm/qcom,saw2.txt +9
-0+Multiple revisions of the SAW hardware are supported using these Device Nodes. +SAW2 revisions differ in the register offset and configuration data. Also, the +same revision of the SAW in different SoCs may have different configuration +data due the the differences in hardware capabilities. Hence the SoC name, the +version of the SAW hardware in that SoC and the distinction between cpu (big +or Little) or cache, may be needed to uniquely identify the SAW register +configuration and initialization data. The compatible string is used to +indicate this parameter. +PROPERTIES
- compatible:
Documentation/devicetree/bindings/arm/msm/qcom,saw2.txt +13
-5@@ -14,10 +23,13 @@ PROPERTIES Value type: <string> Definition: shall contain "qcom,saw2". A more specific value should be one of: - "qcom,saw2-v1" - "qcom,saw2-v1.1" - "qcom,saw2-v2" - "qcom,saw2-v2.1" + "qcom,saw2-v1" + "qcom,saw2-v1.1" + "qcom,saw2-v2" + "qcom,saw2-v2.1" + "qcom,apq8064-saw2-v1.1-cpu" + "qcom,msm8974-saw2-v2.1-cpu" + "qcom,apq8084-saw2-v2.1-cpu" - reg: Usage: required@@ -26,10 +38,17 @@ PROPERTIES the register region. An optional second element specifies the base address and size of the alias register region. +- regulator: + Usage: optional + Value type: boolean + Definition: Indicates that this SPM device acts as a regulator device + device for the core (CPU or Cache) the SPM is attached + to.Example:
Documentation/devicetree/bindings/arm/msm/qcom,saw2.txt +1
-1- regulator at 2099000 { + power-controller at 2099000 {compatible = "qcom,saw2"; reg = <0x02099000 0x1000>, <0x02009000 0x1000>;Documentation/devicetree/bindings/arm/msm/qcom,saw2.txt +1
-0+ regulator;};drivers/soc/qcom/Kconfig +0
-0@@ -11,3 +11,11 @@ config QCOM_GSBIconfig
QCOM_SCM
booldrivers/soc/qcom/Kconfig +8
-0+ +config QCOM_PM + bool "Qualcomm Power Management" + depends on ARCH_QCOM + help + QCOM Platform specific power driver to manage cores and L2 low power + modes. It interface with various system drivers to put the cores in + low power modes.drivers/soc/qcom/Makefile +0
-0@@ -1,3 +1,4 @@obj-$(CONFIG_QCOM_GSBI) += qcom_gsbi.o
+obj-$(CONFIG_QCOM_PM) += spm.o
CFLAGS_scm.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1) obj-$(CONFIG_QCOM_SCM) += scm.o scm-boot.odrivers/soc/qcom/spm.c new file +63
-0@@ -0,0 +1,328 @@ +/* Copyright (c) 2011-2014, The Linux Foundation. All rights reserved. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 and +* only version 2 as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +*/ + +#include <linux/module.h> +#include <linux/kernel.h> +#include <linux/init.h> +#include <linux/io.h> +#include <linux/slab.h> +#include <linux/of.h> +#include <linux/of_address.h> +#include <linux/of_device.h> +#include <linux/err.h> +#include <linux/platform_device.h> +#include <linux/cpuidle.h> +#include <linux/cpu_pm.h> + +#include <asm/proc-fns.h> +#include <asm/suspend.h> + +#include <soc/qcom/pm.h> +#include <soc/qcom/pm.h> +#include <soc/qcom/scm.h> +#include <soc/qcom/scm-boot.h> + + +#define SCM_CMD_TERMINATE_PC 0x2 +#define SCM_FLUSH_FLAG_MASK 0x3 +#define SCM_L2_ON 0x0 +#define SCM_L2_OFF 0x1 +#define MAX_PMIC_DATA 2 +#define MAX_SEQ_DATA 64 +#define SPM_CTL_INDEX 0x7f +#define SPM_CTL_INDEX_SHIFT 4 +#define SPM_CTL_EN BIT(0) + +enum spm_reg { +SPM_REG_CFG , +SPM_REG_SPM_CTL , +SPM_REG_DLY , +SPM_REG_PMIC_DLY , +SPM_REG_PMIC_DATA_0 , +SPM_REG_PMIC_DATA_1 , +SPM_REG_VCTL , +SPM_REG_SEQ_ENTRY , +SPM_REG_SPM_STS , +SPM_REG_PMIC_STS , +SPM_REG_NR , +}; + +struct spm_reg_data { +const u8 *reg_offset; +u32 spm_cfg; +u32 spm_dly;
drivers/soc/qcom/spm.c line 73
Quoted 10 lines
drivers/soc/qcom/spm.c new file +10
-0+u32 pmic_dly; +u32 pmic_data[MAX_PMIC_DATA ]; +u8 seq[MAX_SEQ_DATA ]; +u8 start_index[PM_SLEEP_MODE_NR ]; +}; + +struct spm_driver_data { +void __iomem *reg_base; +const struct spm_reg_data *reg_data; +bool available;
Remove this.
Quoted 295 lines
drivers/soc/qcom/spm.c new file +255
-0+}; + +static const u8 spm_reg_offset_v2_1[SPM_REG_NR ] = { + [SPM_REG_CFG ] =0x08 , + [SPM_REG_SPM_CTL ] =0x30 , + [SPM_REG_DLY ] =0x34 , + [SPM_REG_SEQ_ENTRY ] =0x80 , +}; + +/* SPM register data for 8974, 8084 */ +static const struct spm_reg_data spm_reg_8974_8084_cpu = { + .reg_offset = spm_reg_offset_v2_1, + .spm_cfg =0x1 , + .spm_dly =0x3C102800 , + .seq = {0x03 ,0x0B ,0x0F ,0x00 ,0x20 ,0x80 ,0x10 ,0xE8 ,0x5B ,0x03 , +0x3B ,0xE8 ,0x5B ,0x82 ,0x10 ,0x0B ,0x30 ,0x06 ,0x26 ,0x30 , +0x0F }, + .start_index[PM_SLEEP_MODE_STBY ] =0 , + .start_index[PM_SLEEP_MODE_SPC ] =3 , +}; + +static const u8 spm_reg_offset_v1_1[SPM_REG_NR ] = { + [SPM_REG_CFG ] =0x08 , + [SPM_REG_SPM_CTL ] =0x20 , + [SPM_REG_PMIC_DLY ] =0x24 , + [SPM_REG_PMIC_DATA_0 ] =0x28 , + [SPM_REG_PMIC_DATA_1 ] =0x2C , + [SPM_REG_SEQ_ENTRY ] =0x80 , +}; + +/* SPM register data for 8064 */ +static const struct spm_reg_data spm_reg_8064_cpu = { + .reg_offset = spm_reg_offset_v1_1, + .spm_cfg =0x1F , + .pmic_dly =0x02020004 , + .pmic_data[0 ] =0x0084009C , + .pmic_data[1 ] =0x00A4001C , + .seq = {0x03 ,0x0F ,0x00 ,0x24 ,0x54 ,0x10 ,0x09 ,0x03 ,0x01 , +0x10 ,0x54 ,0x30 ,0x0C ,0x24 ,0x30 ,0x0F }, + .start_index[PM_SLEEP_MODE_STBY ] =0 , + .start_index[PM_SLEEP_MODE_SPC ] =2 , +}; + +static DEFINE_PER_CPU_SHARED_ALIGNED(struct spm_driver_data *, cpu_spm_drv); + +static inline void spm_register_write (struct spm_driver_data *drv, +enum spm_reg reg,u32 val) +{ +if (drv->reg_data->reg_offset[reg]) +writel_relaxed (val, drv->reg_base + + drv->reg_data->reg_offset[reg]); +} + +static inline u32 spm_register_read (struct spm_driver_data *drv, +enum spm_reg reg) +{ +return readl_relaxed (drv->reg_base + drv->reg_data->reg_offset[reg]); +} + +static int spm_set_low_power_mode (enum pm_sleep_mode mode) +{ +struct spm_driver_data *drv =per_cpu (cpu_spm_drv, +smp_processor_id ()); +u32 start_index; +u32 ctl_val; + +if (!drv) +return -ENXIO ; + + start_index = drv->reg_data->start_index[mode]; + + ctl_val =spm_register_read (drv,SPM_REG_SPM_CTL ); + ctl_val &= ~(SPM_CTL_INDEX <<SPM_CTL_INDEX_SHIFT ); + ctl_val |= start_index <<SPM_CTL_INDEX_SHIFT ; + ctl_val |=SPM_CTL_EN ; +spm_register_write (drv,SPM_REG_SPM_CTL , ctl_val); + +/* Ensure we have written the start address */ +wmb (); + +return 0 ; +} + +static int qcom_pm_collapse (unsigned long int unused) +{ +int ret; +u32 flag; +int cpu =smp_processor_id (); + + ret =scm_set_warm_boot_addr (cpu_resume, cpu); +if (ret) +return ret; + + flag =SCM_L2_ON &SCM_FLUSH_FLAG_MASK ; +scm_call_atomic1 (SCM_SVC_BOOT ,SCM_CMD_TERMINATE_PC , flag); + +/* +* Returns here only if there was a pending interrupt and we did not +* power down as a result. +*/ +return 0 ; +} + +static int qcom_cpu_standby (void *unused) +{ +int ret; + + ret =spm_set_low_power_mode (PM_SLEEP_MODE_STBY ); +if (ret) +return ret; + +cpu_do_idle (); + +return 0 ; +} + +static int qcom_cpu_spc (void *unused) +{int ret; + + ret =spm_set_low_power_mode (PM_SLEEP_MODE_STBY ); +if (ret) +return ret; + +cpu_pm_enter (); +cpu_suspend (0 , qcom_pm_collapse); +cpu_pm_exit (); + +return 0 ; +} + +static struct spm_driver_data *spm_get_drv (struct platform_device *pdev, +int *spm_cpu) +{ +struct spm_driver_data *drv =NULL ; +struct device_node *cpu_node, *saw_node; +int cpu; +bool found = false; + +for_each_possible_cpu (cpu) { + cpu_node =of_cpu_device_node_get (cpu); +if (!cpu_node) +continue ; + saw_node =of_parse_phandle (cpu_node,"qcom,saw" ,0 ); +if (saw_node) { +if (saw_node == pdev->dev.of_node) + found = true; +of_node_put (saw_node); + } +of_node_put (cpu_node); +if (found) +break ; + } + +if (found) { + drv =devm_kzalloc (&pdev->dev,sizeof (*drv),GFP_KERNEL ); +if (drv) + *spm_cpu = cpu; + } + +return drv; +} + +static const struct of_device_id spm_match_table[] = { + { .compatible ="qcom,msm8974-saw2-v2.1-cpu" , + .data = &spm_reg_8974_8084_cpu }, + { .compatible ="qcom,apq8084-saw2-v2.1-cpu" , + .data = &spm_reg_8974_8084_cpu }, + { .compatible ="qcom,apq8064-saw2-v1.1-cpu" , + .data = &spm_reg_8064_cpu }, + { }, +}; + +static const struct qcom_cpu_pm_ops lpm_ops = { + .standby = qcom_cpu_standby, + .spc = qcom_cpu_spc, +}; + +static int spm_dev_probe (struct platform_device *pdev) +{ +struct spm_driver_data *drv; +struct resource *res; +const struct of_device_id *match_id; +void __iomem *addr; +int cpu = -EINVAL ; +static bool cpuidle_drv_init; +const struct platform_device_info qcom_cpuidle_info = { + .name ="qcom_cpuidle" , + .id =-1 , + .data = &lpm_ops, + .size_data =sizeof (lpm_ops), + }; + + drv =spm_get_drv (pdev, &cpu); +if (!drv || cpu <0 ) +return -EINVAL ; + + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); + drv->reg_base =devm_ioremap_resource (&pdev->dev, res); +if (IS_ERR (drv->reg_base)) +return PTR_ERR (drv->reg_base); + + match_id =of_match_node (spm_match_table, pdev->dev.of_node); +if (!match_id) +return -ENODEV ; + + drv->reg_data = match_id->data; + +/* Write the SPM sequences first.. */ + addr = drv->reg_base + drv->reg_data->reg_offset[SPM_REG_SEQ_ENTRY ]; +__iowrite32_copy (addr, drv->reg_data->seq, +ARRAY_SIZE (drv->reg_data->seq) /4 ); + +/* +* ..and then the control registers. +* On some SoC's if the control registers are written first and if the +* CPU was held in reset, the reset signal could trigger the SPM state +* machine, before the sequences are completely written. +*/ +spm_register_write (drv,SPM_REG_CFG , drv->reg_data->spm_cfg); +spm_register_write (drv,SPM_REG_DLY , drv->reg_data->spm_dly); +spm_register_write (drv,SPM_REG_PMIC_DLY , drv->reg_data->pmic_dly); + +spm_register_write (drv,SPM_REG_PMIC_DATA_0 , + drv->reg_data->pmic_data[0 ]); +spm_register_write (drv,SPM_REG_PMIC_DATA_1 , + drv->reg_data->pmic_data[1 ]); + +/* +* Ensure all observers see the above register writes before the +* cpuidle driver is allowed to use the SPM. +*/ +wmb (); +per_cpu (cpu_spm_drv, cpu) = drv; + +if (!cpuidle_drv_init) { +platform_device_register_full (&qcom_cpuidle_info); + cpuidle_drv_init = true; + } + +return 0 ; +} + +static struct platform_driver spm_driver = { + .probe = spm_dev_probe, + .driver = { + .name ="saw" , + .of_match_table = spm_match_table, + }, +}; + +module_platform_driver (spm_driver); + +MODULE_LICENSE ("GPL v2" ); +MODULE_DESCRIPTION ("SAW power controller driver" ); +MODULE_ALIAS ("platform:saw" );include/soc/qcom/pm.h new file +31
-0@@ -0,0 +1,31 @@ +/* +* Copyright (c) 2009-2014, The Linux Foundation. All rights reserved. +* +* This software is licensed under the terms of the GNU General Public +* License version 2, as published by the Free Software Foundation, and +* may be copied, distributed, and modified under those terms. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +*/ + +#ifndef __QCOM_PM_H +#define __QCOM_PM_H + +enum pm_sleep_mode { +PM_SLEEP_MODE_STBY , +PM_SLEEP_MODE_RET , +PM_SLEEP_MODE_SPC , +PM_SLEEP_MODE_PC , +PM_SLEEP_MODE_NR , +}; + +struct qcom_cpu_pm_ops { +int (*standby)(void *data); +int (*spc)(void *data); +}; + +#endif /* __QCOM_PM_H */ Signature · 1 line
2.1.0
PATCH v12 3/10 qcom: spm: Add Subsystem Power Manager driver
In reply to Lina IyerQuoted 30 lines · Lina Iyer
SPM is a hardware block that controls the peripheral logic surrounding the application cores (cpu/l$). When the core executes WFI instruction, the SPM takes over the putting the core in low power state as configured. The wake up for the SPM is an interrupt at the GIC, which then completes the rest of low power mode sequence and brings the core out of low power mode.
The SPM has a set of control registers that configure the SPMs individually based on the type of the core and the runtime conditions. SPM is a finite state machine block to which a sequence is provided and it interprets the bytes and executes them in sequence. Each low power mode that the core can enter into is provided to the SPM as a sequence.
Configure the SPM to set the core (cpu or L2) into its low power mode, the index of the first command in the sequence is set in the
SPM_CTLregister. When the core executes ARM wfi instruction, it triggers the SPM state machine to start executing from that index. The SPM state machine waits until the interrupt occurs and starts executing the rest of the sequence until it hits the end of the sequence. The end of the sequence jumps the core out of its low power mode.Add support for an idle driver to set up the SPM to place the core in Standby or Standalone power collapse mode when the core is idle.
Based on work by: Mahesh Sivasubramanian <[email protected]>, Ai Li <[email protected]>, Praveen Chidambaram <[email protected]> Original tree available at -
git://codeaurora.org/quic/la/kernel/msm-3.10.gitSigned-off-by Lina Iyer <[email protected]>
[...]
drivers/soc/qcom/spm.c line 1
Quoted 7 lines
drivers/soc/qcom/spm.c new file +1
-0@@ -0,0 +1,328 @@ +/* Copyright (c) 2011-2014, The Linux Foundation. All rights reserved.
nit: one more multi-line coding style missed (no need to repost just for this, feel free to just updated it locally)
After that, feel free to add:
PATCH v12 3/10 qcom: spm: Add Subsystem Power Manager driver
Quoted 46 lines · Kevin Hilman
Quoted 30 lines · Lina Iyer
SPM is a hardware block that controls the peripheral logic surrounding the application cores (cpu/l$). When the core executes WFI instruction, the SPM takes over the putting the core in low power state as configured. The wake up for the SPM is an interrupt at the GIC, which then completes the rest of low power mode sequence and brings the core out of low power mode.
The SPM has a set of control registers that configure the SPMs individually based on the type of the core and the runtime conditions. SPM is a finite state machine block to which a sequence is provided and it interprets the bytes and executes them in sequence. Each low power mode that the core can enter into is provided to the SPM as a sequence.
Configure the SPM to set the core (cpu or L2) into its low power mode, the index of the first command in the sequence is set in the
SPM_CTLregister. When the core executes ARM wfi instruction, it triggers the SPM state machine to start executing from that index. The SPM state machine waits until the interrupt occurs and starts executing the rest of the sequence until it hits the end of the sequence. The end of the sequence jumps the core out of its low power mode.Add support for an idle driver to set up the SPM to place the core in Standby or Standalone power collapse mode when the core is idle.
Based on work by: Mahesh Sivasubramanian <[email protected]>, Ai Li <[email protected]>, Praveen Chidambaram <[email protected]> Original tree available at -
git://codeaurora.org/quic/la/kernel/msm-3.10.gitSigned-off-by Lina Iyer <[email protected]>[...]
drivers/soc/qcom/spm.c line 1
Quoted 7 lines
drivers/soc/qcom/spm.c new file +1
-0@@ -0,0 +1,328 @@ +/* Copyright (c) 2011-2014, The Linux Foundation. All rights reserved. nit: one more multi-line coding style missed (no need to repost just for this, feel free to just updated it locally)
Quoted 1 line
After that, feel free to add:
Thanks, I am going to send an updated set later tonight. This will be fixed.
Quoted 2 lines
Reviewed-by Kevin Hilman <[email protected]>
PATCH v12 4/10 arm: dts: qcom: Add power-controller device node for 8074 Krait CPUs
In reply to Lina IyerEach Krait CPU in the QCOM 8074/8974 SoC has an SAW power controller to regulate the power to the cpu and aide the core in entering idle states. Reference the SAW instance and associate the instance with the CPU core.
--- arch/arm/boot/dts/qcom-msm8974.dtsi | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-)
arch/arm/boot/dts/qcom-msm8974.dtsi +25 -1
@@ -21,6 +21,7 @@ reg = <0>; next-level-cache = <&L2>; qcom,acc = <&acc0>; + qcom,saw = <&saw0>; }; cpu at 1 {
@@ -30,6 +31,7 @@ reg = <1>; next-level-cache = <&L2>; qcom,acc = <&acc1>; + qcom,saw = <&saw1>; }; cpu at 2 {
@@ -39,6 +41,7 @@ reg = <2>; next-level-cache = <&L2>; qcom,acc = <&acc2>; + qcom,saw = <&saw2>; }; cpu at 3 {
@@ -48,6 +51,7 @@ reg = <3>; next-level-cache = <&L2>; qcom,acc = <&acc3>; + qcom,saw = <&saw3>; }; L2: l2-cache {
@@ -144,7 +148,27 @@ }; }; - saw_l2: regulator at f9012000 { + saw0: power-controller at f9089000 { + compatible = "qcom,msm8974-saw2-v2.1-cpu"; + reg = <0xf9089000 0x1000>, <0xf9009000 0x1000>; + }; + + saw1: power-controller at f9099000 { + compatible = "qcom,msm8974-saw2-v2.1-cpu"; + reg = <0xf9099000 0x1000>, <0xf9009000 0x1000>; + }; + + saw2: power-controller at f90a9000 { + compatible = "qcom,msm8974-saw2-v2.1-cpu"; + reg = <0xf90a9000 0x1000>, <0xf9009000 0x1000>; + }; + + saw3: power-controller at f90b9000 { + compatible = "qcom,msm8974-saw2-v2.1-cpu"; + reg = <0xf90b9000 0x1000>, <0xf9009000 0x1000>; + }; + + saw_l2: power-controller at f9012000 { compatible = "qcom,saw2"; reg = <0xf9012000 0x1000>; regulator;
Signature · 1 line
2.1.0
PATCH v12 5/10 arm: dts: qcom: Add power-controller device node for 8084 Krait CPUs
In reply to Lina IyerEach Krait CPU in the QCOM 8084 SoC has an SAW power controller to regulate the power to the cpu and aide the core in entering idle states. Reference the SAW instance and associate the instance with the CPU core.
--- arch/arm/boot/dts/qcom-apq8084.dtsi | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-)
arch/arm/boot/dts/qcom-apq8084.dtsi +25 -1
@@ -21,6 +21,7 @@ enable-method = "qcom,kpss-acc-v2"; next-level-cache = <&L2>; qcom,acc = <&acc0>; + qcom,saw = <&saw0>; }; cpu at 1 {
@@ -30,6 +31,7 @@ enable-method = "qcom,kpss-acc-v2"; next-level-cache = <&L2>; qcom,acc = <&acc1>; + qcom,saw = <&saw1>; }; cpu at 2 {
@@ -39,6 +41,7 @@ enable-method = "qcom,kpss-acc-v2"; next-level-cache = <&L2>; qcom,acc = <&acc2>; + qcom,saw = <&saw2>; }; cpu at 3 {
@@ -48,6 +51,7 @@ enable-method = "qcom,kpss-acc-v2"; next-level-cache = <&L2>; qcom,acc = <&acc3>; + qcom,saw = <&saw3>; }; L2: l2-cache {
@@ -144,7 +148,27 @@ }; }; - saw_l2: regulator at f9012000 { + saw0: power-controller at f9089000 { + compatible = "qcom,apq8084-saw2-v2.1-cpu"; + reg = <0xf9089000 0x1000>, <0xf9009000 0x1000>; + }; + + saw1: power-controller at f9099000 { + compatible = "qcom,apq8084-saw2-v2.1-cpu"; + reg = <0xf9099000 0x1000>, <0xf9009000 0x1000>; + }; + + saw2: power-controller at f90a9000 { + compatible = "qcom,apq8084-saw2-v2.1-cpu"; + reg = <0xf90a9000 0x1000>, <0xf9009000 0x1000>; + }; + + saw3: power-controller at f90b9000 { + compatible = "qcom,apq8084-saw2-v2.1-cpu"; + reg = <0xf90b9000 0x1000>, <0xf9009000 0x1000>; + }; + + saw_l2: power-controller at f9012000 { compatible = "qcom,saw2"; reg = <0xf9012000 0x1000>; regulator;
Signature · 1 line
2.1.0
PATCH v12 6/10 arm: dts: qcom: Update power-controller device node for 8064 Krait CPUs
In reply to Lina IyerUpdate the SAW2 DT bindings to add qcom,apq8064-saw2-v1.1-cpu compatible binding string to configure SPM registers and allow the SPM to put the core in deeper idle states when the core is idle.
--- arch/arm/boot/dts/qcom-apq8064.dtsi | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
arch/arm/boot/dts/qcom-apq8064.dtsi +8 -8
@@ -139,26 +139,26 @@ reg = <0x020b8000 0x1000>, <0x02008000 0x1000>; }; - saw0: regulator at 2089000 { - compatible = "qcom,saw2"; + saw0: power-controller at 2089000 { + compatible = "qcom,apq8064-saw2-v1.1-cpu", "qcom,saw2"; reg = <0x02089000 0x1000>, <0x02009000 0x1000>; regulator; }; - saw1: regulator at 2099000 { - compatible = "qcom,saw2"; + saw1: power-controller at 2099000 { + compatible = "qcom,apq8064-saw2-v1.1-cpu", "qcom,saw2"; reg = <0x02099000 0x1000>, <0x02009000 0x1000>; regulator; }; - saw2: regulator at 20a9000 { - compatible = "qcom,saw2"; + saw2: power-controller at 20a9000 { + compatible = "qcom,apq8064-saw2-v1.1-cpu", "qcom,saw2"; reg = <0x020a9000 0x1000>, <0x02009000 0x1000>; regulator; }; - saw3: regulator at 20b9000 { - compatible = "qcom,saw2"; + saw3: power-controller at 20b9000 { + compatible = "qcom,apq8064-saw2-v1.1-cpu", "qcom,saw2"; reg = <0x020b9000 0x1000>, <0x02009000 0x1000>; regulator; };
Signature · 1 line
2.1.0
PATCH v12 7/10 qcom: cpuidle: Add cpuidle driver for QCOM cpus
In reply to Lina IyerAdd cpuidle driver interface to allow cpus to go into idle states. Use the cpuidle DT interface, common across ARM architectures, to provide the idle state information to the cpuidle framework.
Supported modes at this time are Standby and Standalone Power Collapse.
--- .../bindings/arm/msm/qcom,idle-state.txt | 81 ++++++++++++++++++++++ drivers/cpuidle/Kconfig.arm | 7 ++ drivers/cpuidle/Makefile | 1 + drivers/cpuidle/cpuidle-qcom.c | 78 +++++++++++++++++++++ 4 files changed, 167 insertions(+) create mode 100644 Documentation/devicetree/bindings/arm/msm/qcom,idle-state.txt create mode 100644 drivers/cpuidle/cpuidle-qcom.c
Documentation/devicetree/bindings/arm/msm/qcom,idle-state.txt new file +81 -0
@@ -0,0 +1,81 @@ +QCOM Idle States for cpuidle driver + +ARM provides idle-state node to define the cpuidle states, as defined in [1]. +cpuidle-qcom is the cpuidle driver for Qualcomm SoCs and uses these idle +states. Idle states have different enter/exit latency and residency values. +The idle states supported by the QCOM SoC are defined as - + + * Standby + * Retention + * Standalone Power Collapse (Standalone PC or SPC) + * Power Collapse (PC) + +Standby: Standby does a little more in addition to architectural clock gating. +When the WFI instruction is executed the ARM core would gate its internal +clocks. In addition to gating the clocks, QCOM cpus use this instruction as a +trigger to execute the SPM state machine. The SPM state machine waits for the +interrupt to trigger the core back in to active. This triggers the cache +hierarchy to enter standby states, when all cpus are idle. An interrupt brings +the SPM state machine out of its wait, the next step is to ensure that the +cache hierarchy is also out of standby, and then the cpu is allowed to resume +execution. + +Retention: Retention is a low power state where the core is clock gated and +the memory and the registers associated with the core are retained. The +voltage may be reduced to the minimum value needed to keep the processor +registers active. The SPM should be configured to execute the retention +sequence and would wait for interrupt, before restoring the cpu to execution +state. Retention may have a slightly higher latency than Standby. + +Standalone PC: A cpu can power down and warmboot if there is a sufficient time +between the time it enters idle and the next known wake up. SPC mode is used +to indicate a core entering a power down state without consulting any other +cpu or the system resources. This helps save power only on that core. The SPM +sequence for this idle state is programmed to power down the supply to the +core, wait for the interrupt, restore power to the core, and ensure the +system state including cache hierarchy is ready before allowing core to +resume. Applying power and resetting the core causes the core to warmboot +back into Elevation Level (EL) which trampolines the control back to the +kernel. Entering a power down state for the cpu, needs to be done by trapping +into a EL. Failing to do so, would result in a crash enforced by the warm boot +code in the EL for the SoC. On SoCs with write-back L1 cache, the cache has to +be flushed in s/w, before powering down the core. + +Power Collapse: This state is similar to the SPC mode, but distinguishes +itself in that the cpu acknowledges and permits the SoC to enter deeper sleep +modes. In a hierarchical power domain SoC, this means L2 and other caches can +be flushed, system bus, clocks - lowered, and SoC main XO clock gated and +voltages reduced, provided all cpus enter this state. Since the span of low +power modes possible at this state is vast, the exit latency and the residency +of this low power mode would be considered high even though at a cpu level, +this essentially is cpu power down. The SPM in this state also may handshake +with the Resource power manager processor in the SoC to indicate a complete +application processor subsystem shut down. + +The idle-state for QCOM SoCs are distinguished by the compatible property of +the idle-states device node. +The devicetree representation of the idle state should be - + +Required properties: + +- compatible: Must be one of - + "qcom,idle-state-stby", + "qcom,idle-state-ret", + "qcom,idle-state-spc", + "qcom,idle-state-pc", + and "arm,idle-state". + +Other required and optional properties are specified in [1]. + +Example: + + idle-states { + CPU_SPC: spc { + compatible = "qcom,idle-state-spc", "arm,idle-state"; + entry-latency-us = <150>; + exit-latency-us = <200>; + min-residency-us = <2000>; + }; + }; + +[1]. Documentation/devicetree/bindings/arm/idle-states.txt
drivers/cpuidle/Kconfig.arm +7 -0
@@ -63,3 +63,10 @@ config ARM_MVEBU_V7_CPUIDLE depends on ARCH_MVEBU help Select this to enable cpuidle on Armada 370, 38x and XP processors. + +config ARM_QCOM_CPUIDLE + bool "CPU Idle drivers for Qualcomm processors" + depends on ARCH_QCOM + select DT_IDLE_STATES + help + Select this to enable cpuidle for QCOM processors
drivers/cpuidle/Makefile +1 -0
@@ -17,6 +17,7 @@ obj-$(CONFIG_ARM_ZYNQ_CPUIDLE) += cpuidle-zynq.o obj-$(CONFIG_ARM_U8500_CPUIDLE) += cpuidle-ux500.o obj-$(CONFIG_ARM_AT91_CPUIDLE) += cpuidle-at91.o obj-$(CONFIG_ARM_EXYNOS_CPUIDLE) += cpuidle-exynos.o +obj-$(CONFIG_ARM_QCOM_CPUIDLE) += cpuidle-qcom.o ############################################################################### # MIPS drivers
drivers/cpuidle/cpuidle-qcom.c new file +78 -0
78 lines not on this page · raw message
Signature · 1 line
2.1.0
PATCH v12 7/10 qcom: cpuidle: Add cpuidle driver for QCOM cpus
Quoted 168 lines · Lina Iyer
Add cpuidle driver interface to allow cpus to go into idle states. Use the cpuidle DT interface, common across ARM architectures, to provide the idle state information to the cpuidle framework.
Supported modes at this time are Standby and Standalone Power Collapse.
Signed-off-by Lina Iyer <[email protected]>Acked-by Daniel Lezcano <[email protected]>--- .../bindings/arm/msm/qcom,idle-state.txt | 81 ++++++++++++++++++++++ drivers/cpuidle/Kconfig.arm | 7 ++ drivers/cpuidle/Makefile | 1 + drivers/cpuidle/cpuidle-qcom.c | 78 +++++++++++++++++++++ 4 files changed, 167 insertions(+)create mode 100644
Documentation/devicetree/bindings/arm/msm/qcom,idle-state.txtcreate mode 100644drivers/cpuidle/cpuidle-qcom.cDocumentation/devicetree/bindings/arm/msm/qcom,idle-state.txt new file +81
-0@@ -0,0 +1,81 @@ +QCOM Idle States for cpuidle driver + +ARM provides idle-state node to define the cpuidle states, as defined in [1]. +cpuidle-qcom is the cpuidle driver for Qualcomm SoCs and uses these idle +states. Idle states have different enter/exit latency and residency values. +The idle states supported by the QCOM SoC are defined as - + + * Standby + * Retention + * Standalone Power Collapse (Standalone PC or SPC) + * Power Collapse (PC) + +Standby: Standby does a little more in addition to architectural clock gating. +When the WFI instruction is executed the ARM core would gate its internal +clocks. In addition to gating the clocks, QCOM cpus use this instruction as a +trigger to execute the SPM state machine. The SPM state machine waits for the +interrupt to trigger the core back in to active. This triggers the cache +hierarchy to enter standby states, when all cpus are idle. An interrupt brings +the SPM state machine out of its wait, the next step is to ensure that the +cache hierarchy is also out of standby, and then the cpu is allowed to resume +execution. + +Retention: Retention is a low power state where the core is clock gated and +the memory and the registers associated with the core are retained. The +voltage may be reduced to the minimum value needed to keep the processor +registers active. The SPM should be configured to execute the retention +sequence and would wait for interrupt, before restoring the cpu to execution +state. Retention may have a slightly higher latency than Standby. + +Standalone PC: A cpu can power down and warmboot if there is a sufficient time +between the time it enters idle and the next known wake up. SPC mode is used +to indicate a core entering a power down state without consulting any other +cpu or the system resources. This helps save power only on that core. The SPM +sequence for this idle state is programmed to power down the supply to the +core, wait for the interrupt, restore power to the core, and ensure the +system state including cache hierarchy is ready before allowing core to +resume. Applying power and resetting the core causes the core to warmboot +back into Elevation Level (EL) which trampolines the control back to the +kernel. Entering a power down state for the cpu, needs to be done by trapping +into a EL. Failing to do so, would result in a crash enforced by the warm boot +code in the EL for the SoC. On SoCs with write-back L1 cache, the cache has to +be flushed in s/w, before powering down the core. + +Power Collapse: This state is similar to the SPC mode, but distinguishes +itself in that the cpu acknowledges and permits the SoC to enter deeper sleep +modes. In a hierarchical power domain SoC, this means L2 and other caches can +be flushed, system bus, clocks - lowered, and SoC main XO clock gated and +voltages reduced, provided all cpus enter this state. Since the span of low +power modes possible at this state is vast, the exit latency and the residency +of this low power mode would be considered high even though at a cpu level, +this essentially is cpu power down. The SPM in this state also may handshake +with the Resource power manager processor in the SoC to indicate a complete +application processor subsystem shut down. + +The idle-state for QCOM SoCs are distinguished by the compatible property of +the idle-states device node. +The devicetree representation of the idle state should be - + +Required properties: + +- compatible: Must be one of - + "qcom,idle-state-stby", + "qcom,idle-state-ret", + "qcom,idle-state-spc", + "qcom,idle-state-pc", + and "arm,idle-state". + +Other required and optional properties are specified in [1]. + +Example: + + idle-states { + CPU_SPC: spc { + compatible = "qcom,idle-state-spc", "arm,idle-state"; + entry-latency-us = <150>; + exit-latency-us = <200>; + min-residency-us = <2000>; + }; + }; + +[1]. Documentation/devicetree/bindings/arm/idle-states.txtdrivers/cpuidle/Kconfig.arm +7
-0@@ -63,3 +63,10 @@ config ARM_MVEBU_V7_CPUIDLE depends on ARCH_MVEBU help Select this to enable cpuidle on Armada 370, 38x and XP processors. + +config ARM_QCOM_CPUIDLE + bool "CPU Idle drivers for Qualcomm processors" + depends on ARCH_QCOM + select DT_IDLE_STATES + help + Select this to enable cpuidle for QCOM processorsdrivers/cpuidle/Makefile +1
-0@@ -17,6 +17,7 @@ obj-$(CONFIG_ARM_ZYNQ_CPUIDLE) += cpuidle-zynq.o obj-$(CONFIG_ARM_U8500_CPUIDLE) += cpuidle-ux500.o obj-$(CONFIG_ARM_AT91_CPUIDLE) += cpuidle-at91.o obj-$(CONFIG_ARM_EXYNOS_CPUIDLE) += cpuidle-exynos.o +obj-$(CONFIG_ARM_QCOM_CPUIDLE) += cpuidle-qcom.o ############################################################################### # MIPS driversdrivers/cpuidle/cpuidle-qcom.c new file +30
-0@@ -0,0 +1,78 @@ +/* +* Copyright (c) 2014, Linaro Limited. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 and +* only version 2 as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +*/ + +#include <linux/cpuidle.h> +#include <linux/module.h> +#include <linux/platform_device.h> + +#include <soc/qcom/pm.h> +#include "dt_idle_states.h" + +static struct qcom_cpu_pm_ops *lpm_ops; + +static int qcom_cpu_stby (struct cpuidle_device *dev, +struct cpuidle_driver *drv,int index) +{ +if (!lpm_ops->standby (NULL )) +return -1 ; + +return index;
drivers/cpuidle/cpuidle-qcom.c line 40
Quoted 10 lines
drivers/cpuidle/cpuidle-qcom.c new file +10
-0+} + +static int qcom_cpu_spc (struct cpuidle_device *dev, +struct cpuidle_driver *drv,int index) +{ +if (!lpm_ops->spc (NULL )) +return -1 ; + +return index; +}
Really ? the lpm_ops return NULL on error ?
ret = lpm_ops->spc(NULL);
if (ret)
return ret;
Signature · 5 lines
<http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
PATCH v12 7/10 qcom: cpuidle: Add cpuidle driver for QCOM cpus
Quoted 183 lines · Daniel Lezcano
Quoted 168 lines · Lina Iyer
Add cpuidle driver interface to allow cpus to go into idle states. Use the cpuidle DT interface, common across ARM architectures, to provide the idle state information to the cpuidle framework.
Supported modes at this time are Standby and Standalone Power Collapse.
Signed-off-by Lina Iyer <[email protected]>Acked-by Daniel Lezcano <[email protected]>--- .../bindings/arm/msm/qcom,idle-state.txt | 81 ++++++++++++++++++++++ drivers/cpuidle/Kconfig.arm | 7 ++ drivers/cpuidle/Makefile | 1 + drivers/cpuidle/cpuidle-qcom.c | 78 +++++++++++++++++++++ 4 files changed, 167 insertions(+) create mode 100644 Documentation/devicetree/bindings/arm/msm/qcom,idle-state.txt create mode 100644 drivers/cpuidle/cpuidle-qcom.cDocumentation/devicetree/bindings/arm/msm/qcom,idle-state.txt new file +81
-0@@ -0,0 +1,81 @@ +QCOM Idle States for cpuidle driver + +ARM provides idle-state node to define the cpuidle states, as defined in [1]. +cpuidle-qcom is the cpuidle driver for Qualcomm SoCs and uses these idle +states. Idle states have different enter/exit latency and residency values. +The idle states supported by the QCOM SoC are defined as - + + * Standby + * Retention + * Standalone Power Collapse (Standalone PC or SPC) + * Power Collapse (PC) + +Standby: Standby does a little more in addition to architectural clock gating. +When the WFI instruction is executed the ARM core would gate its internal +clocks. In addition to gating the clocks, QCOM cpus use this instruction as a +trigger to execute the SPM state machine. The SPM state machine waits for the +interrupt to trigger the core back in to active. This triggers the cache +hierarchy to enter standby states, when all cpus are idle. An interrupt brings +the SPM state machine out of its wait, the next step is to ensure that the +cache hierarchy is also out of standby, and then the cpu is allowed to resume +execution. + +Retention: Retention is a low power state where the core is clock gated and +the memory and the registers associated with the core are retained. The +voltage may be reduced to the minimum value needed to keep the processor +registers active. The SPM should be configured to execute the retention +sequence and would wait for interrupt, before restoring the cpu to execution +state. Retention may have a slightly higher latency than Standby. + +Standalone PC: A cpu can power down and warmboot if there is a sufficient time +between the time it enters idle and the next known wake up. SPC mode is used +to indicate a core entering a power down state without consulting any other +cpu or the system resources. This helps save power only on that core. The SPM +sequence for this idle state is programmed to power down the supply to the +core, wait for the interrupt, restore power to the core, and ensure the +system state including cache hierarchy is ready before allowing core to +resume. Applying power and resetting the core causes the core to warmboot +back into Elevation Level (EL) which trampolines the control back to the +kernel. Entering a power down state for the cpu, needs to be done by trapping +into a EL. Failing to do so, would result in a crash enforced by the warm boot +code in the EL for the SoC. On SoCs with write-back L1 cache, the cache has to +be flushed in s/w, before powering down the core. + +Power Collapse: This state is similar to the SPC mode, but distinguishes +itself in that the cpu acknowledges and permits the SoC to enter deeper sleep +modes. In a hierarchical power domain SoC, this means L2 and other caches can +be flushed, system bus, clocks - lowered, and SoC main XO clock gated and +voltages reduced, provided all cpus enter this state. Since the span of low +power modes possible at this state is vast, the exit latency and the residency +of this low power mode would be considered high even though at a cpu level, +this essentially is cpu power down. The SPM in this state also may handshake +with the Resource power manager processor in the SoC to indicate a complete +application processor subsystem shut down. + +The idle-state for QCOM SoCs are distinguished by the compatible property of +the idle-states device node. +The devicetree representation of the idle state should be - + +Required properties: + +- compatible: Must be one of - + "qcom,idle-state-stby", + "qcom,idle-state-ret", + "qcom,idle-state-spc", + "qcom,idle-state-pc", + and "arm,idle-state". + +Other required and optional properties are specified in [1]. + +Example: + + idle-states { + CPU_SPC: spc { + compatible = "qcom,idle-state-spc", "arm,idle-state"; + entry-latency-us = <150>; + exit-latency-us = <200>; + min-residency-us = <2000>; + }; + }; + +[1]. Documentation/devicetree/bindings/arm/idle-states.txtdrivers/cpuidle/Kconfig.arm +7
-0@@ -63,3 +63,10 @@ config ARM_MVEBU_V7_CPUIDLE depends on ARCH_MVEBU help Select this to enable cpuidle on Armada 370, 38x and XP processors. + +config ARM_QCOM_CPUIDLE + bool "CPU Idle drivers for Qualcomm processors" + depends on ARCH_QCOM + select DT_IDLE_STATES + help + Select this to enable cpuidle for QCOM processorsdrivers/cpuidle/Makefile +1
-0@@ -17,6 +17,7 @@ obj-$(CONFIG_ARM_ZYNQ_CPUIDLE) += cpuidle-zynq.o obj-$(CONFIG_ARM_U8500_CPUIDLE) += cpuidle-ux500.o obj-$(CONFIG_ARM_AT91_CPUIDLE) += cpuidle-at91.o obj-$(CONFIG_ARM_EXYNOS_CPUIDLE) += cpuidle-exynos.o +obj-$(CONFIG_ARM_QCOM_CPUIDLE) += cpuidle-qcom.o ############################################################################### # MIPS driversdrivers/cpuidle/cpuidle-qcom.c new file +30
-0@@ -0,0 +1,78 @@ +/* +* Copyright (c) 2014, Linaro Limited. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 and +* only version 2 as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +*/ + +#include <linux/cpuidle.h> +#include <linux/module.h> +#include <linux/platform_device.h> + +#include <soc/qcom/pm.h> +#include "dt_idle_states.h" + +static struct qcom_cpu_pm_ops *lpm_ops; + +static int qcom_cpu_stby (struct cpuidle_device *dev, +struct cpuidle_driver *drv,int index) +{ +if (!lpm_ops->standby (NULL )) +return -1 ; + +return index;drivers/cpuidle/cpuidle-qcom.c line 40
Quoted 10 lines
drivers/cpuidle/cpuidle-qcom.c new file +10
-0+} + +static int qcom_cpu_spc (struct cpuidle_device *dev, +struct cpuidle_driver *drv,int index) +{ +if (!lpm_ops->spc (NULL )) +return -1 ; + +return index; +}Really ? the
lpm_opsreturn NULL on error ?
Quoted 4 lines
ret =
lpm_ops->spc(NULL);
if (ret)return ret;
Apologize.
My sanity test on the device, did not reveal the insanity in my code :(
Sorry, will try to not repeat it.
Quoted 11 lines
Signature · 6 lines
-- <http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
PATCH v12 8/10 arm: dts: qcom: Add idle states device nodes for 8074
In reply to Lina IyerAdd ARM common idle states device bindings for cpuidle support for APQ 8074/8974.
Support Standby and Standalone power collapse (power down that does not affect any SoC idle states) for each cpu.
--- arch/arm/boot/dts/qcom-msm8974.dtsi | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
arch/arm/boot/dts/qcom-msm8974.dtsi +20 -0
@@ -22,6 +22,7 @@ next-level-cache = <&L2>; qcom,acc = <&acc0>; qcom,saw = <&saw0>; + cpu-idle-states = <&CPU_STBY &CPU_SPC>; }; cpu at 1 {
@@ -32,6 +33,7 @@ next-level-cache = <&L2>; qcom,acc = <&acc1>; qcom,saw = <&saw1>; + cpu-idle-states = <&CPU_STBY &CPU_SPC>; }; cpu at 2 {
@@ -42,6 +44,7 @@ next-level-cache = <&L2>; qcom,acc = <&acc2>; qcom,saw = <&saw2>; + cpu-idle-states = <&CPU_STBY &CPU_SPC>; }; cpu at 3 {
@@ -52,6 +55,7 @@ next-level-cache = <&L2>; qcom,acc = <&acc3>; qcom,saw = <&saw3>; + cpu-idle-states = <&CPU_STBY &CPU_SPC>; }; L2: l2-cache {
@@ -59,6 +63,22 @@ cache-level = <2>; qcom,saw = <&saw_l2>; }; + + idle-states { + CPU_STBY: standby { + compatible = "qcom,idle-state-stby", "arm,idle-state"; + entry-latency-us = <1>; + exit-latency-us = <1>; + min-residency-us = <2>; + }; + + CPU_SPC: spc { + compatible = "qcom,idle-state-spc", "arm,idle-state"; + entry-latency-us = <150>; + exit-latency-us = <200>; + min-residency-us = <2000>; + }; + }; }; cpu-pmu {
Signature · 1 line
2.1.0
PATCH v12 9/10 arm: dts: qcom: Add idle states device nodes for 8084
In reply to Lina IyerAdd ARM common idle states device bindings for cpuidle support for APQ 8084.
Support standby and standalone power collapse (power down that does not affect any SoC idle states) for each cpu.
--- arch/arm/boot/dts/qcom-apq8084.dtsi | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
arch/arm/boot/dts/qcom-apq8084.dtsi +20 -0
@@ -22,6 +22,7 @@ next-level-cache = <&L2>; qcom,acc = <&acc0>; qcom,saw = <&saw0>; + cpu-idle-states = <&CPU_STBY &CPU_SPC>; }; cpu at 1 {
@@ -32,6 +33,7 @@ next-level-cache = <&L2>; qcom,acc = <&acc1>; qcom,saw = <&saw1>; + cpu-idle-states = <&CPU_STBY &CPU_SPC>; }; cpu at 2 {
@@ -42,6 +44,7 @@ next-level-cache = <&L2>; qcom,acc = <&acc2>; qcom,saw = <&saw2>; + cpu-idle-states = <&CPU_STBY &CPU_SPC>; }; cpu at 3 {
@@ -52,6 +55,7 @@ next-level-cache = <&L2>; qcom,acc = <&acc3>; qcom,saw = <&saw3>; + cpu-idle-states = <&CPU_STBY &CPU_SPC>; }; L2: l2-cache {
@@ -59,6 +63,22 @@ cache-level = <2>; qcom,saw = <&saw_l2>; }; + + idle-states { + CPU_STBY: standby { + compatible = "qcom,idle-state-stby", "arm,idle-state"; + entry-latency-us = <1>; + exit-latency-us = <1>; + min-residency-us = <2>; + }; + + CPU_SPC: spc { + compatible = "qcom,idle-state-spc", "arm,idle-state"; + entry-latency-us = <150>; + exit-latency-us = <200>; + min-residency-us = <2000>; + }; + }; }; cpu-pmu {
Signature · 1 line
2.1.0
PATCH v12 10/10 arm: dts: qcom: Add idle state device nodes for 8064
In reply to Lina IyerAdd ARM common idle state device bindings for cpuidle support for APQ 8064.
Support Standby and Standalone power collapse (power down that does not affect any SoC idle states) for each cpu.
--- arch/arm/boot/dts/qcom-apq8064.dtsi | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
arch/arm/boot/dts/qcom-apq8064.dtsi +20 -0
@@ -23,6 +23,7 @@ next-level-cache = <&L2>; qcom,acc = <&acc0>; qcom,saw = <&saw0>; + cpu-idle-states = <&CPU_STBY &CPU_SPC>; }; cpu at 1 {
@@ -33,6 +34,7 @@ next-level-cache = <&L2>; qcom,acc = <&acc1>; qcom,saw = <&saw1>; + cpu-idle-states = <&CPU_STBY &CPU_SPC>; }; cpu at 2 {
@@ -43,6 +45,7 @@ next-level-cache = <&L2>; qcom,acc = <&acc2>; qcom,saw = <&saw2>; + cpu-idle-states = <&CPU_STBY &CPU_SPC>; }; cpu at 3 {
@@ -53,12 +56,29 @@ next-level-cache = <&L2>; qcom,acc = <&acc3>; qcom,saw = <&saw3>; + cpu-idle-states = <&CPU_STBY &CPU_SPC>; }; L2: l2-cache { compatible = "cache"; cache-level = <2>; }; + + idle-states { + CPU_STBY: standby { + compatible = "qcom,idle-state-stby", "arm,idle-state"; + entry-latency-us = <1>; + exit-latency-us = <1>; + min-residency-us = <2>; + }; + + CPU_SPC: spc { + compatible = "qcom,idle-state-spc", "arm,idle-state"; + entry-latency-us = <400>; + exit-latency-us = <900>; + min-residency-us = <3000>; + }; + }; }; cpu-pmu {
Signature · 1 line
2.1.0