Skip to contentSkip to conversation

mt76: mt7921s: make pm->suspended usage consistent

PATCH [email protected] 2 participants 2 messages Dec 11, 2021 – Dec 13, 2021 1 message not in the archive Arm MediaTek

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): YbTU08hzeTSJPIsp@lore-desk--annotate

[email protected]

author
#1 lore raw

From: Sean Wang <[email protected]>

Quoted 30 lines
Quoted 22 lines

From: Sean Wang <[email protected]>

Update pm->suspended usage to be consistent with mt7921e driver.

Signed-off-by Sean Wang <[email protected]>
---
 drivers/net/wireless/mediatek/mt76/mt7921/sdio.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7921/sdio.c +0 -1
index 84be229a899d..44ee9369f6bf 100644
@@ -278,7 +278,6 @@ static int mt7921s_resume(struct device *__dev)
 	struct mt76_dev *mdev = &dev->mt76;
 	int err;
 
-	pm->suspended = false;
 	clear_bit(MT76_STATE_SUSPEND, &mdev->phy.state);
 
 	err = mt7921_mcu_drv_pmctrl(dev);

drivers/net/wireless/mediatek/mt76/mt7921/sdio.c static int mt7921s_resume(struct device *__dev) · line 296

Quoted 5 lines
drivers/net/wireless/mediatek/mt76/mt7921/sdio.c +1 -1
@@ -294,7 +293,11 @@ static int mt7921s_resume(struct device *__dev)
 	if (!pm->ds_enable)
 		mt76_connac_mcu_set_deep_sleep(mdev, false);
 
-	return mt76_connac_mcu_set_hif_suspend(mdev, false);
+	err = mt76_connac_mcu_set_hif_suspend(mdev, false);

should we check return value here? Something like:

Quoted 7 lines
	if (err)
		return err;

	pm->suspended = false;
	return 0;

Or, is the chip up even if mt76_connac_mcu_set_hif_suspend() fails?

yes, chip is eventually up again by recovered with the following wifi reset

with current logic, if do so (not mark pm->suspended back as false to show suspend/resume is over),

the pm runtime would not be enabled again after the wifi reset

Quoted 10 lines
Quoted 10 lines
drivers/net/wireless/mediatek/mt76/mt7921/sdio.c +4 -1
+
+	pm->suspended = false;
+
+	return err;
 }
 
 static const struct dev_pm_ops mt7921s_pm_ops = {
--

2.25.1

#2 lore raw
Quoted 38 lines

From: Sean Wang <[email protected]>

Quoted 36 lines
Quoted 22 lines

From: Sean Wang <[email protected]>

Update pm->suspended usage to be consistent with mt7921e driver.

Signed-off-by Sean Wang <[email protected]>
---
 drivers/net/wireless/mediatek/mt76/mt7921/sdio.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7921/sdio.c +0 -1
index 84be229a899d..44ee9369f6bf 100644
@@ -278,7 +278,6 @@ static int mt7921s_resume(struct device *__dev)
 	struct mt76_dev *mdev = &dev->mt76;
 	int err;
 
-	pm->suspended = false;
 	clear_bit(MT76_STATE_SUSPEND, &mdev->phy.state);
 
 	err = mt7921_mcu_drv_pmctrl(dev);

drivers/net/wireless/mediatek/mt76/mt7921/sdio.c static int mt7921s_resume(struct device *__dev) · line 296

Quoted 5 lines
drivers/net/wireless/mediatek/mt76/mt7921/sdio.c +1 -1
@@ -294,7 +293,11 @@ static int mt7921s_resume(struct device *__dev)
 	if (!pm->ds_enable)
 		mt76_connac_mcu_set_deep_sleep(mdev, false);
 
-	return mt76_connac_mcu_set_hif_suspend(mdev, false);
+	err = mt76_connac_mcu_set_hif_suspend(mdev, false);

should we check return value here? Something like:

	if (err)
		return err;

	pm->suspended = false;
	return 0;
Quoted 7 lines
Quoted 1 line

Or, is the chip up even if mt76_connac_mcu_set_hif_suspend() fails?

yes, chip is eventually up again by recovered with the following wifi reset

with current logic, if do so (not mark pm->suspended back as false to show suspend/resume is over),

the pm runtime would not be enabled again after the wifi reset

maybe we should just set pm->suspended = false; in mt7921_mac_reset_work() as we do for hw_full_reset, wdyt?

Regards,
Lorenzo

Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
drivers/net/wireless/mediatek/mt76/mt7921/sdio.c +4 -1
+
+	pm->suspended = false;
+
+	return err;
 }
 
 static const struct dev_pm_ops mt7921s_pm_ops = {
--

2.25.1