Skip to contentSkip to conversation

intel_idle: Adjust state names and descriptions for _LPI states

PATCH New Rafael J. Wysocki 1 participant 1 message Oct 21

Subsystems (3)
lore
Share & tools
lore

Rafael J. Wysocki

author maintainer
#0 lore raw

PATCH 1/1 intel_idle: Adjust state names and descriptions for _LPI states

From: "Rafael J. Wysocki" <[email protected]>

The value of the _LPI "State Name" field is used as the description of the given idle state (that is, the value of it "desc" attribute in sysfs) which is not consistent with idle state descriptions used when the idle state information comes from an ACPI _CST object.

To rectify that, use the _LPI "State Name" field value as the value of the "name" sysfs attribute of a given idle state and use the MWAIT hint value from the _LPI register address value to derive the value of its "desc" sysfs attribute in analogy with the _CST case.

Fixes abc5c103c66d ("intel_idle: Add ACPI _LPI support")
Cc 7.3+ <[email protected]> # 7.3+
---
 Documentation/admin-guide/pm/intel_idle.rst |   12 +++++++-----
 drivers/idle/intel_idle.c                   |    9 +++++++--
 2 files changed, 14 insertions(+), 7 deletions(-)
Documentation/admin-guide/pm/intel_idle.rst +7 -5
@@ -145,11 +145,13 @@ for the other idle state types (C2 and C
 the exit latency (again, that is because it reflects the target residency to
 exit latency ratio in the majority of cases for the processor models recognized
 by ``intel_idle``).  The name of the idle state (to be returned by the ``name``
-idle state attribute in ``sysfs``) is either "Cx_LPI" (if it comes from ``_LPI``
-processing) or "Cx_ACPI", where x is the index of that idle state in the final
-list (note that the minimum value of x is 1, because 0 is reserved for the
-"polling" state), and its target residency is based on the exit latency value.
-All of the idle states in the final list are enabled by default in this case.
+idle state attribute in ``sysfs``) either is equal to the state name value that
+comes from ``_LPI`` processing (with the possible fallback to "Cx_LPI" if the
+state name is not provided) or it is "Cx_ACPI", where x is the index of that
+idle state in the final list (note that the minimum value of x is 1, because 0
+is reserved for the "polling" state), and its target residency is based on the
+exit latency value.  All of the idle states in the final list are enabled by
+default in this case.
 
 
 .. _intel-idle-initialization:
drivers/idle/intel_idle.c +7 -2
@@ -1903,8 +1903,13 @@ static void __init intel_idle_init_cstat
 
 		state = &drv->states[drv->state_count++];
 
-		scnprintf(state->name, CPUIDLE_NAME_LEN, "C%d_LPI", index + 1);
-		strscpy(state->desc, lpi_state->desc);
+		if (strlen(lpi_state->desc) > 0)
+			strscpy(state->name, lpi_state->desc);
+		else
+			scnprintf(state->name, CPUIDLE_NAME_LEN, "C%d_LPI", index + 1);
+
+		scnprintf(state->desc, CPUIDLE_DESC_LEN, "ACPI LPI MWAIT 0x%2llx",
+			  lpi_state->address);
 		state->exit_latency = lpi_state->wake_latency;
 		state->target_residency = lpi_state->min_residency;
 		state->flags = MWAIT2flg(lpi_state->address);