]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
tools/power/x86/intel-speed-select: Die ID for IO dies
authorSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Wed, 5 Mar 2025 19:03:15 +0000 (11:03 -0800)
committerSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Fri, 7 Mar 2025 16:00:21 +0000 (08:00 -0800)
Instead of displaying "-1" for IO dies, display "IO".

Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
tools/power/x86/intel-speed-select/isst-display.c

index 07ebd08f32026e096880aa8b9fe0e9653c53fe4f..da5a59a4c545717f4093397ef71559da86c4248a 100644 (file)
@@ -173,7 +173,11 @@ static int print_package_info(struct isst_id *id, FILE *outf)
 
        if (out_format_is_json()) {
                if (api_version() > 1) {
-                       if (id->cpu < 0)
+                       if (id->die < 0 && id->cpu < 0)
+                               snprintf(header, sizeof(header),
+                                        "package-%d:die-IO:powerdomain-%d:cpu-None",
+                                        id->pkg, id->punit);
+                       else if (id->cpu < 0)
                                snprintf(header, sizeof(header),
                                         "package-%d:die-%d:powerdomain-%d:cpu-None",
                                         id->pkg, id->die, id->punit);
@@ -190,7 +194,10 @@ static int print_package_info(struct isst_id *id, FILE *outf)
        }
        snprintf(header, sizeof(header), "package-%d", id->pkg);
        format_and_print(outf, level++, header, NULL);
-       snprintf(header, sizeof(header), "die-%d", id->die);
+       if (id->die < 0)
+               snprintf(header, sizeof(header), "die-IO");
+       else
+               snprintf(header, sizeof(header), "die-%d", id->die);
        format_and_print(outf, level++, header, NULL);
        if (api_version() > 1) {
                snprintf(header, sizeof(header), "powerdomain-%d", id->punit);