Thread (15 messages) 15 messages, 3 authors, 2021-06-01

Re: [PATCH v4 02/12] wcn36xx: Run suspend for the first ieee80211_vif

From: Loic Poulain <hidden>
Date: 2021-06-01 07:00:03

Hi Bryan,

On Tue, 1 Jun 2021 at 04:47, Bryan O'Donoghue
[off-list ref] wrote:
quoted hunk ↗ jump to hunk
A subsequent set of patches will extend out suspend/resume support in this
driver, we cannot set the firmware up for multiple ipv4/ipv6 addresses and
as such we can't iterate through a list of ieee80211_vif.

Constrain the interaction with the firmware to the first ieee80211_vif on
the suspend/resume/wowlan path.

Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Tested-by: Benjamin Li <redacted>
---
 drivers/net/wireless/ath/wcn36xx/main.c | 30 ++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/ath/wcn36xx/main.c b/drivers/net/wireless/ath/wcn36xx/main.c
index b361e40697a6..6802dce2a02b 100644
--- a/drivers/net/wireless/ath/wcn36xx/main.c
+++ b/drivers/net/wireless/ath/wcn36xx/main.c
@@ -1088,15 +1088,34 @@ static int wcn36xx_sta_remove(struct ieee80211_hw *hw,

 #ifdef CONFIG_PM

+static struct ieee80211_vif *wcn36xx_get_first_assoc_vif(struct wcn36xx *wcn)
+{
+       struct wcn36xx_vif *vif_priv = NULL;
+       struct ieee80211_vif *vif = NULL;
+
+       list_for_each_entry(vif_priv, &wcn->vif_list, list) {
+               if (vif_priv->sta_assoc) {
+                       vif = wcn36xx_priv_to_vif(vif_priv);
+                       break;
+               }
+       }
+       return vif;
+}
+
 static int wcn36xx_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wow)
 {
        struct wcn36xx *wcn = hw->priv;
-       int ret;
+       struct ieee80211_vif *vif = NULL;
+       int ret = 0;

        wcn36xx_dbg(WCN36XX_DBG_MAC, "mac suspend\n");

        flush_workqueue(wcn->hal_ind_wq);
-       ret = wcn36xx_smd_set_power_params(wcn, true);
+       mutex_lock(&wcn->conf_mutex);
+       vif = wcn36xx_get_first_assoc_vif(wcn);
+       if (vif)
+               ret = wcn36xx_smd_set_power_params(wcn, true);
+       mutex_unlock(&wcn->conf_mutex);

        return ret;
 }
@@ -1104,11 +1123,16 @@ static int wcn36xx_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wow)
 static int wcn36xx_resume(struct ieee80211_hw *hw)
 {
        struct wcn36xx *wcn = hw->priv;
+       struct ieee80211_vif *vif = NULL;

        wcn36xx_dbg(WCN36XX_DBG_MAC, "mac resume\n");

        flush_workqueue(wcn->hal_ind_wq);
-       wcn36xx_smd_set_power_params(wcn, false);
+       mutex_lock(&wcn->conf_mutex);
+       vif = wcn36xx_get_first_assoc_vif(wcn);
+       if (vif)
+               wcn36xx_smd_set_power_params(wcn, false);
+
Where is the balanced mutex_unlock?
        return 0;
 }
Regards,
Loic
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help