From: Lorenzo Bianconi <lorenzo@kernel.org>
To: nbd@nbd.name
Cc: linux-wireless@vger.kernel.org, lorenzo.bianconi@redhat.com,
ryder.lee@mediatek.com, sean.wang@mediatek.com,
linux-mediatek@lists.infradead.org
Subject: [PATCH v2 22/22] mt76: mt7615: improve mt7615_driver_own reliability
Date: Fri, 3 Jul 2020 10:16:01 +0200 [thread overview]
Message-ID: <b352afcbf85108249a0e0d5ebf44ca43141cc98a.1593763584.git.lorenzo@kernel.org> (raw)
In-Reply-To: <cover.1593763584.git.lorenzo@kernel.org>
mt7615_driver_own can fail if it runs too close to mt7615_fw_own. In
order to improve mt7615_driver_own reliability, retry to get runtime-pm
ownership if mt7615_driver_own fails
Co-developed-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
.../net/wireless/mediatek/mt76/mt7615/mcu.c | 27 ++++++++++++-------
.../wireless/mediatek/mt76/mt7615/mt7615.h | 2 ++
2 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
index 4b576cc3c5c0..871abbc84b73 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
@@ -1918,29 +1918,36 @@ int mt7615_driver_own(struct mt7615_dev *dev)
{
struct mt76_phy *mphy = &dev->mt76.phy;
struct mt76_dev *mdev = &dev->mt76;
- int err = 0;
- u32 addr;
+ int i;
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);
+ for (i = 0; i < MT7615_DRV_OWN_RETRY_COUNT; i++) {
+ u32 addr;
- 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(mdev->dev, "Timeout for driver own\n");
- set_bit(MT76_STATE_PM, &mphy->state);
- err = -EIO;
+ 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, 50))
+ break;
}
mt7622_trigger_hif_int(dev, false);
+
+ if (i == MT7615_DRV_OWN_RETRY_COUNT) {
+ dev_err(mdev->dev, "driver own failed\n");
+ set_bit(MT76_STATE_PM, &mphy->state);
+ return -EIO;
+ }
+
out:
dev->pm.last_activity = jiffies;
- return err;
+ return 0;
}
EXPORT_SYMBOL_GPL(mt7615_driver_own);
diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h b/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
index e60fb52ad1d2..f70d49cbc027 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
@@ -33,6 +33,8 @@
#define MT7615_RX_RING_SIZE 1024
#define MT7615_RX_MCU_RING_SIZE 512
+#define MT7615_DRV_OWN_RETRY_COUNT 10
+
#define MT7615_FIRMWARE_CR4 "mediatek/mt7615_cr4.bin"
#define MT7615_FIRMWARE_N9 "mediatek/mt7615_n9.bin"
#define MT7615_ROM_PATCH "mediatek/mt7615_rom_patch.bin"
--
2.26.2
prev parent reply other threads:[~2020-07-03 8:17 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-03 8:15 [PATCH v2 00/22] add runtime-pm support to mt7663 driver Lorenzo Bianconi
2020-07-03 8:15 ` [PATCH v2 01/22] mt76: mt7615: avoid polling in fw_own for mt7663 Lorenzo Bianconi
2020-07-03 8:15 ` [PATCH v2 02/22] mt76: move mt76 worqueue in common code Lorenzo Bianconi
2020-07-03 8:15 ` [PATCH v2 03/22] mt76: mt7615: add mt7615_pm_wake utility routine Lorenzo Bianconi
2020-07-03 8:15 ` [PATCH v2 04/22] mt76: mt7615: introduce mt7615_mutex_{acquire,release} utilities Lorenzo Bianconi
2020-07-03 8:15 ` [PATCH v2 05/22] mt76: mt7615: wake device before accessing regmap in debugfs Lorenzo Bianconi
2020-07-03 8:15 ` [PATCH v2 06/22] mt76: mt7615: wake device before configuring hw keys Lorenzo Bianconi
2020-07-03 8:15 ` [PATCH v2 07/22] mt76: mt7615: introduce pm_power_save delayed work Lorenzo Bianconi
2020-07-03 8:15 ` [PATCH v2 08/22] mt76: mt7615: wake device in mt7615_update_channel before access regmap Lorenzo Bianconi
2020-07-03 8:15 ` [PATCH v2 09/22] mt76: mt7615: acquire driver_own before configuring device for suspend Lorenzo Bianconi
2020-07-03 8:15 ` [PATCH v2 10/22] mt76: mt7615: wake device before performing freq scan Lorenzo Bianconi
2020-07-03 8:15 ` [PATCH v2 11/22] mt76: mt7615: add missing lock in mt7615_regd_notifier Lorenzo Bianconi
2020-07-03 8:15 ` [PATCH v2 12/22] mt76: mt7615: run mt7615_mcu_set_wmm holding mt76 mutex Lorenzo Bianconi
2020-07-03 8:15 ` [PATCH v2 13/22] mt76: mt7615: run mt7615_mcu_set_roc " Lorenzo Bianconi
2020-07-03 8:15 ` [PATCH v2 14/22] mt76: mt7615: wake device before pulling packets from mac80211 queues Lorenzo Bianconi
2020-07-03 8:15 ` [PATCH v2 15/22] mt76: mt7615: wake device before pushing frames in mt7615_tx Lorenzo Bianconi
2020-07-03 8:15 ` [PATCH v2 16/22] mt76: mt7615: run mt7615_pm_wake in mt7615_mac_sta_{add,remove} Lorenzo Bianconi
2020-07-03 8:15 ` [PATCH v2 17/22] mt76: mt7615: check MT76_STATE_PM flag before accessing the device Lorenzo Bianconi
2020-07-03 8:15 ` [PATCH v2 18/22] mt76: mt7615: do not request {driver,fw}_own if already granted Lorenzo Bianconi
2020-07-03 8:15 ` [PATCH v2 19/22] mt76: mt7615: add runtime-pm knob in mt7615 debugfs Lorenzo Bianconi
2020-07-03 8:15 ` [PATCH v2 20/22] mt76: mt7615: enable beacon hw filter for runtime-pm Lorenzo Bianconi
2020-07-03 8:16 ` [PATCH v2 21/22] mt76: mt7615: add idle-timeout knob in mt7615 debugfs Lorenzo Bianconi
2020-07-03 8:16 ` Lorenzo Bianconi [this message]
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=b352afcbf85108249a0e0d5ebf44ca43141cc98a.1593763584.git.lorenzo@kernel.org \
--to=lorenzo@kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-wireless@vger.kernel.org \
--cc=lorenzo.bianconi@redhat.com \
--cc=nbd@nbd.name \
--cc=ryder.lee@mediatek.com \
--cc=sean.wang@mediatek.com \
/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;
as well as URLs for NNTP newsgroup(s).