Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'thermal-7.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull thermal control fix from Rafael Wysocki:
"This prevents the int340x thermal driver from taking the power slider
offset parameter into account incorrectly in some cases (Srinivas
Pandruvada)"
* tag 'thermal-7.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
thermal: intel: int340x: soc_slider: Set offset only for balanced mode
+7
-1
+7
-1
drivers/thermal/intel/int340x_thermal/processor_thermal_soc_slider.c
+7
-1
drivers/thermal/intel/int340x_thermal/processor_thermal_soc_slider.c
···
176
176
177
177
static void set_soc_power_profile(struct proc_thermal_device *proc_priv, int slider)
178
178
{
179
+
u8 offset;
179
180
u64 val;
180
181
181
182
val = read_soc_slider(proc_priv);
182
183
val &= ~SLIDER_MASK;
183
184
val |= FIELD_PREP(SLIDER_MASK, slider) | BIT(SLIDER_ENABLE_BIT);
184
185
186
+
if (slider == SOC_SLIDER_VALUE_MINIMUM || slider == SOC_SLIDER_VALUE_MAXIMUM)
187
+
offset = 0;
188
+
else
189
+
offset = slider_offset;
190
+
185
191
/* Set the slider offset from module params */
186
192
val &= ~SLIDER_OFFSET_MASK;
187
-
val |= FIELD_PREP(SLIDER_OFFSET_MASK, slider_offset);
193
+
val |= FIELD_PREP(SLIDER_OFFSET_MASK, offset);
188
194
189
195
write_soc_slider(proc_priv, val);
190
196
}