Skip to content

Commit

Permalink
drivers: cpuidle: Add idle-state-name description to ARM idle states
Browse files Browse the repository at this point in the history
On ARM machines, where generally speaking the idle state numbering has
no fixed and standard meaning it is useful to provide a description
of the idle state inner workings for benchmarking and monitoring purposes.

This patch adds a property to the idle states bindings that if present
gives platform firmware a means of describing the idle state and export
the string description to user space.

The patch updates the DT parsing code accordingly to take the description,
if present, into consideration.

Acked-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
  • Loading branch information
Lorenzo Pieralisi authored and Daniel Lezcano committed Nov 19, 2014
1 parent 97735da commit c00bc5d
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
6 changes: 6 additions & 0 deletions Documentation/devicetree/bindings/arm/idle-states.txt
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,12 @@ follows:
If the property is not present the idle-state must
be considered operational.

- idle-state-name:
Usage: Optional
Value type: <string>
Definition: A string used as a descriptive name for the idle
state.

In addition to the properties listed above, a state node may require
additional properties specifics to the entry-method defined in the
idle-states node, please refer to the entry-method bindings
Expand Down
7 changes: 6 additions & 1 deletion drivers/cpuidle/dt_idle_states.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ static int init_state_node(struct cpuidle_state *idle_state,
{
int err;
const struct of_device_id *match_id;
const char *desc;

match_id = of_match_node(matches, state_node);
if (!match_id)
Expand Down Expand Up @@ -73,6 +74,10 @@ static int init_state_node(struct cpuidle_state *idle_state,
return -EINVAL;
}

err = of_property_read_string(state_node, "idle-state-name", &desc);
if (err)
desc = state_node->name;

idle_state->flags = CPUIDLE_FLAG_TIME_VALID;
if (of_property_read_bool(state_node, "local-timer-stop"))
idle_state->flags |= CPUIDLE_FLAG_TIMER_STOP;
Expand All @@ -82,7 +87,7 @@ static int init_state_node(struct cpuidle_state *idle_state,
* 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);
strncpy(idle_state->desc, desc, CPUIDLE_DESC_LEN - 1);
return 0;
}

Expand Down

0 comments on commit c00bc5d

Please sign in to comment.