Skip to content

Commit db1ae0c

Browse files
dedekindrafaeljw
authored andcommitted
intel_idle: fix confusing message
By default, all non-POLL C-states are entered with interrupts disabled. There are 2 ways to make 'intel_idle' enter C-states with interrupts enabled: 1. Mark the C-state with the CPUIDLE_FLAG_IRQ_ENABLE flag. 2. Use the force_irq_on module parameter. The former is the "proper" way of doing it, it is per-C-state and per-platform. The latter is for debugging purposes only. The problem is that intel_idle prints the "forced intel_idle_irq" message in both cases, even though the former case does not needed this message, because nothing is forced there. This patch addresses the problem. Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com> Reviewed-by: Zhang Rui <rui.zhang@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent 00433ea commit db1ae0c

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

drivers/idle/intel_idle.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1912,8 +1912,9 @@ static void __init intel_idle_init_cstates_icpu(struct cpuidle_driver *drv)
19121912
*/
19131913
WARN_ON_ONCE(state->flags & CPUIDLE_FLAG_IRQ_ENABLE);
19141914
state->enter = intel_idle_ibrs;
1915-
} else if ((state->flags & CPUIDLE_FLAG_IRQ_ENABLE) ||
1916-
force_irq_on) {
1915+
} else if (state->flags & CPUIDLE_FLAG_IRQ_ENABLE) {
1916+
state->enter = intel_idle_irq;
1917+
} else if (force_irq_on) {
19171918
pr_info("forced intel_idle_irq for state %d\n", cstate);
19181919
state->enter = intel_idle_irq;
19191920
}

0 commit comments

Comments
 (0)