Commit 4b992ead authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'pm-6.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull power management fix from Rafael Wysocki:
 "Make the amd-pstate cpufreq driver take all of the possible
  combinations of the 'old' and 'new' status values correctly while
  changing the operation mode via sysfs (Wyes Karny)"

* tag 'pm-6.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  amd-pstate: Fix amd_pstate mode switch
parents d0b85e7e 4654e9f9
...@@ -840,22 +840,20 @@ static int amd_pstate_update_status(const char *buf, size_t size) ...@@ -840,22 +840,20 @@ static int amd_pstate_update_status(const char *buf, size_t size)
switch(mode_idx) { switch(mode_idx) {
case AMD_PSTATE_DISABLE: case AMD_PSTATE_DISABLE:
if (!current_pstate_driver) if (current_pstate_driver) {
return -EINVAL;
if (cppc_state == AMD_PSTATE_ACTIVE)
return -EBUSY;
cpufreq_unregister_driver(current_pstate_driver); cpufreq_unregister_driver(current_pstate_driver);
amd_pstate_driver_cleanup(); amd_pstate_driver_cleanup();
}
break; break;
case AMD_PSTATE_PASSIVE: case AMD_PSTATE_PASSIVE:
if (current_pstate_driver) { if (current_pstate_driver) {
if (current_pstate_driver == &amd_pstate_driver) if (current_pstate_driver == &amd_pstate_driver)
return 0; return 0;
cpufreq_unregister_driver(current_pstate_driver); cpufreq_unregister_driver(current_pstate_driver);
cppc_state = AMD_PSTATE_PASSIVE;
current_pstate_driver = &amd_pstate_driver;
} }
current_pstate_driver = &amd_pstate_driver;
cppc_state = AMD_PSTATE_PASSIVE;
ret = cpufreq_register_driver(current_pstate_driver); ret = cpufreq_register_driver(current_pstate_driver);
break; break;
case AMD_PSTATE_ACTIVE: case AMD_PSTATE_ACTIVE:
...@@ -863,10 +861,10 @@ static int amd_pstate_update_status(const char *buf, size_t size) ...@@ -863,10 +861,10 @@ static int amd_pstate_update_status(const char *buf, size_t size)
if (current_pstate_driver == &amd_pstate_epp_driver) if (current_pstate_driver == &amd_pstate_epp_driver)
return 0; return 0;
cpufreq_unregister_driver(current_pstate_driver); cpufreq_unregister_driver(current_pstate_driver);
current_pstate_driver = &amd_pstate_epp_driver;
cppc_state = AMD_PSTATE_ACTIVE;
} }
current_pstate_driver = &amd_pstate_epp_driver;
cppc_state = AMD_PSTATE_ACTIVE;
ret = cpufreq_register_driver(current_pstate_driver); ret = cpufreq_register_driver(current_pstate_driver);
break; break;
default: default:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment