On Wed, Sep 25, 2019 at 10:58 PM Simon Glass wrote:
>
> These functions are the same on modern Intel CPUs, so use common code to
> set them.
>
> Signed-off-by: Simon Glass
> ---
>
> arch/x86/cpu/broadwell/cpu.c | 7 ++
> arch/x86/cpu/broadwell/cpu_full.c | 9 ---
> arch/x86/cpu/intel_common/cpu.c | 20 +++
> arch/x86/cpu/ivybridge/model_206ax.c | 25 +++
> arch/x86/cpu/ivybridge/northbridge.c | 2 +-
> .../include/asm/arch-ivybridge/model_206ax.h | 2 +-
> arch/x86/include/asm/cpu_common.h | 18 +
> 7 files changed, 51 insertions(+), 32 deletions(-)
>
> diff --git a/arch/x86/cpu/broadwell/cpu.c b/arch/x86/cpu/broadwell/cpu.c
> index 586a2e8f05a..55a7439f1c1 100644
> --- a/arch/x86/cpu/broadwell/cpu.c
> +++ b/arch/x86/cpu/broadwell/cpu.c
> @@ -41,12 +41,9 @@ int arch_cpu_init_dm(void)
>
> void set_max_freq(void)
> {
> - msr_t msr, perf_ctl, platform_info;
> + msr_t msr, perf_ctl;
>
> - /* Check for configurable TDP option */
> - platform_info = msr_read(MSR_PLATFORM_INFO);
> -
> - if ((platform_info.hi >> 1) & 3) {
> + if (cpu_config_tdp_levels()) {
> /* Set to nominal TDP ratio */
> msr = msr_read(MSR_CONFIG_TDP_NOMINAL);
> perf_ctl.lo = (msr.lo & 0xff) << 8;
> diff --git a/arch/x86/cpu/broadwell/cpu_full.c
> b/arch/x86/cpu/broadwell/cpu_full.c
> index 58cc2f362cc..169b5b02a6a 100644
> --- a/arch/x86/cpu/broadwell/cpu_full.c
> +++ b/arch/x86/cpu/broadwell/cpu_full.c
> @@ -329,15 +329,6 @@ static int bsp_init_before_ap_bringup(struct udevice
> *dev)
> return 0;
> }
>
> -static int cpu_config_tdp_levels(void)
> -{
> - msr_t platform_info;
> -
> - /* Bits 34:33 indicate how many levels supported */
> - platform_info = msr_read(MSR_PLATFORM_INFO);
> - return (platform_info.hi >> 1) & 3;
> -}
> -
> static void set_max_ratio(void)
> {
> msr_t msr, perf_ctl;
> diff --git a/arch/x86/cpu/intel_common/cpu.c b/arch/x86/cpu/intel_common/cpu.c
> index 7d0ed73b4b6..1898903853f 100644
> --- a/arch/x86/cpu/intel_common/cpu.c
> +++ b/arch/x86/cpu/intel_common/cpu.c
> @@ -145,3 +145,23 @@ int cpu_configure_thermal_target(struct udevice *dev)
>
> return 0;
> }
> +
> +void cpu_set_perf_control(uint clk_ratio)
> +{
> + msr_t perf_ctl;
> +
> + perf_ctl.lo = (clk_ratio & 0xff) << 8;
> + perf_ctl.hi = 0;
> + msr_write(MSR_IA32_PERF_CTL, perf_ctl);
> + debug("CPU: frequency set to %d MHz\n", clk_ratio * INTEL_BCLK_MHZ);
> +}
> +
> +bool cpu_config_tdp_levels(void)
> +{
> + msr_t platform_info;
> +
> + /* Bits 34:33 indicate how many levels supported */
> + platform_info = msr_read(MSR_PLATFORM_INFO);
> +
> + return ((platform_info.hi >> 1) & 3) != 0;
> +}
> diff --git a/arch/x86/cpu/ivybridge/model_206ax.c
> b/arch/x86/cpu/ivybridge/model_206ax.c
> index 3177ba3297f..2c8cedbaea2 100644
> --- a/arch/x86/cpu/ivybridge/model_206ax.c
> +++ b/arch/x86/cpu/ivybridge/model_206ax.c
> @@ -140,19 +140,16 @@ static const u8 power_limit_time_msr_to_sec[] = {
> [0x11] = 128,
> };
>
> -int cpu_config_tdp_levels(void)
> +bool cpu_ivybridge_config_tdp_levels(void)
> {
> struct cpuid_result result;
> - msr_t platform_info;
>
> /* Minimum CPU revision */
> result = cpuid(1);
> if (result.eax < IVB_CONFIG_TDP_MIN_CPUID)
> return 0;
We should return false here, since the return value type is now changed to bool.
>
> - /* Bits 34:33 indicate how many levels supported */
> - platform_info = msr_read(MSR_PLATFORM_INFO);
> - return (platform_info.hi >> 1) & 3;
> + return cpu_config_tdp_levels();
> }
>
> /*
> @@ -213,7 +210,7 @@ void set_power_limits(u8 power_limit_1_time)
> msr_write(MSR_PKG_POWER_LIMIT, limit);
>
> /* Use nominal TDP values for CPUs with configurable TDP */
> - if (cpu_config_tdp_levels()) {
> + if (cpu_ivybridge_config_tdp_levels()) {
> msr = msr_read(MSR_CONFIG_TDP_NOMINAL);
> limit.hi = 0;
> limit.lo = msr.lo & 0xff;
> @@ -329,24 +326,20 @@ static void configure_dca_cap(void)
>
> static void set_max_ratio(void)
> {
> - msr_t msr, perf_ctl;
> -
> - perf_ctl.hi = 0;
> + msr_t msr;
> + uint ratio;
>
> /* Check for configurable TDP option */
> - if (cpu_config_tdp_levels()) {
> + if (cpu_ivybridge_config_tdp_levels()) {
> /* Set to nominal TDP ratio */
> msr = msr_read(MSR_CONFIG_TDP_NOMINAL);
> - perf_ctl.lo = (msr.lo & 0xff) << 8;
> + ratio = msr.lo & 0xff;
> } else {
> /* Platform Info bits 15:8 give max ratio */
> msr = msr_read(MSR_PLATFORM_INFO);
> - perf_ctl.lo = msr.lo & 0xff00;
> +
