From dd0c84f0f17676ca95571454c47625c52d998f7a Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Wed, 25 Aug 2021 14:02:19 +0200 Subject: [PATCH] contrib/thermald: Be consistent about formatting --- .../surface_laptop_1/thermal-conf.xml | 2 +- .../surface_pro_5/40-surface-power.rules | 2 - .../surface_pro_5/thermal-conf.xml.auto.cool | 166 ++++++++-------- .../thermal-conf.xml.auto.mobile | 186 +++++++++--------- .../thermal-conf.xml.auto.performance | 146 +++++++------- .../surface_pro_5/thermal-cpu-cdev-order.xml | 21 +- .../thermald/surface_pro_5/thermald.service | 1 - contrib/thermald/thermal-conf.xml | 50 ++--- contrib/thermald/thermal-cpu-cdev-order.xml | 12 +- 9 files changed, 284 insertions(+), 302 deletions(-) diff --git a/contrib/thermald/surface_laptop_1/thermal-conf.xml b/contrib/thermald/surface_laptop_1/thermal-conf.xml index 40004f5ba..005b52b55 100644 --- a/contrib/thermald/surface_laptop_1/thermal-conf.xml +++ b/contrib/thermald/surface_laptop_1/thermal-conf.xml @@ -46,4 +46,4 @@ - \ No newline at end of file + diff --git a/contrib/thermald/surface_pro_5/40-surface-power.rules b/contrib/thermald/surface_pro_5/40-surface-power.rules index 018e1f5f2..143a4d712 100644 --- a/contrib/thermald/surface_pro_5/40-surface-power.rules +++ b/contrib/thermald/surface_pro_5/40-surface-power.rules @@ -23,8 +23,6 @@ # E: POWER_SUPPLY_ONLINE=0 # E: SUBSYSTEM=power_supply - - # Plugged SUBSYSTEM=="power_supply", ENV{POWER_SUPPLY_ONLINE}=="1", RUN+="/usr/bin/logger -t surface power supply online" SUBSYSTEM=="power_supply", ENV{POWER_SUPPLY_ONLINE}=="1", RUN+="/usr/bin/surface profile set performance" diff --git a/contrib/thermald/surface_pro_5/thermal-conf.xml.auto.cool b/contrib/thermald/surface_pro_5/thermal-conf.xml.auto.cool index 14be11d35..a8798adc3 100644 --- a/contrib/thermald/surface_pro_5/thermal-conf.xml.auto.cool +++ b/contrib/thermald/surface_pro_5/thermal-conf.xml.auto.cool @@ -1,85 +1,83 @@ - - - - - Auto generated - Surface Pro - QUIET - - 0 - 3000 - 25000 - 28000 - 32000 - 500 - - - - auto_zone_0 - - - pch_skylake - 46000 - Passive - - B0D4 - 20 - 15000000 - - - - pch_skylake - 49000 - Passive - - B0D4 - 20 - 13000000 - - - - pch_skylake - 52000 - Passive - - B0D4 - 20 - 11000000 - - - - pch_skylake - 56000 - Passive - - B0D4 - 20 - 9000000 - - - - pch_skylake - 59000 - Passive - - B0D4 - 15 - 7000000 - - - - pch_skylake - 62000 - Passive - - B0D4 - 10 - 6000000 - - - - - - + + + + Auto generated + Surface Pro + QUIET + + 0 + 3000 + 25000 + 28000 + 32000 + 500 + + + + auto_zone_0 + + + pch_skylake + 46000 + Passive + + B0D4 + 20 + 15000000 + + + + pch_skylake + 49000 + Passive + + B0D4 + 20 + 13000000 + + + + pch_skylake + 52000 + Passive + + B0D4 + 20 + 11000000 + + + + pch_skylake + 56000 + Passive + + B0D4 + 20 + 9000000 + + + + pch_skylake + 59000 + Passive + + B0D4 + 15 + 7000000 + + + + pch_skylake + 62000 + Passive + + B0D4 + 10 + 6000000 + + + + + + - diff --git a/contrib/thermald/surface_pro_5/thermal-conf.xml.auto.mobile b/contrib/thermald/surface_pro_5/thermal-conf.xml.auto.mobile index 538d6a585..38b4a78ff 100644 --- a/contrib/thermald/surface_pro_5/thermal-conf.xml.auto.mobile +++ b/contrib/thermald/surface_pro_5/thermal-conf.xml.auto.mobile @@ -1,95 +1,93 @@ - - - - - Auto generated - Surface Pro - QUIET - - 0 - 3000 - 15000 - 28000 - 32000 - 500 - - - - auto_zone_0 - - - pch_skylake - 39000 - Passive - - B0D4 - 10 - 15000000 - - - - pch_skylake - 43000 - Passive - - B0D4 - 10 - 10000000 - - - - pch_skylake - 47000 - Passive - - B0D4 - 10 - 8000000 - - - - pch_skylake - 49000 - Passive - - B0D4 - 10 - 6000000 - - - - pch_skylake - 51000 - Passive - - B0D4 - 5 - 5000000 - - - - pch_skylake - 53000 - Passive - - B0D4 - 5 - 4000000 - - - - pch_skylake - 54000 - Passive - - B0D4 - 5 - 3000000 - - - - - - + + + + Auto generated + Surface Pro + QUIET + + 0 + 3000 + 15000 + 28000 + 32000 + 500 + + + + auto_zone_0 + + + pch_skylake + 39000 + Passive + + B0D4 + 10 + 15000000 + + + + pch_skylake + 43000 + Passive + + B0D4 + 10 + 10000000 + + + + pch_skylake + 47000 + Passive + + B0D4 + 10 + 8000000 + + + + pch_skylake + 49000 + Passive + + B0D4 + 10 + 6000000 + + + + pch_skylake + 51000 + Passive + + B0D4 + 5 + 5000000 + + + + pch_skylake + 53000 + Passive + + B0D4 + 5 + 4000000 + + + + pch_skylake + 54000 + Passive + + B0D4 + 5 + 3000000 + + + + + + - diff --git a/contrib/thermald/surface_pro_5/thermal-conf.xml.auto.performance b/contrib/thermald/surface_pro_5/thermal-conf.xml.auto.performance index fb06d3360..00c75921a 100644 --- a/contrib/thermald/surface_pro_5/thermal-conf.xml.auto.performance +++ b/contrib/thermald/surface_pro_5/thermal-conf.xml.auto.performance @@ -1,75 +1,73 @@ - - - - - Auto generated - Surface Pro - QUIET - - 0 - 3000 - 15000 - 28000 - 32000 - 500 - - - - auto_zone_0 - - - pch_skylake - 54000 - Passive - - B0D4 - 10 - 15000000 - - - - pch_skylake - 58000 - Passive - - B0D4 - 10 - 13000000 - - - - pch_skylake - 60000 - Passive - - B0D4 - 5 - 9000000 - - - - pch_skylake - 62000 - Passive - - B0D4 - 5 - 7000000 - - - - pch_skylake - 63000 - Passive - - B0D4 - 5 - 6000000 - - - - - - + + + + Auto generated + Surface Pro + QUIET + + 0 + 3000 + 15000 + 28000 + 32000 + 500 + + + + auto_zone_0 + + + pch_skylake + 54000 + Passive + + B0D4 + 10 + 15000000 + + + + pch_skylake + 58000 + Passive + + B0D4 + 10 + 13000000 + + + + pch_skylake + 60000 + Passive + + B0D4 + 5 + 9000000 + + + + pch_skylake + 62000 + Passive + + B0D4 + 5 + 7000000 + + + + pch_skylake + 63000 + Passive + + B0D4 + 5 + 6000000 + + + + + + - diff --git a/contrib/thermald/surface_pro_5/thermal-cpu-cdev-order.xml b/contrib/thermald/surface_pro_5/thermal-cpu-cdev-order.xml index 75fe44a1e..b6cb80a22 100644 --- a/contrib/thermald/surface_pro_5/thermal-cpu-cdev-order.xml +++ b/contrib/thermald/surface_pro_5/thermal-cpu-cdev-order.xml @@ -1,17 +1,8 @@ - - - - - rapl_controller - intel_pstate - intel_powerclamp - cpufreq - Processor + + rapl_controller + intel_pstate + intel_powerclamp + cpufreq + Processor diff --git a/contrib/thermald/surface_pro_5/thermald.service b/contrib/thermald/surface_pro_5/thermald.service index 9445c2a4d..1353c0653 100644 --- a/contrib/thermald/surface_pro_5/thermald.service +++ b/contrib/thermald/surface_pro_5/thermald.service @@ -11,4 +11,3 @@ ExecStart=/usr/sbin/thermald --systemd --dbus-enable [Install] WantedBy=multi-user.target Alias=dbus-org.freedesktop.thermald.service - diff --git a/contrib/thermald/thermal-conf.xml b/contrib/thermald/thermal-conf.xml index b1efeb395..b25821df1 100644 --- a/contrib/thermald/thermal-conf.xml +++ b/contrib/thermald/thermal-conf.xml @@ -1,27 +1,27 @@ - + - - Intel Powered Laptop - * - QUIET - - - cpu - - - x86_pkg_temp - 65000 - passive - SEQUENTIAL - - 1 - rapl_controller - 100 - 5 - - - - - - + + Intel Powered Laptop + * + QUIET + + + cpu + + + x86_pkg_temp + 65000 + passive + SEQUENTIAL + + 1 + rapl_controller + 100 + 5 + + + + + + diff --git a/contrib/thermald/thermal-cpu-cdev-order.xml b/contrib/thermald/thermal-cpu-cdev-order.xml index 5877d4856..b6cb80a22 100644 --- a/contrib/thermald/thermal-cpu-cdev-order.xml +++ b/contrib/thermald/thermal-cpu-cdev-order.xml @@ -1,8 +1,8 @@ - - rapl_controller - intel_pstate - intel_powerclamp - cpufreq - Processor + + rapl_controller + intel_pstate + intel_powerclamp + cpufreq + Processor