Skip to content

Commit

Permalink
mt76: mt7663s: enable runtime-pm
Browse files Browse the repository at this point in the history
Allow the user to enable runtime-pm for mt7663s driver

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 Jun 19, 2021
1 parent c2f9e63 commit 8aff2d9
Showing 3 changed files with 13 additions and 6 deletions.
2 changes: 1 addition & 1 deletion drivers/net/wireless/mediatek/mt76/mt7615/debugfs.c
Original file line number Diff line number Diff line change
@@ -75,7 +75,7 @@ mt7615_pm_set(void *data, u64 val)
if (!mt7615_wait_for_mcu_init(dev))
return 0;

if (!mt7615_firmware_offload(dev) || !mt76_is_mmio(&dev->mt76))
if (!mt7615_firmware_offload(dev) || mt76_is_usb(&dev->mt76))
return -EOPNOTSUPP;

if (val == pm->enable)
13 changes: 10 additions & 3 deletions drivers/net/wireless/mediatek/mt76/mt7615/sdio_mcu.c
Original file line number Diff line number Diff line change
@@ -65,13 +65,16 @@ static int __mt7663s_mcu_drv_pmctrl(struct mt7615_dev *dev)

ret = readx_poll_timeout(mt7663s_read_pcr, dev, status,
status & WHLPCR_IS_DRIVER_OWN, 2000, 1000000);
if (ret < 0)
if (ret < 0) {
dev_err(dev->mt76.dev, "Cannot get ownership from device");
else
} else {
clear_bit(MT76_STATE_PM, &mphy->state);

pm->stats.last_wake_event = jiffies;
pm->stats.doze_time += pm->stats.last_wake_event -
pm->stats.last_doze_event;
}
sdio_release_host(func);
pm->last_activity = jiffies;

return ret;
}
@@ -113,6 +116,10 @@ static int mt7663s_mcu_fw_pmctrl(struct mt7615_dev *dev)
if (ret < 0) {
dev_err(dev->mt76.dev, "Cannot set ownership to device");
clear_bit(MT76_STATE_PM, &mphy->state);
} else {
pm->stats.last_doze_event = jiffies;
pm->stats.awake_time += pm->stats.last_doze_event -
pm->stats.last_wake_event;
}

sdio_release_host(func);
4 changes: 2 additions & 2 deletions drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ int mt76_connac_pm_wake(struct mt76_phy *phy, struct mt76_connac_pm *pm)
if (!pm->enable)
return 0;

if (!mt76_is_mmio(dev))
if (mt76_is_usb(dev))
return 0;

cancel_delayed_work_sync(&pm->ps_work);
@@ -37,7 +37,7 @@ void mt76_connac_power_save_sched(struct mt76_phy *phy,
{
struct mt76_dev *dev = phy->dev;

if (!mt76_is_mmio(dev))
if (mt76_is_usb(dev))
return;

if (!pm->enable)

0 comments on commit 8aff2d9

Please sign in to comment.