Commit 7da71072 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pm-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull power management updates from Rafael Wysocki:
 "These add support for new processors (Sierra Forest, Grand Ridge and
  Meteor Lake) to the intel_idle driver, make intel_pstate run on
  Emerald Rapids without HWP support and adjust it to utilize EPP values
  supplied by the platform firmware, fix issues, clean up code and
  improve documentation.

  The most significant fix addresses deadlocks in the core system-wide
  resume code that occur if async_schedule_dev() attempts to run its
  argument function synchronously (for example, due to a memory
  allocation failure). It rearranges the code in question which may
  increase the system resume time in some cases, but this basically is a
  removal of a premature optimization. That optimization will be added
  back later, but properly this time.

  Specifics:

   - Add support for the Sierra Forest, Grand Ridge and Meteorlake SoCs
     to the intel_idle cpuidle driver (Artem Bityutskiy, Zhang Rui)

   - Do not enable interrupts when entering idle in the haltpoll cpuidle
     driver (Borislav Petkov)

   - Add Emerald Rapids support in no-HWP mode to the intel_pstate
     cpufreq driver (Zhenguo Yao)

   - Use EPP values programmed by the platform firmware as balanced
     performance ones by default in intel_pstate (Srinivas Pandruvada)

   - Add a missing function return value check to the SCMI cpufreq
     driver to avoid unexpected behavior (Alexandra Diupina)

   - Fix parameter type warning in the armada-8k cpufreq driver (Gregory
     CLEMENT)

   - Rework trans_stat_show() in the devfreq core code to avoid buffer
     overflows (Christian Marangi)

   - Synchronize devfreq_monitor_[start/stop] so as to prevent a timer
     list corruption from occurring when devfreq governors are switched
     frequently (Mukesh Ojha)

   - Fix possible deadlocks in the core system-wide PM code that occur
     if device-handling functions cannot be executed asynchronously
     during resume from system-wide suspend (Rafael J. Wysocki)

   - Clean up unnecessary local variable initializations in multiple
     places in the hibernation code (Wang chaodong, Li zeming)

   - Adjust core hibernation code to avoid missing wakeup events that
     occur after saving an image to persistent storage (Chris Feng)

   - Update hibernation code to enforce correct ordering during image
     compression and decompression (Hongchen Zhang)

   - Use kmap_local_page() instead of kmap_atomic() in copy_data_page()
     during hibernation and restore (Chen Haonan)

   - Adjust documentation and code comments to reflect recent tasks
     freezer changes (Kevin Hao)

   - Repair excess function parameter description warning in the
     hibernation image-saving code (Randy Dunlap)

   - Fix _set_required_opps when opp is NULL (Bryan O'Donoghue)

   - Use device_get_match_data() in the OPP code for TI (Rob Herring)

   - Clean up OPP level and other parts and call dev_pm_opp_set_opp()
     recursively for required OPPs (Viresh Kumar)"

* tag 'pm-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (35 commits)
  OPP: Rename 'rate_clk_single'
  OPP: Pass rounded rate to _set_opp()
  OPP: Relocate dev_pm_opp_sync_regulators()
  PM: sleep: Fix possible deadlocks in core system-wide PM code
  OPP: Move dev_pm_opp_icc_bw to internal opp.h
  async: Introduce async_schedule_dev_nocall()
  async: Split async_schedule_node_domain()
  cpuidle: haltpoll: Do not enable interrupts when entering idle
  OPP: Fix _set_required_opps when opp is NULL
  OPP: The level field is always of unsigned int type
  PM: hibernate: Repair excess function parameter description warning
  PM: sleep: Remove obsolete comment from unlock_system_sleep()
  cpufreq: intel_pstate: Add Emerald Rapids support in no-HWP mode
  Documentation: PM: Adjust freezing-of-tasks.rst to the freezer changes
  PM: hibernate: Use kmap_local_page() in copy_data_page()
  intel_idle: add Sierra Forest SoC support
  intel_idle: add Grand Ridge SoC support
  PM / devfreq: Synchronize devfreq_monitor_[start/stop]
  cpufreq: armada-8k: Fix parameter type warning
  PM: hibernate: Enforce ordering during image compression/decompression
  ...
parents 7f73ba68 f1e5e463

Documentation/ABI/testing/sysfs-class-devfreq

+3 −0
Original line number Diff line number Diff line
@@ -52,6 +52,9 @@ Description: 


			echo 0 > /sys/class/devfreq/.../trans_stat



		If the transition table is bigger than PAGE_SIZE, reading

		this will return an -EFBIG error.



What:		/sys/class/devfreq/.../available_frequencies

Date:		October 2012

Contact:	Nishanth Menon <nm@ti.com>

Documentation/power/freezing-of-tasks.rst

+48 −37
Original line number Diff line number Diff line
@@ -14,27 +14,28 @@ architectures). 
II. How does it work?

