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

Commit 7a8c6ad9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq 

* git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
  [CPUFREQ] Add missing printk levels to e_powersaver
  [CPUFREQ] Fix sparse warning in powernow-k8
  [CPUFREQ] Support Model D parts and newer in e_powersaver
  [CPUFREQ] Powernow-k8: Update to support the latest Turion processors
  [CPUFREQ] fix configuration help message
  [CPUFREQ] powernow-k8 print pstate instead of fid/did for family 10h
  [CPUFREQ] Eliminate cpufreq_userspace scaling_setspeed deadlock
  [CPUFREQ] gx-suspmod.c: use boot_cpu_data instead of current_cpu_data
  [CPUFREQ] fix incorrect comment on show_available_freqs() in freq_table.c
  [CPUFREQ] drivers/cpufreq: Add missing "space"
  [CPUFREQ] arch/x86: Add missing "space"
  [CPUFREQ] Remove pointless Kconfig dependancy
parents 37969581 e19717fe

arch/x86/kernel/cpu/cpufreq/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ config X86_ACPI_CPUFREQ 
config ELAN_CPUFREQ

	tristate "AMD Elan SC400 and SC410"

	select CPU_FREQ_TABLE

	depends on X86_32 && X86_ELAN

	depends on X86_ELAN

	---help---

	  This adds the CPUFreq driver for AMD Elan SC400 and SC410

	  processors.
@@ -45,7 +45,7 @@ config ELAN_CPUFREQ 
config SC520_CPUFREQ

	tristate "AMD Elan SC520"

	select CPU_FREQ_TABLE

	depends on X86_32 && X86_ELAN

	depends on X86_ELAN

	---help---

	  This adds the CPUFreq driver for AMD Elan SC520 processor.

arch/x86/kernel/cpu/cpufreq/e_powersaver.c

+44 −17
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#define EPS_BRAND_C7	1

#define EPS_BRAND_EDEN	2

#define EPS_BRAND_C3	3

#define EPS_BRAND_C7D	4



struct eps_cpu_data {

	u32 fsb;
@@ -54,6 +55,7 @@ static int eps_set_state(struct eps_cpu_data *centaur, 
{

	struct cpufreq_freqs freqs;

	u32 lo, hi;

	u8 current_multiplier, current_voltage;

	int err = 0;

	int i;
@@ -93,6 +95,15 @@ static int eps_set_state(struct eps_cpu_data *centaur, 
	rdmsr(MSR_IA32_PERF_STATUS, lo, hi);

	freqs.new = centaur->fsb * ((lo >> 8) & 0xff);



	/* Print voltage and multiplier */

	rdmsr(MSR_IA32_PERF_STATUS, lo, hi);

	current_voltage = lo & 0xff;

	printk(KERN_INFO "eps: Current voltage = %dmV\n",

		current_voltage * 16 + 700);

	current_multiplier = (lo >> 8) & 0xff;

	printk(KERN_INFO "eps: Current multiplier = %d\n",

		current_multiplier);



	cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);

	return err;

}
@@ -141,9 +152,10 @@ static int eps_cpu_init(struct cpufreq_policy *policy) 
	u8 current_multiplier, current_voltage;

	u8 max_multiplier, max_voltage;

	u8 min_multiplier, min_voltage;

	u8 brand;

	u8 brand = 0;

	u32 fsb;

	struct eps_cpu_data *centaur;

	struct cpuinfo_x86 *c = &cpu_data(0);

	struct cpufreq_frequency_table *f_table;

	int k, step, voltage;

	int ret;
@@ -153,21 +165,36 @@ static int eps_cpu_init(struct cpufreq_policy *policy) 
		return -ENODEV;



	/* Check brand */

	printk("eps: Detected VIA ");

	printk(KERN_INFO "eps: Detected VIA ");



	switch (c->x86_model) {

	case 10:

		rdmsr(0x1153, lo, hi);

		brand = (((lo >> 2) ^ lo) >> 18) & 3;

		printk(KERN_CONT "Model A ");

		break;

	case 13:

		rdmsr(0x1154, lo, hi);

		brand = (((lo >> 4) ^ (lo >> 2))) & 0x000000ff;

		printk(KERN_CONT "Model D ");

		break;

	}



	switch(brand) {

	case EPS_BRAND_C7M:

		printk("C7-M\n");

		printk(KERN_CONT "C7-M\n");

		break;

	case EPS_BRAND_C7:

		printk("C7\n");

		printk(KERN_CONT "C7\n");

		break;

	case EPS_BRAND_EDEN:

		printk("Eden\n");

		printk(KERN_CONT "Eden\n");

		break;

	case EPS_BRAND_C7D:

		printk(KERN_CONT "C7-D\n");

		break;

	case EPS_BRAND_C3:

		printk("C3\n");

		printk(KERN_CONT "C3\n");

		return -ENODEV;

		break;

	}
@@ -179,7 +206,7 @@ static int eps_cpu_init(struct cpufreq_policy *policy) 
		/* Can be locked at 0 */

		rdmsrl(MSR_IA32_MISC_ENABLE, val);

		if (!(val & 1 << 16)) {

			printk("eps: Can't enable Enhanced PowerSaver\n");

			printk(KERN_INFO "eps: Can't enable Enhanced PowerSaver\n");

			return -ENODEV;

		}

	}
@@ -187,19 +214,19 @@ static int eps_cpu_init(struct cpufreq_policy *policy) 
	/* Print voltage and multiplier */

