Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-11 13:41:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

cpufreq: intel_pstate: Replace BYT with ATOM

Browse Source 
Rename symbol and function names starting with "BYT" or "byt" to
start with "ATOM" or "atom", respectively, so as to make it clear
that they may apply to Atom in general and not just to Baytrail
(the goal is to support several Atoms architectures eventually).

This should not lead to any functional changes.

Signed-off-by: Philippe Longepe <philippe.longepe@linux.intel.com>
Signed-off-by: Stephane Gasparini <stephane.gasparini@linux.intel.com>
Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
[ rjw : Changelog ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Philippe Longepe 2015-11-09 17:40:46 -08:00 committed by Rafael J. Wysocki
parent 6ee11e413c
commit 938d21a2a6
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
drivers/cpufreq/intel_pstate.c
View File

@ -34,10 +34,10 @@
#include <asm/cpu_device_id.h> #include <asm/cpu_device_id.h>
#include <asm/cpufeature.h> #include <asm/cpufeature.h>
#define BYT_RATIOS 0x66a #define ATOM_RATIOS 0x66a
#define BYT_VIDS 0x66b #define ATOM_VIDS 0x66b
#define BYT_TURBO_RATIOS 0x66c #define ATOM_TURBO_RATIOS 0x66c
#define BYT_TURBO_VIDS 0x66d #define ATOM_TURBO_VIDS 0x66d
#define FRAC_BITS 8 #define FRAC_BITS 8
#define int_tofp(X) ((int64_t)(X) << FRAC_BITS) #define int_tofp(X) ((int64_t)(X) << FRAC_BITS)
@ -528,31 +528,31 @@ static void intel_pstate_hwp_enable(struct cpudata *cpudata)
wrmsrl_on_cpu(cpudata->cpu, MSR_PM_ENABLE, 0x1); wrmsrl_on_cpu(cpudata->cpu, MSR_PM_ENABLE, 0x1);
} }
static int byt_get_min_pstate(void) static int atom_get_min_pstate(void)
{ {
u64 value; u64 value;
rdmsrl(BYT_RATIOS, value); rdmsrl(ATOM_RATIOS, value);
return (value >> 8) & 0x7F; return (value >> 8) & 0x7F;
} }
static int byt_get_max_pstate(void) static int atom_get_max_pstate(void)
{ {
u64 value; u64 value;
rdmsrl(BYT_RATIOS, value); rdmsrl(ATOM_RATIOS, value);
return (value >> 16) & 0x7F; return (value >> 16) & 0x7F;
} }
static int byt_get_turbo_pstate(void) static int atom_get_turbo_pstate(void)
{ {
u64 value; u64 value;
rdmsrl(BYT_TURBO_RATIOS, value); rdmsrl(ATOM_TURBO_RATIOS, value);
return value & 0x7F; return value & 0x7F;
} }
static void byt_set_pstate(struct cpudata *cpudata, int pstate) static void atom_set_pstate(struct cpudata *cpudata, int pstate)
{ {
u64 val; u64 val;
int32_t vid_fp; int32_t vid_fp;
@ -577,10 +577,10 @@ static void byt_set_pstate(struct cpudata *cpudata, int pstate)
wrmsrl_on_cpu(cpudata->cpu, MSR_IA32_PERF_CTL, val); wrmsrl_on_cpu(cpudata->cpu, MSR_IA32_PERF_CTL, val);
} }
#define BYT_BCLK_FREQS 5 #define ATOM_BCLK_FREQS 5
static int byt_freq_table[BYT_BCLK_FREQS] = { 833, 1000, 1333, 1167, 800}; static int atom_freq_table[ATOM_BCLK_FREQS] = { 833, 1000, 1333, 1167, 800};
static int byt_get_scaling(void) static int atom_get_scaling(void)
{ {
u64 value; u64 value;
int i; int i;
@ -588,16 +588,16 @@ static int byt_get_scaling(void)
rdmsrl(MSR_FSB_FREQ, value); rdmsrl(MSR_FSB_FREQ, value);
i = value & 0x3; i = value & 0x3;
BUG_ON(i > BYT_BCLK_FREQS); WARN_ON(i > ATOM_BCLK_FREQS);
return byt_freq_table[i] * 100; return atom_freq_table[i] * 100;
} }
static void byt_get_vid(struct cpudata *cpudata) static void atom_get_vid(struct cpudata *cpudata)
{ {
u64 value; u64 value;
rdmsrl(BYT_VIDS, value); rdmsrl(ATOM_VIDS, value);
cpudata->vid.min = int_tofp((value >> 8) & 0x7f); cpudata->vid.min = int_tofp((value >> 8) & 0x7f);
cpudata->vid.max = int_tofp((value >> 16) & 0x7f); cpudata->vid.max = int_tofp((value >> 16) & 0x7f);
cpudata->vid.ratio = div_fp( cpudata->vid.ratio = div_fp(
@ -605,7 +605,7 @@ static void byt_get_vid(struct cpudata *cpudata)
int_tofp(cpudata->pstate.max_pstate - int_tofp(cpudata->pstate.max_pstate -
cpudata->pstate.min_pstate)); cpudata->pstate.min_pstate));
rdmsrl(BYT_TURBO_VIDS, value); rdmsrl(ATOM_TURBO_VIDS, value);
cpudata->vid.turbo = value & 0x7f; cpudata->vid.turbo = value & 0x7f;
} }
@ -726,7 +726,7 @@ static struct cpu_defaults core_params = {
}, },
}; };
static struct cpu_defaults byt_params = { static struct cpu_defaults atom_params = {
.pid_policy = { .pid_policy = {
.sample_rate_ms = 10, .sample_rate_ms = 10,
.deadband = 0, .deadband = 0,
@ -736,13 +736,13 @@ static struct cpu_defaults byt_params = {
.i_gain_pct = 4, .i_gain_pct = 4,
}, },
.funcs = { .funcs = {
.get_max = byt_get_max_pstate, .get_max = atom_get_max_pstate,
.get_max_physical = byt_get_max_pstate, .get_max_physical = atom_get_max_pstate,
.get_min = byt_get_min_pstate, .get_min = atom_get_min_pstate,
.get_turbo = byt_get_turbo_pstate, .get_turbo = atom_get_turbo_pstate,
.set = byt_set_pstate, .set = atom_set_pstate,
.get_scaling = byt_get_scaling, .get_scaling = atom_get_scaling,
.get_vid = byt_get_vid, .get_vid = atom_get_vid,
}, },
}; };
@ -983,7 +983,7 @@ static void intel_pstate_timer_func(unsigned long __data)
static const struct x86_cpu_id intel_pstate_cpu_ids[] = { static const struct x86_cpu_id intel_pstate_cpu_ids[] = {
ICPU(0x2a, core_params), ICPU(0x2a, core_params),
ICPU(0x2d, core_params), ICPU(0x2d, core_params),
ICPU(0x37, byt_params), ICPU(0x37, atom_params),
ICPU(0x3a, core_params), ICPU(0x3a, core_params),
ICPU(0x3c, core_params), ICPU(0x3c, core_params),
ICPU(0x3d, core_params), ICPU(0x3d, core_params),
@ -992,7 +992,7 @@ static const struct x86_cpu_id intel_pstate_cpu_ids[] = {
ICPU(0x45, core_params), ICPU(0x45, core_params),
ICPU(0x46, core_params), ICPU(0x46, core_params),
ICPU(0x47, core_params), ICPU(0x47, core_params),
ICPU(0x4c, byt_params), ICPU(0x4c, atom_params),
ICPU(0x4e, core_params), ICPU(0x4e, core_params),
ICPU(0x4f, core_params), ICPU(0x4f, core_params),
ICPU(0x5e, core_params), ICPU(0x5e, core_params),