From: Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
To: Kalle Valo <kvalo-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
Cc: Eyal Reizer <eyalr-l0cyMroinI0@public.gmane.org>,
Kishon Vijay Abraham I <kishon-l0cyMroinI0@public.gmane.org>,
Guy Mishol <guym-l0cyMroinI0@public.gmane.org>,
Luca Coelho
<luciano.coelho-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>,
Maital Hahn <maitalm-l0cyMroinI0@public.gmane.org>,
Maxim Altshul <maxim.altshul-l0cyMroinI0@public.gmane.org>,
Shahar Patury <shaharp-l0cyMroinI0@public.gmane.org>,
linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: [RFT 5/6] wclore: Fix timout errors after recovery
Date: Tue, 29 May 2018 11:06:04 -0700 [thread overview]
Message-ID: <20180529180605.73622-6-tony@atomide.com> (raw)
In-Reply-To: <20180529180605.73622-1-tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
After enabling runtime PM, if we force hardware reset multiple times with:
# echo 1 > /sys/kernel/debug/ieee80211/phy0/wlcore/start_recovery
We will after few tries get the following error:
wlcore: ERROR timeout waiting for the hardware to complete initialization
And then wlcore is unable to reconnect until after the wlcore related modules
are reloaded.
Let's fix this by moving pm_runtime_put() earlier before we restart the hardware.
And let's use the sync version to make sure we're done before we restart.
Note that we still will get -EBUSY warning from wl12xx_sdio_set_power() but let's
fix that separately once we know exactly why we get the warning.
Reported-by: Eyal Reizer <eyalr-l0cyMroinI0@public.gmane.org>
Signed-off-by: Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
---
drivers/net/wireless/ti/wlcore/main.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c
--- a/drivers/net/wireless/ti/wlcore/main.c
+++ b/drivers/net/wireless/ti/wlcore/main.c
@@ -977,6 +977,7 @@ static void wl1271_recovery_work(struct work_struct *work)
}
wlcore_op_stop_locked(wl);
+ pm_runtime_put_sync(wl->dev);
ieee80211_restart_hw(wl->hw);
@@ -986,8 +987,6 @@ static void wl1271_recovery_work(struct work_struct *work)
*/
wlcore_wake_queues(wl, WLCORE_QUEUE_STOP_REASON_FW_RESTART);
- pm_runtime_put(wl->dev);
WARNING: multiple messages have this Message-ID (diff)
From: Tony Lindgren <tony@atomide.com>
To: Kalle Valo <kvalo@codeaurora.org>
Cc: Eyal Reizer <eyalr@ti.com>,
Kishon Vijay Abraham I <kishon@ti.com>, Guy Mishol <guym@ti.com>,
Luca Coelho <luciano.coelho@intel.com>,
Maital Hahn <maitalm@ti.com>,
Maxim Altshul <maxim.altshul@ti.com>,
Shahar Patury <shaharp@ti.com>,
linux-wireless@vger.kernel.org, linux-omap@vger.kernel.org
Subject: [RFT 5/6] wclore: Fix timout errors after recovery
Date: Tue, 29 May 2018 11:06:04 -0700 [thread overview]
Message-ID: <20180529180605.73622-6-tony@atomide.com> (raw)
In-Reply-To: <20180529180605.73622-1-tony@atomide.com>
After enabling runtime PM, if we force hardware reset multiple times with:
# echo 1 > /sys/kernel/debug/ieee80211/phy0/wlcore/start_recovery
We will after few tries get the following error:
wlcore: ERROR timeout waiting for the hardware to complete initialization
And then wlcore is unable to reconnect until after the wlcore related modules
are reloaded.
Let's fix this by moving pm_runtime_put() earlier before we restart the hardware.
And let's use the sync version to make sure we're done before we restart.
Note that we still will get -EBUSY warning from wl12xx_sdio_set_power() but let's
fix that separately once we know exactly why we get the warning.
Reported-by: Eyal Reizer <eyalr@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
drivers/net/wireless/ti/wlcore/main.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c
--- a/drivers/net/wireless/ti/wlcore/main.c
+++ b/drivers/net/wireless/ti/wlcore/main.c
@@ -977,6 +977,7 @@ static void wl1271_recovery_work(struct work_struct *work)
}
wlcore_op_stop_locked(wl);
+ pm_runtime_put_sync(wl->dev);
ieee80211_restart_hw(wl->hw);
@@ -986,8 +987,6 @@ static void wl1271_recovery_work(struct work_struct *work)
*/
wlcore_wake_queues(wl, WLCORE_QUEUE_STOP_REASON_FW_RESTART);
- pm_runtime_put(wl->dev);
-
out_unlock:
wl->watchdog_recovery = false;
clear_bit(WL1271_FLAG_RECOVERY_IN_PROGRESS, &wl->flags);
--
2.17.0
next prev parent reply other threads:[~2018-05-29 18:06 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-29 18:05 [RFTv3 0/6] Runtime PM support for wlcore Tony Lindgren
2018-05-29 18:05 ` Tony Lindgren
[not found] ` <20180529180605.73622-1-tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
2018-05-29 18:06 ` [RFT 1/6] wlcore: Add missing PM call for wlcore_cmd_wait_for_event_or_timeout() Tony Lindgren
2018-05-29 18:06 ` Tony Lindgren
[not found] ` <20180529180605.73622-2-tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
2018-05-31 17:17 ` [RFT 7/6] wlcore: Make sure firmware is initialized in wl1271_op_add_interface() Tony Lindgren
2018-05-31 17:17 ` Tony Lindgren
2018-05-29 18:06 ` [RFT 2/6] wlcore: Make sure PM calls are paired Tony Lindgren
2018-05-29 18:06 ` Tony Lindgren
2018-05-29 18:06 ` [RFT 3/6] wlcore: Add support for runtime PM Tony Lindgren
2018-05-29 18:06 ` Tony Lindgren
[not found] ` <20180529180605.73622-4-tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
2018-05-31 17:14 ` Tony Lindgren
2018-05-31 17:14 ` Tony Lindgren
[not found] ` <20180531171420.GQ5705-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
2018-06-03 6:04 ` [EXTERNAL] " Reizer, Eyal
2018-06-03 6:04 ` Reizer, Eyal
[not found] ` <fe42f9d6bb744cd39e38db8f51c0b74e-l0cyMroinI0@public.gmane.org>
2018-06-05 4:20 ` Tony Lindgren
2018-06-05 4:20 ` Tony Lindgren
[not found] ` <20180605042000.GA5738-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
2018-06-05 10:44 ` Tony Lindgren
2018-06-05 10:44 ` Tony Lindgren
[not found] ` <20180605104404.GD5738-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
2018-06-05 10:49 ` Reizer, Eyal
2018-06-05 10:49 ` Reizer, Eyal
2018-06-06 12:20 ` Reizer, Eyal
2018-06-06 12:20 ` Reizer, Eyal
[not found] ` <b55bd6bf93eb4b7884ad05e44eded929-l0cyMroinI0@public.gmane.org>
2018-06-13 6:42 ` Tony Lindgren
2018-06-13 6:42 ` Tony Lindgren
2018-06-14 8:36 ` Reizer, Eyal
2018-06-14 8:36 ` Reizer, Eyal
2018-06-14 11:29 ` Reizer, Eyal
2018-06-14 11:29 ` Reizer, Eyal
[not found] ` <90db5e5b092a4be6b4390fc5f695b5fe-l0cyMroinI0@public.gmane.org>
2018-06-15 5:04 ` Tony Lindgren
2018-06-15 5:04 ` Tony Lindgren
2018-05-29 18:06 ` [RFT 4/6] wlcore: Fix misplaced PM call for scan_complete_work() Tony Lindgren
2018-05-29 18:06 ` Tony Lindgren
2018-05-29 18:06 ` Tony Lindgren [this message]
2018-05-29 18:06 ` [RFT 5/6] wclore: Fix timout errors after recovery Tony Lindgren
2018-05-29 18:06 ` [RFT 6/6] wlcore: Use generic runtime pm calls for wowlan elp configuration Tony Lindgren
2018-05-29 18:06 ` Tony Lindgren
[not found] ` <20180529180605.73622-7-tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
2018-05-29 19:23 ` Grygorii Strashko
2018-05-29 19:23 ` Grygorii Strashko
[not found] ` <75fb865b-dc84-2e7d-d879-581e65dc343d-l0cyMroinI0@public.gmane.org>
2018-05-29 21:40 ` Tony Lindgren
2018-05-29 21:40 ` Tony Lindgren
2018-05-31 17:56 ` [RFTv3 8/6] wlcore: Enable runtime PM autosuspend support Tony Lindgren
2018-05-31 17:56 ` Tony Lindgren
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=20180529180605.73622-6-tony@atomide.com \
--to=tony-4v6ys6ai5vpbdgjk7y7tuq@public.gmane.org \
--cc=eyalr-l0cyMroinI0@public.gmane.org \
--cc=guym-l0cyMroinI0@public.gmane.org \
--cc=kishon-l0cyMroinI0@public.gmane.org \
--cc=kvalo-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org \
--cc=linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=luciano.coelho-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org \
--cc=maitalm-l0cyMroinI0@public.gmane.org \
--cc=maxim.altshul-l0cyMroinI0@public.gmane.org \
--cc=shaharp-l0cyMroinI0@public.gmane.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.