diff options
| author | Len Brown <len.brown@intel.com> | 2013-03-15 10:58:02 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2013-03-15 11:05:26 -0400 |
| commit | 149c2319c6316d979de90ce2c8665e9c02d5927b (patch) | |
| tree | 6a7a880ef8067c32877631a31df8627fa376c587 | |
| parent | 0b15841b0bbbde75134a777c543dc51fe6187108 (diff) | |
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: Len Brown <len.brown@intel.com>
| -rw-r--r-- | tools/power/x86/turbostat/turbostat.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c index 6f3214ed4444..321e066a0753 100644 --- 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) | |||
| 1421 | case 0x3C: /* HSW */ | 1421 | case 0x3C: /* HSW */ |
| 1422 | case 0x3F: /* HSW */ | 1422 | case 0x3F: /* HSW */ |
| 1423 | case 0x45: /* HSW */ | 1423 | case 0x45: /* HSW */ |
| 1424 | case 0x46: /* HSW */ | ||
| 1424 | return 1; | 1425 | return 1; |
| 1425 | case 0x2E: /* Nehalem-EX Xeon - Beckton */ | 1426 | case 0x2E: /* Nehalem-EX Xeon - Beckton */ |
| 1426 | case 0x2F: /* Westmere-EX Xeon - Eagleton */ | 1427 | case 0x2F: /* Westmere-EX Xeon - Eagleton */ |
| @@ -1515,6 +1516,7 @@ void rapl_probe(unsigned int family, unsigned int model) | |||
| 1515 | case 0x3C: /* HSW */ | 1516 | case 0x3C: /* HSW */ |
| 1516 | case 0x3F: /* HSW */ | 1517 | case 0x3F: /* HSW */ |
| 1517 | case 0x45: /* HSW */ | 1518 | case 0x45: /* HSW */ |
| 1519 | case 0x46: /* HSW */ | ||
| 1518 | do_rapl = RAPL_PKG | RAPL_CORES | RAPL_GFX; | 1520 | do_rapl = RAPL_PKG | RAPL_CORES | RAPL_GFX; |
| 1519 | break; | 1521 | break; |
| 1520 | case 0x2D: | 1522 | case 0x2D: |
| @@ -1754,6 +1756,7 @@ int is_snb(unsigned int family, unsigned int model) | |||
| 1754 | case 0x3C: /* HSW */ | 1756 | case 0x3C: /* HSW */ |
| 1755 | case 0x3F: /* HSW */ | 1757 | case 0x3F: /* HSW */ |
| 1756 | case 0x45: /* HSW */ | 1758 | case 0x45: /* HSW */ |
| 1759 | case 0x46: /* HSW */ | ||
| 1757 | return 1; | 1760 | return 1; |
| 1758 | } | 1761 | } |
| 1759 | return 0; | 1762 | return 0; |
| @@ -2276,7 +2279,7 @@ int main(int argc, char **argv) | |||
| 2276 | cmdline(argc, argv); | 2279 | cmdline(argc, argv); |
| 2277 | 2280 | ||
| 2278 | if (verbose) | 2281 | if (verbose) |
| 2279 | fprintf(stderr, "turbostat v3.2 February 11, 2013" | 2282 | fprintf(stderr, "turbostat v3.3 March 15, 2013" |
| 2280 | " - Len Brown <lenb@kernel.org>\n"); | 2283 | " - Len Brown <lenb@kernel.org>\n"); |
| 2281 | 2284 | ||
| 2282 | turbostat_init(); | 2285 | turbostat_init(); |
