Skip to contentSkip to conversation

ARM generic idle states

PATCH In review Lorenzo Pieralisi 4 participants 15 messages Sep 5, 2014 – Sep 9, 2014

Subsystems (8)
lore
Share & tools
lore
#0 lore raw

v9 cover ARM generic idle states

This patch is v9 of a previous posting:

http://lists.infradead.org/pipermail/linux-arm-kernel/2014-September/283384.html

Patchset has been tested on:

- Juno ARM64 platform and Foundation v8 models (based on Trusted Firmware PSCI implementation available at [1])
# Patches to enable idle states on Juno and Foundation models can be made
available, current dts are not in the mainline kernel
- TC2
- Compile tested on Samsung Exynos

Patch for Exynos CPUidle code depends on patch [2].

[1] https://github.com/ARM-software/arm-trusted-firmware
[2] http://lists.infradead.org/pipermail/linux-arm-kernel/2014-July/274179.html

Changes in v9:

- Cosmetic changes to arm64 CPUidle driver (pr_err logs)
- Added acknowledgements
- Reordered the series by splitting arm64 and CPUidle specific bits

Changes in v8:

- Added idle states check on all cpus in the CPUidle driver mask
- Added missing DT nodes ref counting
- Added idle states node matching code to initialize CPUidle enter function
- Added code to fall back on cpu_possible_mask on NULL CPUidle driver cpumask

Changes in v7:

- Refactored arm64 cpu_suspend API to support retention states
- Readded static states tables for TC2 and Exynos CPUidle driver so that platforms with old dts files will still work as expected
- Slightly reworked the DT parsing API to return the number of parsed DT states
- Ported PSCI to the new cpu_suspend API, now supporting retention states
- Rebased against 3.16

Changes in v6:

- Added ARM64 CPU init idle to CPU operations
- Removed power-rank property; sorting depends on the cpu-idle-states phandle list order now
- Added local-timer-stop flag
- Removed useless TC2 and Exynos DT idle state entry-method bindings
- Removed RTSM dts update
- Updated PSCI suspend parameter and DT bindings
- Updated PSCI parsing code
- Rebased against 3.16-rc6

Changes in v5:

- Added power-rank property to implement state sorting, following a number of on/off list review comments
- Added timer retained bool property
- Ported TC2 big.LITTLE and Exynos drivers to DT initialization
- Renamed s/OF/dt/ throughout the patch
- Incorporated review comments and list discussions in the idle states bindings documents
- Rebased against 3.16-rc2

Changes in v4:

- States sorting using exit-latency
- Added cosmetic review comments
- Dropped RFC
- Rebased against 3.15

Changes in v3:

- Streamlined the idle states bindings and added them to the series
http://www.spinics.net/lists/arm-kernel/msg316299.html
- Sorting states through min-residency+exit-latency
- Added debug strings formatting
- Reworded min-residency-us idle state property
- Removed power-domain properties from idle states waiting for code examples requiring them to be defined

Changes in v2:

- Moved OF parsing code to drivers/cpuidle
- Improved states detection and sorting through linked list
- Split code in generic and ARM64 specific bits
- Moved idle enter function into ARM64 idle driver
- Refactored PSCI idle states register function
- Renamed suspend operations and moved detection to ARM64 idle driver
- Changed the way CPUIDLE_FLAG_TIMER_STOP is handled
- Simplified idle state nodes parsing since according to the latest bindings idle state nodes are a flat list, not hierarchical anymore
- Used min-residency-us to sort the states, to be further discussed

Idle states on most ARM platforms can be characterized by a set of parameters that are platform agnostic and describe the HW idle states features. So far, CPU idle drivers for ARM platforms required the definition of parameters through static tables, duplicating control data for different platforms. Moreover, the lack of standardization on firmware interfaces hampered any standardization effort, resulting in CPU idle drivers for ARM platforms containing duplicated code and platform specific power down routines.

The introduction of the PSCI firmware interface, and more in general, well defined suspend back-ends, allows the definition of generic idle states and the respective kernel infrastructure to support them.

Building on top of DT idle states bindings, that standardize idle states parameters and corresponding suspend back-ends, this patchset provides code that parses DT idle states nodes and builds at run-time the control data infrastructure required by the ARM CPU idle drivers.

Idle states define an entry method (eg PSCI), that requires the respective ARM64 kernel back-end to be invoked to initialize idle states parameters, so that when the idle driver executes the back-end specific entry method a table look-up can be carried out to retrieve the corresponding idle state parameter.

On legacy ARM platforms the DT idle states are used to initialize states data and the idle state compatible string allows to match the corresponding idle state enter function and initialize the enter function pointer accordingly.

Lorenzo Pieralisi (8):
Documentation: arm: define DT idle states bindings
arm64: kernel: refactor the CPU suspend API for retention states
arm64: kernel: introduce cpu_init_idle CPU operation
arm64: add PSCI CPU_SUSPEND based cpu_suspend support
drivers: cpuidle: implement DT based idle states infrastructure
drivers: cpuidle: CPU idle ARM64 driver
drivers: cpuidle: initialize big.LITTLE driver through DT
drivers: cpuidle: initialize Exynos driver through DT

 Documentation/devicetree/bindings/arm/cpus.txt     |   8 +
 .../devicetree/bindings/arm/idle-states.txt        | 679 +++++++++++++++++++++
 Documentation/devicetree/bindings/arm/psci.txt     |  14 +-
 arch/arm/boot/dts/exynos4210.dtsi                  |  11 +
 arch/arm/boot/dts/exynos5250.dtsi                  |  11 +
 arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts         |  23 +
 arch/arm64/include/asm/cpu_ops.h                   |   3 +
 arch/arm64/include/asm/cpuidle.h                   |  13 +
 arch/arm64/include/asm/suspend.h                   |   1 +
 arch/arm64/kernel/Makefile                         |   1 +
 arch/arm64/kernel/cpuidle.c                        |  31 +
 arch/arm64/kernel/psci.c                           | 104 ++++
 arch/arm64/kernel/sleep.S                          |  47 +-
 arch/arm64/kernel/suspend.c                        |  48 +-
 drivers/cpuidle/Kconfig                            |   8 +
 drivers/cpuidle/Kconfig.arm                        |   2 +
 drivers/cpuidle/Kconfig.arm64                      |  14 +
 drivers/cpuidle/Makefile                           |   5 +
 drivers/cpuidle/cpuidle-arm64.c                    | 133 ++++
 drivers/cpuidle/cpuidle-big_little.c               |  19 +
 drivers/cpuidle/cpuidle-exynos.c                   |  18 +-
 drivers/cpuidle/dt_idle_states.c                   | 213 +++++++
 drivers/cpuidle/dt_idle_states.h                   |   7 +
 23 files changed, 1379 insertions(+), 34 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/arm/idle-states.txt
 create mode 100644 arch/arm64/include/asm/cpuidle.h
 create mode 100644 arch/arm64/kernel/cpuidle.c
 create mode 100644 drivers/cpuidle/Kconfig.arm64
 create mode 100644 drivers/cpuidle/cpuidle-arm64.c
 create mode 100644 drivers/cpuidle/dt_idle_states.c
 create mode 100644 drivers/cpuidle/dt_idle_states.h
Signature · 1 line
1.9.1
#1 lore raw

