Commit fcf12783 authored by Srinivas Pandruvada's avatar Srinivas Pandruvada
Browse files

tools/power/x86/intel-speed-select: Fix json formatting issue 



Fix two issues related to JSON formatting:
1.
intel-speed-select -f json -o cp.out -c 1 core-power assoc -c 1
Intel(R) Speed Select Technology
Executing on CPU model:143[0x8f]
[root@spr-bkc bin]# cat cp.out | jq .
"package-0:die-0:cpu-1"

2.
intel-speed-select -f json -o tf.out turbo-freq enable -a
Intel(R) Speed Select Technology
Executing on CPU model:143[0x8f]
[root@spr-bkc bin]# cat tf.out | jq .
{
  "package-0:die-0:cpu-0": {
    "turbo-freq": {
      "enable": "success"
    }
  },
  "package-1:die-0:cpu-48": {
    "turbo-freq": {
      "enable": "success"
    }
  }
}
"turbo-freq --auto"
parse error: Expected string key before ':' at line 17, column 24

Both of these issues needed proper closing "}" for JSON.

Signed-off-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
parent 4ebde55b

tools/power/x86/intel-speed-select/isst-config.c

+7 −1
Original line number Diff line number Diff line
@@ -2113,7 +2113,6 @@ static void set_fact_enable(int arg) 
	else

		for_each_online_power_domain_in_set(set_fact_for_cpu, NULL, NULL,

					       NULL, &enable);

	isst_ctdp_display_information_end(outf);



	if (!fact_enable_fail && enable && auto_mode) {

		/*
@@ -2192,10 +2191,13 @@ static void set_fact_enable(int arg) 
		isst_display_result(&id, outf, "turbo-freq --auto", "enable", 0);

	}



	isst_ctdp_display_information_end(outf);



	return;



error_disp:

	isst_display_result(&id, outf, "turbo-freq --auto", "enable", ret);

	isst_ctdp_display_information_end(outf);



}
@@ -2434,12 +2436,16 @@ static void set_clos_assoc(int arg) 
		isst_display_error_info_message(1, "Invalid clos id\n", 0, 0);

		exit(0);

	}



	isst_ctdp_display_information_start(outf);



	if (max_target_cpus)

		for_each_online_target_cpu_in_set(set_clos_assoc_for_cpu, NULL,

						  NULL, NULL, NULL);

	else {

		isst_display_error_info_message(1, "Invalid target cpu. Specify with [-c|--cpu]", 0, 0);

	}

	isst_ctdp_display_information_end(outf);

}



static void get_clos_assoc_for_cpu(struct isst_id *id, void *arg1, void *arg2, void *arg3,