diff options
author | Anastasios Koutian <akoutian2@gmail.com> | 2024-05-10 20:10:04 +0300 |
---|---|---|
committer | Nico Huber <nico.h@gmx.de> | 2024-07-15 16:34:17 +0000 |
commit | 3c9944ea4127c69cc262a44830d941ee1861f0f8 (patch) | |
tree | 53e5f9e9830eb8633c30b5a39bff8251bce87547 /src/cpu | |
parent | 3dbf0c5c5f9a44a346ad6c1c0af69dca7d84ef97 (diff) |
cpu/intel/model_206ax: Allow turbo boost ratio limit configuration
Tested on ThinkPad T420 with the i7-3940XM.
Change-Id: I1c65a129478e8ac2c4f66eb3c6aa2507358f82ad
Signed-off-by: Anastasios Koutian <akoutian2@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/83271
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Diffstat (limited to 'src/cpu')
-rw-r--r-- | src/cpu/intel/model_206ax/chip.h | 13 | ||||
-rw-r--r-- | src/cpu/intel/model_206ax/model_206ax.h | 1 | ||||
-rw-r--r-- | src/cpu/intel/model_206ax/model_206ax_init.c | 26 |
3 files changed, 40 insertions, 0 deletions
diff --git a/src/cpu/intel/model_206ax/chip.h b/src/cpu/intel/model_206ax/chip.h index 1102cfeb9c..81ec2ff83f 100644 --- a/src/cpu/intel/model_206ax/chip.h +++ b/src/cpu/intel/model_206ax/chip.h @@ -38,6 +38,17 @@ struct psi_state { int current; /* In Amps */ }; +union turbo_ratio_limits { + /* Limit for 1, 2, 3 and 4 active cores respectively */ + struct { + int limit_1c; + int limit_2c; + int limit_3c; + int limit_4c; + }; + int raw[4]; +}; + struct cpu_intel_model_206ax_config { enum cpu_acpi_level acpi_c1; enum cpu_acpi_level acpi_c2; @@ -56,6 +67,8 @@ struct cpu_intel_model_206ax_config { /* PSI states only have an effect when in Package C3 or higher */ struct psi_state pp0_psi[3]; /* Power states for Primary Plane (Icc) */ struct psi_state pp1_psi[3]; /* Power states for Secondary Plane (IAXG) */ + + union turbo_ratio_limits turbo_limits; /* Turbo ratio limits depending on the number of active cores */ }; #endif /* __CPU_INTEL_MODEL_206AX_CHIP_H__ */ diff --git a/src/cpu/intel/model_206ax/model_206ax.h b/src/cpu/intel/model_206ax/model_206ax.h index 9a2fefbb59..afe915dd08 100644 --- a/src/cpu/intel/model_206ax/model_206ax.h +++ b/src/cpu/intel/model_206ax/model_206ax.h @@ -46,6 +46,7 @@ #define MSR_LT_LOCK_MEMORY 0x2e7 #define MSR_PLATFORM_INFO 0xce #define PLATFORM_INFO_SET_TDP (1 << 29) +#define PLATFORM_INFO_SET_TURBO_LIMIT (1 << 28) #define MSR_MISC_PWR_MGMT 0x1aa #define MISC_PWR_MGMT_EIST_HW_DIS (1 << 0) diff --git a/src/cpu/intel/model_206ax/model_206ax_init.c b/src/cpu/intel/model_206ax/model_206ax_init.c index 0d0e3f749a..4fa8cef5d4 100644 --- a/src/cpu/intel/model_206ax/model_206ax_init.c +++ b/src/cpu/intel/model_206ax/model_206ax_init.c @@ -11,6 +11,7 @@ #include <cpu/intel/turbo.h> #include <cpu/x86/cache.h> #include <cpu/x86/name.h> +#include "commonlib/bsd/helpers.h" #include "model_206ax.h" #include "chip.h" #include <cpu/intel/smm_reloc.h> @@ -175,6 +176,23 @@ void set_power_limits(u8 power_limit_1_time) } } +static void configure_turbo_ratio_limits(struct cpu_intel_model_206ax_config *conf) +{ + msr_t msr = rdmsr(MSR_TURBO_RATIO_LIMIT); + + for (int i = 0; i < ARRAY_SIZE(conf->turbo_limits.raw); i++) { + const int shift = i * 8; + const int limit = conf->turbo_limits.raw[i]; + + if (limit) { + msr.lo &= ~(0xff << shift); + msr.lo |= (limit << shift); + } + } + + wrmsr(MSR_TURBO_RATIO_LIMIT, msr); +} + static void configure_c_states(struct device *dev) { struct cpu_intel_model_206ax_config *conf = dev->upstream->dev->chip_info; @@ -298,6 +316,14 @@ static void configure_c_states(struct device *dev) msr.lo |= PP1_CURRENT_LIMIT_LOCK; wrmsr(MSR_PP1_CURRENT_CONFIG, msr); } + + msr = rdmsr(MSR_PLATFORM_INFO); + if (msr.lo & PLATFORM_INFO_SET_TURBO_LIMIT) { + configure_turbo_ratio_limits(conf); + } else { + printk(BIOS_INFO, "%s: Programmable ratio limit for turbo mode is disabled\n", + dev_path(dev)); + } } static void configure_thermal_target(struct device *dev) |