PATCH v9 1/8 Documentation: arm: define DT idle states bindings

ARM based platforms implement a variety of power management schemes that allow processors to enter idle states at run-time.
The parameters defining these idle states vary on a per-platform basis forcing the OS to hardcode the state parameters in platform specific static tables whose size grows as the number of platforms supported in the kernel increases and hampers device drivers standardization.

Therefore, this patch aims at standardizing idle state device tree bindings for ARM platforms. Bindings define idle state parameters inclusive of entry methods and state latencies, to allow operating systems to retrieve the configuration entries from the device tree and initialize the related power management drivers, paving the way for common code in the kernel to deal with idle states and removing the need for static data in current and previous kernel versions.

ARM64 platforms require the DT to define an entry-method property for idle states.

On system implementing PSCI as an enable-method to enter low-power states the PSCI CPU suspend method requires the power_state parameter to be passed to the PSCI CPU suspend function.

This parameter is specific to a power state and platform specific, therefore must be provided by firmware to the OS in order to enable proper call sequence.

Thus, this patch also adds a property in the PSCI bindings that describes how the PSCI CPU suspend power_state parameter should be defined in DT in all device nodes that rely on PSCI CPU suspend method usage.

---
 Documentation/devicetree/bindings/arm/cpus.txt     |   8 +
 .../devicetree/bindings/arm/idle-states.txt        | 679 +++++++++++++++++++++
 Documentation/devicetree/bindings/arm/psci.txt     |  14 +-
 3 files changed, 700 insertions(+), 1 deletion(-)
 create mode 100644 Documentation/devicetree/bindings/arm/idle-states.txt
Documentation/devicetree/bindings/arm/cpus.txt +8 -0
index 298e2f6..6fd0f15 100644
@@ -219,6 +219,12 @@ nodes to be present and contain the properties described below.
 		Value type: <phandle>
 		Definition: Specifies the ACC[2] node associated with this CPU.
 
+	- cpu-idle-states
+		Usage: Optional
+		Value type: <prop-encoded-array>
+		Definition:
+			# List of phandles to idle state nodes supported
+			  by this cpu [3].
 
 Example 1 (dual-cluster big.LITTLE system 32-bit):
 
@@ -415,3 +421,5 @@ cpus {
 --
 [1] arm/msm/qcom,saw2.txt
 [2] arm/msm/qcom,kpss-acc.txt
+[3] ARM Linux kernel documentation - idle states bindings
+    Documentation/devicetree/bindings/arm/idle-states.txt
Documentation/devicetree/bindings/arm/idle-states.txt new file +679 -0

679 lines not on this page · raw message

Documentation/devicetree/bindings/arm/psci.txt +13 -1
index b4a58f3..5aa40ed 100644
@@ -50,6 +50,16 @@ Main node optional properties:
 
  - migrate       : Function ID for MIGRATE operation
 
+Device tree nodes that require usage of PSCI CPU_SUSPEND function (ie idle
+state nodes, as per bindings in [1]) must specify the following properties:
+
+- arm,psci-suspend-param
+		Usage: Required for state nodes[1] if the corresponding
+                       idle-states node entry-method property is set
+                       to "psci".
+		Value type: <u32>
+		Definition: power_state parameter to pass to the PSCI
+			    suspend call.
 
 Example:
 
@@ -64,7 +74,6 @@ Case 1: PSCI v0.1 only.
 		migrate		= <0x95c10003>;
 	};
 
-
 Case 2: PSCI v0.2 only
 
 	psci {
@@ -88,3 +97,6 @@ Case 3: PSCI v0.2 and PSCI v0.1.
 
 		...
 	};
+
+[1] Kernel documentation - ARM idle states bindings
+    Documentation/devicetree/bindings/arm/idle-states.txt
Signature · 1 line
1.9.1
#2 lore raw

PATCH v9 2/8 arm64: kernel: refactor the CPU suspend API for retention states

In reply to Lorenzo Pieralisi

CPU suspend is the standard kernel interface to be used to enter low-power states on ARM64 systems. Current cpu_suspend implementation by default assumes that all low power states are losing the CPU context, so the CPU registers must be saved and cleaned to DRAM upon state entry. Furthermore, the current cpu_suspend() implementation assumes that if the CPU suspend back-end method returns when called, this has to be considered an error regardless of the return code (which can be successful) since the CPU was not expected to return from a code path that is different from cpu_resume code path - eg returning from the reset vector.

All in all this means that the current API does not cope well with low-power states that preserve the CPU context when entered (ie retention states), since first of all the context is saved for nothing on state entry for those states and a successful state entry can return as a normal function return, which is considered an error by the current CPU suspend implementation.

This patch refactors the cpu_suspend() API so that it can be split in two separate functionalities. The arm64 cpu_suspend API just provides a wrapper around CPU suspend operation hook. A new function is introduced (for architecture code use only) for states that require context saving upon entry:

__cpu_suspend(unsigned long arg, int (*fn)(unsigned long))

__cpu_suspend() saves the context on function entry and calls the so called suspend finisher (ie fn) to complete the suspend operation. The finisher is not expected to return, unless it fails in which case the error is propagated back to the __cpu_suspend caller.

The API refactoring results in the following pseudo code call sequence for a suspending CPU, when triggered from a kernel subsystem:

/*
* int cpu_suspend(unsigned long idx)
* @idx: idle state index
*/
{
-> cpu_suspend(idx)

	|---> CPU operations suspend hook called, if present
		|--> if (retention_state)
			|--> direct suspend back-end call (eg PSCI suspend)
		     else
			|--> __cpu_suspend(idx, &back_end_finisher);
}

By refactoring the cpu_suspend API this way, the CPU operations back-end has a chance to detect whether idle states require state saving or not and can call the required suspend operations accordingly either through simple function call or indirectly through __cpu_suspend() which carries out state saving and suspend finisher dispatching to complete idle state entry.

---
 arch/arm64/include/asm/suspend.h |  1 +
 arch/arm64/kernel/sleep.S        | 47 ++++++++++++++++++++++++++++-----------
 arch/arm64/kernel/suspend.c      | 48 ++++++++++++++++++++++++----------------
 3 files changed, 64 insertions(+), 32 deletions(-)
arch/arm64/include/asm/suspend.h +1 -0
index e9c149c..456d67c 100644
@@ -21,6 +21,7 @@ struct sleep_save_sp {
 	phys_addr_t save_ptr_stash_phys;
 };
 
+extern int __cpu_suspend(unsigned long arg, int (*fn)(unsigned long));
 extern void cpu_resume(void);
 extern int cpu_suspend(unsigned long);
 
arch/arm64/kernel/sleep.S +34 -13

80 lines not on this page · raw message

arch/arm64/kernel/suspend.c +29 -19

94 lines not on this page · raw message

Signature · 1 line
1.9.1
#3 lore raw

PATCH v9 3/8 arm64: kernel: introduce cpu_init_idle CPU operation

In reply to Lorenzo Pieralisi

The CPUidle subsystem on ARM64 machines requires the idle states implementation back-end to initialize idle states parameter upon boot. This patch adds a hook in the CPU operations structure that should be initialized by the CPU operations back-end in order to provide a function that initializes cpu idle states.

This patch also adds the infrastructure to arm64 kernel required to export the CPU operations based initialization interface, so that drivers (ie CPUidle) can use it when they are initialized at probe time.

---
 arch/arm64/include/asm/cpu_ops.h |  3 +++
 arch/arm64/include/asm/cpuidle.h | 13 +++++++++++++
 arch/arm64/kernel/Makefile       |  1 +
 arch/arm64/kernel/cpuidle.c      | 31 +++++++++++++++++++++++++++++++
 4 files changed, 48 insertions(+)
 create mode 100644 arch/arm64/include/asm/cpuidle.h
 create mode 100644 arch/arm64/kernel/cpuidle.c
arch/arm64/include/asm/cpu_ops.h +3 -0
index d7b4b38..47dfa31 100644
@@ -28,6 +28,8 @@ struct device_node;
  *		enable-method property.
  * @cpu_init:	Reads any data necessary for a specific enable-method from the
  *		devicetree, for a given cpu node and proposed logical id.
+ * @cpu_init_idle: Reads any data necessary to initialize CPU idle states from
+ *		devicetree, for a given cpu node and proposed logical id.
  * @cpu_prepare: Early one-time preparation step for a cpu. If there is a
  *		mechanism for doing so, tests whether it is possible to boot
  *		the given CPU.
@@ -47,6 +49,7 @@ struct device_node;
 struct cpu_operations {
 	const char	*name;
 	int		(*cpu_init)(struct device_node *, unsigned int);
+	int		(*cpu_init_idle)(struct device_node *, unsigned int);
 	int		(*cpu_prepare)(unsigned int);
 	int		(*cpu_boot)(unsigned int);
 	void		(*cpu_postboot)(void);
arch/arm64/include/asm/cpuidle.h new file +13 -0
new file mode 100644
index 0000000..b52a993
@@ -0,0 +1,13 @@
+#ifndef __ASM_CPUIDLE_H
+#define __ASM_CPUIDLE_H
+
+#ifdef CONFIG_CPU_IDLE
+extern int cpu_init_idle(unsigned int cpu);
+#else
+static inline int cpu_init_idle(unsigned int cpu)
+{
+	return -EOPNOTSUPP;
+}
+#endif
+
+#endif
arch/arm64/kernel/Makefile +1 -0
index 383d81d..be78980 100644
@@ -27,6 +27,7 @@ arm64-obj-$(CONFIG_PERF_EVENTS)		+= perf_regs.o
 arm64-obj-$(CONFIG_HW_PERF_EVENTS)	+= perf_event.o
 arm64-obj-$(CONFIG_HAVE_HW_BREAKPOINT)	+= hw_breakpoint.o
 arm64-obj-$(CONFIG_ARM64_CPU_SUSPEND)	+= sleep.o suspend.o
+arm64-obj-$(CONFIG_CPU_IDLE)		+= cpuidle.o
 arm64-obj-$(CONFIG_JUMP_LABEL)		+= jump_label.o
 arm64-obj-$(CONFIG_KGDB)		+= kgdb.o
 arm64-obj-$(CONFIG_EFI)			+= efi.o efi-stub.o efi-entry.o
arch/arm64/kernel/cpuidle.c new file +31 -0
new file mode 100644
index 0000000..19d17f5
@@ -0,0 +1,31 @@
+/*
+ * ARM64 CPU idle arch support
+ *
+ * Copyright (C) 2014 ARM Ltd.
+ * Author: Lorenzo Pieralisi <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/of.h>
+#include <linux/of_device.h>
+
+#include <asm/cpuidle.h>
+#include <asm/cpu_ops.h>
+
+int cpu_init_idle(unsigned int cpu)
+{
+	int ret = -EOPNOTSUPP;
+	struct device_node *cpu_node = of_cpu_device_node_get(cpu);
+
+	if (!cpu_node)
+		return -ENODEV;
+
+	if (cpu_ops[cpu] && cpu_ops[cpu]->cpu_init_idle)
+		ret = cpu_ops[cpu]->cpu_init_idle(cpu_node, cpu);
+
+	of_node_put(cpu_node);
+	return ret;
+}
Signature · 1 line
1.9.1
#4 lore raw

PATCH v9 4/8 arm64: add PSCI CPU_SUSPEND based cpu_suspend support

In reply to Lorenzo Pieralisi

This patch implements the cpu_suspend cpu operations method through the PSCI CPU SUSPEND API. The PSCI implementation translates the idle state index passed by the cpu_suspend core call into a valid PSCI state according to the PSCI states initialized at boot through the cpu_init_idle() CPU operations hook.

The PSCI CPU suspend operation hook checks if the PSCI state is a standby state. If it is, it calls the PSCI suspend implementation straight away, without saving any context. If the state is a power down state the kernel calls the __cpu_suspend API (that saves the CPU context) and passed the PSCI suspend finisher as a parameter so that PSCI can be called by the __cpu_suspend implementation after saving and flushing the context as last function before power down.

For power down states, entry point is set to cpu_resume physical address, that represents the default kernel execution address following a CPU reset.

---
 arch/arm64/kernel/psci.c | 104 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 104 insertions(+)
arch/arm64/kernel/psci.c +104 -0
index 5539547..866c1c8 100644
@@ -21,6 +21,7 @@
 #include <linux/reboot.h>
 #include <linux/pm.h>
 #include <linux/delay.h>
+#include <linux/slab.h>
 #include <uapi/linux/psci.h>
 
 #include <asm/compiler.h>
@@ -28,6 +29,7 @@
 #include <asm/errno.h>
 #include <asm/psci.h>
 #include <asm/smp_plat.h>
+#include <asm/suspend.h>
 #include <asm/system_misc.h>
 
 #define PSCI_POWER_STATE_TYPE_STANDBY		0
@@ -65,6 +67,8 @@ enum psci_function {
 	PSCI_FN_MAX,
 };
 
+static DEFINE_PER_CPU_READ_MOSTLY(struct psci_power_state *, psci_power_state);
+
 static u32 psci_function_id[PSCI_FN_MAX];
 
 static int psci_to_linux_errno(int errno)
@@ -93,6 +97,18 @@ static u32 psci_power_state_pack(struct psci_power_state state)
 		 & PSCI_0_2_POWER_STATE_AFFL_MASK);
 }
 
+static void psci_power_state_unpack(u32 power_state,
+				    struct psci_power_state *state)
+{
+	state->id = (power_state & PSCI_0_2_POWER_STATE_ID_MASK) >>
+			PSCI_0_2_POWER_STATE_ID_SHIFT;
+	state->type = (power_state & PSCI_0_2_POWER_STATE_TYPE_MASK) >>
+			PSCI_0_2_POWER_STATE_TYPE_SHIFT;
+	state->affinity_level =
+			(power_state & PSCI_0_2_POWER_STATE_AFFL_MASK) >>
+			PSCI_0_2_POWER_STATE_AFFL_SHIFT;
+}
+
 /*
  * The following two functions are invoked via the invoke_psci_fn pointer
  * and will not be inlined, allowing us to piggyback on the AAPCS.
@@ -199,6 +215,63 @@ static int psci_migrate_info_type(void)
 	return err;
 }
 
+static int __maybe_unused cpu_psci_cpu_init_idle(struct device_node *cpu_node,
+						 unsigned int cpu)
+{
+	int i, ret, count = 0;
+	struct psci_power_state *psci_states;
+	struct device_node *state_node;
+
+	/*
+	 * If the PSCI cpu_suspend function hook has not been initialized
+	 * idle states must not be enabled, so bail out
+	 */
+	if (!psci_ops.cpu_suspend)
+		return -EOPNOTSUPP;
+
+	/* Count idle states */
+	while ((state_node = of_parse_phandle(cpu_node, "cpu-idle-states",
+					      count))) {
+		count++;
+		of_node_put(state_node);
+	}
+
+	if (!count)
+		return -ENODEV;
+
+	psci_states = kcalloc(count, sizeof(*psci_states), GFP_KERNEL);
+	if (!psci_states)
+		return -ENOMEM;
+
+	for (i = 0; i < count; i++) {
+		u32 psci_power_state;
+
+		state_node = of_parse_phandle(cpu_node, "cpu-idle-states", i);
+
+		ret = of_property_read_u32(state_node,
+					   "arm,psci-suspend-param",
+					   &psci_power_state);
+		if (ret) {
+			pr_warn(" * %s missing arm,psci-suspend-param property\n",
+				state_node->full_name);
+			of_node_put(state_node);
+			goto free_mem;
+		}
+
+		of_node_put(state_node);
+		pr_debug("psci-power-state %#x index %d\n", psci_power_state,
+							    i);
+		psci_power_state_unpack(psci_power_state, &psci_states[i]);
+	}
+	/* Idle states parsed correctly, initialize per-cpu pointer */
+	per_cpu(psci_power_state, cpu) = psci_states;
+	return 0;
+
+free_mem:
+	kfree(psci_states);
+	return ret;
+}
+
 static int get_set_conduit_method(struct device_node *np)
 {
 	const char *method;
@@ -436,8 +509,39 @@ static int cpu_psci_cpu_kill(unsigned int cpu)
 #endif
 #endif
 
+static int psci_suspend_finisher(unsigned long index)
+{
+	struct psci_power_state *state = __get_cpu_var(psci_power_state);
+
+	return psci_ops.cpu_suspend(state[index - 1],
+				    virt_to_phys(cpu_resume));
+}
+
+static int __maybe_unused cpu_psci_cpu_suspend(unsigned long index)
+{
+	int ret;
+	struct psci_power_state *state = __get_cpu_var(psci_power_state);
+	/*
+	 * idle state index 0 corresponds to wfi, should never be called
+	 * from the cpu_suspend operations
+	 */
+	if (WARN_ON_ONCE(!index))
+		return -EINVAL;
+
+	if (state->type == PSCI_POWER_STATE_TYPE_STANDBY)
+		ret = psci_ops.cpu_suspend(state[index - 1], 0);
+	else
+		ret = __cpu_suspend(index, psci_suspend_finisher);
+
+	return ret;
+}
+
 const struct cpu_operations cpu_psci_ops = {
 	.name		= "psci",
+#ifdef CONFIG_CPU_IDLE
+	.cpu_init_idle	= cpu_psci_cpu_init_idle,
+	.cpu_suspend	= cpu_psci_cpu_suspend,
+#endif
 #ifdef CONFIG_SMP
 	.cpu_init	= cpu_psci_cpu_init,
 	.cpu_prepare	= cpu_psci_cpu_prepare,
Signature · 1 line
1.9.1
#5 lore raw

PATCH v9 5/8 drivers: cpuidle: implement DT based idle states infrastructure

In reply to Lorenzo Pieralisi

On most common ARM systems, the low-power states a CPU can be put into are not discoverable in HW and require device tree bindings to describe power down suspend operations and idle states parameters.

In order to enable DT based idle states and configure idle drivers, this patch implements the bulk infrastructure required to parse the device tree idle states bindings and initialize the corresponding CPUidle driver states data.

The parsing API accepts a start index that defines the first idle state that should be initialized by the parsing code in order to give new and legacy driver flexibility over which states should be parsed using the new DT mechanism.

The idle states node(s) is obtained from the phandle list of the first cpu in the driver cpumask; the kernel checks that the idle state node phandle is the same for all CPUs in the driver cpumask before declaring the idle state as valid and start parsing its content.

The idle state enter function pointer is initialized through DT match structures passed in by the CPUidle driver, so that ARM legacy code can cope with platform specific idle entry method based on compatible string matching and the code used to initialize the enter function pointer can be moved to the DT generic layer.

---
 drivers/cpuidle/Kconfig          |   3 +
 drivers/cpuidle/Makefile         |   1 +
 drivers/cpuidle/dt_idle_states.c | 213 +++++++++++++++++++++++++++++++++++++++
 drivers/cpuidle/dt_idle_states.h |   7 ++
 4 files changed, 224 insertions(+)
 create mode 100644 drivers/cpuidle/dt_idle_states.c
 create mode 100644 drivers/cpuidle/dt_idle_states.h
drivers/cpuidle/Kconfig +3 -0
index 32748c3..8deb934 100644
@@ -25,6 +25,9 @@ config CPU_IDLE_GOV_MENU
 	bool "Menu governor (for tickless system)"
 	default y
 
+config DT_IDLE_STATES
+	bool
+
 menu "ARM CPU Idle Drivers"
 depends on ARM
 source "drivers/cpuidle/Kconfig.arm"
drivers/cpuidle/Makefile +1 -0
index 11edb31..002b653 100644
@@ -4,6 +4,7 @@
 
 obj-y += cpuidle.o driver.o governor.o sysfs.o governors/
 obj-$(CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED) += coupled.o
+obj-$(CONFIG_DT_IDLE_STATES)		  += dt_idle_states.o
 
 ##################################################################################
 # ARM SoC drivers
drivers/cpuidle/dt_idle_states.c new file +213 -0

213 lines not on this page · raw message

drivers/cpuidle/dt_idle_states.h new file +7 -0
new file mode 100644
index 0000000..4818134
@@ -0,0 +1,7 @@
+#ifndef __DT_IDLE_STATES
+#define __DT_IDLE_STATES
+
+int dt_init_idle_driver(struct cpuidle_driver *drv,
+			const struct of_device_id *matches,
+			unsigned int start_idx);
+#endif
Signature · 1 line
1.9.1
#6 lore raw

Re: [PATCH v9 5/8] drivers: cpuidle: implement DT based idle states infrastructure

Quoted 28 lines · Lorenzo Pieralisi

On most common ARM systems, the low-power states a CPU can be put into are not discoverable in HW and require device tree bindings to describe power down suspend operations and idle states parameters.

In order to enable DT based idle states and configure idle drivers, this patch implements the bulk infrastructure required to parse the device tree idle states bindings and initialize the corresponding CPUidle driver states data.

The parsing API accepts a start index that defines the first idle state that should be initialized by the parsing code in order to give new and legacy driver flexibility over which states should be parsed using the new DT mechanism.

The idle states node(s) is obtained from the phandle list of the first cpu in the driver cpumask; the kernel checks that the idle state node phandle is the same for all CPUs in the driver cpumask before declaring the idle state as valid and start parsing its content.

The idle state enter function pointer is initialized through DT match structures passed in by the CPUidle driver, so that ARM legacy code can cope with platform specific idle entry method based on compatible string matching and the code used to initialize the enter function pointer can be moved to the DT generic layer.

[...]

drivers/cpuidle/dt_idle_states.c line 85

Quoted 10 lines
drivers/cpuidle/dt_idle_states.c new file +10 -0
+	idle_state->flags = CPUIDLE_FLAG_TIME_VALID;
+	if (of_property_read_bool(state_node, "local-timer-stop"))
+		idle_state->flags |= CPUIDLE_FLAG_TIMER_STOP;
+	/*
+	 * TODO:
+	 *	replace with kstrdup and pointer assignment when name
+	 *	and desc become string pointers
+	 */
+	strncpy(idle_state->name, state_node->name, CPUIDLE_NAME_LEN - 1);
+	strncpy(idle_state->desc, state_node->name, CPUIDLE_DESC_LEN - 1);

This is a very minor concern, and shouldn't hold back this series, but...

I was playing with this series in order to test out the qcom cpuidle driver from Lina, and noticed that the state name and descriptions were not terribly helpful:

/sys/devices/system/cpu/cpu0/cpuidle # cat state?/name cpu-idle-state-
cpu-idle-state- /sys/devices/system/cpu/cpu0/cpuidle # cat state?/desc cpu-idle-state-0
cpu-idle-state-1

Turns out these strings come from the node name itself, and truncated in the case of state->name, but this can be fixed in the DTS itself (c.f. reply to Lina's driver.)

However, seeing that the node name is used to populate both the state->name and ->, made me wonder if there should better way to set the state->desc field to a more useful string. Tools like powertop actually use that field and it can be quite useful.

Kevin

#7 lore raw

PATCH v9 5/8 drivers: cpuidle: implement DT based idle states infrastructure

Quoted 58 lines · Kevin Hilman
Quoted 28 lines · Lorenzo Pieralisi

On most common ARM systems, the low-power states a CPU can be put into are not discoverable in HW and require device tree bindings to describe power down suspend operations and idle states parameters.

In order to enable DT based idle states and configure idle drivers, this patch implements the bulk infrastructure required to parse the device tree idle states bindings and initialize the corresponding CPUidle driver states data.

The parsing API accepts a start index that defines the first idle state that should be initialized by the parsing code in order to give new and legacy driver flexibility over which states should be parsed using the new DT mechanism.

The idle states node(s) is obtained from the phandle list of the first cpu in the driver cpumask; the kernel checks that the idle state node phandle is the same for all CPUs in the driver cpumask before declaring the idle state as valid and start parsing its content.

The idle state enter function pointer is initialized through DT match structures passed in by the CPUidle driver, so that ARM legacy code can cope with platform specific idle entry method based on compatible string matching and the code used to initialize the enter function pointer can be moved to the DT generic layer.

[...]

drivers/cpuidle/dt_idle_states.c line 85

Quoted 10 lines
drivers/cpuidle/dt_idle_states.c new file +10 -0
+	idle_state->flags = CPUIDLE_FLAG_TIME_VALID;
+	if (of_property_read_bool(state_node, "local-timer-stop"))
+		idle_state->flags |= CPUIDLE_FLAG_TIMER_STOP;
+	/*
+	 * TODO:
+	 *	replace with kstrdup and pointer assignment when name
+	 *	and desc become string pointers
+	 */
+	strncpy(idle_state->name, state_node->name, CPUIDLE_NAME_LEN - 1);
+	strncpy(idle_state->desc, state_node->name, CPUIDLE_DESC_LEN - 1);

This is a very minor concern, and shouldn't hold back this series, but...

I was playing with this series in order to test out the qcom cpuidle driver from Lina, and noticed that the state name and descriptions were not terribly helpful:

/sys/devices/system/cpu/cpu0/cpuidle # cat state?/name cpu-idle-state-
cpu-idle-state- /sys/devices/system/cpu/cpu0/cpuidle # cat state?/desc cpu-idle-state-0
cpu-idle-state-1

Quoted 8 lines

Turns out these strings come from the node name itself, and truncated in the case of state->name, but this can be fixed in the DTS itself (c.f. reply to Lina's driver.)

However, seeing that the node name is used to populate both the state->name and ->, made me wonder if there should better way to set the state->desc field to a more useful string. Tools like powertop actually use that field and it can be quite useful.

Well, the truncation problem will be solved when those strings will be kdup'ed, so for the name I think there is not a problem, copying the state node is fine waiting for those strings to become pointers.

For desc, there are four options:

(1) enumerating idle states (but that's worse than copying the name into desc since on ARM idle-state{1,2,3...} means nothing)
(2) copying the idle state node compatible string into desc
(3) Add an optional property to the DT bindings to describe the state
(4) Leave code as it is

(3) I am not extremely keen at this stage to re-patch the DT bindings, it has been an awful lot of work to make everyone agree so I would avoid any changes, I hope you understand (and I am not even sure DT maintainers would accept that, so even less keen on changing the DT bindings at this stage).

(2) I am not sure it will clarify the description much.

(1) I would rule it out. So either we accept that the name can be extended in length (that's going to be the case since we will dynamically allocate the string so there will be no truncation, to a reasonable extent) so (4) is fine, or we merge this code and I will take care of pushing for (3) in a separate patch and copy the resulting description into desc (if that change does not get NACK'ed).

I would really want to see this code in the mailine asap since it is groundwork for all future CPUidle generalisation, I hope that what I am saying above is acceptable, please let me know what you think.

Lorenzo

#8 lore raw

PATCH v9 5/8 drivers: cpuidle: implement DT based idle states infrastructure

Quoted 9 lines · Lorenzo Pieralisi

On Fri, Sep 05, 2014 at 09:00:52PM +0100, Kevin Hilman wrote:

(3) Add an optional property to the DT bindings to describe the state

(3) I am not extremely keen at this stage to re-patch the DT bindings, it has been an awful lot of work to make everyone agree so I would avoid any changes, I hope you understand (and I am not even sure DT maintainers would accept that, so even less keen on changing the DT bindings at this stage).

Just do it as an incremental patch if you're worried - we've got
precendents for this like regulator-name which exists solely to make
diagnostics more descriptive.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140905/94263623/attachment.sig>

#9 lore raw

PATCH v9 5/8 drivers: cpuidle: implement DT based idle states infrastructure

In reply to Lorenzo Pieralisi
Quoted 95 lines · Lorenzo Pieralisi
Quoted 58 lines · Kevin Hilman
Quoted 28 lines · Lorenzo Pieralisi

On most common ARM systems, the low-power states a CPU can be put into are not discoverable in HW and require device tree bindings to describe power down suspend operations and idle states parameters.

In order to enable DT based idle states and configure idle drivers, this patch implements the bulk infrastructure required to parse the device tree idle states bindings and initialize the corresponding CPUidle driver states data.

The parsing API accepts a start index that defines the first idle state that should be initialized by the parsing code in order to give new and legacy driver flexibility over which states should be parsed using the new DT mechanism.

The idle states node(s) is obtained from the phandle list of the first cpu in the driver cpumask; the kernel checks that the idle state node phandle is the same for all CPUs in the driver cpumask before declaring the idle state as valid and start parsing its content.

The idle state enter function pointer is initialized through DT match structures passed in by the CPUidle driver, so that ARM legacy code can cope with platform specific idle entry method based on compatible string matching and the code used to initialize the enter function pointer can be moved to the DT generic layer.

[...]

drivers/cpuidle/dt_idle_states.c line 85

Quoted 10 lines
drivers/cpuidle/dt_idle_states.c new file +10 -0
+	idle_state->flags = CPUIDLE_FLAG_TIME_VALID;
+	if (of_property_read_bool(state_node, "local-timer-stop"))
+		idle_state->flags |= CPUIDLE_FLAG_TIMER_STOP;
+	/*
+	 * TODO:
+	 *	replace with kstrdup and pointer assignment when name
+	 *	and desc become string pointers
+	 */
+	strncpy(idle_state->name, state_node->name, CPUIDLE_NAME_LEN - 1);
+	strncpy(idle_state->desc, state_node->name, CPUIDLE_DESC_LEN - 1);

This is a very minor concern, and shouldn't hold back this series, but...

I was playing with this series in order to test out the qcom cpuidle driver from Lina, and noticed that the state name and descriptions were not terribly helpful:

/sys/devices/system/cpu/cpu0/cpuidle # cat state?/name cpu-idle-state-
cpu-idle-state- /sys/devices/system/cpu/cpu0/cpuidle # cat state?/desc cpu-idle-state-0
cpu-idle-state-1

Quoted 8 lines

Turns out these strings come from the node name itself, and truncated in the case of state->name, but this can be fixed in the DTS itself (c.f. reply to Lina's driver.)

However, seeing that the node name is used to populate both the state->name and ->, made me wonder if there should better way to set the state->desc field to a more useful string. Tools like powertop actually use that field and it can be quite useful.

Well, the truncation problem will be solved when those strings will be kdup'ed, so for the name I think there is not a problem, copying the state node is fine waiting for those strings to become pointers.

For desc, there are four options:

(1) enumerating idle states (but that's worse than copying the name into desc since on ARM idle-state{1,2,3...} means nothing)
(2) copying the idle state node compatible string into desc
(3) Add an optional property to the DT bindings to describe the state
(4) Leave code as it is

(3) I am not extremely keen at this stage to re-patch the DT bindings, it has been an awful lot of work to make everyone agree so I would avoid any changes, I hope you understand (and I am not even sure DT maintainers would accept that, so even less keen on changing the DT bindings at this stage).

(2) I am not sure it will clarify the description much.

(1) I would rule it out. So either we accept that the name can be extended in length (that's going to be the case since we will dynamically allocate the string so there will be no truncation, to a reasonable extent) so (4) is fine, or we merge this code and I will take care of pushing for (3) in a separate patch and copy the resulting description into desc (if that change does not get NACK'ed).

Quoted 3 lines

I would really want to see this code in the mailine asap since it is groundwork for all future CPUidle generalisation, I hope that what I am saying above is acceptable, please let me know what you think.

Agreed, as I stated when I rasied this issue, it's a very minor concern and I don't think it should hold back this series.

After this series is merged, I think approach (3) is probably the best and should be done as a follow-up patch/series.

Kevin

#10 lore raw

PATCH v9 5/8 drivers: cpuidle: implement DT based idle states infrastructure

Quoted 101 lines · Kevin Hilman
Quoted 95 lines · Lorenzo Pieralisi
Quoted 58 lines · Kevin Hilman
Quoted 28 lines · Lorenzo Pieralisi

On most common ARM systems, the low-power states a CPU can be put into are not discoverable in HW and require device tree bindings to describe power down suspend operations and idle states parameters.

In order to enable DT based idle states and configure idle drivers, this patch implements the bulk infrastructure required to parse the device tree idle states bindings and initialize the corresponding CPUidle driver states data.

The parsing API accepts a start index that defines the first idle state that should be initialized by the parsing code in order to give new and legacy driver flexibility over which states should be parsed using the new DT mechanism.

The idle states node(s) is obtained from the phandle list of the first cpu in the driver cpumask; the kernel checks that the idle state node phandle is the same for all CPUs in the driver cpumask before declaring the idle state as valid and start parsing its content.

The idle state enter function pointer is initialized through DT match structures passed in by the CPUidle driver, so that ARM legacy code can cope with platform specific idle entry method based on compatible string matching and the code used to initialize the enter function pointer can be moved to the DT generic layer.

[...]

drivers/cpuidle/dt_idle_states.c line 85

Quoted 10 lines
drivers/cpuidle/dt_idle_states.c new file +10 -0
+	idle_state->flags = CPUIDLE_FLAG_TIME_VALID;
+	if (of_property_read_bool(state_node, "local-timer-stop"))
+		idle_state->flags |= CPUIDLE_FLAG_TIMER_STOP;
+	/*
+	 * TODO:
+	 *	replace with kstrdup and pointer assignment when name
+	 *	and desc become string pointers
+	 */
+	strncpy(idle_state->name, state_node->name, CPUIDLE_NAME_LEN - 1);
+	strncpy(idle_state->desc, state_node->name, CPUIDLE_DESC_LEN - 1);

This is a very minor concern, and shouldn't hold back this series, but...

I was playing with this series in order to test out the qcom cpuidle driver from Lina, and noticed that the state name and descriptions were not terribly helpful:

/sys/devices/system/cpu/cpu0/cpuidle # cat state?/name cpu-idle-state-
cpu-idle-state- /sys/devices/system/cpu/cpu0/cpuidle # cat state?/desc cpu-idle-state-0
cpu-idle-state-1

Quoted 8 lines

Turns out these strings come from the node name itself, and truncated in the case of state->name, but this can be fixed in the DTS itself (c.f. reply to Lina's driver.)

However, seeing that the node name is used to populate both the state->name and ->, made me wonder if there should better way to set the state->desc field to a more useful string. Tools like powertop actually use that field and it can be quite useful.

Well, the truncation problem will be solved when those strings will be kdup'ed, so for the name I think there is not a problem, copying the state node is fine waiting for those strings to become pointers.

For desc, there are four options:

(1) enumerating idle states (but that's worse than copying the name into desc since on ARM idle-state{1,2,3...} means nothing)
(2) copying the idle state node compatible string into desc
(3) Add an optional property to the DT bindings to describe the state
(4) Leave code as it is

(3) I am not extremely keen at this stage to re-patch the DT bindings, it has been an awful lot of work to make everyone agree so I would avoid any changes, I hope you understand (and I am not even sure DT maintainers would accept that, so even less keen on changing the DT bindings at this stage).

(2) I am not sure it will clarify the description much.

(1) I would rule it out. So either we accept that the name can be extended in length (that's going to be the case since we will dynamically allocate the string so there will be no truncation, to a reasonable extent) so (4) is fine, or we merge this code and I will take care of pushing for (3) in a separate patch and copy the resulting description into desc (if that change does not get NACK'ed).

Quoted 3 lines

I would really want to see this code in the mailine asap since it is groundwork for all future CPUidle generalisation, I hope that what I am saying above is acceptable, please let me know what you think.

Quoted 5 lines

Agreed, as I stated when I rasied this issue, it's a very minor concern and I don't think it should hold back this series.

After this series is merged, I think approach (3) is probably the best and should be done as a follow-up patch/series.

I agree and that's what I will do, thank you Kevin (and Mark).

Lorenzo

#11 lore raw

PATCH v9 6/8 drivers: cpuidle: CPU idle ARM64 driver

In reply to Lorenzo Pieralisi

This patch implements a generic CPU idle driver for ARM64 machines.

It relies on the DT idle states infrastructure to initialize idle states count and respective parameters. Current code assumes the driver is managing idle states on all possible CPUs but can be easily generalized to support heterogenous systems and build cpumasks at runtime using MIDRs or DT cpu nodes compatible properties.

The driver relies on the arm64 CPU operations to call the idle initialization hook used to parse and save suspend back-end specific idle states information upon probing.

Idle state index 0 is always initialized as a simple wfi state, ie always considered present and functional on all ARM64 platforms.

Idle state indices higher than 0 trigger idle state entry by calling the cpu_suspend function, that triggers the suspend operation through the CPU operations suspend back-end hook. cpu_suspend passes the idle state index as a parameter so that the CPU operations suspend back-end can retrieve the required idle state data by using the idle state index to execute a look-up on its internal data structures.

---
 drivers/cpuidle/Kconfig         |   5 ++
 drivers/cpuidle/Kconfig.arm64   |  14 +++++
 drivers/cpuidle/Makefile        |   4 ++
 drivers/cpuidle/cpuidle-arm64.c | 133 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 156 insertions(+)
 create mode 100644 drivers/cpuidle/Kconfig.arm64
 create mode 100644 drivers/cpuidle/cpuidle-arm64.c
drivers/cpuidle/Kconfig +5 -0
index 8deb934..c5029c1 100644
@@ -33,6 +33,11 @@ depends on ARM
 source "drivers/cpuidle/Kconfig.arm"
 endmenu
 
+menu "ARM64 CPU Idle Drivers"
+depends on ARM64
+source "drivers/cpuidle/Kconfig.arm64"
+endmenu
+
 menu "MIPS CPU Idle Drivers"
 depends on MIPS
 source "drivers/cpuidle/Kconfig.mips"
drivers/cpuidle/Kconfig.arm64 new file +14 -0
new file mode 100644
index 0000000..d0a08ed
@@ -0,0 +1,14 @@
+#
+# ARM64 CPU Idle drivers
+#
+
+config ARM64_CPUIDLE
+	bool "Generic ARM64 CPU idle Driver"
+	select ARM64_CPU_SUSPEND
+	select DT_IDLE_STATES
+	help
+	  Select this to enable generic cpuidle driver for ARM64.
+	  It provides a generic idle driver whose idle states are configured
+	  at run-time through DT nodes. The CPUidle suspend backend is
+	  initialized by calling the CPU operations init idle hook
+	  provided by architecture code.
drivers/cpuidle/Makefile +4 -0
index 002b653..4d177b9 100644
@@ -23,6 +23,10 @@ obj-$(CONFIG_ARM_EXYNOS_CPUIDLE)        += cpuidle-exynos.o
 obj-$(CONFIG_MIPS_CPS_CPUIDLE)		+= cpuidle-cps.o
 
 ###############################################################################
+# ARM64 drivers
+obj-$(CONFIG_ARM64_CPUIDLE)		+= cpuidle-arm64.o
+
+###############################################################################
 # POWERPC drivers
 obj-$(CONFIG_PSERIES_CPUIDLE)		+= cpuidle-pseries.o
 obj-$(CONFIG_POWERNV_CPUIDLE)		+= cpuidle-powernv.o
drivers/cpuidle/cpuidle-arm64.c new file +133 -0

133 lines not on this page · raw message

Signature · 1 line
1.9.1
maintainer
#12 lore raw

PATCH v9 6/8 drivers: cpuidle: CPU idle ARM64 driver

Quoted 25 lines · Lorenzo Pieralisi

This patch implements a generic CPU idle driver for ARM64 machines.

It relies on the DT idle states infrastructure to initialize idle states count and respective parameters. Current code assumes the driver is managing idle states on all possible CPUs but can be easily generalized to support heterogenous systems and build cpumasks at runtime using MIDRs or DT cpu nodes compatible properties.

The driver relies on the arm64 CPU operations to call the idle initialization hook used to parse and save suspend back-end specific idle states information upon probing.

Idle state index 0 is always initialized as a simple wfi state, ie always considered present and functional on all ARM64 platforms.

Idle state indices higher than 0 trigger idle state entry by calling the cpu_suspend function, that triggers the suspend operation through the CPU operations suspend back-end hook. cpu_suspend passes the idle state index as a parameter so that the CPU operations suspend back-end can retrieve the required idle state data by using the idle state index to execute a look-up on its internal data structures.

Quoted 8 lines
---
 drivers/cpuidle/Kconfig         |   5 ++
 drivers/cpuidle/Kconfig.arm64   |  14 +++++
 drivers/cpuidle/Makefile        |   4 ++
 drivers/cpuidle/cpuidle-arm64.c | 133 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 156 insertions(+)
 create mode 100644 drivers/cpuidle/Kconfig.arm64
 create mode 100644 drivers/cpuidle/cpuidle-arm64.c

Daniel, do you have any preference for how this patch should go in? You can either ack it so that I can take it via the arm64 tree or you take it separately (though it doesn't make sense on its own without the arm64 infrastructure in place, we need a bit of synchronisation but it's not something difficult).

Thanks.

Signature · 1 line
Catalin
#13 lore raw

PATCH v9 7/8 drivers: cpuidle: initialize big.LITTLE driver through DT

In reply to Lorenzo Pieralisi

With the introduction of DT based idle states, CPUidle drivers for ARM can now initialize idle states data through properties in the device tree.

This patch adds code to the big.LITTLE CPUidle driver to dynamically initialize idle states data through the updated device tree source file.

---
 arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts | 23 +++++++++++++++++++++++
 drivers/cpuidle/Kconfig.arm                |  1 +
 drivers/cpuidle/cpuidle-big_little.c       | 19 +++++++++++++++++++
 3 files changed, 43 insertions(+)
arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts +23 -0
index a25c262..322fd15 100644
@@ -38,6 +38,7 @@
 			compatible = "arm,cortex-a15";
 			reg = <0>;
 			cci-control-port = <&cci_control1>;
+			cpu-idle-states = <&CLUSTER_SLEEP_BIG>;
 		};
 
 		cpu1: cpu at 1 {
@@ -45,6 +46,7 @@
 			compatible = "arm,cortex-a15";
 			reg = <1>;
 			cci-control-port = <&cci_control1>;
+			cpu-idle-states = <&CLUSTER_SLEEP_BIG>;
 		};
 
 		cpu2: cpu at 2 {
@@ -52,6 +54,7 @@
 			compatible = "arm,cortex-a7";
 			reg = <0x100>;
 			cci-control-port = <&cci_control2>;
+			cpu-idle-states = <&CLUSTER_SLEEP_LITTLE>;
 		};
 
 		cpu3: cpu at 3 {
@@ -59,6 +62,7 @@
 			compatible = "arm,cortex-a7";
 			reg = <0x101>;
 			cci-control-port = <&cci_control2>;
+			cpu-idle-states = <&CLUSTER_SLEEP_LITTLE>;
 		};
 
 		cpu4: cpu at 4 {
@@ -66,6 +70,25 @@
 			compatible = "arm,cortex-a7";
 			reg = <0x102>;
 			cci-control-port = <&cci_control2>;
+			cpu-idle-states = <&CLUSTER_SLEEP_LITTLE>;
+		};
+
+		idle-states {
+			CLUSTER_SLEEP_BIG: cluster-sleep-big {
+				compatible = "arm,idle-state";
+				local-timer-stop;
+				entry-latency-us = <1000>;
+				exit-latency-us = <700>;
+				min-residency-us = <2000>;
+			};
+
+			CLUSTER_SLEEP_LITTLE: cluster-sleep-little {
+				compatible = "arm,idle-state";
+				local-timer-stop;
+				entry-latency-us = <1000>;
+				exit-latency-us = <500>;
+				min-residency-us = <2500>;
+			};
 		};
 	};
 
drivers/cpuidle/Kconfig.arm +1 -0
index 38cff69..e339c7f 100644
@@ -7,6 +7,7 @@ config ARM_BIG_LITTLE_CPUIDLE
 	depends on MCPM
 	select ARM_CPU_SUSPEND
 	select CPU_IDLE_MULTIPLE_DRIVERS
+	select DT_IDLE_STATES
 	help
 	  Select this option to enable CPU idle driver for big.LITTLE based
 	  ARM systems. Driver manages CPUs coordination through MCPM and
drivers/cpuidle/cpuidle-big_little.c +19 -0
index ef94c3b..85d09bc 100644
@@ -24,6 +24,8 @@
 #include <asm/smp_plat.h>
 #include <asm/suspend.h>
 
+#include "dt_idle_states.h"
+
 static int bl_enter_powerdown(struct cpuidle_device *dev,
 			      struct cpuidle_driver *drv, int idx);
 
@@ -73,6 +75,12 @@ static struct cpuidle_driver bl_idle_little_driver = {
 	.state_count = 2,
 };
 
+static const struct of_device_id bl_idle_state_match[] __initconst = {
+	{ .compatible = "arm,idle-state",
+	  .data = bl_enter_powerdown },
+	{ },
+};
+
 static struct cpuidle_driver bl_idle_big_driver = {
 	.name = "big_idle",
 	.owner = THIS_MODULE,
@@ -190,6 +198,17 @@ static int __init bl_idle_init(void)
 	if (ret)
 		goto out_uninit_little;
 
+	/* Start at index 1, index 0 standard WFI */
+	ret = dt_init_idle_driver(&bl_idle_big_driver, bl_idle_state_match, 1);
+	if (ret < 0)
+		goto out_uninit_big;
+
+	/* Start@index 1, index 0 standard WFI */
+	ret = dt_init_idle_driver(&bl_idle_little_driver,
+				  bl_idle_state_match, 1);
+	if (ret < 0)
+		goto out_uninit_big;
+
 	ret = cpuidle_register(&bl_idle_little_driver, NULL);
 	if (ret)
 		goto out_uninit_big;
Signature · 1 line
1.9.1
#14 lore raw

PATCH v9 8/8 drivers: cpuidle: initialize Exynos driver through DT

In reply to Lorenzo Pieralisi

With the introduction of DT based idle states, CPUidle drivers for ARM can now initialize idle states data through properties in the device tree.

This patch adds code to the Exynos CPUidle driver to dynamically initialize idle states data through the updated device tree source files.

---
 arch/arm/boot/dts/exynos4210.dtsi | 11 +++++++++++
 arch/arm/boot/dts/exynos5250.dtsi | 11 +++++++++++
 drivers/cpuidle/Kconfig.arm       |  1 +
 drivers/cpuidle/cpuidle-exynos.c  | 18 +++++++++++++++++-
 4 files changed, 40 insertions(+), 1 deletion(-)
arch/arm/boot/dts/exynos4210.dtsi +11 -0
index eab7c7b..69fd1a0 100644
@@ -48,12 +48,23 @@
 			device_type = "cpu";
 			compatible = "arm,cortex-a9";
 			reg = <0x900>;
+			cpu-idle-states = <&CLUSTER_SLEEP_0>;
 		};
 
 		cpu at 901 {
 			device_type = "cpu";
 			compatible = "arm,cortex-a9";
 			reg = <0x901>;
+			cpu-idle-states = <&CLUSTER_SLEEP_0>;
+		};
+
+		idle-states {
+			CLUSTER_SLEEP_0: cluster-sleep-0 {
+				compatible = "arm,idle-state";
+				entry-latency-us = <1000>;
+				exit-latency-us = <300>;
+				min-residency-us = <100000>;
+			};
 		};
 	};
 
arch/arm/boot/dts/exynos5250.dtsi +11 -0
index 492e1ef..3a758ff 100644
@@ -63,12 +63,23 @@
 			compatible = "arm,cortex-a15";
 			reg = <0>;
 			clock-frequency = <1700000000>;
+			cpu-idle-states = <&CLUSTER_SLEEP_0>;
 		};
 		cpu at 1 {
 			device_type = "cpu";
 			compatible = "arm,cortex-a15";
 			reg = <1>;
 			clock-frequency = <1700000000>;
+			cpu-idle-states = <&CLUSTER_SLEEP_0>;
+		};
+
+		idle-states {
+			CLUSTER_SLEEP_0: cluster-sleep-0 {
+				compatible = "arm,idle-state";
+				entry-latency-us = <1000>;
+				exit-latency-us = <300>;
+				min-residency-us = <100000>;
+			};
 		};
 	};
 
drivers/cpuidle/Kconfig.arm +1 -0
index e339c7f..04cc229 100644
@@ -55,6 +55,7 @@ config ARM_AT91_CPUIDLE
 config ARM_EXYNOS_CPUIDLE
 	bool "Cpu Idle Driver for the Exynos processors"
 	depends on ARCH_EXYNOS
+	select DT_IDLE_STATES
 	help
 	  Select this to enable cpuidle for Exynos processors
 
drivers/cpuidle/cpuidle-exynos.c +17 -1
index ba9b34b..e66a426 100644
@@ -18,6 +18,8 @@
 #include <asm/suspend.h>
 #include <asm/cpuidle.h>
 
+#include "dt_idle_states.h"
+
 static void (*exynos_enter_aftr)(void);
 
 static int exynos_enter_lowpower(struct cpuidle_device *dev,
@@ -56,13 +58,27 @@ static struct cpuidle_driver exynos_idle_driver = {
 	.safe_state_index = 0,
 };
 
+static const struct of_device_id exynos_idle_state_match[] __initconst = {
+	{ .compatible = "arm,idle-state",
+	  .data = exynos_enter_lowpower },
+	{ },
+};
+
 static int exynos_cpuidle_probe(struct platform_device *pdev)
 {
 	int ret;
+	struct cpuidle_driver *drv = &exynos_idle_driver;
 
 	exynos_enter_aftr = (void *)(pdev->dev.platform_data);
 
-	ret = cpuidle_register(&exynos_idle_driver, NULL);
+	/* Start at index 1, index 0 standard WFI */
+	ret = dt_init_idle_driver(drv, exynos_idle_state_match, 1);
+	if (ret < 0) {
+		dev_err(&pdev->dev, "failed to initialize idle states\n");
+		return ret;
+	}
+
+	ret = cpuidle_register(drv, NULL);
 	if (ret) {
 		dev_err(&pdev->dev, "failed to register cpuidle driver\n");
 		return ret;
Signature · 1 line
1.9.1