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

Merge branches 'pm-sleep' and 'pm-em' 

Merge a hibernation regression fix and an fix related to energy model
management for 6.17-rc6

* pm-sleep:
  PM: hibernate: Restrict GFP mask in hibernation_snapshot()

* pm-em:
  PM: EM: Add function for registering a PD without capacity update
parents 971e2c87 449c9c02 e0423541

drivers/cpufreq/intel_pstate.c

+2 −2
Original line number Diff line number Diff line
@@ -1034,7 +1034,7 @@ static bool hybrid_register_perf_domain(unsigned int cpu) 
	if (!cpu_dev)

		return false;



	if (em_dev_register_perf_domain(cpu_dev, HYBRID_EM_STATE_COUNT, &cb,

	if (em_dev_register_pd_no_update(cpu_dev, HYBRID_EM_STATE_COUNT, &cb,

					 cpumask_of(cpu), false))

		return false;

include/linux/energy_model.h

+10 −0
Original line number Diff line number Diff line
@@ -171,6 +171,9 @@ int em_dev_update_perf_domain(struct device *dev, 
int em_dev_register_perf_domain(struct device *dev, unsigned int nr_states,

				const struct em_data_callback *cb,

				const cpumask_t *cpus, bool microwatts);

int em_dev_register_pd_no_update(struct device *dev, unsigned int nr_states,

				 const struct em_data_callback *cb,

				 const cpumask_t *cpus, bool microwatts);

void em_dev_unregister_perf_domain(struct device *dev);

struct em_perf_table *em_table_alloc(struct em_perf_domain *pd);

void em_table_free(struct em_perf_table *table);
@@ -350,6 +353,13 @@ int em_dev_register_perf_domain(struct device *dev, unsigned int nr_states, 
{

	return -EINVAL;

}

static inline

int em_dev_register_pd_no_update(struct device *dev, unsigned int nr_states,

				 const struct em_data_callback *cb,

				 const cpumask_t *cpus, bool microwatts)

{

	return -EINVAL;

}

static inline void em_dev_unregister_perf_domain(struct device *dev)

{

}

kernel/power/energy_model.c

+25 −4
Original line number Diff line number Diff line
@@ -552,6 +552,30 @@ EXPORT_SYMBOL_GPL(em_cpu_get); 
int em_dev_register_perf_domain(struct device *dev, unsigned int nr_states,

				const struct em_data_callback *cb,

				const cpumask_t *cpus, bool microwatts)

{

	int ret = em_dev_register_pd_no_update(dev, nr_states, cb, cpus, microwatts);



	if (_is_cpu_device(dev))

		em_check_capacity_update();



	return ret;

}

EXPORT_SYMBOL_GPL(em_dev_register_perf_domain);



/**

 * em_dev_register_pd_no_update() - Register a perf domain for a device

 * @dev : Device to register the PD for

 * @nr_states : Number of performance states in the new PD

 * @cb : Callback functions for populating the energy model

 * @cpus : CPUs to include in the new PD (mandatory if @dev is a CPU device)

 * @microwatts : Whether or not the power values in the EM will be in uW

 *

 * Like em_dev_register_perf_domain(), but does not trigger a CPU capacity

 * update after registering the PD, even if @dev is a CPU device.

 */

int em_dev_register_pd_no_update(struct device *dev, unsigned int nr_states,

				 const struct em_data_callback *cb,

				 const cpumask_t *cpus, bool microwatts)

{

	struct em_perf_table *em_table;

	unsigned long cap, prev_cap = 0;
@@ -636,12 +660,9 @@ int em_dev_register_perf_domain(struct device *dev, unsigned int nr_states, 
unlock:

	mutex_unlock(&em_pd_mutex);



	if (_is_cpu_device(dev))

		em_check_capacity_update();



	return ret;

}

EXPORT_SYMBOL_GPL(em_dev_register_perf_domain);

EXPORT_SYMBOL_GPL(em_dev_register_pd_no_update);



/**

 * em_dev_unregister_perf_domain() - Unregister Energy Model (EM) for a device

kernel/power/hibernate.c

+1 −0
Original line number Diff line number Diff line
@@ -449,6 +449,7 @@ int hibernation_snapshot(int platform_mode) 
	shrink_shmem_memory();



	console_suspend_all();

	pm_restrict_gfp_mask();



	error = dpm_suspend(PMSG_FREEZE);