Skip to content

Commit

Permalink
cpuidle: dt: bail out if the idle-state DT node is not compatible
Browse files Browse the repository at this point in the history
Currently, the DT of the idle states will be parsed first whether it's
compatible or not. This could cause a warning message that comes from if
the CPU doesn't support identical idle states. E.g. Tegra186 can run
with 2 Cortex-A57 and 2 Denver cores with different idle states on
different types of these cores.

So fix it by checking the match node earlier, then it can make sure it
only goes through the idle states that the CPU supported.

Signed-off-by: Joseph Lo <josephl@nvidia.com>
Reviewed-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  • Loading branch information
Joseph Lo authored and Rafael J. Wysocki committed Feb 1, 2019
1 parent 8a56bde commit db10945
Showing 1 changed file with 9 additions and 6 deletions.
15 changes: 9 additions & 6 deletions drivers/cpuidle/dt_idle_states.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,12 @@
#include "dt_idle_states.h"

static int init_state_node(struct cpuidle_state *idle_state,
const struct of_device_id *matches,
const struct of_device_id *match_id,
struct device_node *state_node)
{
int err;
const struct of_device_id *match_id;
const char *desc;

match_id = of_match_node(matches, state_node);
if (!match_id)
return -ENODEV;
/*
* CPUidle drivers are expected to initialize the const void *data
* pointer of the passed in struct of_device_id array to the idle
Expand Down Expand Up @@ -160,6 +156,7 @@ int dt_init_idle_driver(struct cpuidle_driver *drv,
{
struct cpuidle_state *idle_state;
struct device_node *state_node, *cpu_node;
const struct of_device_id *match_id;
int i, err = 0;
const cpumask_t *cpumask;
unsigned int state_idx = start_idx;
Expand All @@ -180,6 +177,12 @@ int dt_init_idle_driver(struct cpuidle_driver *drv,
if (!state_node)
break;

match_id = of_match_node(matches, state_node);
if (!match_id) {
err = -ENODEV;
break;
}

if (!of_device_is_available(state_node)) {
of_node_put(state_node);
continue;
Expand All @@ -198,7 +201,7 @@ int dt_init_idle_driver(struct cpuidle_driver *drv,
}

idle_state = &drv->states[state_idx++];
err = init_state_node(idle_state, matches, state_node);
err = init_state_node(idle_state, match_id, state_node);
if (err) {
pr_err("Parsing idle state node %pOF failed with err %d\n",
state_node, err);
Expand Down

0 comments on commit db10945

Please sign in to comment.