gitops/mt76
1
0
Fork 0
mirror of https://github.com/outbackdingo/mt76.git synced 2026-10-24 13:26:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

wifi: mt76: mt7915: hold dev->mutex while interacting with the thermal state

Browse Source 
Avoid issuing MCU calls during a hardware restart

Signed-off-by: Felix Fietkau <[email protected]>
This commit is contained in:
Felix Fietkau
2024-10-17 12:32:27 +02:00
parent b2b6ccf8ee
commit 3be3e7352d
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mt7915/init.c
+5 -2
View File
@@ -52,7 +52,9 @@ static ssize_t mt7915_thermal_temp_show(struct device *dev,
switch (i) { switch (i) {
case 0: case 0:
mutex_lock(&phy->dev->mt76.mutex);
temperature = mt7915_mcu_get_temperature(phy); temperature = mt7915_mcu_get_temperature(phy);
mutex_unlock(&phy->dev->mt76.mutex);
if (temperature < 0) if (temperature < 0)
return temperature; return temperature;
/* display in millidegree celcius */ /* display in millidegree celcius */
@@ -94,9 +96,8 @@ static ssize_t mt7915_thermal_temp_store(struct device *dev,
} }
phy->throttle_temp[i - 1] = val; phy->throttle_temp[i - 1] = val;
mutex_unlock(&phy->dev->mt76.mutex);
ret = mt7915_mcu_set_thermal_protect(phy); ret = mt7915_mcu_set_thermal_protect(phy);
mutex_unlock(&phy->dev->mt76.mutex);
if (ret) if (ret)
return ret; return ret;
@@ -158,7 +159,9 @@ mt7915_thermal_set_cur_throttle_state(struct thermal_cooling_device *cdev,
* cooling_device convention: 0 = no cooling, more = more cooling * cooling_device convention: 0 = no cooling, more = more cooling
* mcu convention: 1 = max cooling, more = less cooling * mcu convention: 1 = max cooling, more = less cooling
*/ */
mutex_lock(&phy->dev->mt76.mutex);
ret = mt7915_mcu_set_thermal_throttling(phy, throttling); ret = mt7915_mcu_set_thermal_throttling(phy, throttling);
mutex_unlock(&phy->dev->mt76.mutex);
if (ret) if (ret)
return ret; return ret;