tools/power/x86/intel-speed-select: Ignore missing config level

[ Upstream commit 20183ccd3e4d01d23b0a01fe9f3ee73fbae312fa ]

It is possible that certain config levels are not available, even
if the max level includes the level. There can be missing levels in
some platforms. So ignore the level when called for information dump
for all levels and fail if specifically ask for the missing level.

Here the changes is to continue reading information about other levels
even if we fail to get information for the current level. But use the
"processed" flag to indicate the failure. When the "processed" flag is
not set, don't dump information about that level.

Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/tools/power/x86/intel-speed-select/isst-core.c b/tools/power/x86/intel-speed-select/isst-core.c
index 6dee5332c9d370ececd9015333a2a2a5b2438b10..fde3f9cefc6db1b249406edcde94d2078d3c544c 100644 (file)
--- a/tools/power/x86/intel-speed-select/isst-core.c
+++ b/tools/power/x86/intel-speed-select/isst-core.c
@@ -553,7 +553,6 @@ int isst_get_process_ctdp(int cpu, int tdp_level, struct isst_pkg_ctdp *pkg_dev)
                             i);
                ctdp_level = &pkg_dev->ctdp_level[i];
 
-               ctdp_level->processed = 1;
                ctdp_level->level = i;
                ctdp_level->control_cpu = cpu;
                ctdp_level->pkg_id = get_physical_package_id(cpu);
@@ -561,7 +560,10 @@ int isst_get_process_ctdp(int cpu, int tdp_level, struct isst_pkg_ctdp *pkg_dev)
 
                ret = isst_get_ctdp_control(cpu, i, ctdp_level);
                if (ret)
-                       return ret;
+                       continue;
+
+               pkg_dev->processed = 1;
+               ctdp_level->processed = 1;
 
                ret = isst_get_tdp_info(cpu, i, ctdp_level);
                if (ret)
@@ -614,8 +616,6 @@ int isst_get_process_ctdp(int cpu, int tdp_level, struct isst_pkg_ctdp *pkg_dev)
                }
        }
 
-       pkg_dev->processed = 1;
-
        return 0;
 }
 

diff --git a/tools/power/x86/intel-speed-select/isst-display.c b/tools/power/x86/intel-speed-select/isst-display.c
index 40346d534f789a120f36ecc95e1527f35d074b94..b11575c3e88643af72caf42ddf758852831b1deb 100644 (file)
--- a/tools/power/x86/intel-speed-select/isst-display.c
+++ b/tools/power/x86/intel-speed-select/isst-display.c
@@ -314,7 +314,8 @@ void isst_ctdp_display_information(int cpu, FILE *outf, int tdp_level,
        char value[256];
        int i, base_level = 1;
 
-       print_package_info(cpu, outf);
+       if (pkg_dev->processed)
+               print_package_info(cpu, outf);
 
        for (i = 0; i <= pkg_dev->levels; ++i) {
                struct isst_pkg_ctdp_level_info *ctdp_level;