Commit 668cc16c authored by Zhang Rui's avatar Zhang Rui Committed by Srinivas Pandruvada
Browse files

tools/power/x86/intel-speed-select: Abstract get_coremask_info 



Allow platform specific implementation to get the core mask for a given
SST-PP level.

No functional changes are expected.

Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
[srinivas.pandruvada@linux.intel.com: changelog edits]
Signed-off-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
parent a30cbd22

tools/power/x86/intel-speed-select/isst-core-mbox.c

+35 −0
Original line number Original line Diff line number Diff line
@@ -159,6 +159,40 @@ static int mbox_get_pwr_info(struct isst_id *id, int config_index, 
	return 0;

	return 0;

}

}





static int mbox_get_coremask_info(struct isst_id *id, int config_index,

			   struct isst_pkg_ctdp_level_info *ctdp_level)

{

	unsigned int resp;

	int i, ret;



	ctdp_level->cpu_count = 0;

	for (i = 0; i < 2; ++i) {

		unsigned long long mask;

		int cpu_count = 0;



		ret = isst_send_mbox_command(id->cpu, CONFIG_TDP,

					     CONFIG_TDP_GET_CORE_MASK, 0,

					     (i << 8) | config_index, &resp);

		if (ret)

			return ret;



		debug_printf(

			"cpu:%d ctdp:%d mask:%d CONFIG_TDP_GET_CORE_MASK resp:%x\n",

			id->cpu, config_index, i, resp);



		mask = (unsigned long long)resp << (32 * i);

		set_cpu_mask_from_punit_coremask(id, mask,

						 ctdp_level->core_cpumask_size,

						 ctdp_level->core_cpumask,

						 &cpu_count);

		ctdp_level->cpu_count += cpu_count;

		debug_printf("cpu:%d ctdp:%d mask:%d cpu count:%d\n", id->cpu,

			     config_index, i, ctdp_level->cpu_count);

	}



	return 0;

}



static struct isst_platform_ops mbox_ops = {

static struct isst_platform_ops mbox_ops = {

	.get_disp_freq_multiplier = mbox_get_disp_freq_multiplier,

	.get_disp_freq_multiplier = mbox_get_disp_freq_multiplier,

	.get_trl_max_levels = mbox_get_trl_max_levels,

	.get_trl_max_levels = mbox_get_trl_max_levels,
@@ -168,6 +202,7 @@ static struct isst_platform_ops mbox_ops = { 
	.get_ctdp_control = mbox_get_ctdp_control,

	.get_ctdp_control = mbox_get_ctdp_control,

	.get_tdp_info = mbox_get_tdp_info,

	.get_tdp_info = mbox_get_tdp_info,

	.get_pwr_info = mbox_get_pwr_info,

	.get_pwr_info = mbox_get_pwr_info,

	.get_coremask_info = mbox_get_coremask_info,

};

};





struct isst_platform_ops *mbox_get_platform_ops(void)

struct isst_platform_ops *mbox_get_platform_ops(void)

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

+2 −29
Original line number Original line Diff line number Diff line
@@ -315,35 +315,8 @@ int isst_get_pwr_info(struct isst_id *id, int config_index, 
int isst_get_coremask_info(struct isst_id *id, int config_index,

int isst_get_coremask_info(struct isst_id *id, int config_index,

			   struct isst_pkg_ctdp_level_info *ctdp_level)

			   struct isst_pkg_ctdp_level_info *ctdp_level)

{

{

	unsigned int resp;

	CHECK_CB(get_coremask_info);

	int i, ret;

	return isst_ops->get_coremask_info(id, config_index, ctdp_level);



	ctdp_level->cpu_count = 0;

	for (i = 0; i < 2; ++i) {

		unsigned long long mask;

		int cpu_count = 0;



		ret = isst_send_mbox_command(id->cpu, CONFIG_TDP,

					     CONFIG_TDP_GET_CORE_MASK, 0,

					     (i << 8) | config_index, &resp);

		if (ret)

			return ret;



		debug_printf(

			"cpu:%d ctdp:%d mask:%d CONFIG_TDP_GET_CORE_MASK resp:%x\n",

			id->cpu, config_index, i, resp);



		mask = (unsigned long long)resp << (32 * i);

		set_cpu_mask_from_punit_coremask(id, mask,

						 ctdp_level->core_cpumask_size,

						 ctdp_level->core_cpumask,

						 &cpu_count);

		ctdp_level->cpu_count += cpu_count;

		debug_printf("cpu:%d ctdp:%d mask:%d cpu count:%d\n", id->cpu,

			     config_index, i, ctdp_level->cpu_count);

	}



	return 0;

}

}





int isst_get_get_trl_from_msr(struct isst_id *id, int *trl)

int isst_get_get_trl_from_msr(struct isst_id *id, int *trl)

tools/power/x86/intel-speed-select/isst.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -190,6 +190,7 @@ struct isst_platform_ops { 
	int (*get_ctdp_control)(struct isst_id *id, int config_index, struct isst_pkg_ctdp_level_info *ctdp_level);

	int (*get_ctdp_control)(struct isst_id *id, int config_index, struct isst_pkg_ctdp_level_info *ctdp_level);

	int (*get_tdp_info)(struct isst_id *id, int config_index, struct isst_pkg_ctdp_level_info *ctdp_level);

	int (*get_tdp_info)(struct isst_id *id, int config_index, struct isst_pkg_ctdp_level_info *ctdp_level);

	int (*get_pwr_info)(struct isst_id *id, int config_index, struct isst_pkg_ctdp_level_info *ctdp_level);

	int (*get_pwr_info)(struct isst_id *id, int config_index, struct isst_pkg_ctdp_level_info *ctdp_level);

	int (*get_coremask_info)(struct isst_id *id, int config_index, struct isst_pkg_ctdp_level_info *ctdp_level);

};

};





extern int is_cpu_in_power_domain(int cpu, struct isst_id *id);

extern int is_cpu_in_power_domain(int cpu, struct isst_id *id);