Commit 940efc9f authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge tag 'amd-pstate-v6.12-2024-10-10' of... 

Merge tag 'amd-pstate-v6.12-2024-10-10' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/superm1/linux

Merge an amd-pstate fix for 6.12 from Mario Limonciello:

"Fix an issue with changing amd-pstate modes at runtime on shared memory
 systems."

* tag 'amd-pstate-v6.12-2024-10-10' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/superm1/linux:
  cpufreq/amd-pstate: Fix amd_pstate mode switch on shared memory systems
parents 8cf0b939 c10e50a4

drivers/cpufreq/amd-pstate.c

+10 −0
Original line number Diff line number Diff line
@@ -1201,11 +1201,21 @@ static int amd_pstate_register_driver(int mode) 
		return -EINVAL;



	cppc_state = mode;



	ret = amd_pstate_enable(true);

	if (ret) {

		pr_err("failed to enable cppc during amd-pstate driver registration, return %d\n",

		       ret);

		amd_pstate_driver_cleanup();

		return ret;

	}



	ret = cpufreq_register_driver(current_pstate_driver);

	if (ret) {

		amd_pstate_driver_cleanup();

		return ret;

	}



	return 0;

}