diff for duplicates of <a5eb26fc5db445f2a6473df1306da735@ti.com> diff --git a/a/1.txt b/N1/1.txt index 88064a8..9bac125 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,13 +1,15 @@ -> +>=20 > > > > Here's a modified version of your patch, does that put wlcore to > > idle with wowlan during suspend for you? > > -> +>=20 > Still no joy. -> It suspends/resumes ok but leaves the firmware disabled from entering ELP. +> It suspends/resumes ok but leaves the firmware disabled from entering ELP= +. -Spent some time on it today and looks like adding calls to pm_generic_runtime_suspend () +Spent some time on it today and looks like adding calls to pm_generic_runti= +me_suspend () And pm_generic_runtime_resume is helping and all seems to work well. See the modified version of your patch below. Let me know what you think. @@ -22,7 +24,8 @@ index 4c297aa..9859e5a 100644 --- a/drivers/net/wireless/ti/wlcore/main.c +++ b/drivers/net/wireless/ti/wlcore/main.c @@ -1001,24 +1001,6 @@ static int wlcore_fw_wakeup(struct wl1271 *wl) - return wlcore_raw_write32(wl, HW_ACCESS_ELP_CTRL_REG, ELPCTRL_WAKE_UP); + return wlcore_raw_write32(wl, HW_ACCESS_ELP_CTRL_REG, ELPCTRL_WAKE_UP)= +; } -static int wlcore_fw_sleep(struct wl1271 *wl) @@ -30,7 +33,7 @@ index 4c297aa..9859e5a 100644 - int ret; - - mutex_lock(&wl->mutex); -- ret = wlcore_raw_write32(wl, HW_ACCESS_ELP_CTRL_REG, ELPCTRL_SLEEP); +- ret =3D wlcore_raw_write32(wl, HW_ACCESS_ELP_CTRL_REG, ELPCTRL_SLEEP); - if (ret < 0) { - wl12xx_queue_recovery_work(wl); - goto out; @@ -45,16 +48,17 @@ index 4c297aa..9859e5a 100644 - static int wl1271_setup(struct wl1271 *wl) { - wl->raw_fw_status = kzalloc(wl->fw_status_len, GFP_KERNEL); + wl->raw_fw_status =3D kzalloc(wl->fw_status_len, GFP_KERNEL); @@ -1742,6 +1724,7 @@ static int wl1271_op_suspend(struct ieee80211_hw *hw, { - struct wl1271 *wl = hw->priv; + struct wl1271 *wl =3D hw->priv; struct wl12xx_vif *wlvif; + unsigned long flags; int ret; - wl1271_debug(DEBUG_MAC80211, "mac80211 suspend wow=%d", !!wow); -@@ -1800,19 +1783,6 @@ static int wl1271_op_suspend(struct ieee80211_hw *hw, + wl1271_debug(DEBUG_MAC80211, "mac80211 suspend wow=3D%d", !!wow); +@@ -1800,19 +1783,6 @@ static int wl1271_op_suspend(struct ieee80211_hw *hw= +, /* flush any remaining work */ wl1271_debug(DEBUG_MAC80211, "flushing remaining works"); @@ -74,7 +78,8 @@ index 4c297aa..9859e5a 100644 flush_work(&wl->tx_work); /* -@@ -1822,13 +1792,14 @@ static int wl1271_op_suspend(struct ieee80211_hw *hw, +@@ -1822,13 +1792,14 @@ static int wl1271_op_suspend(struct ieee80211_hw *h= +w, cancel_delayed_work(&wl->tx_watchdog_work); /* diff --git a/a/content_digest b/N1/content_digest index 7b39cdd..b87b128 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,32 +1,34 @@ - "From\0Reizer, Eyal <eyalr-l0cyMroinI0@public.gmane.org>\0" + "From\0Reizer, Eyal <eyalr@ti.com>\0" "Subject\0RE: [PATCHv2 0/5] Runtime PM support for wlcore\0" "Date\0Wed, 23 May 2018 12:43:18 +0000\0" - "To\0Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>\0" - "Cc\0Kalle Valo <kvalo-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>" - KISHON VIJAY ABRAHAM <kishon-l0cyMroinI0@public.gmane.org> + "To\0Tony Lindgren <tony@atomide.com>\0" + "Cc\0Kalle Valo <kvalo@codeaurora.org>" + KISHON VIJAY ABRAHAM <kishon@ti.com> Mishol - Guy <guym-l0cyMroinI0@public.gmane.org> - Luca Coelho <luciano.coelho-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> + Guy <guym@ti.com> + Luca Coelho <luciano.coelho@intel.com> Hahn - Maital <maitalm-l0cyMroinI0@public.gmane.org> + Maital <maitalm@ti.com> Altshul - Maxim <maxim.altshul-l0cyMroinI0@public.gmane.org> - linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org <linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> - linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org <linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> + Maxim <maxim.altshul@ti.com> + linux-wireless@vger.kernel.org <linux-wireless@vger.kernel.org> + linux-omap@vger.kernel.org <linux-omap@vger.kernel.org> Loewy - " Chen <c-loewy-l0cyMroinI0@public.gmane.org>\0" + " Chen <c-loewy@ti.com>\0" "\00:1\0" "b\0" - "> \n" + ">=20\n" "> >\n" "> > Here's a modified version of your patch, does that put wlcore to\n" "> > idle with wowlan during suspend for you?\n" "> >\n" - "> \n" + ">=20\n" "> Still no joy.\n" - "> It suspends/resumes ok but leaves the firmware disabled from entering ELP.\n" + "> It suspends/resumes ok but leaves the firmware disabled from entering ELP=\n" + ".\n" "\n" - "Spent some time on it today and looks like adding calls to pm_generic_runtime_suspend ()\n" + "Spent some time on it today and looks like adding calls to pm_generic_runti=\n" + "me_suspend ()\n" "And pm_generic_runtime_resume is helping and all seems to work well.\n" "See the modified version of your patch below.\n" "Let me know what you think.\n" @@ -41,7 +43,8 @@ "--- a/drivers/net/wireless/ti/wlcore/main.c\n" "+++ b/drivers/net/wireless/ti/wlcore/main.c\n" "@@ -1001,24 +1001,6 @@ static int wlcore_fw_wakeup(struct wl1271 *wl)\n" - " return wlcore_raw_write32(wl, HW_ACCESS_ELP_CTRL_REG, ELPCTRL_WAKE_UP);\n" + " return wlcore_raw_write32(wl, HW_ACCESS_ELP_CTRL_REG, ELPCTRL_WAKE_UP)=\n" + ";\n" " }\n" "\n" "-static int wlcore_fw_sleep(struct wl1271 *wl)\n" @@ -49,7 +52,7 @@ "- int ret;\n" "-\n" "- mutex_lock(&wl->mutex);\n" - "- ret = wlcore_raw_write32(wl, HW_ACCESS_ELP_CTRL_REG, ELPCTRL_SLEEP);\n" + "- ret =3D wlcore_raw_write32(wl, HW_ACCESS_ELP_CTRL_REG, ELPCTRL_SLEEP);\n" "- if (ret < 0) {\n" "- wl12xx_queue_recovery_work(wl);\n" "- goto out;\n" @@ -64,16 +67,17 @@ "-\n" " static int wl1271_setup(struct wl1271 *wl)\n" " {\n" - " wl->raw_fw_status = kzalloc(wl->fw_status_len, GFP_KERNEL);\n" + " wl->raw_fw_status =3D kzalloc(wl->fw_status_len, GFP_KERNEL);\n" "@@ -1742,6 +1724,7 @@ static int wl1271_op_suspend(struct ieee80211_hw *hw,\n" " {\n" - " struct wl1271 *wl = hw->priv;\n" + " struct wl1271 *wl =3D hw->priv;\n" " struct wl12xx_vif *wlvif;\n" "+ unsigned long flags;\n" " int ret;\n" "\n" - " wl1271_debug(DEBUG_MAC80211, \"mac80211 suspend wow=%d\", !!wow);\n" - "@@ -1800,19 +1783,6 @@ static int wl1271_op_suspend(struct ieee80211_hw *hw,\n" + " wl1271_debug(DEBUG_MAC80211, \"mac80211 suspend wow=3D%d\", !!wow);\n" + "@@ -1800,19 +1783,6 @@ static int wl1271_op_suspend(struct ieee80211_hw *hw=\n" + ",\n" " /* flush any remaining work */\n" " wl1271_debug(DEBUG_MAC80211, \"flushing remaining works\");\n" "\n" @@ -93,7 +97,8 @@ " flush_work(&wl->tx_work);\n" "\n" " /*\n" - "@@ -1822,13 +1792,14 @@ static int wl1271_op_suspend(struct ieee80211_hw *hw,\n" + "@@ -1822,13 +1792,14 @@ static int wl1271_op_suspend(struct ieee80211_hw *h=\n" + "w,\n" " cancel_delayed_work(&wl->tx_watchdog_work);\n" "\n" " /*\n" @@ -124,4 +129,4 @@ " * re-enable irq_work enqueuing, and call irq_work directly if\n" * there is a pending work. -95acf4e7f4a31d023ddda01d2a6b878df507c9d3451b33dba0d0fe854d6dd003 +e51b611848e972178191238a6e1aa4e7bfc0d397b59cda8a45d916e36aea3ca3
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.