wcn36xx: Run suspend for the first ieee80211_vif
authorBryan O'Donoghue <bryan.odonoghue@linaro.org>
Sat, 5 Jun 2021 01:11:30 +0000 (02:11 +0100)
committerKalle Valo <kvalo@codeaurora.org>
Mon, 14 Jun 2021 15:18:10 +0000 (18:18 +0300)
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 <benl@squareup.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20210605011140.2004643-3-bryan.odonoghue@linaro.org
drivers/net/wireless/ath/wcn36xx/main.c

index b361e40697a627cbb815ab9d83e30ddeb4ed3f11..9a97a288a96f1423b1fb5cd2fbf36a0b265e0df0 100644 (file)
@@ -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,17 @@ 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);
+       mutex_unlock(&wcn->conf_mutex);
+
        return 0;
 }