UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

mt76: connac: check wake refcount in mcu_fw_pmctrl 

In order to avoid synchronization races between tx and rx path, rely on
mt76_connac_skip_fw_pmctrl putting the chip in sleep mode for mt7921 and
mt7663 devices

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Lorenzo Bianconi 2021-04-18 18:45:36 +02:00 committed by Felix Fietkau
parent 4f9b3aeb83
commit ec7bd7b4a9
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
View File

@ -358,7 +358,7 @@ static int mt7615_mcu_fw_pmctrl(struct mt7615_dev *dev)
mutex_lock(&dev->pm.mutex);
if (test_and_set_bit(MT76_STATE_PM, &mphy->state))
if (mt76_connac_skip_fw_pmctrl(mphy, &dev->pm))
goto out;
mt7622_trigger_hif_int(dev, true);

12
drivers/net/wireless/mediatek/mt76/mt76_connac.h
View File

@ -116,6 +116,18 @@ mt76_connac_pm_unref(struct mt76_connac_pm *pm)
spin_unlock_bh(&pm->wake.lock);
}
static inline bool
mt76_connac_skip_fw_pmctrl(struct mt76_phy *phy, struct mt76_connac_pm *pm)
{
bool ret;
spin_lock_bh(&pm->wake.lock);
ret = pm->wake.count || test_and_set_bit(MT76_STATE_PM, &phy->state);
spin_unlock_bh(&pm->wake.lock);
return ret;
}
static inline void
mt76_connac_mutex_acquire(struct mt76_dev *dev, struct mt76_connac_pm *pm)
__acquires(&dev->mutex)

2
drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
View File

@ -1304,7 +1304,7 @@ int mt7921_mcu_fw_pmctrl(struct mt7921_dev *dev)
mutex_lock(&dev->pm.mutex);
if (test_and_set_bit(MT76_STATE_PM, &mphy->state))
if (mt76_connac_skip_fw_pmctrl(mphy, &dev->pm))
goto out;
for (i = 0; i < MT7921_DRV_OWN_RETRY_COUNT; i++) {