config: don't set EPP or EBP on performance profile on intel-pstate

fixes #46

Author: RGBCube

watt/config.rs

@@ -395,6 +395,7 @@ mod expression {
   named!(power_supply_discharge_rate => "%power-supply-discharge-rate");
 
   named!(discharging => "?discharging");
+  named!(intel_pstate => "?intel-pstate");
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
@@ -454,6 +455,9 @@ pub enum Expression {
   #[serde(with = "expression::discharging")]
   Discharging,
 
+  #[serde(with = "expression::intel_pstate")]
+  IntelPstate,
+
   Boolean(bool),
 
   Number(f64),
@@ -615,7 +619,8 @@ pub struct EvalState<'peripherals, 'context> {
   pub power_supply_charge:         Option<f64>,
   pub power_supply_discharge_rate: Option<f64>,
 
-  pub discharging: bool,
+  pub discharging:  bool,
+  pub intel_pstate: bool,
 
   pub context: EvalContext<'context>,
 
@@ -748,6 +753,7 @@ impl Expression {
       },
 
       Discharging => Boolean(state.discharging),
+      IntelPstate => Boolean(state.intel_pstate),
 
       literal @ (Boolean(_) | Number(_) | String(_)) => literal.clone(),
 
@@ -1039,6 +1045,7 @@ mod tests {
         power_supply_charge: Some(0.8),
         power_supply_discharge_rate: Some(10.0),
         discharging: false,
+        intel_pstate: false,
         context: EvalContext::Cpu(&cpu),
         cpus: &cpus,
         power_supplies: &power_supplies,
@@ -1123,6 +1130,7 @@ mod tests {
       power_supply_charge:         Some(0.8),
       power_supply_discharge_rate: Some(10.0),
       discharging:                 false,
+      intel_pstate:                false,
       context:                     EvalContext::Cpu(&cpu),
       cpus:                        &cpus,
       power_supplies:              &power_supplies,

watt/config.toml

@@ -35,8 +35,8 @@ if.all = [
 ]
 priority = 80
 
-cpu.energy-performance-bias       = { if.is-energy-performance-bias-available = "performance", then = "performance" }
-cpu.energy-performance-preference = { if.is-energy-performance-preference-available = "performance", then = "performance" }
+cpu.energy-performance-bias       = { if.all = [{ not = "?intel-pstate" }, { is-energy-performance-bias-available = "performance" }], then = "performance" }
+cpu.energy-performance-preference = { if.all = [{ not = "?intel-pstate" }, { is-energy-performance-preference-available = "performance" }], then = "performance" }
 cpu.governor                      = { if.is-governor-available = "performance", then = "performance" }
 cpu.turbo                         = { if = "?turbo-available", then = true }
 
@@ -49,8 +49,8 @@ if.all = [
 ]
 priority = 70
 
-cpu.energy-performance-bias       = { if.is-energy-performance-bias-available = "balance_performance", then = "balance_performance" }
-cpu.energy-performance-preference = { if.is-energy-performance-preference-available = "performance", then = "performance" }
+cpu.energy-performance-bias       = { if.all = [{ not = "?intel-pstate" }, { is-energy-performance-bias-available = "balance_performance" }], then = "balance_performance" }
+cpu.energy-performance-preference = { if.all = [{ not = "?intel-pstate" }, { is-energy-performance-preference-available = "performance" }], then = "performance" }
 cpu.governor                      = { if.is-governor-available = "performance", then = "performance" }
 cpu.turbo                         = { if = "?turbo-available", then = true }
 

watt/cpu.rs

@@ -723,6 +723,10 @@ impl Cpu {
       .map(|x| x.map(|freq| freq / 1000))
   }
 
+  pub fn is_intel_pstate() -> bool {
+    fs::exists("/sys/devices/system/cpu/intel_pstate")
+  }
+
   pub fn turbo() -> anyhow::Result<Option<bool>> {
     log::trace!("reading turbo boost status");
 

watt/system.rs

@@ -792,7 +792,8 @@ pub fn run_daemon(config: config::DaemonConfig) -> anyhow::Result<()> {
         .map(|log| log.charge),
       power_supply_discharge_rate: system.power_supply_discharge_rate(),
 
-      discharging: system.is_discharging(),
+      discharging:  system.is_discharging(),
+      intel_pstate: cpu::Cpu::is_intel_pstate(),
 
       context: config::EvalContext::WidestPossible,