Commit bde7f150 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 3a97a299 d121758d

drivers/cpufreq/sparc-us2e-cpufreq.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/cpufreq/sparc-us3-cpufreq.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

kernel/power/hibernate.c

+1 −0
Original line number Diff line number Diff line
@@ -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) {

kernel/power/qos.c

+7 −2
Original line number Diff line number Diff line
@@ -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),