tools/power turbostat: simplify dump_turbo_ratio_limits()

code cleanup only.
no functional change.

Signed-off-by: Len Brown <len.brown@intel.com>

diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index b343a13537b5bb67726674b20edf9b9123d47097..5d3c40ad0cb1fa087bd6edce493acfe0873753aa 100644 (file)
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -2532,7 +2532,7 @@ int has_turbo_ratio_group_limits(int family, int model)
 static void dump_turbo_ratio_limits(int family, int model)
 {
        unsigned long long msr, core_counts;
-       unsigned int ratio, group_size;
+       int shift;
 
        get_msr(base_cpu, MSR_TURBO_RATIO_LIMIT, &msr);
        fprintf(outf, "cpu%d: MSR_TURBO_RATIO_LIMIT: 0x%08llx\n", base_cpu, msr);
@@ -2544,53 +2544,16 @@ static void dump_turbo_ratio_limits(int family, int model)
                core_counts = 0x0807060504030201;
        }
 
-       ratio = (msr >> 56) & 0xFF;
-       group_size = (core_counts >> 56) & 0xFF;
-       if (ratio)
-               fprintf(outf, "%d * %.1f = %.1f MHz max turbo %d active cores\n",
-                       ratio, bclk, ratio * bclk, group_size);
-
-       ratio = (msr >> 48) & 0xFF;
-       group_size = (core_counts >> 48) & 0xFF;
-       if (ratio)
-               fprintf(outf, "%d * %.1f = %.1f MHz max turbo %d active cores\n",
-                       ratio, bclk, ratio * bclk, group_size);
-
-       ratio = (msr >> 40) & 0xFF;
-       group_size = (core_counts >> 40) & 0xFF;
-       if (ratio)
-               fprintf(outf, "%d * %.1f = %.1f MHz max turbo %d active cores\n",
-                       ratio, bclk, ratio * bclk, group_size);
-
-       ratio = (msr >> 32) & 0xFF;
-       group_size = (core_counts >> 32) & 0xFF;
-       if (ratio)
-               fprintf(outf, "%d * %.1f = %.1f MHz max turbo %d active cores\n",
-                       ratio, bclk, ratio * bclk, group_size);
+       for (shift = 56; shift >= 0; shift -= 8) {
+               unsigned int ratio, group_size;
 
-       ratio = (msr >> 24) & 0xFF;
-       group_size = (core_counts >> 24) & 0xFF;
-       if (ratio)
-               fprintf(outf, "%d * %.1f = %.1f MHz max turbo %d active cores\n",
-                       ratio, bclk, ratio * bclk, group_size);
-
-       ratio = (msr >> 16) & 0xFF;
-       group_size = (core_counts >> 16) & 0xFF;
-       if (ratio)
-               fprintf(outf, "%d * %.1f = %.1f MHz max turbo %d active cores\n",
-                       ratio, bclk, ratio * bclk, group_size);
-
-       ratio = (msr >> 8) & 0xFF;
-       group_size = (core_counts >> 8) & 0xFF;
-       if (ratio)
-               fprintf(outf, "%d * %.1f = %.1f MHz max turbo %d active cores\n",
-                       ratio, bclk, ratio * bclk, group_size);
+               ratio = (msr >> shift) & 0xFF;
+               group_size = (core_counts >> shift) & 0xFF;
+               if (ratio)
+                       fprintf(outf, "%d * %.1f = %.1f MHz max turbo %d active cores\n",
+                               ratio, bclk, ratio * bclk, group_size);
+       }
 
-       ratio = (msr >> 0) & 0xFF;
-       group_size = (core_counts >> 0) & 0xFF;
-       if (ratio)
-               fprintf(outf, "%d * %.1f = %.1f MHz max turbo %d active cores\n",
-                       ratio, bclk, ratio * bclk, group_size);
        return;
 }