Commit b04b981f authored by Konrad Dybcio's avatar Konrad Dybcio Committed by Ulf Hansson
Browse files

pmdomain: core: Support naming idle states 



Commit 422f2d41 ("arm64: dts: qcom: Drop undocumented domain
"idle-state-name"") brought to light the common misbelief that
idle-state-names also applies to e.g. PSCI power domain idle states.

Make that a reality, mimicking the property name used by cpuidle
states.

Signed-off-by: default avatarKonrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Message-ID: <20241130-topic-idle_state_name-v1-2-d0ff67b0c8e9@oss.qualcomm.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 11444fb6

drivers/pmdomain/core.c

+12 −3
Original line number Diff line number Diff line
@@ -3174,6 +3174,8 @@ static int genpd_parse_state(struct genpd_power_state *genpd_state, 
	if (!err)

		genpd_state->residency_ns = 1000LL * residency;



	of_property_read_string(state_node, "idle-state-name", &genpd_state->name);



	genpd_state->power_on_latency_ns = 1000LL * exit_latency;

	genpd_state->power_off_latency_ns = 1000LL * entry_latency;

	genpd_state->fwnode = &state_node->fwnode;
@@ -3452,7 +3454,10 @@ static int idle_states_show(struct seq_file *s, void *data) 
	seq_puts(s, "State          Time Spent(ms) Usage          Rejected\n");



	for (i = 0; i < genpd->state_count; i++) {

		idle_time += genpd->states[i].idle_time;

		struct genpd_power_state *state = &genpd->states[i];

		char state_name[15];



		idle_time += state->idle_time;



		if (genpd->status == GENPD_STATE_OFF && genpd->state_idx == i) {

			now = ktime_get_mono_fast_ns();
@@ -3462,9 +3467,13 @@ static int idle_states_show(struct seq_file *s, void *data) 
			}

		}



		if (!state->name)

			snprintf(state_name, ARRAY_SIZE(state_name), "S%-13d", i);



		do_div(idle_time, NSEC_PER_MSEC);

		seq_printf(s, "S%-13i %-14llu %-14llu %llu\n", i, idle_time,

			   genpd->states[i].usage, genpd->states[i].rejected);

		seq_printf(s, "%-14s %-14llu %-14llu %llu\n",

			   state->name ?: state_name, idle_time,

			   state->usage, state->rejected);

	}



	genpd_unlock(genpd);

include/linux/pm_domain.h

+1 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ struct genpd_governor_data { 
};



struct genpd_power_state {

	const char *name;

	s64 power_off_latency_ns;

	s64 power_on_latency_ns;

	s64 residency_ns;