contrib/thermald: Be consistent about formatting

This commit is contained in:
Maximilian Luz 2021-08-25 14:02:19 +02:00
parent cdd9778b2a
commit dd0c84f0f1
No known key found for this signature in database
GPG key ID: 70EC0937F6C26F02
9 changed files with 284 additions and 302 deletions

View file

@ -46,4 +46,4 @@
</CoolingDevice> </CoolingDevice>
</CoolingDevices> </CoolingDevices>
</Platform> </Platform>
</ThermalConfiguration> </ThermalConfiguration>

View file

@ -23,8 +23,6 @@
# E: POWER_SUPPLY_ONLINE=0 # E: POWER_SUPPLY_ONLINE=0
# E: SUBSYSTEM=power_supply # E: SUBSYSTEM=power_supply
# Plugged # 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/logger -t surface power supply online"
SUBSYSTEM=="power_supply", ENV{POWER_SUPPLY_ONLINE}=="1", RUN+="/usr/bin/surface profile set performance" SUBSYSTEM=="power_supply", ENV{POWER_SUPPLY_ONLINE}=="1", RUN+="/usr/bin/surface profile set performance"

View file

@ -1,85 +1,83 @@
<?xml version="1.0"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- BEGIN --> <ThermalConfiguration>
<ThermalConfiguration> <Platform>
<Platform> <Name> Auto generated </Name>
<Name> Auto generated </Name> <ProductName>Surface Pro</ProductName>
<ProductName>Surface Pro</ProductName> <Preference>QUIET</Preference>
<Preference>QUIET</Preference> <PPCC>
<PPCC> <PowerLimitIndex>0</PowerLimitIndex>
<PowerLimitIndex>0</PowerLimitIndex> <PowerLimitMinimum>3000</PowerLimitMinimum>
<PowerLimitMinimum>3000</PowerLimitMinimum> <PowerLimitMaximum>25000</PowerLimitMaximum>
<PowerLimitMaximum>25000</PowerLimitMaximum> <TimeWindowMinimum>28000</TimeWindowMinimum>
<TimeWindowMinimum>28000</TimeWindowMinimum> <TimeWindowMaximum>32000</TimeWindowMaximum>
<TimeWindowMaximum>32000</TimeWindowMaximum> <StepSize>500</StepSize>
<StepSize>500</StepSize> </PPCC>
</PPCC> <ThermalZones>
<ThermalZones> <ThermalZone>
<ThermalZone> <Type>auto_zone_0</Type>
<Type>auto_zone_0</Type> <TripPoints>
<TripPoints> <TripPoint>
<TripPoint> <SensorType>pch_skylake</SensorType>
<SensorType>pch_skylake</SensorType> <Temperature>46000</Temperature>
<Temperature>46000</Temperature> <Type>Passive</Type>
<Type>Passive</Type> <CoolingDevice>
<CoolingDevice> <Type>B0D4</Type>
<Type>B0D4</Type> <SamplingPeriod>20</SamplingPeriod>
<SamplingPeriod>20</SamplingPeriod> <TargetState>15000000</TargetState>
<TargetState>15000000</TargetState> </CoolingDevice>
</CoolingDevice> </TripPoint>
</TripPoint> <TripPoint>
<TripPoint> <SensorType>pch_skylake</SensorType>
<SensorType>pch_skylake</SensorType> <Temperature>49000</Temperature>
<Temperature>49000</Temperature> <Type>Passive</Type>
<Type>Passive</Type> <CoolingDevice>
<CoolingDevice> <Type>B0D4</Type>
<Type>B0D4</Type> <SamplingPeriod>20</SamplingPeriod>
<SamplingPeriod>20</SamplingPeriod> <TargetState>13000000</TargetState>
<TargetState>13000000</TargetState> </CoolingDevice>
</CoolingDevice> </TripPoint>
</TripPoint> <TripPoint>
<TripPoint> <SensorType>pch_skylake</SensorType>
<SensorType>pch_skylake</SensorType> <Temperature>52000</Temperature>
<Temperature>52000</Temperature> <Type>Passive</Type>
<Type>Passive</Type> <CoolingDevice>
<CoolingDevice> <Type>B0D4</Type>
<Type>B0D4</Type> <SamplingPeriod>20</SamplingPeriod>
<SamplingPeriod>20</SamplingPeriod> <TargetState>11000000</TargetState>
<TargetState>11000000</TargetState> </CoolingDevice>
</CoolingDevice> </TripPoint>
</TripPoint> <TripPoint>
<TripPoint> <SensorType>pch_skylake</SensorType>
<SensorType>pch_skylake</SensorType> <Temperature>56000</Temperature>
<Temperature>56000</Temperature> <Type>Passive</Type>
<Type>Passive</Type> <CoolingDevice>
<CoolingDevice> <Type>B0D4</Type>
<Type>B0D4</Type> <SamplingPeriod>20</SamplingPeriod>
<SamplingPeriod>20</SamplingPeriod> <TargetState>9000000</TargetState>
<TargetState>9000000</TargetState> </CoolingDevice>
</CoolingDevice> </TripPoint>
</TripPoint> <TripPoint>
<TripPoint> <SensorType>pch_skylake</SensorType>
<SensorType>pch_skylake</SensorType> <Temperature>59000</Temperature>
<Temperature>59000</Temperature> <Type>Passive</Type>
<Type>Passive</Type> <CoolingDevice>
<CoolingDevice> <Type>B0D4</Type>
<Type>B0D4</Type> <SamplingPeriod>15</SamplingPeriod>
<SamplingPeriod>15</SamplingPeriod> <TargetState>7000000</TargetState>
<TargetState>7000000</TargetState> </CoolingDevice>
</CoolingDevice> </TripPoint>
</TripPoint> <TripPoint>
<TripPoint> <SensorType>pch_skylake</SensorType>
<SensorType>pch_skylake</SensorType> <Temperature>62000</Temperature>
<Temperature>62000</Temperature> <Type>Passive</Type>
<Type>Passive</Type> <CoolingDevice>
<CoolingDevice> <Type>B0D4</Type>
<Type>B0D4</Type> <SamplingPeriod>10</SamplingPeriod>
<SamplingPeriod>10</SamplingPeriod> <TargetState>6000000</TargetState>
<TargetState>6000000</TargetState> </CoolingDevice>
</CoolingDevice> </TripPoint>
</TripPoint> </TripPoints>
</TripPoints> </ThermalZone>
</ThermalZone> </ThermalZones>
</ThermalZones> </Platform>
</Platform>
</ThermalConfiguration> </ThermalConfiguration>
<!-- END -->

