Skip to content

Commit

Permalink
mt76: mt7615: do not request {driver,fw}_own if already granted
Browse files Browse the repository at this point in the history
Check MT76_STATE_PM in mt7615_driver_own/mt7615_firmware_own
in order to not requested power ownership if it is already granted

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
  • Loading branch information
Lorenzo Bianconi authored and Felix Fietkau committed Jul 21, 2020
1 parent a2b30bd commit 1f54900
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 10 deletions.
1 change: 1 addition & 0 deletions drivers/net/wireless/mediatek/mt76/mt7615/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,7 @@ void mt7615_init_device(struct mt7615_dev *dev)
INIT_WORK(&dev->pm.wake_work, mt7615_pm_wake_work);
init_completion(&dev->pm.wake_cmpl);
spin_lock_init(&dev->pm.txq_lock);
set_bit(MT76_STATE_PM, &dev->mphy.state);
INIT_DELAYED_WORK(&dev->phy.mac_work, mt7615_mac_work);
INIT_DELAYED_WORK(&dev->phy.scan_work, mt7615_scan_work);
skb_queue_head_init(&dev->phy.scan_event_list);
Expand Down
21 changes: 11 additions & 10 deletions drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
Original file line number Diff line number Diff line change
Expand Up @@ -1894,22 +1894,23 @@ int mt7615_driver_own(struct mt7615_dev *dev)
int err = 0;
u32 addr;

if (!test_and_clear_bit(MT76_STATE_PM, &mphy->state))
goto out;

mt7622_trigger_hif_int(dev, true);

addr = is_mt7663(mdev) ? MT_PCIE_DOORBELL_PUSH : MT_CFG_LPCR_HOST;
mt76_wr(dev, addr, MT_CFG_LPCR_HOST_DRV_OWN);

addr = is_mt7663(mdev) ? MT_CONN_HIF_ON_LPCTL : MT_CFG_LPCR_HOST;
if (!mt76_poll_msec(dev, addr, MT_CFG_LPCR_HOST_FW_OWN, 0, 3000)) {
dev_err(dev->mt76.dev, "Timeout for driver own\n");
dev_err(mdev->dev, "Timeout for driver own\n");
set_bit(MT76_STATE_PM, &mphy->state);
err = -EIO;
goto out;
}

clear_bit(MT76_STATE_PM, &mphy->state);

out:
mt7622_trigger_hif_int(dev, false);
out:
dev->pm.last_activity = jiffies;

return err;
Expand All @@ -1922,22 +1923,22 @@ int mt7615_firmware_own(struct mt7615_dev *dev)
int err = 0;
u32 addr;

addr = is_mt7663(&dev->mt76) ? MT_CONN_HIF_ON_LPCTL : MT_CFG_LPCR_HOST;
if (test_and_set_bit(MT76_STATE_PM, &mphy->state))
return 0;

mt7622_trigger_hif_int(dev, true);

addr = is_mt7663(&dev->mt76) ? MT_CONN_HIF_ON_LPCTL : MT_CFG_LPCR_HOST;
mt76_wr(dev, addr, MT_CFG_LPCR_HOST_FW_OWN);

if (is_mt7622(&dev->mt76) &&
!mt76_poll_msec(dev, addr, MT_CFG_LPCR_HOST_FW_OWN,
MT_CFG_LPCR_HOST_FW_OWN, 300)) {
dev_err(dev->mt76.dev, "Timeout for firmware own\n");
clear_bit(MT76_STATE_PM, &mphy->state);
err = -EIO;
goto out;
}

set_bit(MT76_STATE_PM, &mphy->state);

out:
mt7622_trigger_hif_int(dev, false);

return err;
Expand Down
2 changes: 2 additions & 0 deletions drivers/net/wireless/mediatek/mt76/mt7615/usb_mcu.c
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ int mt7663u_mcu_init(struct mt7615_dev *dev)

dev->mt76.mcu_ops = &mt7663u_mcu_ops,

/* usb does not support runtime-pm */
clear_bit(MT76_STATE_PM, &dev->mphy.state);
mt76_set(dev, MT_UDMA_TX_QSEL, MT_FW_DL_EN);

if (test_and_clear_bit(MT76_STATE_POWER_OFF, &dev->mphy.state)) {
Expand Down

0 comments on commit 1f54900

Please sign in to comment.