lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wl1251: Implement delayed entry into ELP mode

Browse Source 
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>
This commit is contained in:
Juuso Oikarinen
2009-11-17 18:48:37 +02:00
committed by John W. Linville
parent 6b21a2cd31
commit d5da79ac1f
4 changed files with 35 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/wl12xx/wl1251.h
View File

@@ -354,6 +354,8 @@ struct wl1251 {
/* is firmware in elp mode */ /* is firmware in elp mode */
bool elp; bool elp;
struct delayed_work elp_work;
/* we can be in psm, but not in elp, we have to differentiate */ /* we can be in psm, but not in elp, we have to differentiate */
bool psm; bool psm;

1
drivers/net/wireless/wl12xx/wl1251_main.c
View File

@@ -1367,6 +1367,7 @@ struct ieee80211_hw *wl1251_alloc_hw(void)
skb_queue_head_init(&wl->tx_queue); skb_queue_head_init(&wl->tx_queue);
INIT_WORK(&wl->filter_work, wl1251_filter_work); INIT_WORK(&wl->filter_work, wl1251_filter_work);
INIT_DELAYED_WORK(&wl->elp_work, wl1251_elp_work);
wl->channel = WL1251_DEFAULT_CHANNEL; wl->channel = WL1251_DEFAULT_CHANNEL;
wl->scanning = false; wl->scanning = false;
wl->default_key = 0; wl->default_key = 0;

38
drivers/net/wireless/wl12xx/wl1251_ps.c
View File

@@ -28,17 +28,41 @@
#define WL1251_WAKEUP_TIMEOUT 2000 #define WL1251_WAKEUP_TIMEOUT 2000
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)
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 */ /* Routines to toggle sleep mode while in ELP */
void wl1251_ps_elp_sleep(struct wl1251 *wl) void wl1251_ps_elp_sleep(struct wl1251 *wl)
{ {
if (wl->elp || !wl->psm) unsigned long delay;
return;
wl1251_debug(DEBUG_PSM, "chip to elp"); if (wl->psm) {
cancel_delayed_work(&wl->elp_work);
wl1251_write32(wl, HW_ACCESS_ELP_CTRL_REG_ADDR, ELPCTRL_SLEEP); delay = msecs_to_jiffies(ELP_ENTRY_DELAY);
ieee80211_queue_delayed_work(wl->hw, &wl->elp_work, delay);
wl->elp = true; }
} }
int wl1251_ps_elp_wakeup(struct wl1251 *wl) int wl1251_ps_elp_wakeup(struct wl1251 *wl)

1
drivers/net/wireless/wl12xx/wl1251_ps.h
View File

@@ -31,6 +31,7 @@
int wl1251_ps_set_mode(struct wl1251 *wl, enum wl1251_cmd_ps_mode mode); int wl1251_ps_set_mode(struct wl1251 *wl, enum wl1251_cmd_ps_mode mode);
void wl1251_ps_elp_sleep(struct wl1251 *wl); void wl1251_ps_elp_sleep(struct wl1251 *wl);
int wl1251_ps_elp_wakeup(struct wl1251 *wl); int wl1251_ps_elp_wakeup(struct wl1251 *wl);
void wl1251_elp_work(struct work_struct *work);
#endif /* __WL1251_PS_H__ */ #endif /* __WL1251_PS_H__ */