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

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



Allow platform specific implementation to get min and max power 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 645b6605

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

+24 −0
Original line number Diff line number Diff line
@@ -125,6 +125,29 @@ static int mbox_get_tdp_info(struct isst_id *id, int config_index, 
	return 0;

}



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

		      struct isst_pkg_ctdp_level_info *ctdp_level)

{

	unsigned int resp;

	int ret;



	ret = isst_send_mbox_command(id->cpu, CONFIG_TDP, CONFIG_TDP_GET_PWR_INFO,

				     0, config_index, &resp);

	if (ret)

		return ret;



	ctdp_level->pkg_max_power = resp & GENMASK(14, 0);

	ctdp_level->pkg_min_power = (resp & GENMASK(30, 16)) >> 16;



	debug_printf(

		"cpu:%d ctdp:%d CONFIG_TDP_GET_PWR_INFO resp:%x pkg_max_power:%d pkg_min_power:%d\n",

		id->cpu, config_index, resp, ctdp_level->pkg_max_power,

		ctdp_level->pkg_min_power);



	return 0;

}





static struct isst_platform_ops mbox_ops = {

	.get_disp_freq_multiplier = mbox_get_disp_freq_multiplier,

	.get_trl_max_levels = mbox_get_trl_max_levels,
@@ -133,6 +156,7 @@ static struct isst_platform_ops mbox_ops = { 
	.get_config_levels = mbox_get_config_levels,

	.get_ctdp_control = mbox_get_ctdp_control,

	.get_tdp_info = mbox_get_tdp_info,

	.get_pwr_info = mbox_get_pwr_info,

};



struct isst_platform_ops *mbox_get_platform_ops(void)

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

+2 −17
Original line number Diff line number Diff line
@@ -308,23 +308,8 @@ int isst_get_tdp_info(struct isst_id *id, int config_index, 
int isst_get_pwr_info(struct isst_id *id, int config_index,

		      struct isst_pkg_ctdp_level_info *ctdp_level)

{

	unsigned int resp;

	int ret;



	ret = isst_send_mbox_command(id->cpu, CONFIG_TDP, CONFIG_TDP_GET_PWR_INFO,

				     0, config_index, &resp);

	if (ret)

		return ret;



	ctdp_level->pkg_max_power = resp & GENMASK(14, 0);

	ctdp_level->pkg_min_power = (resp & GENMASK(30, 16)) >> 16;



	debug_printf(

		"cpu:%d ctdp:%d CONFIG_TDP_GET_PWR_INFO resp:%x pkg_max_power:%d pkg_min_power:%d\n",

		id->cpu, config_index, resp, ctdp_level->pkg_max_power,

		ctdp_level->pkg_min_power);



	return 0;

	CHECK_CB(get_pwr_info);

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

}



void isst_get_uncore_p0_p1_info(struct isst_id *id, int config_index,

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

+1 −0
Original line number Diff line number Diff line
@@ -189,6 +189,7 @@ struct isst_platform_ops { 
	int (*get_config_levels)(struct isst_id *id, struct isst_pkg_ctdp *pkg_ctdp);

	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_pwr_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);