aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2016-04-06 17:15:56 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-04-07 16:18:33 -0400
commite4085d543e256aff6606ba99ed257f7c06685f3b (patch)
tree542fe45af072240088c62c0e09b53b111fc42177
parent5a63426e2a18775ed05b20e3bc90c68bacb1f68a (diff)
tools/power turbostat: initial BXT support
Broxton has a lot in common with SKL Signed-off-by: Len Brown <len.brown@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--tools/power/x86/turbostat/turbostat.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index 2f60fdbf9213..96d8eafdd380 100644
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -1298,6 +1298,7 @@ int hsw_pkg_cstate_limits[16] = {PCL__0, PCL__2, PCL__3, PCL__6, PCL__7, PCL_7S,
1298int slv_pkg_cstate_limits[16] = {PCL__0, PCL__1, PCLRSV, PCLRSV, PCL__4, PCLRSV, PCL__6, PCL__7, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV}; 1298int slv_pkg_cstate_limits[16] = {PCL__0, PCL__1, PCLRSV, PCLRSV, PCL__4, PCLRSV, PCL__6, PCL__7, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV};
1299int amt_pkg_cstate_limits[16] = {PCL__0, PCL__1, PCL__2, PCLRSV, PCLRSV, PCLRSV, PCL__6, PCL__7, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV}; 1299int amt_pkg_cstate_limits[16] = {PCL__0, PCL__1, PCL__2, PCLRSV, PCLRSV, PCLRSV, PCL__6, PCL__7, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV};
1300int phi_pkg_cstate_limits[16] = {PCL__0, PCL__2, PCL_6N, PCL_6R, PCLRSV, PCLRSV, PCLRSV, PCLUNL, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV}; 1300int phi_pkg_cstate_limits[16] = {PCL__0, PCL__2, PCL_6N, PCL_6R, PCLRSV, PCLRSV, PCLRSV, PCLUNL, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV};
1301int bxt_pkg_cstate_limits[16] = {PCL__0, PCL__2, PCLUNL, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV};
1301 1302
1302 1303
1303static void 1304static void
@@ -2199,6 +2200,9 @@ int probe_nhm_msrs(unsigned int family, unsigned int model)
2199 case 0x57: /* PHI */ 2200 case 0x57: /* PHI */
2200 pkg_cstate_limits = phi_pkg_cstate_limits; 2201 pkg_cstate_limits = phi_pkg_cstate_limits;
2201 break; 2202 break;
2203 case 0x5C: /* BXT */
2204 pkg_cstate_limits = bxt_pkg_cstate_limits;
2205 break;
2202 default: 2206 default:
2203 return 0; 2207 return 0;
2204 } 2208 }
@@ -2628,6 +2632,9 @@ void rapl_probe(unsigned int family, unsigned int model)
2628 case 0x47: /* BDW */ 2632 case 0x47: /* BDW */
2629 do_rapl = RAPL_PKG | RAPL_CORES | RAPL_CORE_POLICY | RAPL_GFX | RAPL_PKG_POWER_INFO; 2633 do_rapl = RAPL_PKG | RAPL_CORES | RAPL_CORE_POLICY | RAPL_GFX | RAPL_PKG_POWER_INFO;
2630 break; 2634 break;
2635 case 0x5C: /* BXT */
2636 do_rapl = RAPL_PKG | RAPL_PKG_POWER_INFO;
2637 break;
2631 case 0x4E: /* SKL */ 2638 case 0x4E: /* SKL */
2632 case 0x5E: /* SKL */ 2639 case 0x5E: /* SKL */
2633 do_rapl = RAPL_PKG | RAPL_DRAM | RAPL_DRAM_PERF_STATUS | RAPL_PKG_PERF_STATUS | RAPL_PKG_POWER_INFO; 2640 do_rapl = RAPL_PKG | RAPL_DRAM | RAPL_DRAM_PERF_STATUS | RAPL_PKG_PERF_STATUS | RAPL_PKG_POWER_INFO;
@@ -2914,6 +2921,7 @@ int has_snb_msrs(unsigned int family, unsigned int model)
2914 case 0x56: /* BDX-DE */ 2921 case 0x56: /* BDX-DE */
2915 case 0x4E: /* SKL */ 2922 case 0x4E: /* SKL */
2916 case 0x5E: /* SKL */ 2923 case 0x5E: /* SKL */
2924 case 0x5C: /* BXT */
2917 return 1; 2925 return 1;
2918 } 2926 }
2919 return 0; 2927 return 0;
@@ -2941,6 +2949,7 @@ int has_hsw_msrs(unsigned int family, unsigned int model)
2941 case 0x3D: /* BDW */ 2949 case 0x3D: /* BDW */
2942 case 0x4E: /* SKL */ 2950 case 0x4E: /* SKL */
2943 case 0x5E: /* SKL */ 2951 case 0x5E: /* SKL */
2952 case 0x5C: /* BXT */
2944 return 1; 2953 return 1;
2945 } 2954 }
2946 return 0; 2955 return 0;