x86: Make MSR_PKG_POWER_SKU common

This is used on several boards so add it to the common file. Also add a
useful power-limit value while we are here.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

diff --git a/arch/x86/include/asm/arch-broadwell/cpu.h b/arch/x86/include/asm/arch-broadwell/cpu.h
index 3bc3bd6609e2a49301f5fd03a2e35aa81f9511fa..2b39a76fbdb390b42d62ab8c21ffcb833f11d6bf 100644 (file)
--- a/arch/x86/include/asm/arch-broadwell/cpu.h
+++ b/arch/x86/include/asm/arch-broadwell/cpu.h
@@ -27,7 +27,6 @@
 
 #define MSR_VR_CURRENT_CONFIG          0x601
 #define MSR_VR_MISC_CONFIG             0x603
-#define MSR_PKG_POWER_SKU              0x614
 #define MSR_DDR_RAPL_LIMIT             0x618
 #define MSR_VR_MISC_CONFIG2            0x636
 

diff --git a/arch/x86/include/asm/arch-ivybridge/model_206ax.h b/arch/x86/include/asm/arch-ivybridge/model_206ax.h
index 4839ebc3124413805f6b0076c11ab00a1db04fd1..5c066294bc238fa80ef068af862b386b4166460d 100644 (file)
--- a/arch/x86/include/asm/arch-ivybridge/model_206ax.h
+++ b/arch/x86/include/asm/arch-ivybridge/model_206ax.h
@@ -43,7 +43,6 @@
 #define MSR_PP1_CURRENT_CONFIG         0x602
 #define  PP1_CURRENT_LIMIT_SNB         (35 << 3) /* 35 A */
 #define  PP1_CURRENT_LIMIT_IVB         (50 << 3) /* 50 A */
-#define MSR_PKG_POWER_SKU              0x614
 
 #define IVB_CONFIG_TDP_MIN_CPUID       0x306a2
 #define MSR_CONFIG_TDP_LEVEL1          0x649

diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h
index 5bc8b6c22c7eab17ed1c41446bc5e356b8029b6b..79a9369de1128cc9f3a8f8bdf59dfa3150afc838 100644 (file)
--- a/arch/x86/include/asm/msr-index.h
+++ b/arch/x86/include/asm/msr-index.h
@@ -241,10 +241,17 @@
 #define  PKG_POWER_LIMIT_CLAMP         (1 << 16)
 #define  PKG_POWER_LIMIT_TIME_SHIFT    17
 #define  PKG_POWER_LIMIT_TIME_MASK     0x7f
+/*
+ * For Mobile, RAPL default PL1 time window value set to 28 seconds.
+ * RAPL time window calculation defined as follows:
+ * Time Window = (float)((1+X/4)*(2*^Y), X Corresponds to [23:22],
+ * Y to [21:17] in MSR 0x610. 28 sec is equal to 0x6e.
+ */
+#define  MB_POWER_LIMIT1_TIME_DEFAULT  0x6e
 
 #define MSR_PKG_ENERGY_STATUS          0x00000611
 #define MSR_PKG_PERF_STATUS            0x00000613
-#define MSR_PKG_POWER_INFO             0x00000614
+#define MSR_PKG_POWER_SKU              0x614
 
 #define MSR_DRAM_POWER_LIMIT           0x00000618
 #define MSR_DRAM_ENERGY_STATUS         0x00000619