mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-07-16 14:30:06 -04:00
Merge tag 'pm-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management updates from Rafael Wysocki:
"These are dominated by cpufreq updates which in turn are dominated by
updates related to boost support in the core and drivers and
amd-pstate driver optimizations.
Apart from the above, there are some cpuidle updates including a
rework of the most recent idle intervals handling in the venerable
menu governor that leads to significant improvements in some
performance benchmarks, as the governor is now more likely to predict
a shorter idle duration in some cases, and there are updates of the
core device power management code, mostly related to system suspend
and resume, that should help to avoid potential issues arising when
the drivers of devices depending on one another want to use different
optimizations.
There is also a usual collection of assorted fixes and cleanups,
including removal of some unused code.
Specifics:
- Manage sysfs attributes and boost frequencies efficiently from
cpufreq core to reduce boilerplate code in drivers (Viresh Kumar)
- Minor cleanups to cpufreq drivers (Aaron Kling, Benjamin Schneider,
Dhananjay Ugwekar, Imran Shaik, zuoqian)
- Migrate some cpufreq drivers to using for_each_present_cpu() (Jacky
Bai)
- cpufreq-qcom-hw DT binding fixes (Krzysztof Kozlowski)
- Use str_enable_disable() helper in cpufreq_online() (Lifeng Zheng)
- Optimize the amd-pstate driver to avoid cases where call paths end
up calling the same writes multiple times and needlessly caching
variables through code reorganization, locking overhaul and tracing
adjustments (Mario Limonciello, Dhananjay Ugwekar)
- Make it possible to avoid enabling capacity-aware scheduling (CAS)
in the intel_pstate driver and relocate a check for out-of-band
(OOB) platform handling in it to make it detect OOB before checking
HWP availability (Rafael Wysocki)
- Fix dbs_update() to avoid inadvertent conversions of negative
integer values to unsigned int which causes CPU frequency selection
to be inaccurate in some cases when the "conservative" cpufreq
governor is in use (Jie Zhan)
- Update the handling of the most recent idle intervals in the menu
cpuidle governor to prevent useful information from being discarded
by it in some cases and improve the prediction accuracy (Rafael
Wysocki)
- Make it possible to tell the intel_idle driver to ignore its
built-in table of idle states for the given processor, clean up the
handling of auto-demotion disabling on Baytrail and Cherrytrail
chips in it, and update its MAINTAINERS entry (David Arcari, Artem
Bityutskiy, Rafael Wysocki)
- Make some cpuidle drivers use for_each_present_cpu() instead of
for_each_possible_cpu() during initialization to avoid issues
occurring when nosmp or maxcpus=0 are used (Jacky Bai)
- Clean up the Energy Model handling code somewhat (Rafael Wysocki)
- Use kfree_rcu() to simplify the handling of runtime Energy Model
updates (Li RongQing)
- Add an entry for the Energy Model framework to MAINTAINERS as
properly maintained (Lukasz Luba)
- Address RCU-related sparse warnings in the Energy Model code
(Rafael Wysocki)
- Remove ENERGY_MODEL dependency on SMP and allow it to be selected
when DEVFREQ is set without CPUFREQ so it can be used on a wider
range of systems (Jeson Gao)
- Unify error handling during runtime suspend and runtime resume in
the core to help drivers to implement more consistent runtime PM
error handling (Rafael Wysocki)
- Drop a redundant check from pm_runtime_force_resume() and rearrange
documentation related to __pm_runtime_disable() (Rafael Wysocki)
- Rework the handling of the "smart suspend" driver flag in the PM
core to avoid issues hat may occur when drivers using it depend on
some other drivers and clean up the related PM core code (Rafael
Wysocki, Colin Ian King)
- Fix the handling of devices with the power.direct_complete flag set
if device_suspend() returns an error for at least one device to
avoid situations in which some of them may not be resumed (Rafael
Wysocki)
- Use mutex_trylock() in hibernate_compressor_param_set() to avoid a
possible deadlock that may occur if the "compressor" hibernation
module parameter is accessed during the registration of a new
ieee80211 device (Lizhi Xu)
- Suppress sleeping parent warning in device_pm_add() in the case
when new children are added under a device with the
power.direct_complete set after it has been processed by
device_resume() (Xu Yang)
- Remove needless return in three void functions related to system
wakeup (Zijun Hu)
- Replace deprecated kmap_atomic() with kmap_local_page() in the
hibernation core code (David Reaver)
- Remove unused helper functions related to system sleep (David Alan
Gilbert)
- Clean up s2idle_enter() so it does not lock and unlock CPU offline
in vain and update comments in it (Ulf Hansson)
- Clean up broken white space in dpm_wait_for_children() (Geert
Uytterhoeven)
- Update the cpupower utility to fix lib version-ing in it and memory
leaks in error legs, remove hard-coded values, and implement CPU
physical core querying (Thomas Renninger, John B. Wyatt IV, Shuah
Khan, Yiwei Lin, Zhongqiu Han)"
* tag 'pm-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (139 commits)
PM: sleep: Fix bit masking operation
dt-bindings: cpufreq: cpufreq-qcom-hw: Narrow properties on SDX75, SA8775p and SM8650
dt-bindings: cpufreq: cpufreq-qcom-hw: Drop redundant minItems:1
dt-bindings: cpufreq: cpufreq-qcom-hw: Add missing constraint for interrupt-names
dt-bindings: cpufreq: cpufreq-qcom-hw: Add QCS8300 compatible
cpufreq: Init cpufreq only for present CPUs
PM: sleep: Fix handling devices with direct_complete set on errors
cpuidle: Init cpuidle only for present CPUs
PM: clk: Remove unused pm_clk_remove()
PM: sleep: core: Fix indentation in dpm_wait_for_children()
PM: s2idle: Extend comment in s2idle_enter()
PM: s2idle: Drop redundant locks when entering s2idle
PM: sleep: Remove unused pm_generic_ wrappers
cpufreq: tegra186: Share policy per cluster
cpupower: Make lib versioning scheme more obvious and fix version link
PM: EM: Rework the depends on for CONFIG_ENERGY_MODEL
PM: EM: Address RCU-related sparse warnings
cpupower: Implement CPU physical core querying
pm: cpupower: remove hard-coded topology depth values
pm: cpupower: Fix cmd_monitor() error legs to free cpu_topology
...
This commit is contained in:
Linus Torvalds
@@ -380,8 +380,7 @@ config CPU_PM
|
||||
|
||||
config ENERGY_MODEL
|
||||
bool "Energy Model for devices with DVFS (CPUs, GPUs, etc)"
|
||||
depends on SMP
|
||||
depends on CPU_FREQ
|
||||
depends on CPU_FREQ || PM_DEVFREQ
|
||||
help
|
||||
Several subsystems (thermal and/or the task scheduler for example)
|
||||
can leverage information about the energy consumed by devices to
|
||||
|
||||
@@ -161,22 +161,10 @@ static void em_debug_create_pd(struct device *dev) {}
|
||||
static void em_debug_remove_pd(struct device *dev) {}
|
||||
#endif
|
||||
|
||||
static void em_destroy_table_rcu(struct rcu_head *rp)
|
||||
{
|
||||
struct em_perf_table __rcu *table;
|
||||
|
||||
table = container_of(rp, struct em_perf_table, rcu);
|
||||
kfree(table);
|
||||
}
|
||||
|
||||
static void em_release_table_kref(struct kref *kref)
|
||||
{
|
||||
struct em_perf_table __rcu *table;
|
||||
|
||||
/* It was the last owner of this table so we can free */
|
||||
table = container_of(kref, struct em_perf_table, kref);
|
||||
|
||||
call_rcu(&table->rcu, em_destroy_table_rcu);
|
||||
kfree_rcu(container_of(kref, struct em_perf_table, kref), rcu);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -185,7 +173,7 @@ static void em_release_table_kref(struct kref *kref)
|
||||
*
|
||||
* No return values.
|
||||
*/
|
||||
void em_table_free(struct em_perf_table __rcu *table)
|
||||
void em_table_free(struct em_perf_table *table)
|
||||
{
|
||||
kref_put(&table->kref, em_release_table_kref);
|
||||
}
|
||||
@@ -198,9 +186,9 @@ void em_table_free(struct em_perf_table __rcu *table)
|
||||
* has a user.
|
||||
* Returns allocated table or NULL.
|
||||
*/
|
||||
struct em_perf_table __rcu *em_table_alloc(struct em_perf_domain *pd)
|
||||
struct em_perf_table *em_table_alloc(struct em_perf_domain *pd)
|
||||
{
|
||||
struct em_perf_table __rcu *table;
|
||||
struct em_perf_table *table;
|
||||
int table_size;
|
||||
|
||||
table_size = sizeof(struct em_perf_state) * pd->nr_perf_states;
|
||||
@@ -239,7 +227,7 @@ static void em_init_performance(struct device *dev, struct em_perf_domain *pd,
|
||||
}
|
||||
|
||||
static int em_compute_costs(struct device *dev, struct em_perf_state *table,
|
||||
struct em_data_callback *cb, int nr_states,
|
||||
const struct em_data_callback *cb, int nr_states,
|
||||
unsigned long flags)
|
||||
{
|
||||
unsigned long prev_cost = ULONG_MAX;
|
||||
@@ -308,9 +296,9 @@ int em_dev_compute_costs(struct device *dev, struct em_perf_state *table,
|
||||
* Return 0 on success or an error code on failure.
|
||||
*/
|
||||
int em_dev_update_perf_domain(struct device *dev,
|
||||
struct em_perf_table __rcu *new_table)
|
||||
struct em_perf_table *new_table)
|
||||
{
|
||||
struct em_perf_table __rcu *old_table;
|
||||
struct em_perf_table *old_table;
|
||||
struct em_perf_domain *pd;
|
||||
|
||||
if (!dev)
|
||||
@@ -327,7 +315,8 @@ int em_dev_update_perf_domain(struct device *dev,
|
||||
|
||||
kref_get(&new_table->kref);
|
||||
|
||||
old_table = pd->em_table;
|
||||
old_table = rcu_dereference_protected(pd->em_table,
|
||||
lockdep_is_held(&em_pd_mutex));
|
||||
rcu_assign_pointer(pd->em_table, new_table);
|
||||
|
||||
em_cpufreq_update_efficiencies(dev, new_table->state);
|
||||
@@ -341,7 +330,7 @@ EXPORT_SYMBOL_GPL(em_dev_update_perf_domain);
|
||||
|
||||
static int em_create_perf_table(struct device *dev, struct em_perf_domain *pd,
|
||||
struct em_perf_state *table,
|
||||
struct em_data_callback *cb,
|
||||
const struct em_data_callback *cb,
|
||||
unsigned long flags)
|
||||
{
|
||||
unsigned long power, freq, prev_freq = 0;
|
||||
@@ -396,10 +385,11 @@ static int em_create_perf_table(struct device *dev, struct em_perf_domain *pd,
|
||||
}
|
||||
|
||||
static int em_create_pd(struct device *dev, int nr_states,
|
||||
struct em_data_callback *cb, cpumask_t *cpus,
|
||||
const struct em_data_callback *cb,
|
||||
const cpumask_t *cpus,
|
||||
unsigned long flags)
|
||||
{
|
||||
struct em_perf_table __rcu *em_table;
|
||||
struct em_perf_table *em_table;
|
||||
struct em_perf_domain *pd;
|
||||
struct device *cpu_dev;
|
||||
int cpu, ret, num_cpus;
|
||||
@@ -556,9 +546,10 @@ EXPORT_SYMBOL_GPL(em_cpu_get);
|
||||
* Return 0 on success
|
||||
*/
|
||||
int em_dev_register_perf_domain(struct device *dev, unsigned int nr_states,
|
||||
struct em_data_callback *cb, cpumask_t *cpus,
|
||||
bool microwatts)
|
||||
const struct em_data_callback *cb,
|
||||
const cpumask_t *cpus, bool microwatts)
|
||||
{
|
||||
struct em_perf_table *em_table;
|
||||
unsigned long cap, prev_cap = 0;
|
||||
unsigned long flags = 0;
|
||||
int cpu, ret;
|
||||
@@ -631,7 +622,9 @@ int em_dev_register_perf_domain(struct device *dev, unsigned int nr_states,
|
||||
dev->em_pd->min_perf_state = 0;
|
||||
dev->em_pd->max_perf_state = nr_states - 1;
|
||||
|
||||
em_cpufreq_update_efficiencies(dev, dev->em_pd->em_table->state);
|
||||
em_table = rcu_dereference_protected(dev->em_pd->em_table,
|
||||
lockdep_is_held(&em_pd_mutex));
|
||||
em_cpufreq_update_efficiencies(dev, em_table->state);
|
||||
|
||||
em_debug_create_pd(dev);
|
||||
dev_info(dev, "EM: created perf domain\n");
|
||||
@@ -668,7 +661,8 @@ void em_dev_unregister_perf_domain(struct device *dev)
|
||||
mutex_lock(&em_pd_mutex);
|
||||
em_debug_remove_pd(dev);
|
||||
|
||||
em_table_free(dev->em_pd->em_table);
|
||||
em_table_free(rcu_dereference_protected(dev->em_pd->em_table,
|
||||
lockdep_is_held(&em_pd_mutex)));
|
||||
|
||||
kfree(dev->em_pd);
|
||||
dev->em_pd = NULL;
|
||||
@@ -676,9 +670,9 @@ void em_dev_unregister_perf_domain(struct device *dev)
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(em_dev_unregister_perf_domain);
|
||||
|
||||
static struct em_perf_table __rcu *em_table_dup(struct em_perf_domain *pd)
|
||||
static struct em_perf_table *em_table_dup(struct em_perf_domain *pd)
|
||||
{
|
||||
struct em_perf_table __rcu *em_table;
|
||||
struct em_perf_table *em_table;
|
||||
struct em_perf_state *ps, *new_ps;
|
||||
int ps_size;
|
||||
|
||||
@@ -700,7 +694,7 @@ static struct em_perf_table __rcu *em_table_dup(struct em_perf_domain *pd)
|
||||
}
|
||||
|
||||
static int em_recalc_and_update(struct device *dev, struct em_perf_domain *pd,
|
||||
struct em_perf_table __rcu *em_table)
|
||||
struct em_perf_table *em_table)
|
||||
{
|
||||
int ret;
|
||||
|
||||
@@ -728,10 +722,9 @@ static int em_recalc_and_update(struct device *dev, struct em_perf_domain *pd,
|
||||
* are correctly calculated.
|
||||
*/
|
||||
static void em_adjust_new_capacity(struct device *dev,
|
||||
struct em_perf_domain *pd,
|
||||
u64 max_cap)
|
||||
struct em_perf_domain *pd)
|
||||
{
|
||||
struct em_perf_table __rcu *em_table;
|
||||
struct em_perf_table *em_table;
|
||||
|
||||
em_table = em_table_dup(pd);
|
||||
if (!em_table) {
|
||||
@@ -775,7 +768,8 @@ static void em_check_capacity_update(void)
|
||||
}
|
||||
cpufreq_cpu_put(policy);
|
||||
|
||||
pd = em_cpu_get(cpu);
|
||||
dev = get_cpu_device(cpu);
|
||||
pd = em_pd_get(dev);
|
||||
if (!pd || em_is_artificial(pd))
|
||||
continue;
|
||||
|
||||
@@ -799,8 +793,7 @@ static void em_check_capacity_update(void)
|
||||
pr_debug("updating cpu%d cpu_cap=%lu old capacity=%lu\n",
|
||||
cpu, cpu_capacity, em_max_perf);
|
||||
|
||||
dev = get_cpu_device(cpu);
|
||||
em_adjust_new_capacity(dev, pd, cpu_capacity);
|
||||
em_adjust_new_capacity(dev, pd);
|
||||
}
|
||||
|
||||
free_cpumask_var(cpu_done_mask);
|
||||
@@ -822,7 +815,7 @@ static void em_update_workfn(struct work_struct *work)
|
||||
*/
|
||||
int em_dev_update_chip_binning(struct device *dev)
|
||||
{
|
||||
struct em_perf_table __rcu *em_table;
|
||||
struct em_perf_table *em_table;
|
||||
struct em_perf_domain *pd;
|
||||
int i, ret;
|
||||
|
||||
|
||||
@@ -1446,10 +1446,10 @@ static const char * const comp_alg_enabled[] = {
|
||||
static int hibernate_compressor_param_set(const char *compressor,
|
||||
const struct kernel_param *kp)
|
||||
{
|
||||
unsigned int sleep_flags;
|
||||
int index, ret;
|
||||
|
||||
sleep_flags = lock_system_sleep();
|
||||
if (!mutex_trylock(&system_transition_mutex))
|
||||
return -EBUSY;
|
||||
|
||||
index = sysfs_match_string(comp_alg_enabled, compressor);
|
||||
if (index >= 0) {
|
||||
@@ -1461,7 +1461,7 @@ static int hibernate_compressor_param_set(const char *compressor,
|
||||
ret = index;
|
||||
}
|
||||
|
||||
unlock_system_sleep(sleep_flags);
|
||||
mutex_unlock(&system_transition_mutex);
|
||||
|
||||
if (ret)
|
||||
pr_debug("Cannot set specified compressor %s\n",
|
||||
|
||||
@@ -2270,9 +2270,9 @@ int snapshot_read_next(struct snapshot_handle *handle)
|
||||
*/
|
||||
void *kaddr;
|
||||
|
||||
kaddr = kmap_atomic(page);
|
||||
kaddr = kmap_local_page(page);
|
||||
copy_page(buffer, kaddr);
|
||||
kunmap_atomic(kaddr);
|
||||
kunmap_local(kaddr);
|
||||
handle->buffer = buffer;
|
||||
} else {
|
||||
handle->buffer = page_address(page);
|
||||
@@ -2561,9 +2561,9 @@ static void copy_last_highmem_page(void)
|
||||
if (last_highmem_page) {
|
||||
void *dst;
|
||||
|
||||
dst = kmap_atomic(last_highmem_page);
|
||||
dst = kmap_local_page(last_highmem_page);
|
||||
copy_page(dst, buffer);
|
||||
kunmap_atomic(dst);
|
||||
kunmap_local(dst);
|
||||
last_highmem_page = NULL;
|
||||
}
|
||||
}
|
||||
@@ -2881,13 +2881,13 @@ static inline void swap_two_pages_data(struct page *p1, struct page *p2,
|
||||
{
|
||||
void *kaddr1, *kaddr2;
|
||||
|
||||
kaddr1 = kmap_atomic(p1);
|
||||
kaddr2 = kmap_atomic(p2);
|
||||
kaddr1 = kmap_local_page(p1);
|
||||
kaddr2 = kmap_local_page(p2);
|
||||
copy_page(buf, kaddr1);
|
||||
copy_page(kaddr1, kaddr2);
|
||||
copy_page(kaddr2, buf);
|
||||
kunmap_atomic(kaddr2);
|
||||
kunmap_atomic(kaddr1);
|
||||
kunmap_local(kaddr2);
|
||||
kunmap_local(kaddr1);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -91,6 +91,16 @@ static void s2idle_enter(void)
|
||||
{
|
||||
trace_suspend_resume(TPS("machine_suspend"), PM_SUSPEND_TO_IDLE, true);
|
||||
|
||||
/*
|
||||
* The correctness of the code below depends on the number of online
|
||||
* CPUs being stable, but CPUs cannot be taken offline or put online
|
||||
* while it is running.
|
||||
*
|
||||
* The s2idle_lock must be acquired before the pending wakeup check to
|
||||
* prevent pm_system_wakeup() from running as a whole between that check
|
||||
* and the subsequent s2idle_state update in which case a wakeup event
|
||||
* would get lost.
|
||||
*/
|
||||
raw_spin_lock_irq(&s2idle_lock);
|
||||
if (pm_wakeup_pending())
|
||||
goto out;
|
||||
@@ -98,8 +108,6 @@ static void s2idle_enter(void)
|
||||
s2idle_state = S2IDLE_STATE_ENTER;
|
||||
raw_spin_unlock_irq(&s2idle_lock);
|
||||
|
||||
cpus_read_lock();
|
||||
|
||||
/* Push all the CPUs into the idle loop. */
|
||||
wake_up_all_idle_cpus();
|
||||
/* Make the current CPU wait so it can enter the idle loop too. */
|
||||
@@ -112,8 +120,6 @@ static void s2idle_enter(void)
|
||||
*/
|
||||
wake_up_all_idle_cpus();
|
||||
|
||||
cpus_read_unlock();
|
||||
|
||||
raw_spin_lock_irq(&s2idle_lock);
|
||||
|
||||
out:
|
||||
|
||||
Reference in New Issue
Block a user