Power management fixes for 6.5-rc2
- Unbreak the /sys/power/resume interface after recent changes (Azat Khuzhin). - Allow PM_QOS_DEFAULT_VALUE to be used with frequency QoS (Chungkai Yang). - Remove __init from cpufreq callbacks in the sparc driver, because they may be called after initialization too (Viresh Kumar). -----BEGIN PGP SIGNATURE----- iQJGBAABCAAwFiEE4fcc61cGeeHD/fCwgsRv/nhiVHEFAmSxhIcSHHJqd0Byand5 c29ja2kubmV0AAoJEILEb/54YlRxfdQP/1+MxGLh2XVVKvB9QTI0/ofYPxPfoTuf 5Sf2lOa7rNeauc2xnQFM6EMOeme4ckTUbrO7AkZVACYVqbKJ92IUBJfo3R2Ar+1Z 9TogwG+YOX3OjR8QtiGHLwA5fvOgbt89JaDn2ZCWcS+gHARZ3VMgdbDt+C3MUldV UVr/5kAkWefv39PIYHCwAJU7Xhn97B5nW58KgpkHuxOcHDKe0VfdxLcKBsyoc6QE IGMVV2WtnoyEdM1aNfZ37+3NksiIdZMA6OvM5C/7HOs6IqJaFxVUxm4333sM5AW9 y5LPYSBbedVxICdLkUUq8W5MDRNCTPXgC3gexEu0XtWdAV9AG+9aNeZytT7KGrLO xe4vbl6s1LnxC6YBw2bB+U/DbLtxQrAP1nYZj6yxhbHVsnTTZg7Qvevz7nAdPlOL 3FsutIT+9OQprWXxYBRv3AumF+hpG1bm8Zutyaqb2vwRwMbbXWTpzRry4ydp6bTj VB2YWeQOxCKl+dC5jXM1wfPjbsqWQvvGZVh1VIzlcZgzqALWf+F5fTMUKuY963kd V6fR1YmKg+Xxb+BU9mEjaUMfH5Yr8Mv9Gpf7D87MTsNTluFjAmRWk5a0ahVAXcwe n1jFxBNUsuJuvz2KwWrVZExT2xqJ8kVfnOxNcevtaXK+uk8+jE94lwjJn0P9v8w8 e+0QABkgUYY2 =b/om -----END PGP SIGNATURE----- Merge tag 'pm-6.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm Pull power management fixes from Rafael Wysocki: "These fix hibernation (after recent changes), frequency QoS and the sparc cpufreq driver. Specifics: - Unbreak the /sys/power/resume interface after recent changes (Azat Khuzhin). - Allow PM_QOS_DEFAULT_VALUE to be used with frequency QoS (Chungkai Yang). - Remove __init from cpufreq callbacks in the sparc driver, because they may be called after initialization too (Viresh Kumar)" * tag 'pm-6.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: cpufreq: sparc: Don't mark cpufreq callbacks with __init PM: QoS: Restore support for default value on frequency QoS PM: hibernate: Fix writing maj:min to /sys/power/resume
This commit is contained in:
Коммит
bde7f15027
|
@ -269,7 +269,7 @@ static int us2e_freq_target(struct cpufreq_policy *policy, unsigned int index)
|
|||
return smp_call_function_single(cpu, __us2e_freq_target, &index, 1);
|
||||
}
|
||||
|
||||
static int __init us2e_freq_cpu_init(struct cpufreq_policy *policy)
|
||||
static int us2e_freq_cpu_init(struct cpufreq_policy *policy)
|
||||
{
|
||||
unsigned int cpu = policy->cpu;
|
||||
unsigned long clock_tick = sparc64_get_clock_tick(cpu) / 1000;
|
||||
|
|
|
@ -117,7 +117,7 @@ static int us3_freq_target(struct cpufreq_policy *policy, unsigned int index)
|
|||
return smp_call_function_single(cpu, update_safari_cfg, &new_bits, 1);
|
||||
}
|
||||
|
||||
static int __init us3_freq_cpu_init(struct cpufreq_policy *policy)
|
||||
static int us3_freq_cpu_init(struct cpufreq_policy *policy)
|
||||
{
|
||||
unsigned int cpu = policy->cpu;
|
||||
unsigned long clock_tick = sparc64_get_clock_tick(cpu) / 1000;
|
||||
|
|
|
@ -1179,6 +1179,7 @@ static ssize_t resume_store(struct kobject *kobj, struct kobj_attribute *attr,
|
|||
unsigned maj, min, offset;
|
||||
char *p, dummy;
|
||||
|
||||
error = 0;
|
||||
if (sscanf(name, "%u:%u%c", &maj, &min, &dummy) == 2 ||
|
||||
sscanf(name, "%u:%u:%u:%c", &maj, &min, &offset,
|
||||
&dummy) == 3) {
|
||||
|
|
|
@ -426,6 +426,11 @@ late_initcall(cpu_latency_qos_init);
|
|||
|
||||
/* Definitions related to the frequency QoS below. */
|
||||
|
||||
static inline bool freq_qos_value_invalid(s32 value)
|
||||
{
|
||||
return value < 0 && value != PM_QOS_DEFAULT_VALUE;
|
||||
}
|
||||
|
||||
/**
|
||||
* freq_constraints_init - Initialize frequency QoS constraints.
|
||||
* @qos: Frequency QoS constraints to initialize.
|
||||
|
@ -531,7 +536,7 @@ int freq_qos_add_request(struct freq_constraints *qos,
|
|||
{
|
||||
int ret;
|
||||
|
||||
if (IS_ERR_OR_NULL(qos) || !req || value < 0)
|
||||
if (IS_ERR_OR_NULL(qos) || !req || freq_qos_value_invalid(value))
|
||||
return -EINVAL;
|
||||
|
||||
if (WARN(freq_qos_request_active(req),
|
||||
|
@ -563,7 +568,7 @@ EXPORT_SYMBOL_GPL(freq_qos_add_request);
|
|||
*/
|
||||
int freq_qos_update_request(struct freq_qos_request *req, s32 new_value)
|
||||
{
|
||||
if (!req || new_value < 0)
|
||||
if (!req || freq_qos_value_invalid(new_value))
|
||||
return -EINVAL;
|
||||
|
||||
if (WARN(!freq_qos_request_active(req),
|
||||
|
|
Загрузка…
Ссылка в новой задаче