From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Wed, 4 Feb 2026 19:34:26 +0000 (+0100)
Subject: Merge branch 'pm-cpuidle'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d367141eb68ced4d1e1fc97e97c59be1daa3085;p=thirdparty%2Flinux.git

Merge branch 'pm-cpuidle'

Merge cpuidle updates for 6.20-rc1/7.0-rc1:

 - Add a command line option to adjust the C-states table in the
   intel_idle driver, remove the 'preferred_cstates' module parameter
   from it, add C-states validation to it and clean it up (Artem
   Bityutskiy)

 - Make the menu cpuidle governor always check the time till the closest
   timer event when the scheduler tick has been stopped to prevent it
   from mistakenly selecting the deepest available idle state (Rafael
   Wysocki)

 - Update the teo cpuidle governor to avoid making suboptimal decisions
   in certain corner cases and generally improve idle state selection
   accuracy (Rafael Wysocki)

 - Remove an unlikely() annotation on the early-return condition in
   menu_select() that leads to branch misprediction 100% of the time
   on systems with only 1 idle state enabled, like ARM64 servers (Breno
   Leitao)

 - Add Christian Loehle to MAINTAINERS as a cpuidle reviewer (Christian
   Loehle)

* pm-cpuidle:
  cpuidle: governors: teo: Refine intercepts-based idle state lookup
  cpuidle: governors: teo: Adjust the classification of wakeup events
  cpuidle: governors: teo: Refine tick_intercepts vs total events check
  cpuidle: governors: teo: Avoid fake intercepts produced by tick
  cpuidle: governors: teo: Avoid selecting states with zero-size bins
  cpuidle: governors: menu: Always check timers with tick stopped
  MAINTAINERS: Add myself as cpuidle reviewer
  cpuidle: menu: Remove incorrect unlikely() annotation
  intel_idle: Add C-states validation
  intel_idle: Add cmdline option to adjust C-states table
  intel_idle: Initialize sysfs after cpuidle driver initialization
  intel_idle: Remove the 'preferred_cstates' parameter
  intel_idle: Remove unused driver version constant
---

6d367141eb68ced4d1e1fc97e97c59be1daa3085