LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86: Use a common bus clock for Intel CPUs 

Modern Intel CPUs use a standard bus clock value of 100MHz, so put this in
a common file and tidy up the copies.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Simon Glass 2019-09-25 08:56:37 -06:00 committed by Bin Meng
parent 246ac08b03
commit 55a6b13a75
7 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/cpu/broadwell/cpu.c
View File

@ -60,7 +60,7 @@ void set_max_freq(void)
msr_write(MSR_IA32_PERF_CTL, perf_ctl); msr_write(MSR_IA32_PERF_CTL, perf_ctl);
debug("CPU: frequency set to %d MHz\n", debug("CPU: frequency set to %d MHz\n",
((perf_ctl.lo >> 8) & 0xff) * CPU_BCLK); ((perf_ctl.lo >> 8) & 0xff) * INTEL_BCLK_MHZ);
} }
int arch_cpu_init(void) int arch_cpu_init(void)

4
arch/x86/cpu/broadwell/cpu_full.c
View File

@ -360,7 +360,7 @@ static void set_max_ratio(void)
msr_write(MSR_IA32_PERF_CTL, perf_ctl); msr_write(MSR_IA32_PERF_CTL, perf_ctl);
debug("cpu: frequency set to %d\n", debug("cpu: frequency set to %d\n",
((perf_ctl.lo >> 8) & 0xff) * CPU_BCLK); ((perf_ctl.lo >> 8) & 0xff) * INTEL_BCLK_MHZ);
} }
int broadwell_init(struct udevice *dev) int broadwell_init(struct udevice *dev)
@ -634,7 +634,7 @@ void cpu_set_power_limits(int power_limit_1_time)
static int broadwell_get_info(struct udevice *dev, struct cpu_info *info) static int broadwell_get_info(struct udevice *dev, struct cpu_info *info)
{ {
return cpu_intel_get_info(info, BROADWELL_BCLK); return cpu_intel_get_info(info, INTEL_BCLK_MHZ);
} }
static int broadwell_get_count(struct udevice *dev) static int broadwell_get_count(struct udevice *dev)

4
arch/x86/cpu/ivybridge/model_206ax.c
View File

@ -346,7 +346,7 @@ static void set_max_ratio(void)
msr_write(MSR_IA32_PERF_CTL, perf_ctl); msr_write(MSR_IA32_PERF_CTL, perf_ctl);
debug("model_x06ax: frequency set to %d\n", debug("model_x06ax: frequency set to %d\n",
((perf_ctl.lo >> 8) & 0xff) * SANDYBRIDGE_BCLK); ((perf_ctl.lo >> 8) & 0xff) * INTEL_BCLK_MHZ);
} }
static void set_energy_perf_bias(u8 policy) static void set_energy_perf_bias(u8 policy)
@ -418,7 +418,7 @@ static int model_206ax_init(struct udevice *dev)
static int model_206ax_get_info(struct udevice *dev, struct cpu_info *info) static int model_206ax_get_info(struct udevice *dev, struct cpu_info *info)
{ {
return cpu_intel_get_info(info, SANDYBRIDGE_BCLK); return cpu_intel_get_info(info, INTEL_BCLK_MHZ);
return 0; return 0;
} }

3
arch/x86/include/asm/arch-broadwell/cpu.h
View File

@ -21,9 +21,6 @@
#define CPUID_BROADWELL_D0 0x306d3 #define CPUID_BROADWELL_D0 0x306d3
#define CPUID_BROADWELL_E0 0x306d4 #define CPUID_BROADWELL_E0 0x306d4
/* Broadwell bus clock is fixed at 100MHz */
#define BROADWELL_BCLK 100
#define BROADWELL_FAMILY_ULT 0x306d0 #define BROADWELL_FAMILY_ULT 0x306d0
#define CORE_THREAD_COUNT_MSR 0x35 #define CORE_THREAD_COUNT_MSR 0x35

3
arch/x86/include/asm/arch-broadwell/pch.h
View File

@ -6,9 +6,6 @@
#ifndef __ASM_ARCH_PCH_H #ifndef __ASM_ARCH_PCH_H
#define __ASM_ARCH_PCH_H #define __ASM_ARCH_PCH_H
/* CPU bus clock is fixed at 100MHz */
#define CPU_BCLK 100
#define PMBASE 0x40 #define PMBASE 0x40
#define ACPI_CNTL 0x44 #define ACPI_CNTL 0x44
#define ACPI_EN (1 << 7) #define ACPI_EN (1 << 7)

3
arch/x86/include/asm/arch-ivybridge/model_206ax.h
View File

@ -8,9 +8,6 @@
#ifndef _ASM_ARCH_MODEL_206AX_H #ifndef _ASM_ARCH_MODEL_206AX_H
#define _ASM_ARCH_MODEL_206AX_H #define _ASM_ARCH_MODEL_206AX_H
/* SandyBridge/IvyBridge bus clock is fixed at 100MHz */
#define SANDYBRIDGE_BCLK 100
#define CPUID_VMX (1 << 5) #define CPUID_VMX (1 << 5)
#define CPUID_SMX (1 << 6) #define CPUID_SMX (1 << 6)
#define MSR_FEATURE_CONFIG 0x13c #define MSR_FEATURE_CONFIG 0x13c

5
arch/x86/include/asm/cpu_common.h
View File

@ -6,6 +6,11 @@
#ifndef __ASM_CPU_COMMON_H #ifndef __ASM_CPU_COMMON_H
#define __ASM_CPU_COMMON_H #define __ASM_CPU_COMMON_H
/* Standard Intel bus clock is fixed at 100MHz */
enum {
INTEL_BCLK_MHZ = 100
};
struct cpu_info; struct cpu_info;
/** /**