=====================



There are three per-task flags used for that, PF_NOFREEZE, PF_FROZEN

and PF_FREEZER_SKIP (the last one is auxiliary).  The tasks that have

PF_NOFREEZE unset (all user space processes and some kernel threads) are

regarded as 'freezable' and treated in a special way before the system enters a

suspend state as well as before a hibernation image is created (in what follows

we only consider hibernation, but the description also applies to suspend).

There is one per-task flag (PF_NOFREEZE) and three per-task states

(TASK_FROZEN, TASK_FREEZABLE and __TASK_FREEZABLE_UNSAFE) used for that.

The tasks that have PF_NOFREEZE unset (all user space tasks and some kernel

threads) are regarded as 'freezable' and treated in a special way before the

system enters a sleep state as well as before a hibernation image is created

(hibernation is directly covered by what follows, but the description applies

to system-wide suspend too).



Namely, as the first step of the hibernation procedure the function

freeze_processes() (defined in kernel/power/process.c) is called.  A system-wide

variable system_freezing_cnt (as opposed to a per-task flag) is used to indicate

whether the system is to undergo a freezing operation. And freeze_processes()

sets this variable.  After this, it executes try_to_freeze_tasks() that sends a

fake signal to all user space processes, and wakes up all the kernel threads.

All freezable tasks must react to that by calling try_to_freeze(), which

results in a call to __refrigerator() (defined in kernel/freezer.c), which sets

the task's PF_FROZEN flag, changes its state to TASK_UNINTERRUPTIBLE and makes

it loop until PF_FROZEN is cleared for it. Then, we say that the task is

'frozen' and therefore the set of functions handling this mechanism is referred

to as 'the freezer' (these functions are defined in kernel/power/process.c,

kernel/freezer.c & include/linux/freezer.h). User space processes are generally

frozen before kernel threads.

static key freezer_active (as opposed to a per-task flag or state) is used to

indicate whether the system is to undergo a freezing operation. And

freeze_processes() sets this static key.  After this, it executes

try_to_freeze_tasks() that sends a fake signal to all user space processes, and

wakes up all the kernel threads. All freezable tasks must react to that by

calling try_to_freeze(), which results in a call to __refrigerator() (defined

in kernel/freezer.c), which changes the task's state to TASK_FROZEN, and makes

it loop until it is woken by an explicit TASK_FROZEN wakeup. Then, that task

is regarded as 'frozen' and so the set of functions handling this mechanism is

referred to as 'the freezer' (these functions are defined in

kernel/power/process.c, kernel/freezer.c & include/linux/freezer.h). User space

tasks are generally frozen before kernel threads.



__refrigerator() must not be called directly.  Instead, use the

try_to_freeze() function (defined in include/linux/freezer.h), that checks
@@ -43,31 +44,40 @@ if the task is to be frozen and makes the task enter __refrigerator(). 
For user space processes try_to_freeze() is called automatically from the

signal-handling code, but the freezable kernel threads need to call it

explicitly in suitable places or use the wait_event_freezable() or

wait_event_freezable_timeout() macros (defined in include/linux/freezer.h)

that combine interruptible sleep with checking if the task is to be frozen and

calling try_to_freeze().  The main loop of a freezable kernel thread may look

wait_event_freezable_timeout() macros (defined in include/linux/wait.h)

that put the task to sleep (TASK_INTERRUPTIBLE) or freeze it (TASK_FROZEN) if

freezer_active is set. The main loop of a freezable kernel thread may look

like the following one::



	set_freezable();

	do {

		hub_events();

		wait_event_freezable(khubd_wait,

				!list_empty(&hub_event_list) ||

				kthread_should_stop());

	} while (!kthread_should_stop() || !list_empty(&hub_event_list));



(from drivers/usb/core/hub.c::hub_thread()).



If a freezable kernel thread fails to call try_to_freeze() after the freezer has

initiated a freezing operation, the freezing of tasks will fail and the entire

hibernation operation will be cancelled.  For this reason, freezable kernel

