mt76: mt7921: fix a leftover race in runtime-pm
authorLorenzo Bianconi <lorenzo@kernel.org>
Thu, 30 Dec 2021 20:47:05 +0000 (21:47 +0100)
committerFelix Fietkau <nbd@nbd.name>
Thu, 3 Feb 2022 12:57:58 +0000 (13:57 +0100)
Fix a possible race in mt7921_pm_power_save_work() if rx/tx napi
schedules ps_work and we are currently accessing device register
on a different cpu.

Fixes: 1d8efc741df8 ("mt76: mt7921: introduce Runtime PM support")
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
drivers/net/wireless/mediatek/mt76/mt7921/mac.c

index defef34..0744f6e 100644 (file)
@@ -1553,6 +1553,14 @@ void mt7921_pm_power_save_work(struct work_struct *work)
            dev->fw_assert)
                goto out;
 
+       if (mutex_is_locked(&dev->mt76.mutex))
+               /* if mt76 mutex is held we should not put the device
+                * to sleep since we are currently accessing device
+                * register map. We need to wait for the next power_save
+                * trigger.
+                */
+               goto out;
+
        if (time_is_after_jiffies(dev->pm.last_activity + delta)) {
                delta = dev->pm.last_activity + delta - jiffies;
                goto out;