View file

@ -1,95 +1,93 @@
<?xml version="1.0"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- BEGIN --> <ThermalConfiguration>
<ThermalConfiguration> <Platform>
<Platform> <Name> Auto generated </Name>
<Name> Auto generated </Name> <ProductName>Surface Pro</ProductName>
<ProductName>Surface Pro</ProductName> <Preference>QUIET</Preference>
<Preference>QUIET</Preference> <PPCC>
<PPCC> <PowerLimitIndex>0</PowerLimitIndex>
<PowerLimitIndex>0</PowerLimitIndex> <PowerLimitMinimum>3000</PowerLimitMinimum>
<PowerLimitMinimum>3000</PowerLimitMinimum> <PowerLimitMaximum>15000</PowerLimitMaximum>
<PowerLimitMaximum>15000</PowerLimitMaximum> <TimeWindowMinimum>28000</TimeWindowMinimum>
<TimeWindowMinimum>28000</TimeWindowMinimum> <TimeWindowMaximum>32000</TimeWindowMaximum>
<TimeWindowMaximum>32000</TimeWindowMaximum> <StepSize>500</StepSize>
<StepSize>500</StepSize> </PPCC>
</PPCC> <ThermalZones>
<ThermalZones> <ThermalZone>
<ThermalZone> <Type>auto_zone_0</Type>
<Type>auto_zone_0</Type> <TripPoints>
<TripPoints> <TripPoint>
<TripPoint> <SensorType>pch_skylake</SensorType>
<SensorType>pch_skylake</SensorType> <Temperature>39000</Temperature>
<Temperature>39000</Temperature> <Type>Passive</Type>
<Type>Passive</Type> <CoolingDevice>
<CoolingDevice> <Type>B0D4</Type>
<Type>B0D4</Type> <SamplingPeriod>10</SamplingPeriod>
<SamplingPeriod>10</SamplingPeriod> <TargetState>15000000</TargetState>
<TargetState>15000000</TargetState> </CoolingDevice>
</CoolingDevice> </TripPoint>
</TripPoint> <TripPoint>
<TripPoint> <SensorType>pch_skylake</SensorType>
<SensorType>pch_skylake</SensorType> <Temperature>43000</Temperature>
<Temperature>43000</Temperature> <Type>Passive</Type>
<Type>Passive</Type> <CoolingDevice>
<CoolingDevice> <Type>B0D4</Type>
<Type>B0D4</Type> <SamplingPeriod>10</SamplingPeriod>
<SamplingPeriod>10</SamplingPeriod> <TargetState>10000000</TargetState>
<TargetState>10000000</TargetState> </CoolingDevice>
</CoolingDevice> </TripPoint>
</TripPoint> <TripPoint>
<TripPoint> <SensorType>pch_skylake</SensorType>
<SensorType>pch_skylake</SensorType> <Temperature>47000</Temperature>
<Temperature>47000</Temperature> <Type>Passive</Type>
<Type>Passive</Type> <CoolingDevice>
<CoolingDevice> <Type>B0D4</Type>
<Type>B0D4</Type> <SamplingPeriod>10</SamplingPeriod>
<SamplingPeriod>10</SamplingPeriod> <TargetState>8000000</TargetState>
<TargetState>8000000</TargetState> </CoolingDevice>
</CoolingDevice> </TripPoint>
</TripPoint> <TripPoint>
<TripPoint> <SensorType>pch_skylake</SensorType>
<SensorType>pch_skylake</SensorType> <Temperature>49000</Temperature>
<Temperature>49000</Temperature> <Type>Passive</Type>
<Type>Passive</Type> <CoolingDevice>
<CoolingDevice> <Type>B0D4</Type>
<Type>B0D4</Type> <SamplingPeriod>10</SamplingPeriod>
<SamplingPeriod>10</SamplingPeriod> <TargetState>6000000</TargetState>
<TargetState>6000000</TargetState> </CoolingDevice>
</CoolingDevice> </TripPoint>
</TripPoint> <TripPoint>
<TripPoint> <SensorType>pch_skylake</SensorType>
<SensorType>pch_skylake</SensorType> <Temperature>51000</Temperature>
<Temperature>51000</Temperature> <Type>Passive</Type>
<Type>Passive</Type> <CoolingDevice>
<CoolingDevice> <Type>B0D4</Type>
<Type>B0D4</Type> <SamplingPeriod>5</SamplingPeriod>
<SamplingPeriod>5</SamplingPeriod> <TargetState>5000000</TargetState>
<TargetState>5000000</TargetState> </CoolingDevice>
</CoolingDevice> </TripPoint>
</TripPoint> <TripPoint>
<TripPoint> <SensorType>pch_skylake</SensorType>
<SensorType>pch_skylake</SensorType> <Temperature>53000</Temperature>
<Temperature>53000</Temperature> <Type>Passive</Type>
<Type>Passive</Type> <CoolingDevice>
<CoolingDevice> <Type>B0D4</Type>
<Type>B0D4</Type> <SamplingPeriod>5</SamplingPeriod>
<SamplingPeriod>5</SamplingPeriod> <TargetState>4000000</TargetState>
<TargetState>4000000</TargetState> </CoolingDevice>
</CoolingDevice> </TripPoint>
</TripPoint> <TripPoint>
<TripPoint> <SensorType>pch_skylake</SensorType>
<SensorType>pch_skylake</SensorType> <Temperature>54000</Temperature>
<Temperature>54000</Temperature> <Type>Passive</Type>
<Type>Passive</Type> <CoolingDevice>
<CoolingDevice> <Type>B0D4</Type>
<Type>B0D4</Type> <SamplingPeriod>5</SamplingPeriod>
<SamplingPeriod>5</SamplingPeriod> <TargetState>3000000</TargetState>
<TargetState>3000000</TargetState> </CoolingDevice>
</CoolingDevice> </TripPoint>
</TripPoint> </TripPoints>
</TripPoints> </ThermalZone>
</ThermalZone> </ThermalZones>
</ThermalZones> </Platform>
</Platform>
</ThermalConfiguration> </ThermalConfiguration>
<!-- END -->

