Commit d6bf9ada authored by Eyal Shapira's avatar Eyal Shapira Committed by Luciano Coelho
Browse files

wl12xx: remove PS management code 



Removal of PS management code from the driver as PS
is handled by the FW (dynamic PS)

Signed-off-by: default avatarEyal Shapira <eyal@wizery.com>
Signed-off-by: default avatarEliad Peller <eliad@wizery.com>
Signed-off-by: default avatarLuciano Coelho <coelho@ti.com>
parent 8332f0f6

drivers/net/wireless/wl12xx/boot.c

+0 −1
Original line number Diff line number Diff line
@@ -448,7 +448,6 @@ static int wl1271_boot_run_firmware(struct wl1271 *wl) 
	/* unmask required mbox events  */

	wl->event_mask = BSS_LOSE_EVENT_ID |

		SCAN_COMPLETE_EVENT_ID |

		PS_REPORT_EVENT_ID |

		ROLE_STOP_COMPLETE_EVENT_ID |

		RSSI_SNR_TRIGGER_0_EVENT_ID |

		PSPOLL_DELIVERY_FAILURE_EVENT_ID |

drivers/net/wireless/wl12xx/conf.h

+0 −7
Original line number Diff line number Diff line
@@ -867,13 +867,6 @@ struct conf_conn_settings { 
	 */

	u8 ps_poll_threshold;



	/*

	 * PS Poll failure recovery ACTIVE period length

	 *

	 * Range: u32 (ms)

	 */

	u32 ps_poll_recovery_period;



	/*

	 * Configuration of signal average weights.

	 */

drivers/net/wireless/wl12xx/debugfs.c

+0 −1
Original line number Diff line number Diff line
@@ -471,7 +471,6 @@ static ssize_t vifs_state_read(struct file *file, char __user *user_buf, 
		VIF_STATE_PRINT_INT(default_key);

		VIF_STATE_PRINT_INT(aid);

		VIF_STATE_PRINT_INT(session_counter);

		VIF_STATE_PRINT_INT(ps_poll_failures);

		VIF_STATE_PRINT_INT(psm_entry_retry);

		VIF_STATE_PRINT_INT(power_level);

		VIF_STATE_PRINT_INT(rssi_thold);

drivers/net/wireless/wl12xx/event.c

+0 −143
Original line number Diff line number Diff line
@@ -30,133 +30,6 @@ 
#include "scan.h"

#include "wl12xx_80211.h"



void wl1271_pspoll_work(struct work_struct *work)

{

	struct ieee80211_vif *vif;

	struct wl12xx_vif *wlvif;

	struct delayed_work *dwork;

	struct wl1271 *wl;

	int ret;



	dwork = container_of(work, struct delayed_work, work);

	wlvif = container_of(dwork, struct wl12xx_vif, pspoll_work);

	vif = container_of((void *)wlvif, struct ieee80211_vif, drv_priv);

	wl = wlvif->wl;



	wl1271_debug(DEBUG_EVENT, "pspoll work");



	mutex_lock(&wl->mutex);



	if (unlikely(wl->state == WL1271_STATE_OFF))

		goto out;



	if (!test_and_clear_bit(WLVIF_FLAG_PSPOLL_FAILURE, &wlvif->flags))

		goto out;



	if (!test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags))

		goto out;



	/*

	 * if we end up here, then we were in powersave when the pspoll

	 * delivery failure occurred, and no-one changed state since, so

	 * we should go back to powersave.

	 */

	ret = wl1271_ps_elp_wakeup(wl);

	if (ret < 0)

		goto out;



	wl1271_ps_set_mode(wl, wlvif, STATION_POWER_SAVE_MODE,

			   wlvif->basic_rate, true);



	wl1271_ps_elp_sleep(wl);

out:

	mutex_unlock(&wl->mutex);

};



static void wl1271_event_pspoll_delivery_fail(struct wl1271 *wl,

					      struct wl12xx_vif *wlvif)

{

	int delay = wl->conf.conn.ps_poll_recovery_period;

	int ret;



	wlvif->ps_poll_failures++;

	if (wlvif->ps_poll_failures == 1)

		wl1271_info("AP with dysfunctional ps-poll, "

			    "trying to work around it.");



	/* force active mode receive data from the AP */

	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)

			return;

		set_bit(WLVIF_FLAG_PSPOLL_FAILURE, &wlvif->flags);

		ieee80211_queue_delayed_work(wl->hw, &wlvif->pspoll_work,

					     msecs_to_jiffies(delay));

	}



	/*

	 * If already in active mode, lets we should be getting data from

	 * the AP right away. If we enter PSM too fast after this, and data

	 * remains on the AP, we will get another event like this, and we'll

	 * go into active once more.

	 */

}



static int wl1271_event_ps_report(struct wl1271 *wl,

				  struct wl12xx_vif *wlvif,

				  struct event_mailbox *mbox,

				  bool *beacon_loss)

{

	int ret = 0;

	u32 total_retries = wl->conf.conn.psm_entry_retries;



	wl1271_debug(DEBUG_EVENT, "ps_status: 0x%x", mbox->ps_status);



	switch (mbox->ps_status) {

	case EVENT_ENTER_POWER_SAVE_FAIL:

		wl1271_debug(DEBUG_PSM, "PSM entry failed");



		if (!test_bit(WLVIF_FLAG_PSM, &wlvif->flags)) {

			/* remain in active mode */

			wlvif->psm_entry_retry = 0;

			break;

		}



		if (wlvif->psm_entry_retry < total_retries) {

			wlvif->psm_entry_retry++;

			ret = wl1271_ps_set_mode(wl, wlvif,

						 STATION_POWER_SAVE_MODE,

						 wlvif->basic_rate, true);

		} else {

			wl1271_info("No ack to nullfunc from AP.");

			wlvif->psm_entry_retry = 0;

			*beacon_loss = true;

		}

		break;

	case EVENT_ENTER_POWER_SAVE_SUCCESS:

		wlvif->psm_entry_retry = 0;



		/*

		 * BET has only a minor effect in 5GHz and masks

		 * channel switch IEs, so we only enable BET on 2.4GHz

		*/

		if (wlvif->band == IEEE80211_BAND_2GHZ)

			/* enable beacon early termination */

			ret = wl1271_acx_bet_enable(wl, wlvif, true);



		if (wlvif->ps_compl) {

			complete(wlvif->ps_compl);

			wlvif->ps_compl = NULL;

		}

		break;

	default:

		break;

	}



	return ret;

}



static void wl1271_event_rssi_trigger(struct wl1271 *wl,

				      struct wl12xx_vif *wlvif,

				      struct event_mailbox *mbox)
@@ -237,7 +110,6 @@ static int wl1271_event_process(struct wl1271 *wl, struct event_mailbox *mbox) 
{

	struct ieee80211_vif *vif;

	struct wl12xx_vif *wlvif;

	int ret;

	u32 vector;

	bool beacon_loss = false;

	bool disconnect_sta = false;
@@ -293,21 +165,6 @@ static int wl1271_event_process(struct wl1271 *wl, struct event_mailbox *mbox) 
		beacon_loss = true;

	}



	if (vector & PS_REPORT_EVENT_ID) {

		wl1271_debug(DEBUG_EVENT, "PS_REPORT_EVENT");

		wl12xx_for_each_wlvif_sta(wl, wlvif) {

			ret = wl1271_event_ps_report(wl, wlvif,

						     mbox, &beacon_loss);

			if (ret < 0)

				return ret;

		}

	}



	if (vector & PSPOLL_DELIVERY_FAILURE_EVENT_ID)

		wl12xx_for_each_wlvif_sta(wl, wlvif) {

			wl1271_event_pspoll_delivery_fail(wl, wlvif);

		}



	if (vector & RSSI_SNR_TRIGGER_0_EVENT_ID) {

		/* TODO: check actual multi-role support */

		wl1271_debug(DEBUG_EVENT, "RSSI_SNR_TRIGGER_0_EVENT");

drivers/net/wireless/wl12xx/event.h

+2 −3
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ enum { 
	SCAN_COMPLETE_EVENT_ID			 = BIT(10),

	WFD_DISCOVERY_COMPLETE_EVENT_ID		 = BIT(11),

	AP_DISCOVERY_COMPLETE_EVENT_ID		 = BIT(12),

	PS_REPORT_EVENT_ID			 = BIT(13),

	RESERVED1			         = BIT(13),

	PSPOLL_DELIVERY_FAILURE_EVENT_ID	 = BIT(14),

	ROLE_STOP_COMPLETE_EVENT_ID		 = BIT(15),

	RADAR_DETECTED_EVENT_ID                  = BIT(16),
@@ -96,7 +96,7 @@ struct event_mailbox { 
	s8 rssi_snr_trigger_metric[NUM_OF_RSSI_SNR_TRIGGERS];

	u8 change_auto_mode_timeout;

	u8 scheduled_scan_status;

	u8 ps_status;

	u8 reserved4;

	/* tuned channel (roc) */

	u8 roc_channel;
@@ -135,6 +135,5 @@ struct event_mailbox { 
int wl1271_event_unmask(struct wl1271 *wl);

void wl1271_event_mbox_config(struct wl1271 *wl);

int wl1271_event_handle(struct wl1271 *wl, u8 mbox);

void wl1271_pspoll_work(struct work_struct *work);



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE