tools/power/x86/intel-speed-select: Introduce is_cpu_in_power_domain helper

struct isst_id contains cpu, package and die info, and it can represent
a specific SST power domain.

Introduce is_cpu_in_power_domain() helper to identify if a cpu is in a
specified power_domain.

And cleanup the code to use the new helper.

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>

diff --git a/tools/power/x86/intel-speed-select/isst-config.c b/tools/power/x86/intel-speed-select/isst-config.c
index c65b764d05e8c7c57055b196eda221610b999ef7..061818acdf1dd697ba085094adfe041b83edb405 100644 (file)
--- a/tools/power/x86/intel-speed-select/isst-config.c
+++ b/tools/power/x86/intel-speed-select/isst-config.c
@@ -366,6 +366,18 @@ void set_isst_id(struct isst_id *id, int cpu)
        id->die = get_physical_die_id(cpu);
 }
 
+int is_cpu_in_power_domain(int cpu, struct isst_id *id)
+{
+       struct isst_id tid;
+
+       set_isst_id(&tid, cpu);
+
+       if (id->pkg == tid.pkg && id->die == tid.die)
+               return 1;
+
+       return 0;
+}
+
 int get_cpufreq_base_freq(int cpu)
 {
        return parse_int_file(0, "/sys/devices/system/cpu/cpu%d/cpufreq/base_frequency", cpu);
@@ -592,9 +604,8 @@ int get_max_punit_core_id(struct isst_id *id)
                if (!CPU_ISSET_S(i, present_cpumask_size, present_cpumask))
                        continue;
 
-               if (cpu_map[i].pkg_id == id->pkg &&
-                       cpu_map[i].die_id == id->die &&
-                       cpu_map[i].punit_cpu_core > max_id)
+               if (is_cpu_in_power_domain(i, id) &&
+                   cpu_map[i].punit_cpu_core > max_id)
                        max_id = cpu_map[i].punit_cpu_core;
        }
 
@@ -688,8 +699,7 @@ void set_cpu_mask_from_punit_coremask(struct isst_id *id, unsigned long long cor
                                if (!CPU_ISSET_S(j, present_cpumask_size, present_cpumask))
                                        continue;
 
-                               if (cpu_map[j].pkg_id == id->pkg &&
-                                   cpu_map[j].die_id == id->die &&
+                               if (is_cpu_in_power_domain(j, id) &&
                                    cpu_map[j].punit_cpu_core == i) {
                                        CPU_SET_S(j, core_cpumask_size,
                                                  core_cpumask);
@@ -1129,8 +1139,7 @@ static int clx_n_config(struct isst_id *id)
                if (!CPU_ISSET_S(i, present_cpumask_size, present_cpumask))
                        continue;
 
-               if (id->pkg != get_physical_package_id(i) ||
-                   id->die != get_physical_die_id(i))
+               if (!is_cpu_in_power_domain(i, id))
                        continue;
 
                CPU_SET_S(i, ctdp_level->core_cpumask_size,
@@ -1167,8 +1176,7 @@ static int clx_n_config(struct isst_id *id)
                if (!CPU_ISSET_S(i, present_cpumask_size, present_cpumask))
                        continue;
 
-               if (id->pkg != get_physical_package_id(i) ||
-                   id->die != get_physical_die_id(i))
+               if (!is_cpu_in_power_domain(i, id))
                        continue;
 
                cpu_bf = parse_int_file(1,
@@ -1300,7 +1308,7 @@ static void set_tdp_level_for_cpu(struct isst_id *id, void *arg1, void *arg2, vo
                        if (ctdp_level.cpu_count) {
                                int i, max_cpus = get_topo_max_cpus();
                                for (i = 0; i < max_cpus; ++i) {
-                                       if (id->pkg != get_physical_package_id(i) || id->die != get_physical_die_id(i))
+                                       if (!is_cpu_in_power_domain(i, id))
                                                continue;
                                        if (CPU_ISSET_S(i, ctdp_level.core_cpumask_size, ctdp_level.core_cpumask)) {
                                                fprintf(stderr, "online cpu %d\n", i);
@@ -1507,8 +1515,7 @@ static int set_clx_pbf_cpufreq_scaling_min_max(struct isst_id *id)
        freq_low = pbf_info->p1_low * 100000;
 
        for (i = 0; i < get_topo_max_cpus(); ++i) {
-               if (id->pkg != get_physical_package_id(i) ||
-                   id->die != get_physical_die_id(i))
+               if (!is_cpu_in_power_domain(i, id))
                        continue;
 
                if (CPU_ISSET_S(i, pbf_info->core_cpumask_size,
@@ -1576,8 +1583,7 @@ static void set_scaling_min_to_cpuinfo_max(struct isst_id *id)
        int i;
 
        for (i = 0; i < get_topo_max_cpus(); ++i) {
-               if (id->pkg != get_physical_package_id(i) ||
-                   id->die != get_physical_die_id(i))
+               if (!is_cpu_in_power_domain(i, id))
                        continue;
 
                adjust_scaling_max_from_base_freq(i);
@@ -1591,8 +1597,7 @@ static void set_scaling_min_to_cpuinfo_min(struct isst_id *id)
        int i;
 
        for (i = 0; i < get_topo_max_cpus(); ++i) {
-               if (id->pkg != get_physical_package_id(i) ||
-                   id->die != get_physical_die_id(i))
+               if (!is_cpu_in_power_domain(i, id))
                        continue;
 
                adjust_scaling_max_from_base_freq(i);
@@ -1605,8 +1610,7 @@ static void set_scaling_max_to_cpuinfo_max(struct isst_id *id)
        int i;
 
        for (i = 0; i < get_topo_max_cpus(); ++i) {
-               if (id->pkg != get_physical_package_id(i) ||
-                   id->die != get_physical_die_id(i))
+               if (!is_cpu_in_power_domain(i, id))
                        continue;
 
                set_cpufreq_scaling_min_max_from_cpuinfo(i, 1, 1);
@@ -1642,8 +1646,7 @@ static int set_core_priority_and_min(struct isst_id *id, int mask_size,
                int clos;
                struct isst_id tid;
 
-               if (id->pkg != get_physical_package_id(i) ||
-                   id->die != get_physical_die_id(i))
+               if (!is_cpu_in_power_domain(i, id))
                        continue;
 
                if (CPU_ISSET_S(i, mask_size, cpu_mask))

diff --git a/tools/power/x86/intel-speed-select/isst-daemon.c b/tools/power/x86/intel-speed-select/isst-daemon.c
index 4826625ce891d0380ed38dc8aa5e9005126da778..c5d978ecc44334984ec007e9ae50232dfea5e49a 100644 (file)
--- a/tools/power/x86/intel-speed-select/isst-daemon.c
+++ b/tools/power/x86/intel-speed-select/isst-daemon.c
@@ -85,7 +85,7 @@ void process_level_change(struct isst_id *id)
        if (ctdp_level.cpu_count) {
                int i, max_cpus = get_topo_max_cpus();
                for (i = 0; i < max_cpus; ++i) {
-                       if (id->pkg != get_physical_package_id(i) || id->die != get_physical_die_id(i))
+                       if (!is_cpu_in_power_domain(i, id))
                                continue;
                        if (CPU_ISSET_S(i, ctdp_level.core_cpumask_size, ctdp_level.core_cpumask)) {
                                fprintf(stderr, "online cpu %d\n", i);

diff --git a/tools/power/x86/intel-speed-select/isst.h b/tools/power/x86/intel-speed-select/isst.h
index cb53b5bd30134a322749d3fa8ab7dacfea741ad1..3ff743d14d7b2d09ed7e27c7ee51b7aaca433be2 100644 (file)
--- a/tools/power/x86/intel-speed-select/isst.h
+++ b/tools/power/x86/intel-speed-select/isst.h
@@ -178,6 +178,7 @@ struct isst_pkg_ctdp {
        struct isst_pkg_ctdp_level_info ctdp_level[ISST_MAX_TDP_LEVELS];
 };
 
+extern int is_cpu_in_power_domain(int cpu, struct isst_id *id);
 extern int get_topo_max_cpus(void);
 extern int get_cpu_count(struct isst_id *id);
 extern int get_max_punit_core_id(struct isst_id *id);