	rdmsr(MSR_IA32_PERF_STATUS, lo, hi);

	current_voltage = lo & 0xff;

	printk("eps: Current voltage = %dmV\n", current_voltage * 16 + 700);

	printk(KERN_INFO "eps: Current voltage = %dmV\n", current_voltage * 16 + 700);

	current_multiplier = (lo >> 8) & 0xff;

	printk("eps: Current multiplier = %d\n", current_multiplier);

	printk(KERN_INFO "eps: Current multiplier = %d\n", current_multiplier);



	/* Print limits */

	max_voltage = hi & 0xff;

	printk("eps: Highest voltage = %dmV\n", max_voltage * 16 + 700);

	printk(KERN_INFO "eps: Highest voltage = %dmV\n", max_voltage * 16 + 700);

	max_multiplier = (hi >> 8) & 0xff;

	printk("eps: Highest multiplier = %d\n", max_multiplier);

	printk(KERN_INFO "eps: Highest multiplier = %d\n", max_multiplier);

	min_voltage = (hi >> 16) & 0xff;

	printk("eps: Lowest voltage = %dmV\n", min_voltage * 16 + 700);

	printk(KERN_INFO "eps: Lowest voltage = %dmV\n", min_voltage * 16 + 700);

	min_multiplier = (hi >> 24) & 0xff;

	printk("eps: Lowest multiplier = %d\n", min_multiplier);

	printk(KERN_INFO "eps: Lowest multiplier = %d\n", min_multiplier);



	/* Sanity checks */

	if (current_multiplier == 0 || max_multiplier == 0
@@ -208,7 +235,7 @@ static int eps_cpu_init(struct cpufreq_policy *policy) 
	if (current_multiplier > max_multiplier

	    || max_multiplier <= min_multiplier)

		return -EINVAL;

	if (current_voltage > 0x1c || max_voltage > 0x1c)

	if (current_voltage > 0x1f || max_voltage > 0x1f)

		return -EINVAL;

	if (max_voltage < min_voltage)

		return -EINVAL;
@@ -310,7 +337,7 @@ static int __init eps_init(void) 
	/* This driver will work only on Centaur C7 processors with

	 * Enhanced SpeedStep/PowerSaver registers */

	if (c->x86_vendor != X86_VENDOR_CENTAUR

	    || c->x86 != 6 || c->x86_model != 10)

	    || c->x86 != 6 || c->x86_model < 10)

		return -ENODEV;

	if (!cpu_has(c, X86_FEATURE_EST))

		return -ENODEV;

arch/x86/kernel/cpu/cpufreq/gx-suspmod.c

+2 −2
Original line number Diff line number Diff line
@@ -181,8 +181,8 @@ static __init struct pci_dev *gx_detect_chipset(void) 
	struct pci_dev *gx_pci = NULL;



	/* check if CPU is a MediaGX or a Geode. */

	if ((current_cpu_data.x86_vendor != X86_VENDOR_NSC) &&

	    (current_cpu_data.x86_vendor != X86_VENDOR_CYRIX)) {

	if ((boot_cpu_data.x86_vendor != X86_VENDOR_NSC) &&

	    (boot_cpu_data.x86_vendor != X86_VENDOR_CYRIX)) {

		dprintk("error: no MediaGX/Geode processor found!\n");

		return NULL;

	}

arch/x86/kernel/cpu/cpufreq/powernow-k8.c

+5 −4
Original line number Diff line number Diff line
@@ -578,10 +578,9 @@ static void print_basics(struct powernow_k8_data *data) 
	for (j = 0; j < data->numps; j++) {

		if (data->powernow_table[j].frequency != CPUFREQ_ENTRY_INVALID) {

			if (cpu_family == CPU_HW_PSTATE) {

				printk(KERN_INFO PFX "   %d : fid 0x%x did 0x%x (%d MHz)\n",

				printk(KERN_INFO PFX "   %d : pstate %d (%d MHz)\n",

					j,

					(data->powernow_table[j].index & 0xff00) >> 8,

					(data->powernow_table[j].index & 0xff0000) >> 16,

					data->powernow_table[j].index,

					data->powernow_table[j].frequency/1000);

			} else {

				printk(KERN_INFO PFX "   %d : fid 0x%x (%d MHz), vid 0x%x\n",
@@ -1235,8 +1234,10 @@ static unsigned int powernowk8_get (unsigned int cpu) 
	struct powernow_k8_data *data;

	cpumask_t oldmask = current->cpus_allowed;

	unsigned int khz = 0;

	unsigned int first;



	data = per_cpu(powernow_data, first_cpu(per_cpu(cpu_core_map, cpu)));

	first = first_cpu(per_cpu(cpu_core_map, cpu));

	data = per_cpu(powernow_data, first);



	if (!data)

		return -EINVAL;

arch/x86/kernel/cpu/cpufreq/powernow-k8.h

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ struct powernow_k8_data { 
#define CPUID_XFAM			0x0ff00000	/* extended family */

#define CPUID_XFAM_K8			0

#define CPUID_XMOD			0x000f0000	/* extended model */

#define CPUID_XMOD_REV_MASK		0x00080000

#define CPUID_XMOD_REV_MASK		0x000c0000

#define CPUID_XFAM_10H			0x00100000	/* family 0x10 */

#define CPUID_USE_XFAM_XMOD		0x00000f00

#define CPUID_GET_MAX_CAPABILITIES	0x80000000