wl1251: Implement delayed entry into ELP mode

Implement (slightly) delayed entry into ELP. This will cure several
problems:
  - It works around a firmware race condition if ELP is entered too fast
    after commands (resulting in ELP timeout -traces)
  - It will reduce the number of sleep-wake cycles between already
    scheduled events such as interrupts and tx, hence improving
    performance (less delay in switching between RX and TX)

Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: Vidhya Govindan <vidhya.govindan@nokia.com>
Signed-off-by: Kalle Valo <kalle.valo@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/wl12xx/wl1251.h b/drivers/net/wireless/wl12xx/wl1251.h
index fc2871c5a25b03c90961922d1b35ddcb7c728320..a839466664f0884deecd122703b9c624e0eff530 100644 (file)
--- a/drivers/net/wireless/wl12xx/wl1251.h
+++ b/drivers/net/wireless/wl12xx/wl1251.h
@@ -354,6 +354,8 @@ struct wl1251 {
        /* is firmware in elp mode */
        bool elp;
 
+       struct delayed_work elp_work;
+
        /* we can be in psm, but not in elp, we have to differentiate */
        bool psm;
 

diff --git a/drivers/net/wireless/wl12xx/wl1251_main.c b/drivers/net/wireless/wl12xx/wl1251_main.c
index 900e6e2796fc76c1eb9a33c3fbd232efbaad4d52..b5e3bdb084480f1a880396f3b9e26182866ecf40 100644 (file)
--- a/drivers/net/wireless/wl12xx/wl1251_main.c
+++ b/drivers/net/wireless/wl12xx/wl1251_main.c
@@ -1367,6 +1367,7 @@ struct ieee80211_hw *wl1251_alloc_hw(void)
        skb_queue_head_init(&wl->tx_queue);
 
        INIT_WORK(&wl->filter_work, wl1251_filter_work);
+       INIT_DELAYED_WORK(&wl->elp_work, wl1251_elp_work);
        wl->channel = WL1251_DEFAULT_CHANNEL;
        wl->scanning = false;
        wl->default_key = 0;

diff --git a/drivers/net/wireless/wl12xx/wl1251_ps.c b/drivers/net/wireless/wl12xx/wl1251_ps.c
index c3e348a12322e28fe24a02c7406e1cba470edba4..9931b197ff77c42c3d6aad6ce6964ff4d16a42b1 100644 (file)
--- a/drivers/net/wireless/wl12xx/wl1251_ps.c
+++ b/drivers/net/wireless/wl12xx/wl1251_ps.c
@@ -28,17 +28,41 @@
 
 #define WL1251_WAKEUP_TIMEOUT 2000
 
-/* Routines to toggle sleep mode while in ELP */
-void wl1251_ps_elp_sleep(struct wl1251 *wl)
+void wl1251_elp_work(struct work_struct *work)
 {
+       struct delayed_work *dwork;
+       struct wl1251 *wl;
+
+       dwork = container_of(work, struct delayed_work, work);
+       wl = container_of(dwork, struct wl1251, elp_work);
+
+       wl1251_debug(DEBUG_PSM, "elp work");
+
+       mutex_lock(&wl->mutex);
+
        if (wl->elp || !wl->psm)
-               return;
+               goto out;
 
        wl1251_debug(DEBUG_PSM, "chip to elp");
-
        wl1251_write32(wl, HW_ACCESS_ELP_CTRL_REG_ADDR, ELPCTRL_SLEEP);
-
        wl->elp = true;
+
+out:
+       mutex_unlock(&wl->mutex);
+}
+
+#define ELP_ENTRY_DELAY  5
+
+/* Routines to toggle sleep mode while in ELP */
+void wl1251_ps_elp_sleep(struct wl1251 *wl)
+{
+       unsigned long delay;
+
+       if (wl->psm) {
+               cancel_delayed_work(&wl->elp_work);
+               delay = msecs_to_jiffies(ELP_ENTRY_DELAY);
+               ieee80211_queue_delayed_work(wl->hw, &wl->elp_work, delay);
+       }
 }
 
 int wl1251_ps_elp_wakeup(struct wl1251 *wl)

diff --git a/drivers/net/wireless/wl12xx/wl1251_ps.h b/drivers/net/wireless/wl12xx/wl1251_ps.h
index db036fe12f25f349424bad8cb00338acf3345b7f..c688ac57aee480cc2378c93c50f14f0f32272113 100644 (file)
--- a/drivers/net/wireless/wl12xx/wl1251_ps.h
+++ b/drivers/net/wireless/wl12xx/wl1251_ps.h
@@ -31,6 +31,7 @@
 int wl1251_ps_set_mode(struct wl1251 *wl, enum wl1251_cmd_ps_mode mode);
 void wl1251_ps_elp_sleep(struct wl1251 *wl);
 int wl1251_ps_elp_wakeup(struct wl1251 *wl);
+void wl1251_elp_work(struct work_struct *work);
 
 
 #endif /* __WL1251_PS_H__ */