View file

@ -1,75 +1,73 @@
<?xml version="1.0"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- BEGIN --> <ThermalConfiguration>
<ThermalConfiguration> <Platform>
<Platform> <Name> Auto generated </Name>
<Name> Auto generated </Name> <ProductName>Surface Pro</ProductName>
<ProductName>Surface Pro</ProductName> <Preference>QUIET</Preference>
<Preference>QUIET</Preference> <PPCC>
<PPCC> <PowerLimitIndex>0</PowerLimitIndex>
<PowerLimitIndex>0</PowerLimitIndex> <PowerLimitMinimum>3000</PowerLimitMinimum>
<PowerLimitMinimum>3000</PowerLimitMinimum> <PowerLimitMaximum>15000</PowerLimitMaximum>
<PowerLimitMaximum>15000</PowerLimitMaximum> <TimeWindowMinimum>28000</TimeWindowMinimum>
<TimeWindowMinimum>28000</TimeWindowMinimum> <TimeWindowMaximum>32000</TimeWindowMaximum>
<TimeWindowMaximum>32000</TimeWindowMaximum> <StepSize>500</StepSize>
<StepSize>500</StepSize> </PPCC>
</PPCC> <ThermalZones>
<ThermalZones> <ThermalZone>
<ThermalZone> <Type>auto_zone_0</Type>
<Type>auto_zone_0</Type> <TripPoints>
<TripPoints> <TripPoint>
<TripPoint> <SensorType>pch_skylake</SensorType>
<SensorType>pch_skylake</SensorType> <Temperature>54000</Temperature>
<Temperature>54000</Temperature> <Type>Passive</Type>
<Type>Passive</Type> <CoolingDevice>
<CoolingDevice> <Type>B0D4</Type>
<Type>B0D4</Type> <SamplingPeriod>10</SamplingPeriod>
<SamplingPeriod>10</SamplingPeriod> <TargetState>15000000</TargetState>
<TargetState>15000000</TargetState> </CoolingDevice>
</CoolingDevice> </TripPoint>
</TripPoint> <TripPoint>
<TripPoint> <SensorType>pch_skylake</SensorType>
<SensorType>pch_skylake</SensorType> <Temperature>58000</Temperature>
<Temperature>58000</Temperature> <Type>Passive</Type>
<Type>Passive</Type> <CoolingDevice>
<CoolingDevice> <Type>B0D4</Type>
<Type>B0D4</Type> <SamplingPeriod>10</SamplingPeriod>
<SamplingPeriod>10</SamplingPeriod> <TargetState>13000000</TargetState>
<TargetState>13000000</TargetState> </CoolingDevice>
</CoolingDevice> </TripPoint>
</TripPoint> <TripPoint>
<TripPoint> <SensorType>pch_skylake</SensorType>
<SensorType>pch_skylake</SensorType> <Temperature>60000</Temperature>
<Temperature>60000</Temperature> <Type>Passive</Type>
<Type>Passive</Type> <CoolingDevice>
<CoolingDevice> <Type>B0D4</Type>
<Type>B0D4</Type> <SamplingPeriod>5</SamplingPeriod>
<SamplingPeriod>5</SamplingPeriod> <TargetState>9000000</TargetState>
<TargetState>9000000</TargetState> </CoolingDevice>
</CoolingDevice> </TripPoint>
</TripPoint> <TripPoint>
<TripPoint> <SensorType>pch_skylake</SensorType>
<SensorType>pch_skylake</SensorType> <Temperature>62000</Temperature>
<Temperature>62000</Temperature> <Type>Passive</Type>
<Type>Passive</Type> <CoolingDevice>
<CoolingDevice> <Type>B0D4</Type>
<Type>B0D4</Type> <SamplingPeriod>5</SamplingPeriod>
<SamplingPeriod>5</SamplingPeriod> <TargetState>7000000</TargetState>
<TargetState>7000000</TargetState> </CoolingDevice>
</CoolingDevice> </TripPoint>
</TripPoint> <TripPoint>
<TripPoint> <SensorType>pch_skylake</SensorType>
<SensorType>pch_skylake</SensorType> <Temperature>63000</Temperature>
<Temperature>63000</Temperature> <Type>Passive</Type>
<Type>Passive</Type> <CoolingDevice>
<CoolingDevice> <Type>B0D4</Type>
<Type>B0D4</Type> <SamplingPeriod>5</SamplingPeriod>
<SamplingPeriod>5</SamplingPeriod> <TargetState>6000000</TargetState>
<TargetState>6000000</TargetState> </CoolingDevice>
</CoolingDevice> </TripPoint>
</TripPoint> </TripPoints>
</TripPoints> </ThermalZone>
</ThermalZone> </ThermalZones>
</ThermalZones> </Platform>
</Platform>
</ThermalConfiguration> </ThermalConfiguration>
<!-- END -->

