projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tools/power turbostat: additional Haswell CPU-id
[firefly-linux-kernel-4.4.55.git]
/
tools
/
power
/
x86
/
turbostat
/
turbostat.c
diff --git
a/tools/power/x86/turbostat/turbostat.c
b/tools/power/x86/turbostat/turbostat.c
index 6f3214ed4444ecb14c33cc29c3119057bf812cf5..321e066a07533bcf7a18e72c471e01cc1bef9527 100644
(file)
--- a/
tools/power/x86/turbostat/turbostat.c
+++ b/
tools/power/x86/turbostat/turbostat.c
@@
-1421,6
+1421,7
@@
int has_nehalem_turbo_ratio_limit(unsigned int family, unsigned int model)
case 0x3C: /* HSW */
case 0x3F: /* HSW */
case 0x45: /* HSW */
case 0x3C: /* HSW */
case 0x3F: /* HSW */
case 0x45: /* HSW */
+ case 0x46: /* HSW */
return 1;
case 0x2E: /* Nehalem-EX Xeon - Beckton */
case 0x2F: /* Westmere-EX Xeon - Eagleton */
return 1;
case 0x2E: /* Nehalem-EX Xeon - Beckton */
case 0x2F: /* Westmere-EX Xeon - Eagleton */
@@
-1515,6
+1516,7
@@
void rapl_probe(unsigned int family, unsigned int model)
case 0x3C: /* HSW */
case 0x3F: /* HSW */
case 0x45: /* HSW */
case 0x3C: /* HSW */
case 0x3F: /* HSW */
case 0x45: /* HSW */
+ case 0x46: /* HSW */
do_rapl = RAPL_PKG | RAPL_CORES | RAPL_GFX;
break;
case 0x2D:
do_rapl = RAPL_PKG | RAPL_CORES | RAPL_GFX;
break;
case 0x2D:
@@
-1754,6
+1756,7
@@
int is_snb(unsigned int family, unsigned int model)
case 0x3C: /* HSW */
case 0x3F: /* HSW */
case 0x45: /* HSW */
case 0x3C: /* HSW */
case 0x3F: /* HSW */
case 0x45: /* HSW */
+ case 0x46: /* HSW */
return 1;
}
return 0;
return 1;
}
return 0;
@@
-2276,7
+2279,7
@@
int main(int argc, char **argv)
cmdline(argc, argv);
if (verbose)
cmdline(argc, argv);
if (verbose)
- fprintf(stderr, "turbostat v3.
2 February 11
, 2013"
+ fprintf(stderr, "turbostat v3.
3 March 15
, 2013"
" - Len Brown <lenb@kernel.org>\n");
turbostat_init();
" - Len Brown <lenb@kernel.org>\n");
turbostat_init();