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 2/6] wlcore: Make sure PM calls are paired Date: Tue, 29 May 2018 11:06:01 -0700 [thread overview] Message-ID: <20180529180605.73622-3-tony@atomide.com> (raw) In-Reply-To: <20180529180605.73622-1-tony@atomide.com> The call to wl1271_ps_elp_wakeup() in wl12xx_queue_recovery_work() is unpaired. Let's remove it and add paired calls to wl1271_recovery_work() instead in preparation for changing things to use runtime PM. Signed-off-by: Tony Lindgren <tony@atomide.com> --- drivers/net/wireless/ti/wlcore/main.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 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 @@ -796,8 +796,6 @@ void wl12xx_queue_recovery_work(struct wl1271 *wl) wl->state = WLCORE_STATE_RESTARTING; set_bit(WL1271_FLAG_RECOVERY_IN_PROGRESS, &wl->flags); - wl1271_ps_elp_wakeup(wl); - wlcore_disable_interrupts_nosync(wl); ieee80211_queue_work(wl->hw, &wl->recovery_work); } } @@ -919,12 +917,18 @@ static void wl1271_recovery_work(struct work_struct *work) container_of(work, struct wl1271, recovery_work); struct wl12xx_vif *wlvif; struct ieee80211_vif *vif; + int error; mutex_lock(&wl->mutex); if (wl->state == WLCORE_STATE_OFF || wl->plt) goto out_unlock; + error = wl1271_ps_elp_wakeup(wl); + if (error < 0) + wl1271_warning("Enable for recovery failed"); + wlcore_disable_interrupts_nosync(wl); + if (!test_bit(WL1271_FLAG_INTENDED_FW_RECOVERY, &wl->flags)) { if (wl->conf.fwlog.output == WL12XX_FWLOG_OUTPUT_HOST) wl12xx_read_fwlog_panic(wl); @@ -967,6 +971,8 @@ static void wl1271_recovery_work(struct work_struct *work) */ wlcore_wake_queues(wl, WLCORE_QUEUE_STOP_REASON_FW_RESTART); + wl1271_ps_elp_sleep(wl); + out_unlock: wl->watchdog_recovery = false; clear_bit(WL1271_FLAG_RECOVERY_IN_PROGRESS, &wl->flags); -- 2.17.0
WARNING: multiple messages have this Message-ID (diff)
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 2/6] wlcore: Make sure PM calls are paired Date: Tue, 29 May 2018 11:06:01 -0700 [thread overview] Message-ID: <20180529180605.73622-3-tony@atomide.com> (raw) In-Reply-To: <20180529180605.73622-1-tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org> The call to wl1271_ps_elp_wakeup() in wl12xx_queue_recovery_work() is unpaired. Let's remove it and add paired calls to wl1271_recovery_work() instead in preparation for changing things to use runtime PM. Signed-off-by: Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org> --- drivers/net/wireless/ti/wlcore/main.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 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 @@ -796,8 +796,6 @@ void wl12xx_queue_recovery_work(struct wl1271 *wl) wl->state = WLCORE_STATE_RESTARTING; set_bit(WL1271_FLAG_RECOVERY_IN_PROGRESS, &wl->flags); - wl1271_ps_elp_wakeup(wl); - wlcore_disable_interrupts_nosync(wl); ieee80211_queue_work(wl->hw, &wl->recovery_work); } } @@ -919,12 +917,18 @@ static void wl1271_recovery_work(struct work_struct *work) container_of(work, struct wl1271, recovery_work); struct wl12xx_vif *wlvif; struct ieee80211_vif *vif; + int error; mutex_lock(&wl->mutex); if (wl->state == WLCORE_STATE_OFF || wl->plt) goto out_unlock; + error = wl1271_ps_elp_wakeup(wl); + if (error < 0) + wl1271_warning("Enable for recovery failed"); + wlcore_disable_interrupts_nosync(wl); + if (!test_bit(WL1271_FLAG_INTENDED_FW_RECOVERY, &wl->flags)) { if (wl->conf.fwlog.output == WL12XX_FWLOG_OUTPUT_HOST) wl12xx_read_fwlog_panic(wl); @@ -967,6 +971,8 @@ static void wl1271_recovery_work(struct work_struct *work) */ wlcore_wake_queues(wl, WLCORE_QUEUE_STOP_REASON_FW_RESTART); + wl1271_ps_elp_sleep(wl); + 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 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 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 ` Tony Lindgren [this message] 2018-05-29 18:06 ` [RFT 2/6] wlcore: Make sure PM calls are paired 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 2018-05-31 17:14 ` Tony Lindgren 2018-05-31 17:14 ` Tony Lindgren 2018-06-03 6:04 ` [EXTERNAL] " Reizer, Eyal 2018-06-03 6:04 ` Reizer, Eyal 2018-06-05 4:20 ` Tony Lindgren 2018-06-05 4:20 ` Tony Lindgren 2018-06-05 10:44 ` Tony Lindgren 2018-06-05 10:44 ` Tony Lindgren 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 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 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 ` [RFT 5/6] wclore: Fix timout errors after recovery Tony Lindgren 2018-05-29 18:06 ` 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 2018-05-29 19:23 ` Grygorii Strashko 2018-05-29 19:23 ` Grygorii Strashko 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-3-tony@atomide.com \ --to=tony@atomide.com \ --cc=eyalr@ti.com \ --cc=guym@ti.com \ --cc=kishon@ti.com \ --cc=kvalo@codeaurora.org \ --cc=linux-omap@vger.kernel.org \ --cc=linux-wireless@vger.kernel.org \ --cc=luciano.coelho@intel.com \ --cc=maitalm@ti.com \ --cc=maxim.altshul@ti.com \ --cc=shaharp@ti.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: linkBe 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.