Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge back earlier 'pm-cpufreq' material

parents d4e4ab86 3de9bdeb

Documentation/cpu-freq/cpu-drivers.txt

+0 −2
Original line number Diff line number Diff line
@@ -50,8 +50,6 @@ What shall this struct cpufreq_driver contain? 


cpufreq_driver.name -		The name of this driver.



cpufreq_driver.owner -		THIS_MODULE;



cpufreq_driver.init -		A pointer to the per-CPU initialization 

				function.

arch/x86/include/asm/processor.h

+0 −29
Original line number Diff line number Diff line
@@ -942,35 +942,6 @@ extern int set_tsc_mode(unsigned int val); 


extern u16 amd_get_nb_id(int cpu);



struct aperfmperf {

	u64 aperf, mperf;

};



static inline void get_aperfmperf(struct aperfmperf *am)

{

	WARN_ON_ONCE(!boot_cpu_has(X86_FEATURE_APERFMPERF));



	rdmsrl(MSR_IA32_APERF, am->aperf);

	rdmsrl(MSR_IA32_MPERF, am->mperf);

}



#define APERFMPERF_SHIFT 10



static inline

unsigned long calc_aperfmperf_ratio(struct aperfmperf *old,

				    struct aperfmperf *new)

{

	u64 aperf = new->aperf - old->aperf;

	u64 mperf = new->mperf - old->mperf;

	unsigned long ratio = aperf;



	mperf >>= APERFMPERF_SHIFT;

	if (mperf)

		ratio = div64_u64(aperf, mperf);



	return ratio;

}



extern unsigned long arch_align_stack(unsigned long sp);

extern void free_init_pages(char *what, unsigned long begin, unsigned long end);

drivers/cpufreq/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ obj-$(CONFIG_GENERIC_CPUFREQ_CPU0) += cpufreq-cpu0.o 
# powernow-k8 can load then. ACPI is preferred to all other hardware-specific drivers.

# speedstep-* is preferred over p4-clockmod.



obj-$(CONFIG_X86_ACPI_CPUFREQ)		+= acpi-cpufreq.o mperf.o

obj-$(CONFIG_X86_ACPI_CPUFREQ)		+= acpi-cpufreq.o

obj-$(CONFIG_X86_POWERNOW_K8)		+= powernow-k8.o

obj-$(CONFIG_X86_PCC_CPUFREQ)		+= pcc-cpufreq.o

obj-$(CONFIG_X86_POWERNOW_K6)		+= powernow-k6.o

drivers/cpufreq/acpi-cpufreq.c

+2 −8
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ 
#include <asm/msr.h>

#include <asm/processor.h>

#include <asm/cpufeature.h>

#include "mperf.h"



MODULE_AUTHOR("Paul Diefenbaugh, Dominik Brodowski");

MODULE_DESCRIPTION("ACPI Processor P-States Driver");
@@ -710,7 +709,7 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy) 
		return blacklisted;

#endif



	data = kzalloc(sizeof(struct acpi_cpufreq_data), GFP_KERNEL);

	data = kzalloc(sizeof(*data), GFP_KERNEL);

	if (!data)

		return -ENOMEM;
@@ -800,7 +799,7 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy) 
		goto err_unreg;

	}



	data->freq_table = kmalloc(sizeof(struct cpufreq_frequency_table) *

	data->freq_table = kmalloc(sizeof(*data->freq_table) *

		    (perf->state_count+1), GFP_KERNEL);

	if (!data->freq_table) {

		result = -ENOMEM;
@@ -861,10 +860,6 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy) 
	/* notify BIOS that we exist */

	acpi_processor_notify_smm(THIS_MODULE);



	/* Check for APERF/MPERF support in hardware */

	if (boot_cpu_has(X86_FEATURE_APERFMPERF))

		acpi_cpufreq_driver.getavg = cpufreq_get_measured_perf;



	pr_debug("CPU%u - ACPI performance management activated.\n", cpu);

	for (i = 0; i < perf->state_count; i++)

		pr_debug("     %cP%d: %d MHz, %d mW, %d uS\n",
@@ -941,7 +936,6 @@ static struct cpufreq_driver acpi_cpufreq_driver = { 
	.exit		= acpi_cpufreq_cpu_exit,

	.resume		= acpi_cpufreq_resume,

	.name		= "acpi-cpufreq",

	.owner		= THIS_MODULE,

	.attr		= acpi_cpufreq_attr,

};

drivers/cpufreq/at32ap-cpufreq.c

+0 −1
Original line number Diff line number Diff line
@@ -108,7 +108,6 @@ static int __init at32_cpufreq_driver_init(struct cpufreq_policy *policy) 


static struct cpufreq_driver at32_driver = {

	.name		= "at32ap",

	.owner		= THIS_MODULE,

	.init		= at32_cpufreq_driver_init,

	.verify		= at32_verify_speed,

	.target		= at32_set_target,