Commit 42ce8d3b authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files

mt76: mt7615: fix a leftover race in runtime-pm 



Fix a possible race in mt7615_pm_power_save_work() if rx/tx napi
schedules ps_work and we are currently accessing device register
on a different cpu.

Fixes: db928f1a ("mt76: mt7663: rely on mt76_connac_pm_ref/mt76_connac_pm_unref in tx/rx napi")
Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 591cdcce

drivers/net/wireless/mediatek/mt76/mt7615/mac.c

+8 −0
Original line number Diff line number Diff line
@@ -2131,6 +2131,14 @@ void mt7615_pm_power_save_work(struct work_struct *work) 
	    test_bit(MT76_HW_SCHED_SCANNING, &dev->mphy.state))

		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;