not_a_segfault/PowerTools
1
0
Fork 0
forked from NG-SD-Plugins/PowerTools
Code Pull requests Activity

Improve battery hwmon searching for newer kernels

Browse source
This commit is contained in:
NGnius (Graham) 2023-08-07 20:08:49 -04:00
parent 91d8eee96d
commit 594f69b24c
3 changed files with 31 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
backend/Cargo.lock generated
View file

@ -1043,7 +1043,7 @@ dependencies = [
[[package]]
name = "powertools"
version = "1.4.0-alpha2"
version = "1.4.0-beta1"
dependencies = [
"async-trait",
"libryzenadj",

31
backend/src/settings/steam_deck/battery.rs
View file

@ -285,8 +285,19 @@ impl Battery {
hwmon
},
Err(e) => {
log::error!("Failed to find SteamDeck battery hwmon in sysfs ({}), using naive fallback", e);
root.hwmon_by_index(5)
log::warn!("Failed to find SteamDeck battery hwmon {} in sysfs ({}), trying alternate name",
super::util::JUPITER_HWMON_NAME, e);
match root.hwmon_by_name(super::util::STEAMDECK_HWMON_NAME) {
Ok(hwmon) => {
if !hwmon.capable(attributes(HWMON_NEEDS.into_iter().copied())) {
log::warn!("Found incapable SteamDeck battery hwmon in sysfs (hwmon by name {} exists but missing attributes), persevering because ignorance is bliss", super::util::STEAMDECK_HWMON_NAME);
}
hwmon
},
Err(e) => {
log::error!("Failed to find SteamDeck battery hwmon in sysfs ({}), using naive fallback", e);
root.hwmon_by_index(5)
}
}
}
}
@ -550,7 +561,23 @@ impl OnPowerEvent for Battery {
PowerMode::BatteryCharge(_) => Ok(()),
}
.unwrap_or_else(|mut e| errors.append(&mut e));
let new_charge_control_attr = HwMonAttribute::custom("max_battery_charge_level");
let attr_exists = new_charge_control_attr.exists(&*self.sysfs_hwmon);
log::info!("Does battery limit attribute (max_battery_charge_level) exist? {}", attr_exists);
for ev in &mut self.events {
if attr_exists {
if let EventTrigger::BatteryAbove(level) = ev.trigger {
if let Some(ChargeMode::Idle) = ev.charge_mode {
self.sysfs_hwmon.set(new_charge_control_attr, (level * 100.0).round() as u64)
.unwrap_or_else(|e| errors.push(
SettingError {
msg: format!("Failed to write to {:?}: {}", new_charge_control_attr, e),
setting: crate::settings::SettingVariant::Battery,
}
));
}
}
}
ev.on_power_event(new_mode)
.unwrap_or_else(|mut e| errors.append(&mut e));
}

1
backend/src/settings/steam_deck/util.rs
View file

@ -9,6 +9,7 @@ use std::fs::OpenOptions;
use std::io::{Error, Read, Seek, SeekFrom, Write};
pub const JUPITER_HWMON_NAME: &'static str = "jupiter";
pub const STEAMDECK_HWMON_NAME: &'static str = "steamdeck_hwmon";
pub const GPU_HWMON_NAME: &'static str = "amdgpu";
#[inline]