Commit e3591eeb authored by Dhananjay Ugwekar's avatar Dhananjay Ugwekar Committed by Mario Limonciello
Browse files

cpufreq/amd-pstate: Call amd_pstate_set_driver() in amd_pstate_register_driver() 



Replace a similar chunk of code in amd_pstate_register_driver() with
amd_pstate_set_driver() call.

Signed-off-by: default avatarDhananjay Ugwekar <Dhananjay.Ugwekar@amd.com>
Reviewed-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Link: https://lore.kernel.org/r/20241017100528.300143-3-Dhananjay.Ugwekar@amd.com


Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
parent 6f241fa5

drivers/cpufreq/amd-pstate.c

+22 −25
Original line number Diff line number Diff line
@@ -1191,16 +1191,32 @@ static void amd_pstate_driver_cleanup(void) 
	current_pstate_driver = NULL;

}



static int amd_pstate_register_driver(int mode)

static int amd_pstate_set_driver(int mode_idx)

{

	int ret;

	if (mode_idx >= AMD_PSTATE_DISABLE && mode_idx < AMD_PSTATE_MAX) {

		cppc_state = mode_idx;

		if (cppc_state == AMD_PSTATE_DISABLE)

			pr_info("driver is explicitly disabled\n");



	if (mode == AMD_PSTATE_PASSIVE || mode == AMD_PSTATE_GUIDED)

		current_pstate_driver = &amd_pstate_driver;

	else if (mode == AMD_PSTATE_ACTIVE)

		if (cppc_state == AMD_PSTATE_ACTIVE)

			current_pstate_driver = &amd_pstate_epp_driver;

	else



		if (cppc_state == AMD_PSTATE_PASSIVE || cppc_state == AMD_PSTATE_GUIDED)

			current_pstate_driver = &amd_pstate_driver;



		return 0;

	}



	return -EINVAL;

}



static int amd_pstate_register_driver(int mode)

{

	int ret;



	ret = amd_pstate_set_driver(mode);

	if (ret)

		return ret;



	cppc_state = mode;
@@ -1726,25 +1742,6 @@ static struct cpufreq_driver amd_pstate_epp_driver = { 
	.attr		= amd_pstate_epp_attr,

};



static int __init amd_pstate_set_driver(int mode_idx)

{

	if (mode_idx >= AMD_PSTATE_DISABLE && mode_idx < AMD_PSTATE_MAX) {

		cppc_state = mode_idx;

		if (cppc_state == AMD_PSTATE_DISABLE)

			pr_info("driver is explicitly disabled\n");



		if (cppc_state == AMD_PSTATE_ACTIVE)

			current_pstate_driver = &amd_pstate_epp_driver;



		if (cppc_state == AMD_PSTATE_PASSIVE || cppc_state == AMD_PSTATE_GUIDED)

			current_pstate_driver = &amd_pstate_driver;



		return 0;

	}



	return -EINVAL;

}



/*

 * CPPC function is not supported for family ID 17H with model_ID ranging from 0x10 to 0x2F.

 * show the debug message that helps to check if the CPU has CPPC support for loading issue.