Commit 149c2319 authored by Len Brown's avatar Len Brown

tools/power turbostat: additional Haswell CPU-id

There is an additional HSW CPU-id, 0x46,
which has C-states exactly like CPU-id 0x45.
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 0b15841b
...@@ -1421,6 +1421,7 @@ int has_nehalem_turbo_ratio_limit(unsigned int family, unsigned int model) ...@@ -1421,6 +1421,7 @@ int has_nehalem_turbo_ratio_limit(unsigned int family, unsigned int model)
case 0x3C: /* HSW */ case 0x3C: /* HSW */
case 0x3F: /* HSW */ case 0x3F: /* HSW */
case 0x45: /* HSW */ case 0x45: /* HSW */
case 0x46: /* HSW */
return 1; return 1;
case 0x2E: /* Nehalem-EX Xeon - Beckton */ case 0x2E: /* Nehalem-EX Xeon - Beckton */
case 0x2F: /* Westmere-EX Xeon - Eagleton */ case 0x2F: /* Westmere-EX Xeon - Eagleton */
...@@ -1515,6 +1516,7 @@ void rapl_probe(unsigned int family, unsigned int model) ...@@ -1515,6 +1516,7 @@ void rapl_probe(unsigned int family, unsigned int model)
case 0x3C: /* HSW */ case 0x3C: /* HSW */
case 0x3F: /* HSW */ case 0x3F: /* HSW */
case 0x45: /* HSW */ case 0x45: /* HSW */
case 0x46: /* HSW */
do_rapl = RAPL_PKG | RAPL_CORES | RAPL_GFX; do_rapl = RAPL_PKG | RAPL_CORES | RAPL_GFX;
break; break;
case 0x2D: case 0x2D:
...@@ -1754,6 +1756,7 @@ int is_snb(unsigned int family, unsigned int model) ...@@ -1754,6 +1756,7 @@ int is_snb(unsigned int family, unsigned int model)
case 0x3C: /* HSW */ case 0x3C: /* HSW */
case 0x3F: /* HSW */ case 0x3F: /* HSW */
case 0x45: /* HSW */ case 0x45: /* HSW */
case 0x46: /* HSW */
return 1; return 1;
} }
return 0; return 0;
...@@ -2276,7 +2279,7 @@ int main(int argc, char **argv) ...@@ -2276,7 +2279,7 @@ int main(int argc, char **argv)
cmdline(argc, argv); cmdline(argc, argv);
if (verbose) if (verbose)
fprintf(stderr, "turbostat v3.2 February 11, 2013" fprintf(stderr, "turbostat v3.3 March 15, 2013"
" - Len Brown <lenb@kernel.org>\n"); " - Len Brown <lenb@kernel.org>\n");
turbostat_init(); turbostat_init();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment