tools/power turbostat: regression fix: --show C1E%

The new default idle counter groupings broke "--show C1E%" (or any other C-state %)

Also delete a stray debug printf from the same offending commit.

Reported-by: Zhang Rui <rui.zhang@intel.com>
Fixes: ec4acd3166d8 ("tools/power turbostat: disable "cpuidle" invocation counters, by default")
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 5230e072e414c644cd9ba9833a23566e4a258320..33a54a9e0781866ac0797c7901ab101a4b2db0cd 100644 (file)
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -2429,7 +2429,6 @@ unsigned long long bic_lookup(char *name_list, enum show_hide_mode mode)
 
                }
                if (i == MAX_BIC) {
-                       fprintf(stderr, "deferred %s\n", name_list);
                        if (mode == SHOW_LIST) {
                                deferred_add_names[deferred_add_index++] = name_list;
                                if (deferred_add_index >= MAX_DEFERRED) {
@@ -10537,9 +10536,6 @@ void probe_cpuidle_residency(void)
        int min_state = 1024, max_state = 0;
        char *sp;
 
-       if (!DO_BIC(BIC_pct_idle))
-               return;
-
        for (state = 10; state >= 0; --state) {
 
                sprintf(path, "/sys/devices/system/cpu/cpu%d/cpuidle/state%d/name", base_cpu, state);