diff options
| author |   Len Brown <len.brown@intel.com> | 2015-03-13 16:30:57 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2015-04-13 15:52:54 -0400 |
| commit | e33cbe852de48c313a8a52686765c58a711dd9e4 (patch) | |
| tree | 0fca1f6a3507278776b1a02838205067d2fdb52b /tools | |
| parent | tools/power turbostat: simplify default output (diff) | |
| download | linux-dev-e33cbe852de48c313a8a52686765c58a711dd9e4.tar.xz linux-dev-e33cbe852de48c313a8a52686765c58a711dd9e4.zip | |
tools/power turbostat: update PERF_LIMIT_REASONS decoding
cosmetic only.
order the decoding of MSR_PERF_LIMIT_REASONS bits
from MSB to LSB -- which you notice when more than 1 bit is set
and you are, say, comparing the output to the documentation...
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/power/x86/turbostat/turbostat.c | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c index 1bc6e6c163a5..50ef8577b91f 100644 --- a/tools/power/x86/turbostat/turbostat.c +++ b/tools/power/x86/turbostat/turbostat.c @@ -1700,35 +1700,35 @@ int print_perf_limit(struct thread_data *t, struct core_data *c, struct pkg_data get_msr(cpu, MSR_CORE_PERF_LIMIT_REASONS, &msr); fprintf(stderr, "cpu%d: MSR_CORE_PERF_LIMIT_REASONS, 0x%08llx", cpu, msr); fprintf(stderr, " (Active: %s%s%s%s%s%s%s%s%s%s%s%s%s%s)", - (msr & 1 << 0) ? "PROCHOT, " : "", - (msr & 1 << 1) ? "ThermStatus, " : "", - (msr & 1 << 2) ? "bit2, " : "", - (msr & 1 << 4) ? "Graphics, " : "", - (msr & 1 << 5) ? "Auto-HWP, " : "", - (msr & 1 << 6) ? "VR-Therm, " : "", - (msr & 1 << 8) ? "Amps, " : "", - (msr & 1 << 9) ? "CorePwr, " : "", - (msr & 1 << 10) ? "PkgPwrL1, " : "", - (msr & 1 << 11) ? "PkgPwrL2, " : "", - (msr & 1 << 12) ? "MultiCoreTurbo, " : "", - (msr & 1 << 13) ? "Transitions, " : "", + (msr & 1 << 15) ? "bit15, " : "", (msr & 1 << 14) ? "bit14, " : "", - (msr & 1 << 15) ? "bit15, " : ""); + (msr & 1 << 13) ? "Transitions, " : "", + (msr & 1 << 12) ? "MultiCoreTurbo, " : "", + (msr & 1 << 11) ? "PkgPwrL2, " : "", + (msr & 1 << 10) ? "PkgPwrL1, " : "", + (msr & 1 << 9) ? "CorePwr, " : "", + (msr & 1 << 8) ? "Amps, " : "", + (msr & 1 << 6) ? "VR-Therm, " : "", + (msr & 1 << 5) ? "Auto-HWP, " : "", + (msr & 1 << 4) ? "Graphics, " : "", + (msr & 1 << 2) ? "bit2, " : "", + (msr & 1 << 1) ? "ThermStatus, " : "", + (msr & 1 << 0) ? "PROCHOT, " : ""); fprintf(stderr, " (Logged: %s%s%s%s%s%s%s%s%s%s%s%s%s%s)\n", - (msr & 1 << 16) ? "PROCHOT, " : "", - (msr & 1 << 17) ? "ThermStatus, " : "", - (msr & 1 << 18) ? "bit18, " : "", - (msr & 1 << 20) ? "Graphics, " : "", - (msr & 1 << 21) ? "Auto-HWP, " : "", - (msr & 1 << 22) ? "VR-Therm, " : "", - (msr & 1 << 24) ? "Amps, " : "", - (msr & 1 << 25) ? "CorePwr, " : "", - (msr & 1 << 26) ? "PkgPwrL1, " : "", - (msr & 1 << 27) ? "PkgPwrL2, " : "", - (msr & 1 << 28) ? "MultiCoreTurbo, " : "", - (msr & 1 << 29) ? "Transitions, " : "", + (msr & 1 << 31) ? "bit31, " : "", (msr & 1 << 30) ? "bit30, " : "", - (msr & 1 << 31) ? "bit31, " : ""); + (msr & 1 << 29) ? "Transitions, " : "", + (msr & 1 << 28) ? "MultiCoreTurbo, " : "", + (msr & 1 << 27) ? "PkgPwrL2, " : "", + (msr & 1 << 26) ? "PkgPwrL1, " : "", + (msr & 1 << 25) ? "CorePwr, " : "", + (msr & 1 << 24) ? "Amps, " : "", + (msr & 1 << 22) ? "VR-Therm, " : "", + (msr & 1 << 21) ? "Auto-HWP, " : "", + (msr & 1 << 20) ? "Graphics, " : "", + (msr & 1 << 18) ? "bit18, " : "", + (msr & 1 << 17) ? "ThermStatus, " : "", + (msr & 1 << 16) ? "PROCHOT, " : ""); } if (do_gfx_perf_limit_reasons) { |