From: Hedi Ben Hamida <hedihamida096@gmail.com>
To: Felix Fietkau <nbd@nbd.name>, Lorenzo Bianconi <lorenzo@kernel.org>
Cc: Ryder Lee <ryder.lee@mediatek.com>,
Shayne Chen <shayne.chen@mediatek.com>,
Sean Wang <sean.wang@mediatek.com>,
linux-wireless@vger.kernel.org,
linux-mediatek@lists.infradead.org, stable@vger.kernel.org,
Hedi Ben Hamida <hedihamida096@gmail.com>
Subject: [PATCH v2 1/2] wifi: mt76: mt7921: add pci restore for hibernate
Date: Sat, 24 Oct 2026 09:16:52 -0400 [thread overview]
Message-ID: <20261024131715.64435-2-hedihamida096@gmail.com> (raw)
In-Reply-To: <20261024131715.64435-1-hedihamida096@gmail.com>
Hibernation powers the device off and on. On resume the generic restore
path runs the normal resume sequence and can time out waiting for the
hif-suspend MCU handshake:
mt7921e 0000:03:00.0: Message 00020007 (seq 12) timeout
mt7921e 0000:03:00.0: PM: dpm_run_callback(): pci_pm_restore returns -110
Add a dedicated .restore callback, mirroring mt7925, which skips the
handshake, resets the device and returns it to its pre-hibernate state.
Tested on MEDIATEK MT7922 (14c3:7922) on kernel 6.12.113.
Cc: stable@vger.kernel.org
Signed-off-by: Hedi Ben Hamida <hedihamida096@gmail.com>
---
.../net/wireless/mediatek/mt76/mt7921/pci.c | 26 ++++++++++++++++---
1 file changed, 23 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/pci.c b/drivers/net/wireless/mediatek/mt76/mt7921/pci.c
index f87c44f2a..00532b29f 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7921/pci.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/pci.c
@@ -549,7 +549,7 @@ static int mt7921_pci_suspend(struct device *device)
return err;
}
-static int mt7921_pci_resume(struct device *device)
+static int _mt7921_pci_resume(struct device *device, bool restore)
{
struct pci_dev *pdev = to_pci_dev(device);
struct mt76_dev *mdev = pci_get_drvdata(pdev);
@@ -589,6 +589,9 @@ static int mt7921_pci_resume(struct device *device)
napi_schedule(&mdev->tx_napi);
local_bh_enable();
+ if (restore)
+ goto failed;
+
/* restore previous ds setting */
if (!pm->ds_enable)
mt76_connac_mcu_set_deep_sleep(&dev->mt76, false);
@@ -602,7 +605,7 @@ static int mt7921_pci_resume(struct device *device)
failed:
pm->suspended = false;
- if (err < 0)
+ if (err < 0 || restore)
mt792x_reset(&dev->mt76);
return err;
@@ -715,7 +718,24 @@ static void mt7921_pci_shutdown(struct pci_dev *pdev)
mt7921_pci_remove(pdev);
}
-static DEFINE_SIMPLE_DEV_PM_OPS(mt7921_pm_ops, mt7921_pci_suspend, mt7921_pci_resume);
+static int mt7921_pci_resume(struct device *device)
+{
+ return _mt7921_pci_resume(device, false);
+}
+
+static int mt7921_pci_restore(struct device *device)
+{
+ return _mt7921_pci_resume(device, true);
+}
+
+static const struct dev_pm_ops mt7921_pm_ops = {
+ .suspend = pm_sleep_ptr(mt7921_pci_suspend),
+ .resume = pm_sleep_ptr(mt7921_pci_resume),
+ .freeze = pm_sleep_ptr(mt7921_pci_suspend),
+ .thaw = pm_sleep_ptr(mt7921_pci_resume),
+ .poweroff = pm_sleep_ptr(mt7921_pci_suspend),
+ .restore = pm_sleep_ptr(mt7921_pci_restore),
+};
static struct pci_driver mt7921_pci_driver = {
.name = KBUILD_MODNAME,
--
2.47.3
next prev parent reply other threads:[~2026-10-24 13:18 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-24 13:16 [PATCH v2 0/2] wifi: mt76: mt7921: fix hibernate and suspend resume Hedi Ben Hamida
2026-10-24 13:16 ` Hedi Ben Hamida [this message]
2026-10-24 13:16 ` [PATCH v2 2/2] wifi: mt76: mt7921: reset on HIF resume timeout Hedi Ben Hamida
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261024131715.64435-2-hedihamida096@gmail.com \
--to=hedihamida096@gmail.com \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-wireless@vger.kernel.org \
--cc=lorenzo@kernel.org \
--cc=nbd@nbd.name \
--cc=ryder.lee@mediatek.com \
--cc=sean.wang@mediatek.com \
--cc=shayne.chen@mediatek.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox