The wakeup call was done too deep in code path, it's better to wakeup
chip from higher levels. This will also reduce wakeup calls significantly.
Signed-off-by: Kalle Valo <kalle.valo@nokia.com>
Reviewed-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
- wl12xx_ps_elp_wakeup(wl);
-
wl12xx_spi_mem_write(wl, wl->cmd_box_addr, buf, len);
wl12xx_reg_write32(wl, ACX_REG_INTERRUPT_TRIG, INTR_TRIG_CMD);
wl12xx_spi_mem_write(wl, wl->cmd_box_addr, buf, len);
wl12xx_reg_write32(wl, ACX_REG_INTERRUPT_TRIG, INTR_TRIG_CMD);
wl->chip.intr_cmd_complete);
out:
wl->chip.intr_cmd_complete);
out:
- wl12xx_ps_elp_sleep(wl);
-
* The answer would be a wl12xx_command, where the
* parameter array contains the actual answer.
*/
* The answer would be a wl12xx_command, where the
* parameter array contains the actual answer.
*/
-
- wl12xx_ps_elp_wakeup(wl);
-
wl12xx_spi_mem_read(wl, wl->cmd_box_addr, buf, buf_len);
wl12xx_spi_mem_read(wl, wl->cmd_box_addr, buf, buf_len);
- wl12xx_ps_elp_sleep(wl);
-
cmd_answer = buf;
if (cmd_answer->header.status != CMD_STATUS_SUCCESS)
cmd_answer = buf;
if (cmd_answer->header.status != CMD_STATUS_SUCCESS)
- wl12xx_ps_elp_wakeup(wl);
-
/* the interrogate command got in, we can read the answer */
wl12xx_spi_mem_read(wl, wl->cmd_box_addr, buf, len);
/* the interrogate command got in, we can read the answer */
wl12xx_spi_mem_read(wl, wl->cmd_box_addr, buf, len);
- wl12xx_ps_elp_sleep(wl);
-
acx = buf;
if (acx->cmd.status != CMD_STATUS_SUCCESS)
wl12xx_error("INTERROGATE command error: %d",
acx = buf;
if (acx->cmd.status != CMD_STATUS_SUCCESS)
wl12xx_error("INTERROGATE command error: %d",
#include "wl12xx.h"
#include "acx.h"
#include "wl12xx.h"
#include "acx.h"
/* ms */
#define WL12XX_DEBUGFS_STATS_LIFETIME 1000
/* ms */
#define WL12XX_DEBUGFS_STATS_LIFETIME 1000
{
mutex_lock(&wl->mutex);
{
mutex_lock(&wl->mutex);
+ wl12xx_ps_elp_wakeup(wl);
+
if (wl->state == WL12XX_STATE_ON &&
time_after(jiffies, wl->stats.fw_stats_update +
msecs_to_jiffies(WL12XX_DEBUGFS_STATS_LIFETIME))) {
if (wl->state == WL12XX_STATE_ON &&
time_after(jiffies, wl->stats.fw_stats_update +
msecs_to_jiffies(WL12XX_DEBUGFS_STATS_LIFETIME))) {
wl->stats.fw_stats_update = jiffies;
}
wl->stats.fw_stats_update = jiffies;
}
+ wl12xx_ps_elp_sleep(wl);
+
mutex_unlock(&wl->mutex);
}
mutex_unlock(&wl->mutex);
}
if (wl->state == WL12XX_STATE_OFF)
goto out;
if (wl->state == WL12XX_STATE_OFF)
goto out;
+ wl12xx_ps_elp_wakeup(wl);
+
ret = wl12xx_cmd_join(wl, wl->bss_type, 1, 100, 0);
if (ret < 0)
goto out;
out:
ret = wl12xx_cmd_join(wl, wl->bss_type, 1, 100, 0);
if (ret < 0)
goto out;
out:
+ wl12xx_ps_elp_sleep(wl);
mutex_unlock(&wl->mutex);
}
mutex_unlock(&wl->mutex);
}
+ wl12xx_ps_elp_wakeup(wl);
+
if (channel != wl->channel) {
/* FIXME: use beacon interval provided by mac80211 */
ret = wl12xx_cmd_join(wl, wl->bss_type, 1, 100, 0);
if (channel != wl->channel) {
/* FIXME: use beacon interval provided by mac80211 */
ret = wl12xx_cmd_join(wl, wl->bss_type, 1, 100, 0);
+ wl12xx_ps_elp_sleep(wl);
mutex_unlock(&wl->mutex);
return ret;
}
mutex_unlock(&wl->mutex);
return ret;
}
+ wl12xx_ps_elp_wakeup(wl);
+
switch (cmd) {
case SET_KEY:
wl_cmd->key_action = KEY_ADD_OR_REPLACE;
switch (cmd) {
case SET_KEY:
wl_cmd->key_action = KEY_ADD_OR_REPLACE;
+ wl12xx_ps_elp_sleep(wl);
mutex_unlock(&wl->mutex);
out:
mutex_unlock(&wl->mutex);
out:
}
mutex_lock(&wl->mutex);
}
mutex_lock(&wl->mutex);
+ wl12xx_ps_elp_wakeup(wl);
+
ret = wl12xx_hw_scan(hw->priv, ssid, ssid_len, 1, 0, 13, 3);
ret = wl12xx_hw_scan(hw->priv, ssid, ssid_len, 1, 0, 13, 3);
+
+ wl12xx_ps_elp_sleep(wl);
mutex_unlock(&wl->mutex);
return ret;
mutex_unlock(&wl->mutex);
return ret;
+ wl12xx_ps_elp_wakeup(wl);
+
ret = wl12xx_acx_rts_threshold(wl, (u16) value);
if (ret < 0)
wl12xx_warning("wl12xx_op_set_rts_threshold failed: %d", ret);
ret = wl12xx_acx_rts_threshold(wl, (u16) value);
if (ret < 0)
wl12xx_warning("wl12xx_op_set_rts_threshold failed: %d", ret);
+ wl12xx_ps_elp_sleep(wl);
+
mutex_unlock(&wl->mutex);
return ret;
mutex_unlock(&wl->mutex);
return ret;
+ wl12xx_ps_elp_wakeup(wl);
+
if (changed & BSS_CHANGED_ASSOC) {
if (bss_conf->assoc) {
wl->aid = bss_conf->aid;
if (changed & BSS_CHANGED_ASSOC) {
if (bss_conf->assoc) {
wl->aid = bss_conf->aid;
+ wl12xx_ps_elp_sleep(wl);
mutex_unlock(&wl->mutex);
}
mutex_unlock(&wl->mutex);
}