Commit 0a032839 authored by Dave Jones's avatar Dave Jones Committed by Dave Jones

[CPUFREQ] Silence noisy debugging printk in longhaul driver.

parent 6deb6e5b
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
*/ */
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/cpufreq.h> #include <linux/cpufreq.h>
#include <linux/slab.h> #include <linux/slab.h>
...@@ -118,8 +118,8 @@ static void longhaul_setstate (unsigned int clock_ratio_index) ...@@ -118,8 +118,8 @@ static void longhaul_setstate (unsigned int clock_ratio_index)
cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE); cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
dprintk (KERN_INFO PFX "FSB:%d Mult:%d.%dx\n", fsb, // dprintk (KERN_INFO PFX "FSB:%d Mult:%d.%dx\n", fsb,
mult/10, mult%10); // mult/10, mult%10);
switch (longhaul_version) { switch (longhaul_version) {
case 1: case 1:
...@@ -167,16 +167,16 @@ static void longhaul_setstate (unsigned int clock_ratio_index) ...@@ -167,16 +167,16 @@ static void longhaul_setstate (unsigned int clock_ratio_index)
longhaul.bits.SoftBusRatio = clock_ratio_index & 0xf; longhaul.bits.SoftBusRatio = clock_ratio_index & 0xf;
longhaul.bits.SoftBusRatio4 = (clock_ratio_index & 0x10) >> 4; longhaul.bits.SoftBusRatio4 = (clock_ratio_index & 0x10) >> 4;
longhaul.bits.EnableSoftBusRatio = 1; longhaul.bits.EnableSoftBusRatio = 1;
longhaul.bits.RevisionKey = 0x0; longhaul.bits.RevisionKey = 0x0;
wrmsrl(MSR_VIA_LONGHAUL, longhaul.val); wrmsrl(MSR_VIA_LONGHAUL, longhaul.val);
__hlt(); __hlt();
rdmsrl (MSR_VIA_LONGHAUL, longhaul.val); rdmsrl (MSR_VIA_LONGHAUL, longhaul.val);
longhaul.bits.EnableSoftBusRatio = 0; longhaul.bits.EnableSoftBusRatio = 0;
longhaul.bits.RevisionKey = 0xf; longhaul.bits.RevisionKey = 0xf;
wrmsrl (MSR_VIA_LONGHAUL, longhaul.val); wrmsrl (MSR_VIA_LONGHAUL, longhaul.val);
break; break;
} }
...@@ -276,26 +276,26 @@ static int __init longhaul_get_ranges (void) ...@@ -276,26 +276,26 @@ static int __init longhaul_get_ranges (void)
break; break;
} }
break; break;
case 4: case 4:
rdmsrl (MSR_VIA_LONGHAUL, longhaul.val); rdmsrl (MSR_VIA_LONGHAUL, longhaul.val);
//TODO: Nehemiah may have borken MaxMHzBR. //TODO: Nehemiah may have borken MaxMHzBR.
// need to extrapolate from FSB. // need to extrapolate from FSB.
invalue2 = longhaul.bits.MinMHzBR; invalue2 = longhaul.bits.MinMHzBR;
invalue = longhaul.bits.MaxMHzBR; invalue = longhaul.bits.MaxMHzBR;
if (longhaul.bits.MaxMHzBR4) if (longhaul.bits.MaxMHzBR4)
invalue += 16; invalue += 16;
maxmult=multipliers[invalue]; maxmult=multipliers[invalue];
maxmult=longhaul_get_cpu_mult(); maxmult=longhaul_get_cpu_mult();
printk(KERN_INFO PFX " invalue: %ld maxmult: %d \n", invalue, maxmult); printk(KERN_INFO PFX " invalue: %ld maxmult: %d \n", invalue, maxmult);
printk(KERN_INFO PFX " invalue2: %ld \n", invalue2); printk(KERN_INFO PFX " invalue2: %ld \n", invalue2);
minmult=50; minmult=50;
switch (longhaul.bits.MaxMHzFSB) { switch (longhaul.bits.MaxMHzFSB) {
case 0x0: fsb=133; case 0x0: fsb=133;
break; break;
...@@ -306,8 +306,8 @@ static int __init longhaul_get_ranges (void) ...@@ -306,8 +306,8 @@ static int __init longhaul_get_ranges (void)
case 0x3: fsb=66; case 0x3: fsb=66;
break; break;
} }
break; break;
} }
dprintk (KERN_INFO PFX "MinMult=%d.%dx MaxMult=%d.%dx\n", dprintk (KERN_INFO PFX "MinMult=%d.%dx MaxMult=%d.%dx\n",
...@@ -418,13 +418,13 @@ static int longhaul_target (struct cpufreq_policy *policy, ...@@ -418,13 +418,13 @@ static int longhaul_target (struct cpufreq_policy *policy,
unsigned int relation) unsigned int relation)
{ {
unsigned int table_index = 0; unsigned int table_index = 0;
unsigned int new_clock_ratio = 0; unsigned int new_clock_ratio = 0;
if (cpufreq_frequency_table_target(policy, longhaul_table, target_freq, relation, &table_index)) if (cpufreq_frequency_table_target(policy, longhaul_table, target_freq, relation, &table_index))
return -EINVAL; return -EINVAL;
new_clock_ratio = longhaul_table[table_index].index & 0xFF; new_clock_ratio = longhaul_table[table_index].index & 0xFF;
longhaul_setstate(new_clock_ratio); longhaul_setstate(new_clock_ratio);
return 0; return 0;
...@@ -500,7 +500,6 @@ static int __init longhaul_cpu_init (struct cpufreq_policy *policy) ...@@ -500,7 +500,6 @@ static int __init longhaul_cpu_init (struct cpufreq_policy *policy)
break; break;
} }
break; break;
default: default:
cpuname = "Unknown"; cpuname = "Unknown";
...@@ -514,11 +513,11 @@ static int __init longhaul_cpu_init (struct cpufreq_policy *policy) ...@@ -514,11 +513,11 @@ static int __init longhaul_cpu_init (struct cpufreq_policy *policy)
if (ret != 0) if (ret != 0)
return ret; return ret;
if ((longhaul_version==2) && (dont_scale_voltage==0)) if ((longhaul_version==2) && (dont_scale_voltage==0))
longhaul_setup_voltagescaling(); longhaul_setup_voltagescaling();
policy->governor = CPUFREQ_DEFAULT_GOVERNOR; policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL; policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
policy->cur = calc_speed (longhaul_get_cpu_mult(), fsb); policy->cur = calc_speed (longhaul_get_cpu_mult(), fsb);
ret = cpufreq_frequency_table_cpuinfo(policy, longhaul_table); ret = cpufreq_frequency_table_cpuinfo(policy, longhaul_table);
...@@ -542,14 +541,14 @@ static struct freq_attr* longhaul_attr[] = { ...@@ -542,14 +541,14 @@ static struct freq_attr* longhaul_attr[] = {
}; };
static struct cpufreq_driver longhaul_driver = { static struct cpufreq_driver longhaul_driver = {
.verify = longhaul_verify, .verify = longhaul_verify,
.target = longhaul_target, .target = longhaul_target,
.get = longhaul_get, .get = longhaul_get,
.init = longhaul_cpu_init, .init = longhaul_cpu_init,
.exit = longhaul_cpu_exit, .exit = longhaul_cpu_exit,
.name = "longhaul", .name = "longhaul",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.attr = longhaul_attr, .attr = longhaul_attr,
}; };
static int __init longhaul_init (void) static int __init longhaul_init (void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment