x86: Rename turbo ratio MSR to MSR_TURBO_RATIO_LIMIT

This MSR number is used on most modern Intel processors, so drop the
confusing NHM prefix (which might mean Nehalem).

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
[bmeng: drop MSR_IVT_TURBO_RATIO_LIMIT as no code uses it]
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>

diff --git a/arch/x86/cpu/broadwell/cpu_full.c b/arch/x86/cpu/broadwell/cpu_full.c
index bd0b2037fa15965c436a3d3f7cc4722ad2208807..9686cf5e0e7185252d15bfd07d3a286446a806b5 100644 (file)
--- a/arch/x86/cpu/broadwell/cpu_full.c
+++ b/arch/x86/cpu/broadwell/cpu_full.c
@@ -346,7 +346,7 @@ static void set_max_ratio(void)
 
        /* Check for configurable TDP option */
        if (turbo_get_state() == TURBO_ENABLED) {
-               msr = msr_read(MSR_NHM_TURBO_RATIO_LIMIT);
+               msr = msr_read(MSR_TURBO_RATIO_LIMIT);
                perf_ctl.lo = (msr.lo & 0xff) << 8;
        } else if (cpu_config_tdp_levels()) {
                /* Set to nominal TDP ratio */

diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h
index 1a02d8c8fe5547358b0c280850e97d2874912fd3..6cb58708090897b727a9c92a228380b564bdb73f 100644 (file)
--- a/arch/x86/include/asm/msr-index.h
+++ b/arch/x86/include/asm/msr-index.h
@@ -101,8 +101,7 @@
 #define MSR_OFFCORE_RSP_1              0x000001a7
 #define MSR_MISC_PWR_MGMT              0x1aa
 #define  MISC_PWR_MGMT_EIST_HW_DIS     (1 << 0)
-#define MSR_NHM_TURBO_RATIO_LIMIT      0x000001ad
-#define MSR_IVT_TURBO_RATIO_LIMIT      0x000001ae
+#define MSR_TURBO_RATIO_LIMIT          0x000001ad
 
 #define MSR_IA32_ENERGY_PERFORMANCE_BIAS       0x1b0
 #define  ENERGY_POLICY_PERFORMANCE     0