Commit e589bd06 authored by Dave Jones's avatar Dave Jones Committed by Dave Jones

[CPUFREQ] Remove bogus longhaul v4

The code only supports 3 versions, so numbering them 1,2 and 4
doesn't make a lot of sense.
Signed-off-by: default avatarDave Jones <davej@redhat.com>
parent 3e5fa203
...@@ -78,7 +78,7 @@ static int longhaul_get_cpu_mult (void) ...@@ -78,7 +78,7 @@ static int longhaul_get_cpu_mult (void)
rdmsr (MSR_IA32_EBL_CR_POWERON, lo, hi); rdmsr (MSR_IA32_EBL_CR_POWERON, lo, hi);
invalue = (lo & (1<<22|1<<23|1<<24|1<<25)) >>22; invalue = (lo & (1<<22|1<<23|1<<24|1<<25)) >>22;
if (longhaul_version==2 || longhaul_version==4) { if (longhaul_version==2 || longhaul_version==3) {
if (lo & (1<<27)) if (lo & (1<<27))
invalue+=16; invalue+=16;
} }
...@@ -157,7 +157,7 @@ static void longhaul_setstate (unsigned int clock_ratio_index) ...@@ -157,7 +157,7 @@ static void longhaul_setstate (unsigned int clock_ratio_index)
longhaul.bits.RevisionKey = 3; longhaul.bits.RevisionKey = 3;
wrmsrl (MSR_VIA_LONGHAUL, longhaul.val); wrmsrl (MSR_VIA_LONGHAUL, longhaul.val);
break; break;
case 4: case 3:
rdmsrl (MSR_VIA_LONGHAUL, longhaul.val); rdmsrl (MSR_VIA_LONGHAUL, longhaul.val);
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;
...@@ -264,7 +264,7 @@ static int __init longhaul_get_ranges (void) ...@@ -264,7 +264,7 @@ static int __init longhaul_get_ranges (void)
fsb = eblcr_fsb_table_v2[longhaul.bits.MaxMHzFSB]; fsb = eblcr_fsb_table_v2[longhaul.bits.MaxMHzFSB];
break; break;
case 4: case 3:
rdmsrl (MSR_VIA_LONGHAUL, longhaul.val); rdmsrl (MSR_VIA_LONGHAUL, longhaul.val);
/* /*
...@@ -461,7 +461,7 @@ static int __init longhaul_cpu_init (struct cpufreq_policy *policy) ...@@ -461,7 +461,7 @@ static int __init longhaul_cpu_init (struct cpufreq_policy *policy)
break; break;
case 9: case 9:
longhaul_version=4; longhaul_version=3;
numscales=32; numscales=32;
switch (c->x86_mask) { switch (c->x86_mask) {
case 0 ... 1: case 0 ... 1:
......
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