threads must call try_to_freeze() somewhere or use one of the



	while (true) {

		struct task_struct *tsk = NULL;



		wait_event_freezable(oom_reaper_wait, oom_reaper_list != NULL);

		spin_lock_irq(&oom_reaper_lock);

		if (oom_reaper_list != NULL) {

			tsk = oom_reaper_list;

			oom_reaper_list = tsk->oom_reaper_list;

		}

		spin_unlock_irq(&oom_reaper_lock);



		if (tsk)

			oom_reap_task(tsk);

	}



(from mm/oom_kill.c::oom_reaper()).



If a freezable kernel thread is not put to the frozen state after the freezer

has initiated a freezing operation, the freezing of tasks will fail and the

entire system-wide transition will be cancelled.  For this reason, freezable

kernel threads must call try_to_freeze() somewhere or use one of the

wait_event_freezable() and wait_event_freezable_timeout() macros.



After the system memory state has been restored from a hibernation image and

devices have been reinitialized, the function thaw_processes() is called in

order to clear the PF_FROZEN flag for each frozen task.  Then, the tasks that

have been frozen leave __refrigerator() and continue running.

order to wake up each frozen task.  Then, the tasks that have been frozen leave

__refrigerator() and continue running.





Rationale behind the functions dealing with freezing and thawing of tasks
@@ -96,7 +106,8 @@ III. Which kernel threads are freezable? 
Kernel threads are not freezable by default.  However, a kernel thread may clear

PF_NOFREEZE for itself by calling set_freezable() (the resetting of PF_NOFREEZE

directly is not allowed).  From this point it is regarded as freezable

and must call try_to_freeze() in a suitable place.

and must call try_to_freeze() or variants of wait_event_freezable() in a

suitable place.



IV. Why do we do that?

======================

drivers/base/power/main.c

+68 −80
Original line number Diff line number Diff line
@@ -579,7 +579,7 @@ bool dev_pm_skip_resume(struct device *dev) 
}



/**

 * device_resume_noirq - Execute a "noirq resume" callback for given device.

 * __device_resume_noirq - Execute a "noirq resume" callback for given device.

 * @dev: Device to handle.

 * @state: PM transition of the system being carried out.

 * @async: If true, the device is being resumed asynchronously.
@@ -587,7 +587,7 @@ bool dev_pm_skip_resume(struct device *dev) 
 * The driver of @dev will not receive interrupts while this function is being

 * executed.

 */

static int device_resume_noirq(struct device *dev, pm_message_t state, bool async)

static void __device_resume_noirq(struct device *dev, pm_message_t state, bool async)

{

	pm_callback_t callback = NULL;

	const char *info = NULL;
@@ -655,7 +655,13 @@ static int device_resume_noirq(struct device *dev, pm_message_t state, bool asyn 
Out:

	complete_all(&dev->power.completion);

	TRACE_RESUME(error);

	return error;



	if (error) {

		suspend_stats.failed_resume_noirq++;

		dpm_save_failed_step(SUSPEND_RESUME_NOIRQ);

		dpm_save_failed_dev(dev_name(dev));

		pm_dev_err(dev, state, async ? " async noirq" : " noirq", error);

	}

}



static bool is_async(struct device *dev)
@@ -668,11 +674,15 @@ static bool dpm_async_fn(struct device *dev, async_func_t func) 
{

	reinit_completion(&dev->power.completion);



	if (is_async(dev)) {

	if (!is_async(dev))

		return false;



	get_device(dev);

		async_schedule_dev(func, dev);



	if (async_schedule_dev_nocall(func, dev))

		return true;

	}



	put_device(dev);



	return false;

}
@@ -680,15 +690,19 @@ static bool dpm_async_fn(struct device *dev, async_func_t func) 
static void async_resume_noirq(void *data, async_cookie_t cookie)

{

	struct device *dev = data;

	int error;



	error = device_resume_noirq(dev, pm_transition, true);

	if (error)

		pm_dev_err(dev, pm_transition, " async", error);



	__device_resume_noirq(dev, pm_transition, true);

	put_device(dev);

}



static void device_resume_noirq(struct device *dev)

{

	if (dpm_async_fn(dev, async_resume_noirq))

		return;



	__device_resume_noirq(dev, pm_transition, false);

}



static void dpm_noirq_resume_devices(pm_message_t state)

{

	struct device *dev;
@@ -698,14 +712,6 @@ static void dpm_noirq_resume_devices(pm_message_t state) 
	mutex_lock(&dpm_list_mtx);

	pm_transition = state;



	/*

	 * Advanced the async threads upfront,

	 * in case the starting of async threads is

	 * delayed by non-async resuming devices.

	 */

	list_for_each_entry(dev, &dpm_noirq_list, power.entry)

		dpm_async_fn(dev, async_resume_noirq);



	while (!list_empty(&dpm_noirq_list)) {

		dev = to_device(dpm_noirq_list.next);

		get_device(dev);
@@ -713,17 +719,7 @@ static void dpm_noirq_resume_devices(pm_message_t state) 


		mutex_unlock(&dpm_list_mtx);



		if (!is_async(dev)) {

			int error;



			error = device_resume_noirq(dev, state, false);

			if (error) {

				suspend_stats.failed_resume_noirq++;

				dpm_save_failed_step(SUSPEND_RESUME_NOIRQ);

				dpm_save_failed_dev(dev_name(dev));

				pm_dev_err(dev, state, " noirq", error);

			}

		}

		device_resume_noirq(dev);



		put_device(dev);
@@ -751,14 +747,14 @@ void dpm_resume_noirq(pm_message_t state) 
}



/**

 * device_resume_early - Execute an "early resume" callback for given device.

 * __device_resume_early - Execute an "early resume" callback for given device.

 * @dev: Device to handle.

 * @state: PM transition of the system being carried out.

 * @async: If true, the device is being resumed asynchronously.

 *

 * Runtime PM is disabled for @dev while this function is being executed.

 */

static int device_resume_early(struct device *dev, pm_message_t state, bool async)

static void __device_resume_early(struct device *dev, pm_message_t state, bool async)

{

	pm_callback_t callback = NULL;

	const char *info = NULL;
@@ -811,21 +807,31 @@ static int device_resume_early(struct device *dev, pm_message_t state, bool asyn 


	pm_runtime_enable(dev);

	complete_all(&dev->power.completion);

	return error;



	if (error) {

		suspend_stats.failed_resume_early++;

		dpm_save_failed_step(SUSPEND_RESUME_EARLY);

		dpm_save_failed_dev(dev_name(dev));

		pm_dev_err(dev, state, async ? " async early" : " early", error);

	}

}



static void async_resume_early(void *data, async_cookie_t cookie)

{

	struct device *dev = data;

	int error;



	error = device_resume_early(dev, pm_transition, true);

	if (error)

		pm_dev_err(dev, pm_transition, " async", error);



	__device_resume_early(dev, pm_transition, true);

	put_device(dev);

}



static void device_resume_early(struct device *dev)

{

	if (dpm_async_fn(dev, async_resume_early))

		return;



	__device_resume_early(dev, pm_transition, false);

}



/**

 * dpm_resume_early - Execute "early resume" callbacks for all devices.

 * @state: PM transition of the system being carried out.
@@ -839,14 +845,6 @@ void dpm_resume_early(pm_message_t state) 
	mutex_lock(&dpm_list_mtx);

	pm_transition = state;



	/*

	 * Advanced the async threads upfront,

	 * in case the starting of async threads is

	 * delayed by non-async resuming devices.

	 */

	list_for_each_entry(dev, &dpm_late_early_list, power.entry)

		dpm_async_fn(dev, async_resume_early);



	while (!list_empty(&dpm_late_early_list)) {

		dev = to_device(dpm_late_early_list.next);

		get_device(dev);
@@ -854,17 +852,7 @@ void dpm_resume_early(pm_message_t state) 


		mutex_unlock(&dpm_list_mtx);



		if (!is_async(dev)) {

			int error;



			error = device_resume_early(dev, state, false);

			if (error) {

				suspend_stats.failed_resume_early++;

				dpm_save_failed_step(SUSPEND_RESUME_EARLY);

				dpm_save_failed_dev(dev_name(dev));

				pm_dev_err(dev, state, " early", error);

			}

		}

		device_resume_early(dev);



		put_device(dev);
@@ -888,12 +876,12 @@ void dpm_resume_start(pm_message_t state) 
EXPORT_SYMBOL_GPL(dpm_resume_start);



/**

 * device_resume - Execute "resume" callbacks for given device.

 * __device_resume - Execute "resume" callbacks for given device.

 * @dev: Device to handle.

 * @state: PM transition of the system being carried out.

 * @async: If true, the device is being resumed asynchronously.

 */

static int device_resume(struct device *dev, pm_message_t state, bool async)

static void __device_resume(struct device *dev, pm_message_t state, bool async)

{

	pm_callback_t callback = NULL;

	const char *info = NULL;
@@ -975,20 +963,30 @@ static int device_resume(struct device *dev, pm_message_t state, bool async) 


	TRACE_RESUME(error);



	return error;

	if (error) {

		suspend_stats.failed_resume++;

		dpm_save_failed_step(SUSPEND_RESUME);

		dpm_save_failed_dev(dev_name(dev));

		pm_dev_err(dev, state, async ? " async" : "", error);

	}

}



static void async_resume(void *data, async_cookie_t cookie)

{

	struct device *dev = data;

	int error;



	error = device_resume(dev, pm_transition, true);

	if (error)

		pm_dev_err(dev, pm_transition, " async", error);

	__device_resume(dev, pm_transition, true);

	put_device(dev);

}



static void device_resume(struct device *dev)

{

	if (dpm_async_fn(dev, async_resume))

		return;



	__device_resume(dev, pm_transition, false);

}



/**

 * dpm_resume - Execute "resume" callbacks for non-sysdev devices.

 * @state: PM transition of the system being carried out.
@@ -1008,27 +1006,17 @@ void dpm_resume(pm_message_t state) 
	pm_transition = state;

	async_error = 0;



	list_for_each_entry(dev, &dpm_suspended_list, power.entry)

		dpm_async_fn(dev, async_resume);



	while (!list_empty(&dpm_suspended_list)) {

		dev = to_device(dpm_suspended_list.next);



		get_device(dev);

		if (!is_async(dev)) {

			int error;



		mutex_unlock(&dpm_list_mtx);



			error = device_resume(dev, state, false);

			if (error) {

				suspend_stats.failed_resume++;

				dpm_save_failed_step(SUSPEND_RESUME);

				dpm_save_failed_dev(dev_name(dev));

				pm_dev_err(dev, state, "", error);

			}

		device_resume(dev);



		mutex_lock(&dpm_list_mtx);

		}



		if (!list_empty(&dev->power.entry))

			list_move_tail(&dev->power.entry, &dpm_prepared_list);

drivers/cpufreq/armada-8k-cpufreq.c

+2 −2
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ static void __init armada_8k_get_sharing_cpus(struct clk *cur_clk, 
			continue;

		}



		clk = clk_get(cpu_dev, 0);

		clk = clk_get(cpu_dev, NULL);

		if (IS_ERR(clk)) {

			pr_warn("Cannot get clock for CPU %d\n", cpu);

		} else {
@@ -165,7 +165,7 @@ static int __init armada_8k_cpufreq_init(void) 
			continue;

		}



		clk = clk_get(cpu_dev, 0);

		clk = clk_get(cpu_dev, NULL);



		if (IS_ERR(clk)) {

			pr_err("Cannot get clock for CPU %d\n", cpu);

drivers/cpufreq/intel_pstate.c

+8 −7
Original line number Diff line number Diff line
@@ -1691,13 +1691,6 @@ static void intel_pstate_update_epp_defaults(struct cpudata *cpudata) 
{

	cpudata->epp_default = intel_pstate_get_epp(cpudata, 0);



	/*

	 * If this CPU gen doesn't call for change in balance_perf

	 * EPP return.

	 */

	if (epp_values[EPP_INDEX_BALANCE_PERFORMANCE] == HWP_EPP_BALANCE_PERFORMANCE)

		return;



	/*

	 * If the EPP is set by firmware, which means that firmware enabled HWP

	 * - Is equal or less than 0x80 (default balance_perf EPP)
@@ -1710,6 +1703,13 @@ static void intel_pstate_update_epp_defaults(struct cpudata *cpudata) 
		return;

	}



	/*

	 * If this CPU gen doesn't call for change in balance_perf

	 * EPP return.

	 */

	if (epp_values[EPP_INDEX_BALANCE_PERFORMANCE] == HWP_EPP_BALANCE_PERFORMANCE)

		return;



	/*

	 * Use hard coded value per gen to update the balance_perf

	 * and default EPP.
@@ -2406,6 +2406,7 @@ static const struct x86_cpu_id intel_pstate_cpu_ids[] = { 
	X86_MATCH(ICELAKE_X,		core_funcs),

	X86_MATCH(TIGERLAKE,		core_funcs),

	X86_MATCH(SAPPHIRERAPIDS_X,	core_funcs),

	X86_MATCH(EMERALDRAPIDS_X,      core_funcs),

	{}

};

MODULE_DEVICE_TABLE(x86cpu, intel_pstate_cpu_ids);