View file

@ -1,17 +1,8 @@
<!--
Specifies the order of compensation to cool CPU only.
There is a default already implemented in the code, but
this file can be used to change order
The Following cooling device can present
-->
<CoolingDeviceOrder> <CoolingDeviceOrder>
<!-- Specify Cooling device order --> <!-- Specify Cooling device order -->
<CoolingDevice>rapl_controller</CoolingDevice> <CoolingDevice>rapl_controller</CoolingDevice>
<CoolingDevice>intel_pstate</CoolingDevice> <CoolingDevice>intel_pstate</CoolingDevice>
<CoolingDevice>intel_powerclamp</CoolingDevice> <CoolingDevice>intel_powerclamp</CoolingDevice>
<CoolingDevice>cpufreq</CoolingDevice> <CoolingDevice>cpufreq</CoolingDevice>
<CoolingDevice>Processor</CoolingDevice> <CoolingDevice>Processor</CoolingDevice>
</CoolingDeviceOrder> </CoolingDeviceOrder>

View file

@ -11,4 +11,3 @@ ExecStart=/usr/sbin/thermald --systemd --dbus-enable
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target
Alias=dbus-org.freedesktop.thermald.service Alias=dbus-org.freedesktop.thermald.service

View file

@ -1,27 +1,27 @@
<?xml version="1.0"?> <?xml version="1.0" encoding="UTF-8"?>
<ThermalConfiguration> <ThermalConfiguration>
<Platform> <Platform>
<Name>Intel Powered Laptop</Name> <Name>Intel Powered Laptop</Name>
<ProductName>*</ProductName> <ProductName>*</ProductName>
<Preference>QUIET</Preference> <Preference>QUIET</Preference>
<ThermalZones> <ThermalZones>
<ThermalZone> <ThermalZone>
<Type>cpu</Type> <Type>cpu</Type>
<TripPoints> <TripPoints>
<TripPoint> <TripPoint>
<SensorType>x86_pkg_temp</SensorType> <SensorType>x86_pkg_temp</SensorType>
<Temperature>65000</Temperature> <Temperature>65000</Temperature>
<type>passive</type> <type>passive</type>
<ControlType>SEQUENTIAL</ControlType> <ControlType>SEQUENTIAL</ControlType>
<CoolingDevice> <CoolingDevice>
<index>1</index> <index>1</index>
<type>rapl_controller</type> <type>rapl_controller</type>
<influence>100</influence> <influence>100</influence>
<SamplingPeriod>5</SamplingPeriod> <SamplingPeriod>5</SamplingPeriod>
</CoolingDevice> </CoolingDevice>
</TripPoint> </TripPoint>
</TripPoints> </TripPoints>
</ThermalZone> </ThermalZone>
</ThermalZones> </ThermalZones>
</Platform> </Platform>
</ThermalConfiguration> </ThermalConfiguration>

View file

@ -1,8 +1,8 @@
<CoolingDeviceOrder> <CoolingDeviceOrder>
<!-- Specify Cooling device order --> <!-- Specify Cooling device order -->
<CoolingDevice>rapl_controller</CoolingDevice> <CoolingDevice>rapl_controller</CoolingDevice>
<CoolingDevice>intel_pstate</CoolingDevice> <CoolingDevice>intel_pstate</CoolingDevice>
<CoolingDevice>intel_powerclamp</CoolingDevice> <CoolingDevice>intel_powerclamp</CoolingDevice>
<CoolingDevice>cpufreq</CoolingDevice> <CoolingDevice>cpufreq</CoolingDevice>
<CoolingDevice>Processor</CoolingDevice> <CoolingDevice>Processor</CoolingDevice>
</CoolingDeviceOrder> </CoolingDeviceOrder>