diff options
| author | Vladimir Serbinenko <phcoder@gmail.com> | 2013-11-12 23:32:52 +0100 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2013-11-23 14:32:29 +0100 |
| commit | 71f35ebdaab56e4ff1d4d882d2cd4f29bda1aacc (patch) | |
| tree | 44875da11c8abe59a51e6bfba603b86d2c07ab34 /src/cpu/intel | |
| parent | e2b6795e046894487863e4bc9e29aa075dfcc3f6 (diff) | |
Rename SANDYBRIDGE_BCLK to NEHALEM_BCLK in 2065x.
2065x is with nehalem and not sandybridge.
I don't care much eitherway but it clears some confusion.
Change-Id: Ib2b8e570b830a12ed8d0d313ee4eb56755796d4b
Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
Reviewed-on: http://review.coreboot.org/4046
Tested-by: build bot (Jenkins)
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Diffstat (limited to 'src/cpu/intel')
| -rw-r--r-- | src/cpu/intel/model_2065x/acpi.c | 4 | ||||
| -rw-r--r-- | src/cpu/intel/model_2065x/model_2065x.h | 4 | ||||
| -rw-r--r-- | src/cpu/intel/model_2065x/model_2065x_init.c | 2 | ||||
| -rw-r--r-- | src/cpu/intel/model_2065x/tsc_freq.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/cpu/intel/model_2065x/acpi.c b/src/cpu/intel/model_2065x/acpi.c index 848381297e..fa0dc95a00 100644 --- a/src/cpu/intel/model_2065x/acpi.c +++ b/src/cpu/intel/model_2065x/acpi.c @@ -237,7 +237,7 @@ static int generate_P_state_entries(int core, int cores_per_package) /* Max Non-Turbo Ratio */ ratio_max = (msr.lo >> 8) & 0xff; } - clock_max = ratio_max * SANDYBRIDGE_BCLK + ratio_max / 3; + clock_max = ratio_max * NEHALEM_BCLK + ratio_max / 3; /* Calculate CPU TDP in mW */ power_max = 25000; @@ -298,7 +298,7 @@ static int generate_P_state_entries(int core, int cores_per_package) /* Calculate power at this ratio */ power = calculate_power(power_max, ratio_max, ratio); - clock = ratio * SANDYBRIDGE_BCLK + ratio / 3; + clock = ratio * NEHALEM_BCLK + ratio / 3; len_pss += acpigen_write_PSS_package( clock, /*MHz*/ diff --git a/src/cpu/intel/model_2065x/model_2065x.h b/src/cpu/intel/model_2065x/model_2065x.h index 18a45d8b14..f9dc7e8053 100644 --- a/src/cpu/intel/model_2065x/model_2065x.h +++ b/src/cpu/intel/model_2065x/model_2065x.h @@ -22,8 +22,8 @@ #ifndef _CPU_INTEL_MODEL_2065X_H #define _CPU_INTEL_MODEL_2065X_H -/* SandyBridge/IvyBridge bus clock is fixed at 100MHz */ -#define SANDYBRIDGE_BCLK 133 +/* Nehalem bus clock is fixed at 133MHz */ +#define NEHALEM_BCLK 133 #define IA32_FEATURE_CONTROL 0x3a #define CPUID_VMX (1 << 5) diff --git a/src/cpu/intel/model_2065x/model_2065x_init.c b/src/cpu/intel/model_2065x/model_2065x_init.c index 4c88e4412f..0fd1bf0f7b 100644 --- a/src/cpu/intel/model_2065x/model_2065x_init.c +++ b/src/cpu/intel/model_2065x/model_2065x_init.c @@ -311,7 +311,7 @@ static void set_max_ratio(void) wrmsr(IA32_PERF_CTL, perf_ctl); printk(BIOS_DEBUG, "model_x06ax: frequency set to %d\n", - ((perf_ctl.lo >> 8) & 0xff) * SANDYBRIDGE_BCLK); + ((perf_ctl.lo >> 8) & 0xff) * NEHALEM_BCLK); } static void set_energy_perf_bias(u8 policy) diff --git a/src/cpu/intel/model_2065x/tsc_freq.c b/src/cpu/intel/model_2065x/tsc_freq.c index 7d388bef38..1c20e29ea0 100644 --- a/src/cpu/intel/model_2065x/tsc_freq.c +++ b/src/cpu/intel/model_2065x/tsc_freq.c @@ -27,5 +27,5 @@ unsigned long tsc_freq_mhz(void) msr_t platform_info; platform_info = rdmsr(MSR_PLATFORM_INFO); - return SANDYBRIDGE_BCLK * ((platform_info.lo >> 8) & 0xff); + return NEHALEM_BCLK * ((platform_info.lo >> 8) & 0xff); } |