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

Merge back earlier cpufreq material for 5.20.

parents 5a5adb15 a2f6a7ac

drivers/cpufreq/acpi-cpufreq.c

+4 −0
Original line number Diff line number Diff line
@@ -78,6 +78,8 @@ static bool boost_state(unsigned int cpu) 


	switch (boot_cpu_data.x86_vendor) {

	case X86_VENDOR_INTEL:

	case X86_VENDOR_CENTAUR:

	case X86_VENDOR_ZHAOXIN:

		rdmsr_on_cpu(cpu, MSR_IA32_MISC_ENABLE, &lo, &hi);

		msr = lo | ((u64)hi << 32);

		return !(msr & MSR_IA32_MISC_ENABLE_TURBO_DISABLE);
@@ -97,6 +99,8 @@ static int boost_set_msr(bool enable) 


	switch (boot_cpu_data.x86_vendor) {

	case X86_VENDOR_INTEL:

	case X86_VENDOR_CENTAUR:

	case X86_VENDOR_ZHAOXIN:

		msr_addr = MSR_IA32_MISC_ENABLE;

		msr_mask = MSR_IA32_MISC_ENABLE_TURBO_DISABLE;

		break;

drivers/cpufreq/cpufreq.c

+17 −20
Original line number Diff line number Diff line
@@ -843,12 +843,14 @@ ssize_t cpufreq_show_cpus(const struct cpumask *mask, char *buf) 
	unsigned int cpu;



	for_each_cpu(cpu, mask) {

		if (i)

			i += scnprintf(&buf[i], (PAGE_SIZE - i - 2), " ");

		i += scnprintf(&buf[i], (PAGE_SIZE - i - 2), "%u ", cpu);

		if (i >= (PAGE_SIZE - 5))

			break;

	}



	/* Remove the extra space at the end */

	i--;



	i += sprintf(&buf[i], "\n");

	return i;

}
@@ -971,21 +973,10 @@ static ssize_t store(struct kobject *kobj, struct attribute *attr, 
	if (!fattr->store)

		return -EIO;



	/*

	 * cpus_read_trylock() is used here to work around a circular lock

	 * dependency problem with respect to the cpufreq_register_driver().

	 */

	if (!cpus_read_trylock())

		return -EBUSY;



	if (cpu_online(policy->cpu)) {

	down_write(&policy->rwsem);

	if (likely(!policy_is_inactive(policy)))

		ret = fattr->store(policy, buf, count);

	up_write(&policy->rwsem);

	}



	cpus_read_unlock();



	return ret;

}
@@ -1282,6 +1273,13 @@ static void cpufreq_policy_free(struct cpufreq_policy *policy) 
	unsigned long flags;

	int cpu;



	/*

	 * The callers must ensure the policy is inactive by now, to avoid any

	 * races with show()/store() callbacks.

	 */

	if (unlikely(!policy_is_inactive(policy)))

		pr_warn("%s: Freeing active policy\n", __func__);



	/* Remove policy from list */

	write_lock_irqsave(&cpufreq_driver_lock, flags);

	list_del(&policy->policy_list);
@@ -1536,8 +1534,6 @@ static int cpufreq_online(unsigned int cpu) 
	for_each_cpu(j, policy->real_cpus)

		remove_cpu_dev_symlink(policy, j, get_cpu_device(j));



	cpumask_clear(policy->cpus);



out_offline_policy:

	if (cpufreq_driver->offline)

		cpufreq_driver->offline(policy);
@@ -1547,6 +1543,7 @@ static int cpufreq_online(unsigned int cpu) 
		cpufreq_driver->exit(policy);



out_free_policy:

	cpumask_clear(policy->cpus);

	up_write(&policy->rwsem);



	cpufreq_policy_free(policy);