Merge branch 'pm-cpufreq-ondemand' into pm-cpufreq (1133bfa6) · Commits · 戴 / test

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);

+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

+0 −5

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");
		@@ -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",

+0 −12

Original line number	Diff line number	Diff line
		@@ -1670,18 +1670,6 @@ fail:
		}
		EXPORT_SYMBOL_GPL(cpufreq_driver_target);

		int __cpufreq_driver_getavg(struct cpufreq_policy *policy, unsigned int cpu)
		{
		if (cpufreq_disabled())
		return 0;

		if (!cpufreq_driver->getavg)
		return 0;

		return cpufreq_driver->getavg(policy, cpu);
		}
		EXPORT_SYMBOL_GPL(__cpufreq_driver_getavg);

		/*
		* when "event" is CPUFREQ_GOV_LIMITS
		*/

+1 −9

Original line number	Diff line number	Diff line
		@@ -53,7 +53,7 @@ void dbs_check_cpu(struct dbs_data *dbs_data, int cpu)

		policy = cdbs->cur_policy;

		/* Get Absolute Load (in terms of freq for ondemand gov) */
		/* Get Absolute Load */
		for_each_cpu(j, policy->cpus) {
		struct cpu_dbs_common_info *j_cdbs;
		u64 cur_wall_time, cur_idle_time;
		@@ -104,14 +104,6 @@ void dbs_check_cpu(struct dbs_data *dbs_data, int cpu)

		load = 100 * (wall_time - idle_time) / wall_time;

		if (dbs_data->cdata->governor == GOV_ONDEMAND) {
		int freq_avg = __cpufreq_driver_getavg(policy, j);
		if (freq_avg <= 0)
		freq_avg = policy->cur;

		load *= freq_avg;
		}

		if (load > max_load)
		max_load = load;
		}