| From 22c73795b101597051924556dce019385a1e2fa0 Mon Sep 17 00:00:00 2001 |
| From: Mikulas Patocka <mpatocka@redhat.com> |
| Date: Wed, 11 Dec 2013 19:39:19 -0500 |
| Subject: powernow-k6: reorder frequencies |
| |
| From: Mikulas Patocka <mpatocka@redhat.com> |
| |
| commit 22c73795b101597051924556dce019385a1e2fa0 upstream. |
| |
| This patch reorders reported frequencies from the highest to the lowest, |
| just like in other frequency drivers. |
| |
| Signed-off-by: Mikulas Patocka <mpatocka@redhat.com> |
| Acked-by: Viresh Kumar <viresh.kumar@linaro.org> |
| Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| |
| --- |
| drivers/cpufreq/powernow-k6.c | 17 ++++++++++------- |
| 1 file changed, 10 insertions(+), 7 deletions(-) |
| |
| --- a/drivers/cpufreq/powernow-k6.c |
| +++ b/drivers/cpufreq/powernow-k6.c |
| @@ -37,17 +37,20 @@ MODULE_PARM_DESC(bus_frequency, "Bus fre |
| |
| /* Clock ratio multiplied by 10 - see table 27 in AMD#23446 */ |
| static struct cpufreq_frequency_table clock_ratio[] = { |
| - {45, /* 000 -> 4.5x */ 0}, |
| + {60, /* 110 -> 6.0x */ 0}, |
| + {55, /* 011 -> 5.5x */ 0}, |
| {50, /* 001 -> 5.0x */ 0}, |
| + {45, /* 000 -> 4.5x */ 0}, |
| {40, /* 010 -> 4.0x */ 0}, |
| - {55, /* 011 -> 5.5x */ 0}, |
| - {20, /* 100 -> 2.0x */ 0}, |
| - {30, /* 101 -> 3.0x */ 0}, |
| - {60, /* 110 -> 6.0x */ 0}, |
| {35, /* 111 -> 3.5x */ 0}, |
| + {30, /* 101 -> 3.0x */ 0}, |
| + {20, /* 100 -> 2.0x */ 0}, |
| {0, CPUFREQ_TABLE_END} |
| }; |
| |
| +static const u8 index_to_register[8] = { 6, 3, 1, 0, 2, 7, 5, 4 }; |
| +static const u8 register_to_index[8] = { 3, 2, 4, 1, 7, 6, 0, 5 }; |
| + |
| static const struct { |
| unsigned freq; |
| unsigned mult; |
| @@ -91,7 +94,7 @@ static int powernow_k6_get_cpu_multiplie |
| |
| local_irq_enable(); |
| |
| - return clock_ratio[(invalue >> 5)&7].index; |
| + return clock_ratio[register_to_index[(invalue >> 5)&7]].index; |
| } |
| |
| static void powernow_k6_set_cpu_multiplier(unsigned int best_i) |
| @@ -111,7 +114,7 @@ static void powernow_k6_set_cpu_multipli |
| write_cr0(cr0 | X86_CR0_CD); |
| wbinvd(); |
| |
| - outvalue = (1<<12) | (1<<10) | (1<<9) | (best_i<<5); |
| + outvalue = (1<<12) | (1<<10) | (1<<9) | (index_to_register[best_i]<<5); |
| |
| msrval = POWERNOW_IOPORT + 0x1; |
| wrmsr(MSR_K6_EPMR, msrval, 0); /* enable the PowerNow port */ |