Skip to content

fix(asusd): apply PPT limits on set even without ppt_enabled attribute #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
IoriAkatsuki wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(asusd): apply PPT limits on set even without ppt_enabled attribute #150

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 14 additions & 15 deletions asusd/src/asus_armoury.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,21 +368,11 @@ impl AsusArmouryAttribute {
#[zbus(property)]
async fn current_value(&self) -> fdo::Result<i32> {
if self.name().property_type() == FirmwareAttributeType::Ppt {
let profile: PlatformProfile = self.platform.get_platform_profile()?.into();
let power_plugged = self
.power
.get_online()
.map_err(|e| {
error!("Could not get power status: {e:?}");
e
})
.unwrap_or_default()
== 1;
let config = self.config.lock().await;
if let Some(tuning) = config.select_tunings_ref(power_plugged, profile) {
if let Some(tune) = tuning.group.get(&self.name()) {
return Ok(*tune);
}
// Fix: report the real hardware value read from sysfs, not the cached
// per-profile config value. Returning the config value made tools show
// a PPT limit that may never have been written to the firmware.
if let Ok(AttrValue::Integer(i)) = self.attr.current_value() {
return Ok(i);
}
if let AttrValue::Integer(i) = self.attr.default_value() {
return Ok(*i);
Expand Down Expand Up @@ -445,6 +435,15 @@ impl AsusArmouryAttribute {
debug!("Store tuning config for {name} = {:?}", value);
}

// Fix: an explicit user set implies intent to apply. On kernels
// without a `ppt_enabled` firmware attribute there is no other
// path to flip this per-profile flag, so enabling it here avoids
// silently discarding the write while the getter reports success.
if !tuning.enabled {
info!("Auto-enabling PPT tuning for this profile on explicit set");
tuning.enabled = true;
}

match tuning.enabled {
true => {
debug!("Tuning is enabled: setting value to PPT property {name} = {value}");
Expand Down