|
@@ -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>
|
|
@@ -17,13 +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"
|
|
|
|
|
|
/*
|
|
|
- * 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 +33,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;
|
|
|
|
|
@@ -49,7 +50,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();
|
|
|
}
|
|
@@ -57,8 +58,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 +69,33 @@ 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;
|
|
|
+ struct cpuidle_device *dev;
|
|
|
|
|
|
/*
|
|
|
* Initialize idle states data, starting at index 1.
|
|
@@ -101,22 +103,61 @@ 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;
|
|
|
|
|
|
+ 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 = cpu_init_idle(cpu);
|
|
|
+ ret = arm_cpuidle_init(cpu);
|
|
|
+
|
|
|
+ /*
|
|
|
+ * Skip the cpuidle device initialization if the reported
|
|
|
+ * failure is a HW misconfiguration/breakage (-ENXIO).
|
|
|
+ */
|
|
|
+ if (ret == -ENXIO)
|
|
|
+ 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;
|
|
|
+
|
|
|
+ ret = cpuidle_register_device(dev);
|
|
|
+ if (ret) {
|
|
|
+ pr_err("Failed to register cpuidle device for CPU %d\n",
|
|
|
+ cpu);
|
|
|
+ kfree(dev);
|
|
|
+ goto out_fail;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- return cpuidle_register(drv, NULL);
|
|
|
+ return 0;
|
|
|
+out_fail:
|
|
|
+ while (--cpu >= 0) {
|
|
|
+ dev = per_cpu(cpuidle_devices, cpu);
|
|
|
+ cpuidle_unregister_device(dev);
|
|
|
+ kfree(dev);
|
|
|
+ }
|
|
|
+
|
|
|
+ cpuidle_unregister_driver(drv);
|
|
|
+
|
|
|
+ return ret;
|
|
|
}
|
|
|
-device_initcall(arm64_idle_init);
|
|
|
+device_initcall(arm_idle_init);
|