* [PATCH V2 1/8] ARM: cpuidle: Remove duplicate header inclusion
2015-03-18 18:46 [PATCH V2 0/8] ARM: cpuidle: Unify the ARM64/ARM DT approach Daniel Lezcano
@ 2015-03-18 18:46 ` Daniel Lezcano
2015-03-18 18:46 ` [PATCH V2 2/8] ARM: cpuidle: Add a cpuidle ops structure to be used for DT Daniel Lezcano
` (6 subsequent siblings)
7 siblings, 0 replies; 18+ messages in thread
From: Daniel Lezcano @ 2015-03-18 18:46 UTC (permalink / raw)
To: linux-arm-kernel
The cpu_do_idle() function is always used by the cpuidle drivers.
That led to have each driver including cpuidle.h and proc-fns.h, they are
always paired. That makes a lot of duplicate headers inclusion. Instead of
including both in each .c file, move the proc-fns.h header inclusion in the
cpuidle.h header file directly, so we can save some line of code.
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: Kevin Hilman <khilman@linaro.org>
Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
---
arch/arm/include/asm/cpuidle.h | 2 ++
arch/arm/kernel/cpuidle.c | 2 +-
arch/arm/mach-davinci/cpuidle.c | 1 -
arch/arm/mach-imx/cpuidle-imx6q.c | 1 -
arch/arm/mach-imx/cpuidle-imx6sl.c | 1 -
arch/arm/mach-imx/cpuidle-imx6sx.c | 1 -
arch/arm/mach-omap2/cpuidle44xx.c | 1 -
arch/arm/mach-s3c64xx/cpuidle.c | 2 +-
arch/arm/mach-tegra/cpuidle-tegra20.c | 1 -
arch/arm/mach-tegra/cpuidle-tegra30.c | 1 -
drivers/cpuidle/cpuidle-at91.c | 1 -
drivers/cpuidle/cpuidle-exynos.c | 1 -
drivers/cpuidle/cpuidle-kirkwood.c | 1 -
drivers/cpuidle/cpuidle-ux500.c | 1 -
drivers/cpuidle/cpuidle-zynq.c | 1 -
15 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/arch/arm/include/asm/cpuidle.h b/arch/arm/include/asm/cpuidle.h
index af319ac..348dc81 100644
--- a/arch/arm/include/asm/cpuidle.h
+++ b/arch/arm/include/asm/cpuidle.h
@@ -1,6 +1,8 @@
#ifndef __ASM_ARM_CPUIDLE_H
#define __ASM_ARM_CPUIDLE_H
+#include <asm/proc-fns.h>
+
#ifdef CONFIG_CPU_IDLE
extern int arm_cpuidle_simple_enter(struct cpuidle_device *dev,
struct cpuidle_driver *drv, int index);
diff --git a/arch/arm/kernel/cpuidle.c b/arch/arm/kernel/cpuidle.c
index 89545f6..45969f8 100644
--- a/arch/arm/kernel/cpuidle.c
+++ b/arch/arm/kernel/cpuidle.c
@@ -10,7 +10,7 @@
*/
#include <linux/cpuidle.h>
-#include <asm/proc-fns.h>
+#include <asm/cpuidle.h>
int arm_cpuidle_simple_enter(struct cpuidle_device *dev,
struct cpuidle_driver *drv, int index)
diff --git a/arch/arm/mach-davinci/cpuidle.c b/arch/arm/mach-davinci/cpuidle.c
index e365c1b..306ebc5 100644
--- a/arch/arm/mach-davinci/cpuidle.c
+++ b/arch/arm/mach-davinci/cpuidle.c
@@ -17,7 +17,6 @@
#include <linux/cpuidle.h>
#include <linux/io.h>
#include <linux/export.h>
-#include <asm/proc-fns.h>
#include <asm/cpuidle.h>
#include <mach/cpuidle.h>
diff --git a/arch/arm/mach-imx/cpuidle-imx6q.c b/arch/arm/mach-imx/cpuidle-imx6q.c
index d76d086..8e21ccc 100644
--- a/arch/arm/mach-imx/cpuidle-imx6q.c
+++ b/arch/arm/mach-imx/cpuidle-imx6q.c
@@ -9,7 +9,6 @@
#include <linux/cpuidle.h>
#include <linux/module.h>
#include <asm/cpuidle.h>
-#include <asm/proc-fns.h>
#include "common.h"
#include "cpuidle.h"
diff --git a/arch/arm/mach-imx/cpuidle-imx6sl.c b/arch/arm/mach-imx/cpuidle-imx6sl.c
index 7d92e65..5742a9f 100644
--- a/arch/arm/mach-imx/cpuidle-imx6sl.c
+++ b/arch/arm/mach-imx/cpuidle-imx6sl.c
@@ -9,7 +9,6 @@
#include <linux/cpuidle.h>
#include <linux/module.h>
#include <asm/cpuidle.h>
-#include <asm/proc-fns.h>
#include "common.h"
#include "cpuidle.h"
diff --git a/arch/arm/mach-imx/cpuidle-imx6sx.c b/arch/arm/mach-imx/cpuidle-imx6sx.c
index 5a36722..2c9f1a8 100644
--- a/arch/arm/mach-imx/cpuidle-imx6sx.c
+++ b/arch/arm/mach-imx/cpuidle-imx6sx.c
@@ -10,7 +10,6 @@
#include <linux/cpu_pm.h>
#include <linux/module.h>
#include <asm/cpuidle.h>
-#include <asm/proc-fns.h>
#include <asm/suspend.h>
#include "common.h"
diff --git a/arch/arm/mach-omap2/cpuidle44xx.c b/arch/arm/mach-omap2/cpuidle44xx.c
index 01e398a..7622dbb 100644
--- a/arch/arm/mach-omap2/cpuidle44xx.c
+++ b/arch/arm/mach-omap2/cpuidle44xx.c
@@ -17,7 +17,6 @@
#include <linux/clockchips.h>
#include <asm/cpuidle.h>
-#include <asm/proc-fns.h>
#include "common.h"
#include "pm.h"
diff --git a/arch/arm/mach-s3c64xx/cpuidle.c b/arch/arm/mach-s3c64xx/cpuidle.c
index 2eb0724..93aa8cb 100644
--- a/arch/arm/mach-s3c64xx/cpuidle.c
+++ b/arch/arm/mach-s3c64xx/cpuidle.c
@@ -16,7 +16,7 @@
#include <linux/export.h>
#include <linux/time.h>
-#include <asm/proc-fns.h>
+#include <asm/cpuidle.h>
#include <mach/map.h>
diff --git a/arch/arm/mach-tegra/cpuidle-tegra20.c b/arch/arm/mach-tegra/cpuidle-tegra20.c
index 4f25a7c..e22b0d9 100644
--- a/arch/arm/mach-tegra/cpuidle-tegra20.c
+++ b/arch/arm/mach-tegra/cpuidle-tegra20.c
@@ -27,7 +27,6 @@
#include <linux/module.h>
#include <asm/cpuidle.h>
-#include <asm/proc-fns.h>
#include <asm/smp_plat.h>
#include <asm/suspend.h>
diff --git a/arch/arm/mach-tegra/cpuidle-tegra30.c b/arch/arm/mach-tegra/cpuidle-tegra30.c
index f8815ed..a2400ab4 100644
--- a/arch/arm/mach-tegra/cpuidle-tegra30.c
+++ b/arch/arm/mach-tegra/cpuidle-tegra30.c
@@ -27,7 +27,6 @@
#include <linux/module.h>
#include <asm/cpuidle.h>
-#include <asm/proc-fns.h>
#include <asm/smp_plat.h>
#include <asm/suspend.h>
diff --git a/drivers/cpuidle/cpuidle-at91.c b/drivers/cpuidle/cpuidle-at91.c
index aae7bfc..f2446c7 100644
--- a/drivers/cpuidle/cpuidle-at91.c
+++ b/drivers/cpuidle/cpuidle-at91.c
@@ -19,7 +19,6 @@
#include <linux/cpuidle.h>
#include <linux/io.h>
#include <linux/export.h>
-#include <asm/proc-fns.h>
#include <asm/cpuidle.h>
#define AT91_MAX_STATES 2
diff --git a/drivers/cpuidle/cpuidle-exynos.c b/drivers/cpuidle/cpuidle-exynos.c
index 26f5f29..0c06ea2 100644
--- a/drivers/cpuidle/cpuidle-exynos.c
+++ b/drivers/cpuidle/cpuidle-exynos.c
@@ -19,7 +19,6 @@
#include <linux/of.h>
#include <linux/platform_data/cpuidle-exynos.h>
-#include <asm/proc-fns.h>
#include <asm/suspend.h>
#include <asm/cpuidle.h>
diff --git a/drivers/cpuidle/cpuidle-kirkwood.c b/drivers/cpuidle/cpuidle-kirkwood.c
index cea0a6c..d23d8f4 100644
--- a/drivers/cpuidle/cpuidle-kirkwood.c
+++ b/drivers/cpuidle/cpuidle-kirkwood.c
@@ -21,7 +21,6 @@
#include <linux/cpuidle.h>
#include <linux/io.h>
#include <linux/export.h>
-#include <asm/proc-fns.h>
#include <asm/cpuidle.h>
#define KIRKWOOD_MAX_STATES 2
diff --git a/drivers/cpuidle/cpuidle-ux500.c b/drivers/cpuidle/cpuidle-ux500.c
index 66f81e4..8bf895c 100644
--- a/drivers/cpuidle/cpuidle-ux500.c
+++ b/drivers/cpuidle/cpuidle-ux500.c
@@ -19,7 +19,6 @@
#include <linux/platform_device.h>
#include <asm/cpuidle.h>
-#include <asm/proc-fns.h>
static atomic_t master = ATOMIC_INIT(0);
static DEFINE_SPINLOCK(master_lock);
diff --git a/drivers/cpuidle/cpuidle-zynq.c b/drivers/cpuidle/cpuidle-zynq.c
index 002b8c9..543292b 100644
--- a/drivers/cpuidle/cpuidle-zynq.c
+++ b/drivers/cpuidle/cpuidle-zynq.c
@@ -28,7 +28,6 @@
#include <linux/init.h>
#include <linux/cpuidle.h>
#include <linux/platform_device.h>
-#include <asm/proc-fns.h>
#include <asm/cpuidle.h>
#define ZYNQ_MAX_STATES 2
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH V2 2/8] ARM: cpuidle: Add a cpuidle ops structure to be used for DT
2015-03-18 18:46 [PATCH V2 0/8] ARM: cpuidle: Unify the ARM64/ARM DT approach Daniel Lezcano
2015-03-18 18:46 ` [PATCH V2 1/8] ARM: cpuidle: Remove duplicate header inclusion Daniel Lezcano
@ 2015-03-18 18:46 ` Daniel Lezcano
2015-03-18 18:46 ` [PATCH V2 3/8] ARM64: cpuidle: Replace cpu_suspend by the common ARM/ARM64 function Daniel Lezcano
` (5 subsequent siblings)
7 siblings, 0 replies; 18+ messages in thread
From: Daniel Lezcano @ 2015-03-18 18:46 UTC (permalink / raw)
To: linux-arm-kernel
The current state of the different cpuidle drivers is the different PM
operations are passed via the platform_data using the platform driver
paradigm.
This approach allowed to split the low level PM code from the arch specific
and the generic cpuidle code.
Unfortunately there are complaints about this approach as, in the context of the
single kernel image, we have multiple drivers loaded in memory for nothing and
the platform driver is not adequate for cpuidle.
This patch provides a common interface via cpuidle ops for all new cpuidle
driver and a definition for the device tree.
It will allow with the next patches to a have a common definition with ARM64
and share the same cpuidle driver.
The code is optimized to use the __init section intensively in order to reduce
the memory footprint after the driver is initialized and unify the function
names with ARM64.
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: Kevin Hilman <khilman@linaro.org>
Acked-by: Rob Herring <robherring2@gmail.com>
---
arch/arm/include/asm/cpuidle.h | 19 +++++++++++
arch/arm/kernel/cpuidle.c | 72 +++++++++++++++++++++++++++++++++++++++
arch/arm64/include/asm/cpuidle.h | 5 ++-
include/asm-generic/vmlinux.lds.h | 2 ++
4 files changed, 97 insertions(+), 1 deletion(-)
diff --git a/arch/arm/include/asm/cpuidle.h b/arch/arm/include/asm/cpuidle.h
index 348dc81..1851e9d 100644
--- a/arch/arm/include/asm/cpuidle.h
+++ b/arch/arm/include/asm/cpuidle.h
@@ -27,4 +27,23 @@ static inline int arm_cpuidle_simple_enter(struct cpuidle_device *dev,
*/
#define ARM_CPUIDLE_WFI_STATE ARM_CPUIDLE_WFI_STATE_PWR(UINT_MAX)
+struct cpuidle_ops {
+ int (*suspend)(int cpu, unsigned long arg);
+ int (*init)(struct device_node *, int cpu);
+};
+
+struct of_cpuidle_method {
+ const char *method;
+ struct cpuidle_ops *ops;
+};
+
+#define CPUIDLE_METHOD_OF_DECLARE(name, _method, _ops) \
+ static const struct of_cpuidle_method __cpuidle_method_of_table_##name \
+ __used __section(__cpuidle_method_of_table) \
+ = { .method = _method, .ops = _ops }
+
+extern int arm_cpuidle_suspend(int index);
+
+extern int arm_cpuidle_init(int cpu);
+
#endif
diff --git a/arch/arm/kernel/cpuidle.c b/arch/arm/kernel/cpuidle.c
index 45969f8..7b42a40 100644
--- a/arch/arm/kernel/cpuidle.c
+++ b/arch/arm/kernel/cpuidle.c
@@ -10,8 +10,17 @@
*/
#include <linux/cpuidle.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
#include <asm/cpuidle.h>
+extern struct of_cpuidle_method __cpuidle_method_of_table[];
+
+static const struct of_cpuidle_method __cpuidle_method_of_table_sentinel
+ __used __section(__cpuidle_method_of_table_end);
+
+static struct cpuidle_ops cpuidle_ops[NR_CPUS];
+
int arm_cpuidle_simple_enter(struct cpuidle_device *dev,
struct cpuidle_driver *drv, int index)
{
@@ -19,3 +28,66 @@ int arm_cpuidle_simple_enter(struct cpuidle_device *dev,
return index;
}
+
+int arm_cpuidle_suspend(int index)
+{
+ int ret = -EOPNOTSUPP;
+ int cpu = smp_processor_id();
+
+ if (cpuidle_ops[cpu].suspend)
+ ret = cpuidle_ops[cpu].suspend(cpu, index);
+
+ return ret;
+}
+
+static struct cpuidle_ops *__init arm_cpuidle_get_ops(const char *method)
+{
+ struct of_cpuidle_method *m = __cpuidle_method_of_table;
+
+ for (; m->method; m++)
+ if (!strcmp(m->method, method))
+ return m->ops;
+
+ return NULL;
+}
+
+static int __init arm_cpuidle_read_ops(struct device_node *dn, int cpu)
+{
+ const char *enable_method;
+ struct cpuidle_ops *ops;
+
+ enable_method = of_get_property(dn, "enable-method", NULL);
+ if (!enable_method)
+ return -ENOENT;
+
+ ops = arm_cpuidle_get_ops(enable_method);
+ if (!ops) {
+ pr_warn("%s: unsupported enable-method property: %s\n",
+ dn->full_name, enable_method);
+ return -EOPNOTSUPP;
+ }
+
+ cpuidle_ops[cpu] = *ops; /* structure copy */
+
+ pr_notice("cpuidle: enable-method property '%s'"
+ " found operations\n", enable_method);
+
+ return 0;
+}
+
+int __init arm_cpuidle_init(int cpu)
+{
+ int ret = -EOPNOTSUPP;
+ struct device_node *cpu_node = of_cpu_device_node_get(cpu);
+
+ if (!cpu_node)
+ return -ENODEV;
+
+ ret = arm_cpuidle_read_ops(cpu_node, cpu);
+ if (!ret && cpuidle_ops[cpu].init)
+ ret = cpuidle_ops[cpu].init(cpu_node, cpu);
+
+ of_node_put(cpu_node);
+
+ return ret;
+}
diff --git a/arch/arm64/include/asm/cpuidle.h b/arch/arm64/include/asm/cpuidle.h
index c60643f..460a38b 100644
--- a/arch/arm64/include/asm/cpuidle.h
+++ b/arch/arm64/include/asm/cpuidle.h
@@ -17,5 +17,8 @@ static inline int cpu_suspend(unsigned long arg)
return -EOPNOTSUPP;
}
#endif
-
+static inline int arm_cpuidle_suspend(int index)
+{
+ return cpu_suspend(index);
+}
#endif
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index ac78910..91c0930 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -167,6 +167,7 @@
#define IOMMU_OF_TABLES() OF_TABLE(CONFIG_OF_IOMMU, iommu)
#define RESERVEDMEM_OF_TABLES() OF_TABLE(CONFIG_OF_RESERVED_MEM, reservedmem)
#define CPU_METHOD_OF_TABLES() OF_TABLE(CONFIG_SMP, cpu_method)
+#define CPUIDLE_METHOD_OF_TABLES() OF_TABLE(CONFIG_CPU_IDLE, cpuidle_method)
#define EARLYCON_OF_TABLES() OF_TABLE(CONFIG_SERIAL_EARLYCON, earlycon)
#define KERNEL_DTB() \
@@ -501,6 +502,7 @@
CLKSRC_OF_TABLES() \
IOMMU_OF_TABLES() \
CPU_METHOD_OF_TABLES() \
+ CPUIDLE_METHOD_OF_TABLES() \
KERNEL_DTB() \
IRQCHIP_OF_MATCH_TABLE() \
EARLYCON_OF_TABLES()
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH V2 3/8] ARM64: cpuidle: Replace cpu_suspend by the common ARM/ARM64 function
2015-03-18 18:46 [PATCH V2 0/8] ARM: cpuidle: Unify the ARM64/ARM DT approach Daniel Lezcano
2015-03-18 18:46 ` [PATCH V2 1/8] ARM: cpuidle: Remove duplicate header inclusion Daniel Lezcano
2015-03-18 18:46 ` [PATCH V2 2/8] ARM: cpuidle: Add a cpuidle ops structure to be used for DT Daniel Lezcano
@ 2015-03-18 18:46 ` Daniel Lezcano
2015-03-21 20:56 ` Lorenzo Pieralisi
2015-03-18 18:46 ` [PATCH V2 4/8] ARM64: cpuidle: Rename cpu_init_idle to a common function name Daniel Lezcano
` (4 subsequent siblings)
7 siblings, 1 reply; 18+ messages in thread
From: Daniel Lezcano @ 2015-03-18 18:46 UTC (permalink / raw)
To: linux-arm-kernel
Call the common ARM/ARM64 'arm_cpuidle_suspend' instead of cpu_suspend function
which is specific to ARM64.
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: Kevin Hilman <khilman@linaro.org>
Acked-by: Rob Herring <robherring2@gmail.com>
---
drivers/cpuidle/cpuidle-arm64.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/cpuidle/cpuidle-arm64.c b/drivers/cpuidle/cpuidle-arm64.c
index 39a2c62..0cea244 100644
--- a/drivers/cpuidle/cpuidle-arm64.c
+++ b/drivers/cpuidle/cpuidle-arm64.c
@@ -49,7 +49,7 @@ static int arm64_enter_idle_state(struct cpuidle_device *dev,
* call the CPU ops suspend protocol with idle index as a
* parameter.
*/
- ret = cpu_suspend(idx);
+ arm_cpuidle_suspend(idx);
cpu_pm_exit();
}
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH V2 3/8] ARM64: cpuidle: Replace cpu_suspend by the common ARM/ARM64 function
2015-03-18 18:46 ` [PATCH V2 3/8] ARM64: cpuidle: Replace cpu_suspend by the common ARM/ARM64 function Daniel Lezcano
@ 2015-03-21 20:56 ` Lorenzo Pieralisi
0 siblings, 0 replies; 18+ messages in thread
From: Lorenzo Pieralisi @ 2015-03-21 20:56 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Mar 18, 2015 at 06:46:07PM +0000, Daniel Lezcano wrote:
> Call the common ARM/ARM64 'arm_cpuidle_suspend' instead of cpu_suspend function
> which is specific to ARM64.
>
> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
> Acked-by: Kevin Hilman <khilman@linaro.org>
> Acked-by: Rob Herring <robherring2@gmail.com>
I think that's ok even though I would like with this set to stop
churning out arm64 cpuidle related functions renaming, so:
Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
> ---
> drivers/cpuidle/cpuidle-arm64.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/cpuidle/cpuidle-arm64.c b/drivers/cpuidle/cpuidle-arm64.c
> index 39a2c62..0cea244 100644
> --- a/drivers/cpuidle/cpuidle-arm64.c
> +++ b/drivers/cpuidle/cpuidle-arm64.c
> @@ -49,7 +49,7 @@ static int arm64_enter_idle_state(struct cpuidle_device *dev,
> * call the CPU ops suspend protocol with idle index as a
> * parameter.
> */
> - ret = cpu_suspend(idx);
> + arm_cpuidle_suspend(idx);
>
> cpu_pm_exit();
> }
> --
> 1.9.1
>
>
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH V2 4/8] ARM64: cpuidle: Rename cpu_init_idle to a common function name
2015-03-18 18:46 [PATCH V2 0/8] ARM: cpuidle: Unify the ARM64/ARM DT approach Daniel Lezcano
` (2 preceding siblings ...)
2015-03-18 18:46 ` [PATCH V2 3/8] ARM64: cpuidle: Replace cpu_suspend by the common ARM/ARM64 function Daniel Lezcano
@ 2015-03-18 18:46 ` Daniel Lezcano
2015-03-18 18:46 ` [PATCH V2 5/8] ARM64: cpuidle: Remove arm64 reference Daniel Lezcano
` (3 subsequent siblings)
7 siblings, 0 replies; 18+ messages in thread
From: Daniel Lezcano @ 2015-03-18 18:46 UTC (permalink / raw)
To: linux-arm-kernel
With this change the cpuidle-arm64.c file calls the same function name
for both ARM and ARM64.
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: Kevin Hilman <khilman@linaro.org>
Acked-by: Rob Herring <robherring2@gmail.com>
---
arch/arm64/include/asm/cpuidle.h | 4 ++--
arch/arm64/kernel/cpuidle.c | 2 +-
drivers/cpuidle/cpuidle-arm64.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm64/include/asm/cpuidle.h b/arch/arm64/include/asm/cpuidle.h
index 460a38b..141b2fc 100644
--- a/arch/arm64/include/asm/cpuidle.h
+++ b/arch/arm64/include/asm/cpuidle.h
@@ -4,10 +4,10 @@
#include <asm/proc-fns.h>
#ifdef CONFIG_CPU_IDLE
-extern int cpu_init_idle(unsigned int cpu);
+extern int arm_cpuidle_init(unsigned int cpu);
extern int cpu_suspend(unsigned long arg);
#else
-static inline int cpu_init_idle(unsigned int cpu)
+static inline int arm_cpuidle_init(unsigned int cpu)
{
return -EOPNOTSUPP;
}
diff --git a/arch/arm64/kernel/cpuidle.c b/arch/arm64/kernel/cpuidle.c
index 5c08966..a78143a 100644
--- a/arch/arm64/kernel/cpuidle.c
+++ b/arch/arm64/kernel/cpuidle.c
@@ -15,7 +15,7 @@
#include <asm/cpuidle.h>
#include <asm/cpu_ops.h>
-int cpu_init_idle(unsigned int cpu)
+int arm_cpuidle_init(unsigned int cpu)
{
int ret = -EOPNOTSUPP;
struct device_node *cpu_node = of_cpu_device_node_get(cpu);
diff --git a/drivers/cpuidle/cpuidle-arm64.c b/drivers/cpuidle/cpuidle-arm64.c
index 0cea244..6ef291c7 100644
--- a/drivers/cpuidle/cpuidle-arm64.c
+++ b/drivers/cpuidle/cpuidle-arm64.c
@@ -110,7 +110,7 @@ static int __init arm64_idle_init(void)
* idle states suspend back-end specific data
*/
for_each_possible_cpu(cpu) {
- ret = cpu_init_idle(cpu);
+ ret = arm_cpuidle_init(cpu);
if (ret) {
pr_err("CPU %d failed to init idle CPU ops\n", cpu);
return ret;
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH V2 5/8] ARM64: cpuidle: Remove arm64 reference
2015-03-18 18:46 [PATCH V2 0/8] ARM: cpuidle: Unify the ARM64/ARM DT approach Daniel Lezcano
` (3 preceding siblings ...)
2015-03-18 18:46 ` [PATCH V2 4/8] ARM64: cpuidle: Rename cpu_init_idle to a common function name Daniel Lezcano
@ 2015-03-18 18:46 ` Daniel Lezcano
2015-03-18 18:46 ` [PATCH V2 6/8] ARM: cpuidle: Enable the ARM64 driver for both ARM32/ARM64 Daniel Lezcano
` (2 subsequent siblings)
7 siblings, 0 replies; 18+ messages in thread
From: Daniel Lezcano @ 2015-03-18 18:46 UTC (permalink / raw)
To: linux-arm-kernel
In the next patch, this driver will be common across ARM/ARM64. Remove all refs
to ARM64 as it will be shared with ARM32.
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: Kevin Hilman <khilman@linaro.org>
Acked-by: Rob Herring <robherring2@gmail.com>
---
drivers/cpuidle/cpuidle-arm64.c | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/drivers/cpuidle/cpuidle-arm64.c b/drivers/cpuidle/cpuidle-arm64.c
index 6ef291c7..1c94b88 100644
--- a/drivers/cpuidle/cpuidle-arm64.c
+++ b/drivers/cpuidle/cpuidle-arm64.c
@@ -1,5 +1,5 @@
/*
- * ARM64 generic CPU idle driver.
+ * ARM/ARM64 generic CPU idle driver.
*
* Copyright (C) 2014 ARM Ltd.
* Author: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
@@ -9,7 +9,7 @@
* published by the Free Software Foundation.
*/
-#define pr_fmt(fmt) "CPUidle arm64: " fmt
+#define pr_fmt(fmt) "CPUidle arm: " fmt
#include <linux/cpuidle.h>
#include <linux/cpumask.h>
@@ -23,7 +23,7 @@
#include "dt_idle_states.h"
/*
- * arm64_enter_idle_state - Programs CPU to enter the specified state
+ * arm_enter_idle_state - Programs CPU to enter the specified state
*
* dev: cpuidle device
* drv: cpuidle driver
@@ -32,8 +32,8 @@
* Called from the CPUidle framework to program the device to the
* specified target state selected by the governor.
*/
-static int arm64_enter_idle_state(struct cpuidle_device *dev,
- struct cpuidle_driver *drv, int idx)
+static int arm_enter_idle_state(struct cpuidle_device *dev,
+ struct cpuidle_driver *drv, int idx)
{
int ret;
@@ -57,8 +57,8 @@ static int arm64_enter_idle_state(struct cpuidle_device *dev,
return ret ? -1 : idx;
}
-static struct cpuidle_driver arm64_idle_driver = {
- .name = "arm64_idle",
+static struct cpuidle_driver arm_idle_driver = {
+ .name = "arm_idle",
.owner = THIS_MODULE,
/*
* State at index 0 is standby wfi and considered standard
@@ -68,32 +68,32 @@ static struct cpuidle_driver arm64_idle_driver = {
* handler for idle state index 0.
*/
.states[0] = {
- .enter = arm64_enter_idle_state,
+ .enter = arm_enter_idle_state,
.exit_latency = 1,
.target_residency = 1,
.power_usage = UINT_MAX,
.name = "WFI",
- .desc = "ARM64 WFI",
+ .desc = "ARM WFI",
}
};
-static const struct of_device_id arm64_idle_state_match[] __initconst = {
+static const struct of_device_id arm_idle_state_match[] __initconst = {
{ .compatible = "arm,idle-state",
- .data = arm64_enter_idle_state },
+ .data = arm_enter_idle_state },
{ },
};
/*
- * arm64_idle_init
+ * arm_idle_init
*
- * Registers the arm64 specific cpuidle driver with the cpuidle
+ * Registers the arm specific cpuidle driver with the cpuidle
* framework. It relies on core code to parse the idle states
* and initialize them using driver data structures accordingly.
*/
-static int __init arm64_idle_init(void)
+static int __init arm_idle_init(void)
{
int cpu, ret;
- struct cpuidle_driver *drv = &arm64_idle_driver;
+ struct cpuidle_driver *drv = &arm_idle_driver;
/*
* Initialize idle states data, starting at index 1.
@@ -101,7 +101,7 @@ static int __init arm64_idle_init(void)
* let the driver initialization fail accordingly since there is no
* reason to initialize the idle driver if only wfi is supported.
*/
- ret = dt_init_idle_driver(drv, arm64_idle_state_match, 1);
+ ret = dt_init_idle_driver(drv, arm_idle_state_match, 1);
if (ret <= 0)
return ret ? : -ENODEV;
@@ -119,4 +119,4 @@ static int __init arm64_idle_init(void)
return cpuidle_register(drv, NULL);
}
-device_initcall(arm64_idle_init);
+device_initcall(arm_idle_init);
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH V2 6/8] ARM: cpuidle: Enable the ARM64 driver for both ARM32/ARM64
2015-03-18 18:46 [PATCH V2 0/8] ARM: cpuidle: Unify the ARM64/ARM DT approach Daniel Lezcano
` (4 preceding siblings ...)
2015-03-18 18:46 ` [PATCH V2 5/8] ARM64: cpuidle: Remove arm64 reference Daniel Lezcano
@ 2015-03-18 18:46 ` Daniel Lezcano
2015-03-18 18:46 ` [PATCH V2 7/8] ARM: cpuidle: Register per cpuidle device Daniel Lezcano
2015-03-18 18:46 ` [PATCH V2 8/8] ARM: cpuidle: Change function name to be consistent with x86 Daniel Lezcano
7 siblings, 0 replies; 18+ messages in thread
From: Daniel Lezcano @ 2015-03-18 18:46 UTC (permalink / raw)
To: linux-arm-kernel
ARM32 and ARM64 have the same DT definitions and the same approaches.
The generic ARM cpuidle driver can be put in common for those two
architectures.
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: Kevin Hilman <khilman@linaro.org>
Acked-by: Rob Herring <robherring2@gmail.com>
---
drivers/cpuidle/Kconfig | 7 +------
drivers/cpuidle/Kconfig.arm | 10 ++++++++++
drivers/cpuidle/Kconfig.arm64 | 13 -------------
drivers/cpuidle/Makefile | 5 +----
drivers/cpuidle/{cpuidle-arm64.c => cpuidle-arm.c} | 0
5 files changed, 12 insertions(+), 23 deletions(-)
delete mode 100644 drivers/cpuidle/Kconfig.arm64
rename drivers/cpuidle/{cpuidle-arm64.c => cpuidle-arm.c} (100%)
diff --git a/drivers/cpuidle/Kconfig b/drivers/cpuidle/Kconfig
index c5029c1..8c7930b 100644
--- a/drivers/cpuidle/Kconfig
+++ b/drivers/cpuidle/Kconfig
@@ -29,15 +29,10 @@ config DT_IDLE_STATES
bool
menu "ARM CPU Idle Drivers"
-depends on ARM
+depends on ARM || ARM64
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"
diff --git a/drivers/cpuidle/Kconfig.arm b/drivers/cpuidle/Kconfig.arm
index 8e07c94..f08043e 100644
--- a/drivers/cpuidle/Kconfig.arm
+++ b/drivers/cpuidle/Kconfig.arm
@@ -14,6 +14,16 @@ config ARM_BIG_LITTLE_CPUIDLE
define different C-states for little and big cores through the
multiple CPU idle drivers infrastructure.
+config ARM_CPUIDLE
+ bool "Generic ARM/ARM64 CPU idle Driver"
+ select DT_IDLE_STATES
+ help
+ Select this to enable generic cpuidle driver for ARM.
+ 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.
+
config ARM_CLPS711X_CPUIDLE
bool "CPU Idle Driver for CLPS711X processors"
depends on ARCH_CLPS711X || COMPILE_TEST
diff --git a/drivers/cpuidle/Kconfig.arm64 b/drivers/cpuidle/Kconfig.arm64
deleted file mode 100644
index 6effb36..0000000
--- a/drivers/cpuidle/Kconfig.arm64
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# ARM64 CPU Idle drivers
-#
-
-config ARM64_CPUIDLE
- bool "Generic ARM64 CPU idle Driver"
- 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.
diff --git a/drivers/cpuidle/Makefile b/drivers/cpuidle/Makefile
index 4d177b9..3ba81b1 100644
--- a/drivers/cpuidle/Makefile
+++ b/drivers/cpuidle/Makefile
@@ -17,16 +17,13 @@ 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_CPUIDLE) += cpuidle-arm.o
###############################################################################
# MIPS drivers
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
diff --git a/drivers/cpuidle/cpuidle-arm64.c b/drivers/cpuidle/cpuidle-arm.c
similarity index 100%
rename from drivers/cpuidle/cpuidle-arm64.c
rename to drivers/cpuidle/cpuidle-arm.c
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH V2 7/8] ARM: cpuidle: Register per cpuidle device
2015-03-18 18:46 [PATCH V2 0/8] ARM: cpuidle: Unify the ARM64/ARM DT approach Daniel Lezcano
` (5 preceding siblings ...)
2015-03-18 18:46 ` [PATCH V2 6/8] ARM: cpuidle: Enable the ARM64 driver for both ARM32/ARM64 Daniel Lezcano
@ 2015-03-18 18:46 ` Daniel Lezcano
2015-03-19 11:08 ` Lorenzo Pieralisi
2015-03-19 15:31 ` Lina Iyer
2015-03-18 18:46 ` [PATCH V2 8/8] ARM: cpuidle: Change function name to be consistent with x86 Daniel Lezcano
7 siblings, 2 replies; 18+ messages in thread
From: Daniel Lezcano @ 2015-03-18 18:46 UTC (permalink / raw)
To: linux-arm-kernel
Some architectures have some cpus which does not support idle states.
Let the underlying low level code to return -ENOSYS when it is not
possible to set an idle state.
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
drivers/cpuidle/cpuidle-arm.c | 45 +++++++++++++++++++++++++++++++++++++++++--
1 file changed, 43 insertions(+), 2 deletions(-)
diff --git a/drivers/cpuidle/cpuidle-arm.c b/drivers/cpuidle/cpuidle-arm.c
index 1c94b88..0682ed0 100644
--- a/drivers/cpuidle/cpuidle-arm.c
+++ b/drivers/cpuidle/cpuidle-arm.c
@@ -17,11 +17,14 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/of.h>
+#include <linux/slab.h>
#include <asm/cpuidle.h>
#include "dt_idle_states.h"
+static DEFINE_PER_CPU(struct cpuidle_device, *cpuidle_arm_dev);
+
/*
* arm_enter_idle_state - Programs CPU to enter the specified state
*
@@ -94,6 +97,7 @@ static int __init arm_idle_init(void)
{
int cpu, ret;
struct cpuidle_driver *drv = &arm_idle_driver;
+ struct cpuidle_device *dev;
/*
* Initialize idle states data, starting at index 1.
@@ -105,18 +109,55 @@ static int __init arm_idle_init(void)
if (ret <= 0)
return ret ? : -ENODEV;
+ ret = cpuidle_register_driver(drv);
+ if (ret) {
+ pr_err("Failed to register cpuidle driver\n");
+ return ret;
+ }
+
/*
* Call arch CPU operations in order to initialize
* idle states suspend back-end specific data
*/
for_each_possible_cpu(cpu) {
ret = arm_cpuidle_init(cpu);
+
+ /* This cpu does not support any idle states */
+ if (ret == -ENOSYS)
+ continue;
+
if (ret) {
pr_err("CPU %d failed to init idle CPU ops\n", cpu);
- return ret;
+ goto out_fail;
+ }
+
+ dev = kzalloc(sizeof(*dev), GFP_KERNEL);
+ if (!dev) {
+ pr_err("Failed to allocate cpuidle device\n");
+ goto out_fail;
+ }
+
+ dev->cpu = cpu;
+ per_cpu(cpuidle_arm_dev, cpu) = dev;
+
+ ret = cpuidle_register_device(dev);
+ if (ret) {
+ pr_err("Failed to register cpuidle device for CPU %d\n",
+ cpu);
+ kfree(dev);
+ goto out_fail;
}
}
+out:
+ return ret;
- return cpuidle_register(drv, NULL);
+out_fail:
+ for (cpu--; cpu <= 0; cpu--) {
+ dev = per_cpu(cpuidle_arm_dev, cpu);
+ cpuidle_unregister_device(dev);
+ kfree(dev);
+ }
+ cpuidle_unregister_driver(drv);
+ goto out;
}
device_initcall(arm_idle_init);
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH V2 7/8] ARM: cpuidle: Register per cpuidle device
2015-03-18 18:46 ` [PATCH V2 7/8] ARM: cpuidle: Register per cpuidle device Daniel Lezcano
@ 2015-03-19 11:08 ` Lorenzo Pieralisi
2015-03-19 11:27 ` Daniel Lezcano
2015-03-19 15:31 ` Lina Iyer
1 sibling, 1 reply; 18+ messages in thread
From: Lorenzo Pieralisi @ 2015-03-19 11:08 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Mar 18, 2015 at 06:46:11PM +0000, Daniel Lezcano wrote:
> Some architectures have some cpus which does not support idle states.
>
> Let the underlying low level code to return -ENOSYS when it is not
> possible to set an idle state.
http://www.spinics.net/lists/linux-acpi/msg55550.html
-ENXIO ?
>
> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
> ---
> drivers/cpuidle/cpuidle-arm.c | 45 +++++++++++++++++++++++++++++++++++++++++--
> 1 file changed, 43 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/cpuidle/cpuidle-arm.c b/drivers/cpuidle/cpuidle-arm.c
> index 1c94b88..0682ed0 100644
> --- a/drivers/cpuidle/cpuidle-arm.c
> +++ b/drivers/cpuidle/cpuidle-arm.c
> @@ -17,11 +17,14 @@
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/of.h>
> +#include <linux/slab.h>
>
> #include <asm/cpuidle.h>
>
> #include "dt_idle_states.h"
>
> +static DEFINE_PER_CPU(struct cpuidle_device, *cpuidle_arm_dev);
> +
> /*
> * arm_enter_idle_state - Programs CPU to enter the specified state
> *
> @@ -94,6 +97,7 @@ static int __init arm_idle_init(void)
> {
> int cpu, ret;
> struct cpuidle_driver *drv = &arm_idle_driver;
> + struct cpuidle_device *dev;
>
> /*
> * Initialize idle states data, starting at index 1.
> @@ -105,18 +109,55 @@ static int __init arm_idle_init(void)
> if (ret <= 0)
> return ret ? : -ENODEV;
>
> + ret = cpuidle_register_driver(drv);
> + if (ret) {
> + pr_err("Failed to register cpuidle driver\n");
> + return ret;
> + }
> +
> /*
> * Call arch CPU operations in order to initialize
> * idle states suspend back-end specific data
> */
> for_each_possible_cpu(cpu) {
> ret = arm_cpuidle_init(cpu);
> +
> + /* This cpu does not support any idle states */
> + if (ret == -ENOSYS)
> + continue;
> +
> if (ret) {
> pr_err("CPU %d failed to init idle CPU ops\n", cpu);
> - return ret;
> + goto out_fail;
> + }
> +
> + dev = kzalloc(sizeof(*dev), GFP_KERNEL);
> + if (!dev) {
> + pr_err("Failed to allocate cpuidle device\n");
> + goto out_fail;
> + }
> +
> + dev->cpu = cpu;
> + per_cpu(cpuidle_arm_dev, cpu) = dev;
> +
> + ret = cpuidle_register_device(dev);
> + if (ret) {
> + pr_err("Failed to register cpuidle device for CPU %d\n",
> + cpu);
> + kfree(dev);
> + goto out_fail;
> }
> }
> +out:
> + return ret;
return 0;
>
> - return cpuidle_register(drv, NULL);
> +out_fail:
> + for (cpu--; cpu <= 0; cpu--) {
This loop is wrong.
> + dev = per_cpu(cpuidle_arm_dev, cpu);
> + cpuidle_unregister_device(dev);
> + kfree(dev);
> + }
> + cpuidle_unregister_driver(drv);
> + goto out;
You just:
return ret;
little point in jumping around to just return.
Lorenzo
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCH V2 7/8] ARM: cpuidle: Register per cpuidle device
2015-03-19 11:08 ` Lorenzo Pieralisi
@ 2015-03-19 11:27 ` Daniel Lezcano
2015-03-19 11:38 ` Lorenzo Pieralisi
0 siblings, 1 reply; 18+ messages in thread
From: Daniel Lezcano @ 2015-03-19 11:27 UTC (permalink / raw)
To: linux-arm-kernel
On 03/19/2015 12:08 PM, Lorenzo Pieralisi wrote:
> On Wed, Mar 18, 2015 at 06:46:11PM +0000, Daniel Lezcano wrote:
>> Some architectures have some cpus which does not support idle states.
>>
>> Let the underlying low level code to return -ENOSYS when it is not
>> possible to set an idle state.
>
> http://www.spinics.net/lists/linux-acpi/msg55550.html
>
> -ENXIO ?
Ack, it makes more sense.
>> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
>> ---
>> drivers/cpuidle/cpuidle-arm.c | 45 +++++++++++++++++++++++++++++++++++++++++--
>> 1 file changed, 43 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/cpuidle/cpuidle-arm.c b/drivers/cpuidle/cpuidle-arm.c
>> index 1c94b88..0682ed0 100644
>> --- a/drivers/cpuidle/cpuidle-arm.c
>> +++ b/drivers/cpuidle/cpuidle-arm.c
>> @@ -17,11 +17,14 @@
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> #include <linux/of.h>
>> +#include <linux/slab.h>
>>
>> #include <asm/cpuidle.h>
>>
>> #include "dt_idle_states.h"
>>
>> +static DEFINE_PER_CPU(struct cpuidle_device, *cpuidle_arm_dev);
>> +
>> /*
>> * arm_enter_idle_state - Programs CPU to enter the specified state
>> *
>> @@ -94,6 +97,7 @@ static int __init arm_idle_init(void)
>> {
>> int cpu, ret;
>> struct cpuidle_driver *drv = &arm_idle_driver;
>> + struct cpuidle_device *dev;
>>
>> /*
>> * Initialize idle states data, starting at index 1.
>> @@ -105,18 +109,55 @@ static int __init arm_idle_init(void)
>> if (ret <= 0)
>> return ret ? : -ENODEV;
>>
>> + ret = cpuidle_register_driver(drv);
>> + if (ret) {
>> + pr_err("Failed to register cpuidle driver\n");
>> + return ret;
>> + }
>> +
>> /*
>> * Call arch CPU operations in order to initialize
>> * idle states suspend back-end specific data
>> */
>> for_each_possible_cpu(cpu) {
>> ret = arm_cpuidle_init(cpu);
>> +
>> + /* This cpu does not support any idle states */
>> + if (ret == -ENOSYS)
>> + continue;
>> +
>> if (ret) {
>> pr_err("CPU %d failed to init idle CPU ops\n", cpu);
>> - return ret;
>> + goto out_fail;
>> + }
>> +
>> + dev = kzalloc(sizeof(*dev), GFP_KERNEL);
>> + if (!dev) {
>> + pr_err("Failed to allocate cpuidle device\n");
>> + goto out_fail;
>> + }
>> +
>> + dev->cpu = cpu;
>> + per_cpu(cpuidle_arm_dev, cpu) = dev;
>> +
>> + ret = cpuidle_register_device(dev);
>> + if (ret) {
>> + pr_err("Failed to register cpuidle device for CPU %d\n",
>> + cpu);
>> + kfree(dev);
>> + goto out_fail;
>> }
>> }
>> +out:
>> + return ret;
>
> return 0;
>
>>
>> - return cpuidle_register(drv, NULL);
>> +out_fail:
>> + for (cpu--; cpu <= 0; cpu--) {
>
> This loop is wrong.
Why is it wrong ? We have to initialize at cpu - 1 to unregister the
previous registered cpu, not the current one, no ?
>> + dev = per_cpu(cpuidle_arm_dev, cpu);
>> + cpuidle_unregister_device(dev);
>> + kfree(dev);
>> + }
>> + cpuidle_unregister_driver(drv);
>> + goto out;
>
> You just:
>
> return ret;
>
> little point in jumping around to just return.
Ok.
--
<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
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCH V2 7/8] ARM: cpuidle: Register per cpuidle device
2015-03-19 11:27 ` Daniel Lezcano
@ 2015-03-19 11:38 ` Lorenzo Pieralisi
2015-03-19 11:44 ` Daniel Lezcano
0 siblings, 1 reply; 18+ messages in thread
From: Lorenzo Pieralisi @ 2015-03-19 11:38 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Mar 19, 2015 at 11:27:20AM +0000, Daniel Lezcano wrote:
[...]
> >> for_each_possible_cpu(cpu) {
> >> ret = arm_cpuidle_init(cpu);
> >> +
> >> + /* This cpu does not support any idle states */
> >> + if (ret == -ENOSYS)
> >> + continue;
> >> +
> >> if (ret) {
> >> pr_err("CPU %d failed to init idle CPU ops\n", cpu);
> >> - return ret;
> >> + goto out_fail;
> >> + }
> >> +
> >> + dev = kzalloc(sizeof(*dev), GFP_KERNEL);
> >> + if (!dev) {
> >> + pr_err("Failed to allocate cpuidle device\n");
> >> + goto out_fail;
> >> + }
> >> +
> >> + dev->cpu = cpu;
> >> + per_cpu(cpuidle_arm_dev, cpu) = dev;
> >> +
> >> + ret = cpuidle_register_device(dev);
> >> + if (ret) {
> >> + pr_err("Failed to register cpuidle device for CPU %d\n",
> >> + cpu);
> >> + kfree(dev);
> >> + goto out_fail;
> >> }
> >> }
> >> +out:
> >> + return ret;
> >
> > return 0;
> >
> >>
> >> - return cpuidle_register(drv, NULL);
> >> +out_fail:
> >> + for (cpu--; cpu <= 0; cpu--) {
> >
> > This loop is wrong.
>
> Why is it wrong ? We have to initialize at cpu - 1 to unregister the
> previous registered cpu, not the current one, no ?
Yes, but on cpu>=0 not cpu<=0
while (--cpu >= 0)
?
Lorenzo
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCH V2 7/8] ARM: cpuidle: Register per cpuidle device
2015-03-19 11:38 ` Lorenzo Pieralisi
@ 2015-03-19 11:44 ` Daniel Lezcano
0 siblings, 0 replies; 18+ messages in thread
From: Daniel Lezcano @ 2015-03-19 11:44 UTC (permalink / raw)
To: linux-arm-kernel
On 03/19/2015 12:38 PM, Lorenzo Pieralisi wrote:
> On Thu, Mar 19, 2015 at 11:27:20AM +0000, Daniel Lezcano wrote:
>
> [...]
>
>>>> for_each_possible_cpu(cpu) {
>>>> ret = arm_cpuidle_init(cpu);
>>>> +
>>>> + /* This cpu does not support any idle states */
>>>> + if (ret == -ENOSYS)
>>>> + continue;
>>>> +
>>>> if (ret) {
>>>> pr_err("CPU %d failed to init idle CPU ops\n", cpu);
>>>> - return ret;
>>>> + goto out_fail;
>>>> + }
>>>> +
>>>> + dev = kzalloc(sizeof(*dev), GFP_KERNEL);
>>>> + if (!dev) {
>>>> + pr_err("Failed to allocate cpuidle device\n");
>>>> + goto out_fail;
>>>> + }
>>>> +
>>>> + dev->cpu = cpu;
>>>> + per_cpu(cpuidle_arm_dev, cpu) = dev;
>>>> +
>>>> + ret = cpuidle_register_device(dev);
>>>> + if (ret) {
>>>> + pr_err("Failed to register cpuidle device for CPU %d\n",
>>>> + cpu);
>>>> + kfree(dev);
>>>> + goto out_fail;
>>>> }
>>>> }
>>>> +out:
>>>> + return ret;
>>>
>>> return 0;
>>>
>>>>
>>>> - return cpuidle_register(drv, NULL);
>>>> +out_fail:
>>>> + for (cpu--; cpu <= 0; cpu--) {
>>>
>>> This loop is wrong.
>>
>> Why is it wrong ? We have to initialize at cpu - 1 to unregister the
>> previous registered cpu, not the current one, no ?
>
> Yes, but on cpu>=0 not cpu<=0
>
> while (--cpu >= 0)
Ah, yes. Thanks for spotting this.
-- Daniel
--
<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
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH V2 7/8] ARM: cpuidle: Register per cpuidle device
2015-03-18 18:46 ` [PATCH V2 7/8] ARM: cpuidle: Register per cpuidle device Daniel Lezcano
2015-03-19 11:08 ` Lorenzo Pieralisi
@ 2015-03-19 15:31 ` Lina Iyer
2015-03-19 15:33 ` Daniel Lezcano
1 sibling, 1 reply; 18+ messages in thread
From: Lina Iyer @ 2015-03-19 15:31 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Mar 18 2015 at 12:46 -0600, Daniel Lezcano wrote:
>Some architectures have some cpus which does not support idle states.
>
>Let the underlying low level code to return -ENOSYS when it is not
>possible to set an idle state.
>
>Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
>---
> drivers/cpuidle/cpuidle-arm.c | 45 +++++++++++++++++++++++++++++++++++++++++--
> 1 file changed, 43 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/cpuidle/cpuidle-arm.c b/drivers/cpuidle/cpuidle-arm.c
>index 1c94b88..0682ed0 100644
>--- a/drivers/cpuidle/cpuidle-arm.c
>+++ b/drivers/cpuidle/cpuidle-arm.c
>@@ -17,11 +17,14 @@
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/of.h>
>+#include <linux/slab.h>
>
> #include <asm/cpuidle.h>
>
> #include "dt_idle_states.h"
>
>+static DEFINE_PER_CPU(struct cpuidle_device, *cpuidle_arm_dev);
Is a per-cpu variable needed? There seems to be no per-cpu access, other
than at init.
>+
> /*
> * arm_enter_idle_state - Programs CPU to enter the specified state
> *
>@@ -94,6 +97,7 @@ static int __init arm_idle_init(void)
> {
> int cpu, ret;
> struct cpuidle_driver *drv = &arm_idle_driver;
>+ struct cpuidle_device *dev;
>
> /*
> * Initialize idle states data, starting at index 1.
>@@ -105,18 +109,55 @@ static int __init arm_idle_init(void)
> if (ret <= 0)
> return ret ? : -ENODEV;
>
>+ ret = cpuidle_register_driver(drv);
>+ if (ret) {
>+ pr_err("Failed to register cpuidle driver\n");
>+ return ret;
>+ }
>+
> /*
> * Call arch CPU operations in order to initialize
> * idle states suspend back-end specific data
> */
> for_each_possible_cpu(cpu) {
> ret = arm_cpuidle_init(cpu);
>+
>+ /* This cpu does not support any idle states */
>+ if (ret == -ENOSYS)
>+ continue;
>+
> if (ret) {
> pr_err("CPU %d failed to init idle CPU ops\n", cpu);
>- return ret;
>+ goto out_fail;
>+ }
>+
>+ dev = kzalloc(sizeof(*dev), GFP_KERNEL);
>+ if (!dev) {
>+ pr_err("Failed to allocate cpuidle device\n");
>+ goto out_fail;
>+ }
>+
>+ dev->cpu = cpu;
>+ per_cpu(cpuidle_arm_dev, cpu) = dev;
>+
>+ ret = cpuidle_register_device(dev);
>+ if (ret) {
>+ pr_err("Failed to register cpuidle device for CPU %d\n",
>+ cpu);
>+ kfree(dev);
>+ goto out_fail;
> }
> }
>+out:
>+ return ret;
>
>- return cpuidle_register(drv, NULL);
>+out_fail:
>+ for (cpu--; cpu <= 0; cpu--) {
>+ dev = per_cpu(cpuidle_arm_dev, cpu);
>+ cpuidle_unregister_device(dev);
>+ kfree(dev);
>+ }
>+ cpuidle_unregister_driver(drv);
>+ goto out;
> }
> device_initcall(arm_idle_init);
>--
>1.9.1
>
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCH V2 7/8] ARM: cpuidle: Register per cpuidle device
2015-03-19 15:31 ` Lina Iyer
@ 2015-03-19 15:33 ` Daniel Lezcano
2015-03-19 15:42 ` Lina Iyer
0 siblings, 1 reply; 18+ messages in thread
From: Daniel Lezcano @ 2015-03-19 15:33 UTC (permalink / raw)
To: linux-arm-kernel
On 03/19/2015 04:31 PM, Lina Iyer wrote:
> On Wed, Mar 18 2015 at 12:46 -0600, Daniel Lezcano wrote:
>> Some architectures have some cpus which does not support idle states.
>>
>> Let the underlying low level code to return -ENOSYS when it is not
>> possible to set an idle state.
>>
>> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
>> ---
>> drivers/cpuidle/cpuidle-arm.c | 45
>> +++++++++++++++++++++++++++++++++++++++++--
>> 1 file changed, 43 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/cpuidle/cpuidle-arm.c
>> b/drivers/cpuidle/cpuidle-arm.c
>> index 1c94b88..0682ed0 100644
>> --- a/drivers/cpuidle/cpuidle-arm.c
>> +++ b/drivers/cpuidle/cpuidle-arm.c
>> @@ -17,11 +17,14 @@
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> #include <linux/of.h>
>> +#include <linux/slab.h>
>>
>> #include <asm/cpuidle.h>
>>
>> #include "dt_idle_states.h"
>>
>> +static DEFINE_PER_CPU(struct cpuidle_device, *cpuidle_arm_dev);
>
> Is a per-cpu variable needed? There seems to be no per-cpu access, other
> than at init.
:)
Actually it is the cpuidle framework which is using the per cpu variable.
>> +
>> /*
>> * arm_enter_idle_state - Programs CPU to enter the specified state
>> *
>> @@ -94,6 +97,7 @@ static int __init arm_idle_init(void)
>> {
>> int cpu, ret;
>> struct cpuidle_driver *drv = &arm_idle_driver;
>> + struct cpuidle_device *dev;
>>
>> /*
>> * Initialize idle states data, starting at index 1.
>> @@ -105,18 +109,55 @@ static int __init arm_idle_init(void)
>> if (ret <= 0)
>> return ret ? : -ENODEV;
>>
>> + ret = cpuidle_register_driver(drv);
>> + if (ret) {
>> + pr_err("Failed to register cpuidle driver\n");
>> + return ret;
>> + }
>> +
>> /*
>> * Call arch CPU operations in order to initialize
>> * idle states suspend back-end specific data
>> */
>> for_each_possible_cpu(cpu) {
>> ret = arm_cpuidle_init(cpu);
>> +
>> + /* This cpu does not support any idle states */
>> + if (ret == -ENOSYS)
>> + continue;
>> +
>> if (ret) {
>> pr_err("CPU %d failed to init idle CPU ops\n", cpu);
>> - return ret;
>> + goto out_fail;
>> + }
>> +
>> + dev = kzalloc(sizeof(*dev), GFP_KERNEL);
>> + if (!dev) {
>> + pr_err("Failed to allocate cpuidle device\n");
>> + goto out_fail;
>> + }
>> +
>> + dev->cpu = cpu;
>> + per_cpu(cpuidle_arm_dev, cpu) = dev;
>> +
>> + ret = cpuidle_register_device(dev);
>> + if (ret) {
>> + pr_err("Failed to register cpuidle device for CPU %d\n",
>> + cpu);
>> + kfree(dev);
>> + goto out_fail;
>> }
>> }
>> +out:
>> + return ret;
>>
>> - return cpuidle_register(drv, NULL);
>> +out_fail:
>> + for (cpu--; cpu <= 0; cpu--) {
>> + dev = per_cpu(cpuidle_arm_dev, cpu);
>> + cpuidle_unregister_device(dev);
>> + kfree(dev);
>> + }
>> + cpuidle_unregister_driver(drv);
>> + goto out;
>> }
>> device_initcall(arm_idle_init);
>> --
>> 1.9.1
>>
--
<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
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCH V2 7/8] ARM: cpuidle: Register per cpuidle device
2015-03-19 15:33 ` Daniel Lezcano
@ 2015-03-19 15:42 ` Lina Iyer
2015-03-19 17:11 ` Daniel Lezcano
0 siblings, 1 reply; 18+ messages in thread
From: Lina Iyer @ 2015-03-19 15:42 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Mar 19 2015 at 09:33 -0600, Daniel Lezcano wrote:
>On 03/19/2015 04:31 PM, Lina Iyer wrote:
>>On Wed, Mar 18 2015 at 12:46 -0600, Daniel Lezcano wrote:
>>>Some architectures have some cpus which does not support idle states.
>>>
>>>Let the underlying low level code to return -ENOSYS when it is not
>>>possible to set an idle state.
>>>
>>>Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
>>>---
>>>drivers/cpuidle/cpuidle-arm.c | 45
>>>+++++++++++++++++++++++++++++++++++++++++--
>>>1 file changed, 43 insertions(+), 2 deletions(-)
>>>
>>>diff --git a/drivers/cpuidle/cpuidle-arm.c
>>>b/drivers/cpuidle/cpuidle-arm.c
>>>index 1c94b88..0682ed0 100644
>>>--- a/drivers/cpuidle/cpuidle-arm.c
>>>+++ b/drivers/cpuidle/cpuidle-arm.c
>>>@@ -17,11 +17,14 @@
>>>#include <linux/kernel.h>
>>>#include <linux/module.h>
>>>#include <linux/of.h>
>>>+#include <linux/slab.h>
>>>
>>>#include <asm/cpuidle.h>
>>>
>>>#include "dt_idle_states.h"
>>>
>>>+static DEFINE_PER_CPU(struct cpuidle_device, *cpuidle_arm_dev);
>>
>>Is a per-cpu variable needed? There seems to be no per-cpu access, other
>>than at init.
>
>:)
>
>Actually it is the cpuidle framework which is using the per cpu variable.
>
But this is static pointer, I can see that struct cpuidle_device * being
used by cpuidle framework.
It gets stored here?
DEFINE_PER_CPU(struct cpuidle_device *, cpuidle_devices);
But we dont need to save it here, for in this file, there is no per-cpu
access, other than when the registration fails.
>>>+
>>>/*
>>> * arm_enter_idle_state - Programs CPU to enter the specified state
>>> *
>>>@@ -94,6 +97,7 @@ static int __init arm_idle_init(void)
>>>{
>>> int cpu, ret;
>>> struct cpuidle_driver *drv = &arm_idle_driver;
>>>+ struct cpuidle_device *dev;
>>>
>>> /*
>>> * Initialize idle states data, starting at index 1.
>>>@@ -105,18 +109,55 @@ static int __init arm_idle_init(void)
>>> if (ret <= 0)
>>> return ret ? : -ENODEV;
>>>
>>>+ ret = cpuidle_register_driver(drv);
>>>+ if (ret) {
>>>+ pr_err("Failed to register cpuidle driver\n");
>>>+ return ret;
>>>+ }
>>>+
>>> /*
>>> * Call arch CPU operations in order to initialize
>>> * idle states suspend back-end specific data
>>> */
>>> for_each_possible_cpu(cpu) {
>>> ret = arm_cpuidle_init(cpu);
>>>+
>>>+ /* This cpu does not support any idle states */
>>>+ if (ret == -ENOSYS)
>>>+ continue;
>>>+
>>> if (ret) {
>>> pr_err("CPU %d failed to init idle CPU ops\n", cpu);
>>>- return ret;
>>>+ goto out_fail;
>>>+ }
>>>+
>>>+ dev = kzalloc(sizeof(*dev), GFP_KERNEL);
>>>+ if (!dev) {
>>>+ pr_err("Failed to allocate cpuidle device\n");
>>>+ goto out_fail;
>>>+ }
>>>+
>>>+ dev->cpu = cpu;
>>>+ per_cpu(cpuidle_arm_dev, cpu) = dev;
>>>+
>>>+ ret = cpuidle_register_device(dev);
>>>+ if (ret) {
>>>+ pr_err("Failed to register cpuidle device for CPU %d\n",
>>>+ cpu);
>>>+ kfree(dev);
>>>+ goto out_fail;
>>> }
>>> }
>>>+out:
>>>+ return ret;
>>>
>>>- return cpuidle_register(drv, NULL);
>>>+out_fail:
>>>+ for (cpu--; cpu <= 0; cpu--) {
>>>+ dev = per_cpu(cpuidle_arm_dev, cpu);
>>>+ cpuidle_unregister_device(dev);
>>>+ kfree(dev);
>>>+ }
>>>+ cpuidle_unregister_driver(drv);
>>>+ goto out;
>>>}
>>>device_initcall(arm_idle_init);
>>>--
>>>1.9.1
>>>
>
>
>--
> <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
>
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCH V2 7/8] ARM: cpuidle: Register per cpuidle device
2015-03-19 15:42 ` Lina Iyer
@ 2015-03-19 17:11 ` Daniel Lezcano
0 siblings, 0 replies; 18+ messages in thread
From: Daniel Lezcano @ 2015-03-19 17:11 UTC (permalink / raw)
To: linux-arm-kernel
On 03/19/2015 04:42 PM, Lina Iyer wrote:
> On Thu, Mar 19 2015 at 09:33 -0600, Daniel Lezcano wrote:
>> On 03/19/2015 04:31 PM, Lina Iyer wrote:
>>> On Wed, Mar 18 2015 at 12:46 -0600, Daniel Lezcano wrote:
>>>> Some architectures have some cpus which does not support idle states.
>>>>
>>>> Let the underlying low level code to return -ENOSYS when it is not
>>>> possible to set an idle state.
>>>>
>>>> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
>>>> ---
>>>> drivers/cpuidle/cpuidle-arm.c | 45
>>>> +++++++++++++++++++++++++++++++++++++++++--
>>>> 1 file changed, 43 insertions(+), 2 deletions(-)
>>>>
>>>> diff --git a/drivers/cpuidle/cpuidle-arm.c
>>>> b/drivers/cpuidle/cpuidle-arm.c
>>>> index 1c94b88..0682ed0 100644
>>>> --- a/drivers/cpuidle/cpuidle-arm.c
>>>> +++ b/drivers/cpuidle/cpuidle-arm.c
>>>> @@ -17,11 +17,14 @@
>>>> #include <linux/kernel.h>
>>>> #include <linux/module.h>
>>>> #include <linux/of.h>
>>>> +#include <linux/slab.h>
>>>>
>>>> #include <asm/cpuidle.h>
>>>>
>>>> #include "dt_idle_states.h"
>>>>
>>>> +static DEFINE_PER_CPU(struct cpuidle_device, *cpuidle_arm_dev);
>>>
>>> Is a per-cpu variable needed? There seems to be no per-cpu access, other
>>> than at init.
>>
>> :)
>>
>> Actually it is the cpuidle framework which is using the per cpu variable.
>>
>
> But this is static pointer, I can see that struct cpuidle_device * being
> used by cpuidle framework.
>
> It gets stored here?
>
> DEFINE_PER_CPU(struct cpuidle_device *, cpuidle_devices);
>
> But we dont need to save it here, for in this file, there is no per-cpu
> access, other than when the registration fails.
Indeed, that is true. There is no need of these cpuidle variables.
Furthermore, we can access the cpuidle_devices directly as they are
exported in cpuidle.h.
I will fix it.
Thanks
-- Daniel
>>>> +
>>>> /*
>>>> * arm_enter_idle_state - Programs CPU to enter the specified state
>>>> *
>>>> @@ -94,6 +97,7 @@ static int __init arm_idle_init(void)
>>>> {
>>>> int cpu, ret;
>>>> struct cpuidle_driver *drv = &arm_idle_driver;
>>>> + struct cpuidle_device *dev;
>>>>
>>>> /*
>>>> * Initialize idle states data, starting at index 1.
>>>> @@ -105,18 +109,55 @@ static int __init arm_idle_init(void)
>>>> if (ret <= 0)
>>>> return ret ? : -ENODEV;
>>>>
>>>> + ret = cpuidle_register_driver(drv);
>>>> + if (ret) {
>>>> + pr_err("Failed to register cpuidle driver\n");
>>>> + return ret;
>>>> + }
>>>> +
>>>> /*
>>>> * Call arch CPU operations in order to initialize
>>>> * idle states suspend back-end specific data
>>>> */
>>>> for_each_possible_cpu(cpu) {
>>>> ret = arm_cpuidle_init(cpu);
>>>> +
>>>> + /* This cpu does not support any idle states */
>>>> + if (ret == -ENOSYS)
>>>> + continue;
>>>> +
>>>> if (ret) {
>>>> pr_err("CPU %d failed to init idle CPU ops\n", cpu);
>>>> - return ret;
>>>> + goto out_fail;
>>>> + }
>>>> +
>>>> + dev = kzalloc(sizeof(*dev), GFP_KERNEL);
>>>> + if (!dev) {
>>>> + pr_err("Failed to allocate cpuidle device\n");
>>>> + goto out_fail;
>>>> + }
>>>> +
>>>> + dev->cpu = cpu;
>>>> + per_cpu(cpuidle_arm_dev, cpu) = dev;
>>>> +
>>>> + ret = cpuidle_register_device(dev);
>>>> + if (ret) {
>>>> + pr_err("Failed to register cpuidle device for CPU %d\n",
>>>> + cpu);
>>>> + kfree(dev);
>>>> + goto out_fail;
>>>> }
>>>> }
>>>> +out:
>>>> + return ret;
>>>>
>>>> - return cpuidle_register(drv, NULL);
>>>> +out_fail:
>>>> + for (cpu--; cpu <= 0; cpu--) {
>>>> + dev = per_cpu(cpuidle_arm_dev, cpu);
>>>> + cpuidle_unregister_device(dev);
>>>> + kfree(dev);
>>>> + }
>>>> + cpuidle_unregister_driver(drv);
>>>> + goto out;
>>>> }
>>>> device_initcall(arm_idle_init);
>>>> --
>>>> 1.9.1
>>>>
>>
>>
>> --
>> <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
>>
--
<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
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH V2 8/8] ARM: cpuidle: Change function name to be consistent with x86
2015-03-18 18:46 [PATCH V2 0/8] ARM: cpuidle: Unify the ARM64/ARM DT approach Daniel Lezcano
` (6 preceding siblings ...)
2015-03-18 18:46 ` [PATCH V2 7/8] ARM: cpuidle: Register per cpuidle device Daniel Lezcano
@ 2015-03-18 18:46 ` Daniel Lezcano
7 siblings, 0 replies; 18+ messages in thread
From: Daniel Lezcano @ 2015-03-18 18:46 UTC (permalink / raw)
To: linux-arm-kernel
Change the functions name:
arm_cpuidle_suspend => arm_idle
arm_cpuidle_init => arm_idle_cpu_init
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
arch/arm/include/asm/cpuidle.h | 4 ++--
arch/arm/kernel/cpuidle.c | 4 ++--
arch/arm64/include/asm/cpuidle.h | 6 +++---
arch/arm64/kernel/cpuidle.c | 2 +-
drivers/cpuidle/cpuidle-arm.c | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/arch/arm/include/asm/cpuidle.h b/arch/arm/include/asm/cpuidle.h
index 1851e9d..7968948 100644
--- a/arch/arm/include/asm/cpuidle.h
+++ b/arch/arm/include/asm/cpuidle.h
@@ -42,8 +42,8 @@ struct of_cpuidle_method {
__used __section(__cpuidle_method_of_table) \
= { .method = _method, .ops = _ops }
-extern int arm_cpuidle_suspend(int index);
+extern int arm_idle(int index);
-extern int arm_cpuidle_init(int cpu);
+extern int arm_idle_cpu_init(int cpu);
#endif
diff --git a/arch/arm/kernel/cpuidle.c b/arch/arm/kernel/cpuidle.c
index 7b42a40..05a2c3e 100644
--- a/arch/arm/kernel/cpuidle.c
+++ b/arch/arm/kernel/cpuidle.c
@@ -29,7 +29,7 @@ int arm_cpuidle_simple_enter(struct cpuidle_device *dev,
return index;
}
-int arm_cpuidle_suspend(int index)
+int arm_idle(int index)
{
int ret = -EOPNOTSUPP;
int cpu = smp_processor_id();
@@ -75,7 +75,7 @@ static int __init arm_cpuidle_read_ops(struct device_node *dn, int cpu)
return 0;
}
-int __init arm_cpuidle_init(int cpu)
+int __init arm_idle_cpu_init(int cpu)
{
int ret = -EOPNOTSUPP;
struct device_node *cpu_node = of_cpu_device_node_get(cpu);
diff --git a/arch/arm64/include/asm/cpuidle.h b/arch/arm64/include/asm/cpuidle.h
index 141b2fc..e9c0dc4e 100644
--- a/arch/arm64/include/asm/cpuidle.h
+++ b/arch/arm64/include/asm/cpuidle.h
@@ -4,10 +4,10 @@
#include <asm/proc-fns.h>
#ifdef CONFIG_CPU_IDLE
-extern int arm_cpuidle_init(unsigned int cpu);
+extern int arm_idle_cpu_init(unsigned int cpu);
extern int cpu_suspend(unsigned long arg);
#else
-static inline int arm_cpuidle_init(unsigned int cpu)
+static inline int arm_idle_cpu_init(unsigned int cpu)
{
return -EOPNOTSUPP;
}
@@ -17,7 +17,7 @@ static inline int cpu_suspend(unsigned long arg)
return -EOPNOTSUPP;
}
#endif
-static inline int arm_cpuidle_suspend(int index)
+static inline int arm_idle(int index)
{
return cpu_suspend(index);
}
diff --git a/arch/arm64/kernel/cpuidle.c b/arch/arm64/kernel/cpuidle.c
index a78143a..b6b4fcf 100644
--- a/arch/arm64/kernel/cpuidle.c
+++ b/arch/arm64/kernel/cpuidle.c
@@ -15,7 +15,7 @@
#include <asm/cpuidle.h>
#include <asm/cpu_ops.h>
-int arm_cpuidle_init(unsigned int cpu)
+int arm_idle_cpu_init(unsigned int cpu)
{
int ret = -EOPNOTSUPP;
struct device_node *cpu_node = of_cpu_device_node_get(cpu);
diff --git a/drivers/cpuidle/cpuidle-arm.c b/drivers/cpuidle/cpuidle-arm.c
index 0682ed0..cd8c32f 100644
--- a/drivers/cpuidle/cpuidle-arm.c
+++ b/drivers/cpuidle/cpuidle-arm.c
@@ -52,7 +52,7 @@ static int arm_enter_idle_state(struct cpuidle_device *dev,
* call the CPU ops suspend protocol with idle index as a
* parameter.
*/
- arm_cpuidle_suspend(idx);
+ arm_idle(idx);
cpu_pm_exit();
}
@@ -120,7 +120,7 @@ static int __init arm_idle_init(void)
* idle states suspend back-end specific data
*/
for_each_possible_cpu(cpu) {
- ret = arm_cpuidle_init(cpu);
+ ret = arm_idle_cpu_init(cpu);
/* This cpu does not support any idle states */
if (ret == -ENOSYS)
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread