redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

wlcore: Use generic runtime pm calls for wowlan elp configuration

Browse source 
With runtime PM enabled, we can now use calls to pm_runtime_force_suspend
and pm_runtime_force_resume for enabling elp during suspend when wowlan
is enabled and waking the chip from elp on resume.

Remove the custom API that was used to ensure that the command
that is used to allow ELP during suspend is completed before the system
suspend.

Signed-off-by: Eyal Reizer <eyalr@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Eyal Reizer 2018-06-19 02:43:40 -07:00 committed by Kalle Valo
parent db68052bdf
commit 45aa7f071b
1 changed files with 13 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
drivers/net/wireless/ti/wlcore/main.c
View file

@ -998,24 +998,6 @@ static int wlcore_fw_wakeup(struct wl1271 *wl)
return wlcore_raw_write32(wl, HW_ACCESS_ELP_CTRL_REG, ELPCTRL_WAKE_UP);
}
static int wlcore_fw_sleep(struct wl1271 *wl)
{
int ret;
mutex_lock(&wl->mutex);
ret = wlcore_raw_write32(wl, HW_ACCESS_ELP_CTRL_REG, ELPCTRL_SLEEP);
if (ret < 0) {
wl12xx_queue_recovery_work(wl);
goto out;
}
set_bit(WL1271_FLAG_IN_ELP, &wl->flags);
out:
mutex_unlock(&wl->mutex);
mdelay(WL1271_SUSPEND_SLEEP);
return 0;
}
static int wl1271_setup(struct wl1271 *wl)
{
wl->raw_fw_status = kzalloc(wl->fw_status_len, GFP_KERNEL);
@ -1738,6 +1720,7 @@ static int __maybe_unused wl1271_op_suspend(struct ieee80211_hw *hw,
{
struct wl1271 *wl = hw->priv;
struct wl12xx_vif *wlvif;
unsigned long flags;
int ret;
wl1271_debug(DEBUG_MAC80211, "mac80211 suspend wow=%d", !!wow);
@ -1796,19 +1779,6 @@ out_sleep:
/* flush any remaining work */
wl1271_debug(DEBUG_MAC80211, "flushing remaining works");
/*
* disable and re-enable interrupts in order to flush
* the threaded_irq
*/
wlcore_disable_interrupts(wl);
/*
* set suspended flag to avoid triggering a new threaded_irq
* work. no need for spinlock as interrupts are disabled.
*/
set_bit(WL1271_FLAG_SUSPENDED, &wl->flags);
wlcore_enable_interrupts(wl);
flush_work(&wl->tx_work);
/*
@ -1818,15 +1788,14 @@ out_sleep:
cancel_delayed_work(&wl->tx_watchdog_work);
/*
* Use an immediate call for allowing the firmware to go into power
* save during suspend.
* Using a workque for this last write was only hapenning on resume
* leaving the firmware with power save disabled during suspend,
* while consuming full power during wowlan suspend.
* set suspended flag to avoid triggering a new threaded_irq
* work.
*/
wlcore_fw_sleep(wl);
spin_lock_irqsave(&wl->wl_lock, flags);
set_bit(WL1271_FLAG_SUSPENDED, &wl->flags);
spin_unlock_irqrestore(&wl->wl_lock, flags);
return 0;
return pm_runtime_force_suspend(wl->dev);
}
static int __maybe_unused wl1271_op_resume(struct ieee80211_hw *hw)
@ -1841,6 +1810,12 @@ static int __maybe_unused wl1271_op_resume(struct ieee80211_hw *hw)
wl->wow_enabled);
WARN_ON(!wl->wow_enabled);
ret = pm_runtime_force_resume(wl->dev);
if (ret < 0) {
wl1271_error("ELP wakeup failure!");
goto out_sleep;
}
/*
* re-enable irq_work enqueuing, and call irq_work directly if
* there is a pending work.