wl12xx: make WL1271_FLAG_PSM flag per-vif

move WL1271_FLAG_PSM and WL1271_FLAG_PSM_REQUESTED into
per-vif flags.
These flags should be set per-vif, rather than globally.

Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>

diff --git a/drivers/net/wireless/wl12xx/event.c b/drivers/net/wireless/wl12xx/event.c
index cfb2835c118c974ce21f0d46e22a0336222d2cd4..d8b183bba52ba82304dafef1ea4429e5efea0a29 100644 (file)
--- a/drivers/net/wireless/wl12xx/event.c
+++ b/drivers/net/wireless/wl12xx/event.c
@@ -84,7 +84,7 @@ static void wl1271_event_pspoll_delivery_fail(struct wl1271 *wl,
                            "trying to work around it.");
 
        /* force active mode receive data from the AP */
-       if (test_bit(WL1271_FLAG_PSM, &wl->flags)) {
+       if (test_bit(WLVIF_FLAG_PSM, &wlvif->flags)) {
                ret = wl1271_ps_set_mode(wl, wlvif, STATION_ACTIVE_MODE,
                                         wlvif->basic_rate, true);
                if (ret < 0)
@@ -116,7 +116,7 @@ static int wl1271_event_ps_report(struct wl1271 *wl,
        case EVENT_ENTER_POWER_SAVE_FAIL:
                wl1271_debug(DEBUG_PSM, "PSM entry failed");
 
-               if (!test_bit(WL1271_FLAG_PSM, &wl->flags)) {
+               if (!test_bit(WLVIF_FLAG_PSM, &wlvif->flags)) {
                        /* remain in active mode */
                        wlvif->psm_entry_retry = 0;
                        break;

diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index 41cc5fe27d87b6d65cfee5aef5093e2c1a9b595b..2fe0ee144a9dc3c1c2d2b6bcb02a8a048a7d0ce5 100644 (file)
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -1618,7 +1618,7 @@ static int wl1271_configure_suspend_sta(struct wl1271 *wl,
                goto out_unlock;
 
        /* enter psm if needed*/
-       if (!test_bit(WL1271_FLAG_PSM, &wl->flags)) {
+       if (!test_bit(WLVIF_FLAG_PSM, &wlvif->flags)) {
                DECLARE_COMPLETION_ONSTACK(compl);
 
                wlvif->ps_compl = &compl;
@@ -1705,7 +1705,7 @@ static void wl1271_configure_resume(struct wl1271 *wl,
 
        if (is_sta) {
                /* exit psm if it wasn't configured */
-               if (!test_bit(WL1271_FLAG_PSM_REQUESTED, &wl->flags))
+               if (!test_bit(WLVIF_FLAG_PSM_REQUESTED, &wlvif->flags))
                        wl1271_ps_set_mode(wl, wlvif, STATION_ACTIVE_MODE,
                                           wlvif->basic_rate, true);
        } else if (is_ap) {
@@ -2512,8 +2512,8 @@ static int wl1271_op_config(struct ieee80211_hw *hw, u32 changed)
                clear_bit(WL1271_FLAG_PSPOLL_FAILURE, &wl->flags);
 
        if (conf->flags & IEEE80211_CONF_PS &&
-           !test_bit(WL1271_FLAG_PSM_REQUESTED, &wl->flags)) {
-               set_bit(WL1271_FLAG_PSM_REQUESTED, &wl->flags);
+           !test_bit(WLVIF_FLAG_PSM_REQUESTED, &wlvif->flags)) {
+               set_bit(WLVIF_FLAG_PSM_REQUESTED, &wlvif->flags);
 
                /*
                 * We enter PSM only if we're already associated.
@@ -2527,12 +2527,12 @@ static int wl1271_op_config(struct ieee80211_hw *hw, u32 changed)
                                                 wlvif->basic_rate, true);
                }
        } else if (!(conf->flags & IEEE80211_CONF_PS) &&
-                  test_bit(WL1271_FLAG_PSM_REQUESTED, &wl->flags)) {
+                  test_bit(WLVIF_FLAG_PSM_REQUESTED, &wlvif->flags)) {
                wl1271_debug(DEBUG_PSM, "psm disabled");
 
-               clear_bit(WL1271_FLAG_PSM_REQUESTED, &wl->flags);
+               clear_bit(WLVIF_FLAG_PSM_REQUESTED, &wlvif->flags);
 
-               if (test_bit(WL1271_FLAG_PSM, &wl->flags))
+               if (test_bit(WLVIF_FLAG_PSM, &wlvif->flags))
                        ret = wl1271_ps_set_mode(wl, wlvif,
                                                 STATION_ACTIVE_MODE,
                                                 wlvif->basic_rate, true);
@@ -3769,8 +3769,8 @@ sta_not_found:
                }
 
                /* If we want to go in PSM but we're not there yet */
-               if (test_bit(WL1271_FLAG_PSM_REQUESTED, &wl->flags) &&
-                   !test_bit(WL1271_FLAG_PSM, &wl->flags)) {
+               if (test_bit(WLVIF_FLAG_PSM_REQUESTED, &wlvif->flags) &&
+                   !test_bit(WLVIF_FLAG_PSM, &wlvif->flags)) {
                        enum wl1271_cmd_ps_mode mode;
 
                        mode = STATION_POWER_SAVE_MODE;

diff --git a/drivers/net/wireless/wl12xx/ps.c b/drivers/net/wireless/wl12xx/ps.c
index ac3f20716f5b9dc7a1de9cd6d5c2e6109ae3755b..8cd81cec2841961780fc401fb90daf494a4d53af 100644 (file)
--- a/drivers/net/wireless/wl12xx/ps.c
+++ b/drivers/net/wireless/wl12xx/ps.c
@@ -32,6 +32,7 @@ void wl1271_elp_work(struct work_struct *work)
 {
        struct delayed_work *dwork;
        struct wl1271 *wl;
+       struct wl12xx_vif *wlvif;
 
        dwork = container_of(work, struct delayed_work, work);
        wl = container_of(dwork, struct wl1271, elp_work);
@@ -47,11 +48,15 @@ void wl1271_elp_work(struct work_struct *work)
        if (unlikely(!test_bit(WL1271_FLAG_ELP_REQUESTED, &wl->flags)))
                goto out;
 
-       if (test_bit(WL1271_FLAG_IN_ELP, &wl->flags) ||
-           (!test_bit(WL1271_FLAG_PSM, &wl->flags) &&
-            !test_bit(WL1271_FLAG_IDLE, &wl->flags)))
+       if (test_bit(WL1271_FLAG_IN_ELP, &wl->flags))
                goto out;
 
+       wl12xx_for_each_wlvif(wl, wlvif) {
+               if (!test_bit(WLVIF_FLAG_PSM, &wlvif->flags) &&
+                   !test_bit(WL1271_FLAG_IDLE, &wl->flags))
+                       goto out;
+       }
+
        wl1271_debug(DEBUG_PSM, "chip to elp");
        wl1271_raw_write32(wl, HW_ACCESS_ELP_CTRL_REG_ADDR, ELPCTRL_SLEEP);
        set_bit(WL1271_FLAG_IN_ELP, &wl->flags);
@@ -65,13 +70,17 @@ out:
 /* Routines to toggle sleep mode while in ELP */
 void wl1271_ps_elp_sleep(struct wl1271 *wl)
 {
+       struct wl12xx_vif *wlvif;
+
        /* we shouldn't get consecutive sleep requests */
        if (WARN_ON(test_and_set_bit(WL1271_FLAG_ELP_REQUESTED, &wl->flags)))
                return;
 
-       if (!test_bit(WL1271_FLAG_PSM, &wl->flags) &&
-           !test_bit(WL1271_FLAG_IDLE, &wl->flags))
-               return;
+       wl12xx_for_each_wlvif(wl, wlvif) {
+               if (!test_bit(WLVIF_FLAG_PSM, &wlvif->flags) &&
+                   !test_bit(WL1271_FLAG_IDLE, &wl->flags))
+                       return;
+       }
 
        ieee80211_queue_delayed_work(wl->hw, &wl->elp_work,
                                     msecs_to_jiffies(ELP_ENTRY_DELAY));
@@ -162,7 +171,7 @@ int wl1271_ps_set_mode(struct wl1271 *wl, struct wl12xx_vif *wlvif,
                if (ret < 0)
                        return ret;
 
-               set_bit(WL1271_FLAG_PSM, &wl->flags);
+               set_bit(WLVIF_FLAG_PSM, &wlvif->flags);
                break;
        case STATION_ACTIVE_MODE:
        default:
@@ -184,7 +193,7 @@ int wl1271_ps_set_mode(struct wl1271 *wl, struct wl12xx_vif *wlvif,
                if (ret < 0)
                        return ret;
 
-               clear_bit(WL1271_FLAG_PSM, &wl->flags);
+               clear_bit(WLVIF_FLAG_PSM, &wlvif->flags);
                break;
        }
 

diff --git a/drivers/net/wireless/wl12xx/wl12xx.h b/drivers/net/wireless/wl12xx/wl12xx.h
index 9b28e478930e2976a65ad6301eb4ad150c4bfd28..ea6b7293175a3361454563eedc5570670d837468 100644 (file)
--- a/drivers/net/wireless/wl12xx/wl12xx.h
+++ b/drivers/net/wireless/wl12xx/wl12xx.h
@@ -318,8 +318,6 @@ enum wl12xx_flags {
        WL1271_FLAG_TX_PENDING,
        WL1271_FLAG_IN_ELP,
        WL1271_FLAG_ELP_REQUESTED,
-       WL1271_FLAG_PSM,
-       WL1271_FLAG_PSM_REQUESTED,
        WL1271_FLAG_IRQ_RUNNING,
        WL1271_FLAG_IDLE,
        WL1271_FLAG_PSPOLL_FAILURE,
@@ -339,6 +337,8 @@ enum wl12xx_vif_flags {
        WLVIF_FLAG_STA_ASSOCIATED,
        WLVIF_FLAG_IBSS_JOINED,
        WLVIF_FLAG_AP_STARTED,
+       WLVIF_FLAG_PSM,
+       WLVIF_FLAG_PSM_REQUESTED,
 };
 
 struct wl1271_link {