Commit becbdde5 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'pm-powercap' and 'pm-cpuidle' 

Merge additional power capping and cpuidle updates for 7.0-rc1:

 - Fix the handling of package-scope MSRs in the intel_rapl power
   capping driver when called from the PMU subsystem and make it add all
   package CPUs to the PMU cpumask to allow tools to read RAPL events
   from any CPU in the package (Kuppuswamy Sathyanarayanan)

 - Rework the invalid version check in the intel_rapl_tpmi power capping
   driver to account for the fact that on partitioned systems, multiple
   TPMI instances may exist per package, but RAPL registers are only
   valid on one instance (Kuppuswamy Satharayananyan)

 - Describe the new intel_idle.table command line option in the
   admin-guide intel_idle documentation (Artem Bityutskiy)

 - Fix a crash in the ladder cpuidle governor on systems with only one
   (polling) idle state available by making the cpuidle core bypass the
   governor in those cases and adjust the other existing governors to
   that change (Aboorva Devarajan, Christian Loehle)

* pm-powercap:
  powercap: intel_rapl_tpmi: Remove FW_BUG from invalid version check
  powercap: intel_rapl: Expose all package CPUs in PMU cpumask
  powercap: intel_rapl: Remove incorrect CPU check in PMU context

* pm-cpuidle:
  cpuidle: menu: Remove single state handling
  cpuidle: teo: Remove single state handling
  cpuidle: haltpoll: Remove single state handling
  cpuidle: Skip governor when only one idle state is available
  Documentation: PM: Document intel_idle.table command line option
parents bd9635c4 c7d54daf 93983a9f

Documentation/admin-guide/pm/intel_idle.rst

+11 −0
Original line number Diff line number Diff line
@@ -260,6 +260,17 @@ mode to off when the CPU is in any one of the available idle states. This may 
help performance of a sibling CPU at the expense of a slightly higher wakeup

latency for the idle CPU.



The ``table`` argument allows customization of idle state latency and target

residency. The syntax is a comma-separated list of ``name:latency:residency``

entries, where ``name`` is the idle state name, ``latency`` is the exit latency

in microseconds, and ``residency`` is the target residency in microseconds. It

is not necessary to specify all idle states; only those to be customized. For

example, ``C1:1:3,C6:50:100`` sets the exit latency and target residency for

C1 and C6 to 1/3 and 50/100 microseconds, respectively. Remaining idle states

keep their default values. The driver verifies that deeper idle states have

higher latency and target residency than shallower ones. Also, target

residency cannot be smaller than exit latency. If any of these conditions is

not met, the driver ignores the entire ``table`` parameter.



.. _intel-idle-core-and-package-idle-states:

drivers/cpuidle/cpuidle.c

+10 −0
Original line number Diff line number Diff line
@@ -359,6 +359,16 @@ noinstr int cpuidle_enter_state(struct cpuidle_device *dev, 
int cpuidle_select(struct cpuidle_driver *drv, struct cpuidle_device *dev,

		   bool *stop_tick)

{

	/*

	 * If there is only a single idle state (or none), there is nothing

	 * meaningful for the governor to choose. Skip the governor and

	 * always use state 0 with the tick running.

	 */

	if (drv->state_count <= 1) {

		*stop_tick = false;

		return 0;

	}



	return cpuidle_curr_governor->select(drv, dev, stop_tick);

}

drivers/cpuidle/governors/haltpoll.c

+1 −3
Original line number Diff line number Diff line
@@ -50,9 +50,7 @@ static int haltpoll_select(struct cpuidle_driver *drv, 
			   struct cpuidle_device *dev,

			   bool *stop_tick)

{

	s64 latency_req = cpuidle_governor_latency_req(dev->cpu);



	if (!drv->state_count || latency_req == 0) {

	if (cpuidle_governor_latency_req(dev->cpu) == 0) {

		*stop_tick = false;

		return 0;

	}

drivers/cpuidle/governors/menu.c

+1 −1
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ static int menu_select(struct cpuidle_driver *drv, struct cpuidle_device *dev, 
		data->bucket = BUCKETS - 1;

	}



	if (drv->state_count <= 1 || latency_req == 0 ||

	if (latency_req == 0 ||

	    ((data->next_timer_ns < drv->states[1].target_residency_ns ||

	      latency_req < drv->states[1].exit_latency_ns) &&

	     !dev->states_usage[0].disable)) {

drivers/cpuidle/governors/teo.c

+0 −6
Original line number Diff line number Diff line
@@ -338,12 +338,6 @@ static int teo_select(struct cpuidle_driver *drv, struct cpuidle_device *dev, 
	 */

	cpu_data->sleep_length_ns = KTIME_MAX;



	/* Check if there is any choice in the first place. */

	if (drv->state_count < 2) {

		idx = 0;

		goto out_tick;

	}



	if (!dev->states_usage[0].disable)

		idx = 0;