Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8902a759 authored by Ahmad Masri's avatar Ahmad Masri Committed by Lior David
Browse files

wil6210: refactor disconnect flow 



Separate sending command to the fw from the event handling function to
simplify the disconnect flow and track the from_event flag correctly.

Change-Id: Iccd4277fd6acdbecbdfcf5b9150cec2976473c19
Signed-off-by: default avatarAhmad Masri <amasri@codeaurora.org>
Signed-off-by: default avatarMaya Erez <merez@codeaurora.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Git-commit: e1b43407c034650c11bc597bef319f03b8262b6c
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git


Signed-off-by: default avatarMaya Erez <merez@codeaurora.org>
Signed-off-by: default avatarLior David <liord@codeaurora.org>
parent c607360a

drivers/net/wireless/ath/wil6210/cfg80211.c

+1 −1
Original line number Diff line number Diff line
@@ -2305,7 +2305,7 @@ static int wil_cfg80211_del_station(struct wiphy *wiphy, 
		     params->mac, params->reason_code, vif->mid);



	mutex_lock(&wil->mutex);

	wil6210_disconnect(vif, params->mac, params->reason_code, false);

	wil6210_disconnect(vif, params->mac, params->reason_code);

	mutex_unlock(&wil->mutex);



	return 0;

drivers/net/wireless/ath/wil6210/main.c

+133 −46
Original line number Diff line number Diff line
@@ -204,8 +204,21 @@ static void wil_ring_fini_tx(struct wil6210_priv *wil, int id) 
	wil->txrx_ops.ring_fini_tx(wil, ring);

}



static void wil_disconnect_cid(struct wil6210_vif *vif, int cid,

			       u16 reason_code, bool from_event)

static bool wil_vif_is_connected(struct wil6210_priv *wil, u8 mid)

{

	int i;



	for (i = 0; i < WIL6210_MAX_CID; i++) {

		if (wil->sta[i].mid == mid &&

		    wil->sta[i].status == wil_sta_connected)

			return true;

	}



	return false;

}



static void wil_disconnect_cid_complete(struct wil6210_vif *vif, int cid,

					u16 reason_code)

__acquires(&sta->tid_rx_lock) __releases(&sta->tid_rx_lock)

{

	uint i;
@@ -216,24 +229,14 @@ __acquires(&sta->tid_rx_lock) __releases(&sta->tid_rx_lock) 
	int min_ring_id = wil_get_min_tx_ring_id(wil);



	might_sleep();

	wil_dbg_misc(wil, "disconnect_cid: CID %d, MID %d, status %d\n",

	wil_dbg_misc(wil,

		     "disconnect_cid_complete: CID %d, MID %d, status %d\n",

		     cid, sta->mid, sta->status);

	/* inform upper/lower layers */

	/* inform upper layers */

	if (sta->status != wil_sta_unused) {

		if (vif->mid != sta->mid) {

			wil_err(wil, "STA MID mismatch with VIF MID(%d)\n",

				vif->mid);

			/* let FW override sta->mid but be more strict with

			 * user space requests

			 */

			if (!from_event)

				return;

		}

		if (!from_event) {

			bool del_sta = (wdev->iftype == NL80211_IFTYPE_AP) ?

						disable_ap_sme : false;

			wmi_disconnect_sta(vif, sta->addr, reason_code,

					   true, del_sta);

		}



		switch (wdev->iftype) {
@@ -274,36 +277,20 @@ __acquires(&sta->tid_rx_lock) __releases(&sta->tid_rx_lock) 
	sta->stats.tx_latency_min_us = U32_MAX;

}



static bool wil_vif_is_connected(struct wil6210_priv *wil, u8 mid)

{

	int i;



	for (i = 0; i < ARRAY_SIZE(wil->sta); i++) {

		if (wil->sta[i].mid == mid &&

		    wil->sta[i].status == wil_sta_connected)

			return true;

	}



	return false;

}



static void _wil6210_disconnect(struct wil6210_vif *vif, const u8 *bssid,

				u16 reason_code, bool from_event)

static void _wil6210_disconnect_complete(struct wil6210_vif *vif,

					 const u8 *bssid, u16 reason_code)

{

	struct wil6210_priv *wil = vif_to_wil(vif);

	int cid = -ENOENT;

	struct net_device *ndev;

	struct wireless_dev *wdev;



	if (unlikely(!vif))

		return;



	ndev = vif_to_ndev(vif);

	wdev = vif_to_wdev(vif);



	might_sleep();

	wil_info(wil, "bssid=%pM, reason=%d, ev%s\n", bssid,

		 reason_code, from_event ? "+" : "-");

	wil_info(wil, "disconnect_complete: bssid=%pM, reason=%d\n",

		 bssid, reason_code);



	/* Cases are:

	 * - disconnect single STA, still connected
@@ -318,14 +305,15 @@ static void _wil6210_disconnect(struct wil6210_vif *vif, const u8 *bssid, 
	if (bssid && !is_broadcast_ether_addr(bssid) &&

	    !ether_addr_equal_unaligned(ndev->dev_addr, bssid)) {

		cid = wil_find_cid(wil, vif->mid, bssid);

		wil_dbg_misc(wil, "Disconnect %pM, CID=%d, reason=%d\n",

		wil_dbg_misc(wil,

			     "Disconnect complete %pM, CID=%d, reason=%d\n",

			     bssid, cid, reason_code);

		if (cid >= 0) /* disconnect 1 peer */

			wil_disconnect_cid(vif, cid, reason_code, from_event);

			wil_disconnect_cid_complete(vif, cid, reason_code);

	} else { /* all */

		wil_dbg_misc(wil, "Disconnect all\n");

		wil_dbg_misc(wil, "Disconnect complete all\n");

		for (cid = 0; cid < WIL6210_MAX_CID; cid++)

			wil_disconnect_cid(vif, cid, reason_code, from_event);

			wil_disconnect_cid_complete(vif, cid, reason_code);

	}



	/* link state */
@@ -371,6 +359,84 @@ static void _wil6210_disconnect(struct wil6210_vif *vif, const u8 *bssid, 
	}

}



static int wil_disconnect_cid(struct wil6210_vif *vif, int cid,

			      u16 reason_code)

{

	struct wil6210_priv *wil = vif_to_wil(vif);

	struct wireless_dev *wdev = vif_to_wdev(vif);

	struct wil_sta_info *sta = &wil->sta[cid];

	bool del_sta = false;



	might_sleep();

	wil_dbg_misc(wil, "disconnect_cid: CID %d, MID %d, status %d\n",

		     cid, sta->mid, sta->status);



	if (sta->status == wil_sta_unused)

		return 0;



	if (vif->mid != sta->mid) {

		wil_err(wil, "STA MID mismatch with VIF MID(%d)\n", vif->mid);

		return -EINVAL;

	}



	/* inform lower layers */

	if (wdev->iftype == NL80211_IFTYPE_AP && disable_ap_sme)

		del_sta = true;



	/* disconnect by sending command disconnect/del_sta and wait

	 * synchronously for WMI_DISCONNECT_EVENTID event.

	 */

	return wmi_disconnect_sta(vif, sta->addr, reason_code, del_sta);

}



static void _wil6210_disconnect(struct wil6210_vif *vif, const u8 *bssid,

				u16 reason_code)

{

	struct wil6210_priv *wil;

	struct net_device *ndev;

	struct wireless_dev *wdev;

	int cid = -ENOENT;



	if (unlikely(!vif))

		return;



	wil = vif_to_wil(vif);

	ndev = vif_to_ndev(vif);

	wdev = vif_to_wdev(vif);



	might_sleep();

	wil_info(wil, "disconnect bssid=%pM, reason=%d\n", bssid, reason_code);



	/* Cases are:

	 * - disconnect single STA, still connected

	 * - disconnect single STA, already disconnected

	 * - disconnect all

	 *

	 * For "disconnect all", there are 3 options:

	 * - bssid == NULL

	 * - bssid is broadcast address (ff:ff:ff:ff:ff:ff)

	 * - bssid is our MAC address

	 */

	if (bssid && !is_broadcast_ether_addr(bssid) &&

	    !ether_addr_equal_unaligned(ndev->dev_addr, bssid)) {

		cid = wil_find_cid(wil, vif->mid, bssid);

		wil_dbg_misc(wil, "Disconnect %pM, CID=%d, reason=%d\n",

			     bssid, cid, reason_code);

		if (cid >= 0) /* disconnect 1 peer */

			wil_disconnect_cid(vif, cid, reason_code);

	} else { /* all */

		wil_dbg_misc(wil, "Disconnect all\n");

		for (cid = 0; cid < WIL6210_MAX_CID; cid++)

			wil_disconnect_cid(vif, cid, reason_code);

	}



	/* call event handler manually after processing wmi_call,

	 * to avoid deadlock - disconnect event handler acquires

	 * wil->mutex while it is already held here

	 */

	_wil6210_disconnect_complete(vif, bssid, reason_code);

}



void wil_disconnect_worker(struct work_struct *work)

{

	struct wil6210_vif *vif = container_of(work,
@@ -695,20 +761,41 @@ void wil6210_bus_request(struct wil6210_priv *wil, u32 kbps) 
 * @vif: virtual interface context

 * @bssid: peer to disconnect, NULL to disconnect all

 * @reason_code: Reason code for the Disassociation frame

 * @from_event: whether is invoked from FW event handler

 *

 * Disconnect and release associated resources. If invoked not from the

 * FW event handler, issue WMI command(s) to trigger MAC disconnect.

 * Disconnect and release associated resources. Issue WMI

 * command(s) to trigger MAC disconnect. When command was issued

 * successfully, call the wil6210_disconnect_complete function

 * to handle the event synchronously

 */

void wil6210_disconnect(struct wil6210_vif *vif, const u8 *bssid,

			u16 reason_code, bool from_event)

			u16 reason_code)

{

	struct wil6210_priv *wil = vif_to_wil(vif);



	wil_dbg_misc(wil, "disconnecting\n");



	del_timer_sync(&vif->connect_timer);

	_wil6210_disconnect(vif, bssid, reason_code);

}



/**

 * wil6210_disconnect_complete - handle disconnect event

 * @vif: virtual interface context

 * @bssid: peer to disconnect, NULL to disconnect all

 * @reason_code: Reason code for the Disassociation frame

 *

 * Release associated resources and indicate upper layers the

 * connection is terminated.

 */

void wil6210_disconnect_complete(struct wil6210_vif *vif, const u8 *bssid,

				 u16 reason_code)

{

	struct wil6210_priv *wil = vif_to_wil(vif);



	wil_dbg_misc(wil, "disconnect\n");

	wil_dbg_misc(wil, "got disconnect\n");



	del_timer_sync(&vif->connect_timer);

	_wil6210_disconnect(vif, bssid, reason_code, from_event);

	_wil6210_disconnect_complete(vif, bssid, reason_code);

}



void wil_priv_deinit(struct wil6210_priv *wil)
@@ -1545,7 +1632,7 @@ int wil_reset(struct wil6210_priv *wil, bool load_fw) 
		if (vif) {

			cancel_work_sync(&vif->disconnect_worker);

			wil6210_disconnect(vif, NULL,

					   WLAN_REASON_DEAUTH_LEAVING, false);

					   WLAN_REASON_DEAUTH_LEAVING);

		}

	}

	wil_bcast_fini_all(wil);

drivers/net/wireless/ath/wil6210/netdev.c

+1 −1
Original line number Diff line number Diff line
@@ -510,7 +510,7 @@ void wil_vif_remove(struct wil6210_priv *wil, u8 mid) 
	}



	mutex_lock(&wil->mutex);

	wil6210_disconnect(vif, NULL, WLAN_REASON_DEAUTH_LEAVING, false);

	wil6210_disconnect(vif, NULL, WLAN_REASON_DEAUTH_LEAVING);

	mutex_unlock(&wil->mutex);



	ndev = vif_to_ndev(vif);

drivers/net/wireless/ath/wil6210/wil6210.h

+5 −3
Original line number Diff line number Diff line
@@ -1243,8 +1243,8 @@ int wmi_rx_chain_add(struct wil6210_priv *wil, struct wil_ring *vring); 
int wmi_update_ft_ies(struct wil6210_vif *vif, u16 ie_len, const void *ie);

int wmi_rxon(struct wil6210_priv *wil, bool on);

int wmi_get_temperature(struct wil6210_priv *wil, u32 *t_m, u32 *t_r);

int wmi_disconnect_sta(struct wil6210_vif *vif, const u8 *mac,

		       u16 reason, bool full_disconnect, bool del_sta);

int wmi_disconnect_sta(struct wil6210_vif *vif, const u8 *mac, u16 reason,

		       bool del_sta);

int wmi_addba(struct wil6210_priv *wil, u8 mid,

	      u8 ringid, u8 size, u16 timeout);

int wmi_delba_tx(struct wil6210_priv *wil, u8 mid, u8 ringid, u16 reason);
@@ -1336,7 +1336,9 @@ void wil6210_bus_request(struct wil6210_priv *wil, u32 kbps); 
int wmi_aoa_meas(struct wil6210_priv *wil, const void *mac_addr, u8 chan,

		 u8 type);

void wil6210_disconnect(struct wil6210_vif *vif, const u8 *bssid,

			u16 reason_code, bool from_event);

			u16 reason_code);

void wil6210_disconnect_complete(struct wil6210_vif *vif, const u8 *bssid,

				 u16 reason_code);

void wil_probe_client_flush(struct wil6210_vif *vif);

void wil_probe_client_worker(struct work_struct *work);

void wil_disconnect_worker(struct work_struct *work);

drivers/net/wireless/ath/wil6210/wmi.c

+7 −21
Original line number Diff line number Diff line
@@ -1034,7 +1034,7 @@ static void wmi_evt_connect(struct wil6210_vif *vif, int id, void *d, int len) 
		wil_err(wil, "config tx vring failed for CID %d, rc (%d)\n",

			evt->cid, rc);

		wmi_disconnect_sta(vif, wil->sta[evt->cid].addr,

				   WLAN_REASON_UNSPECIFIED, false, false);

				   WLAN_REASON_UNSPECIFIED, false);

	} else {

		wil_info(wil, "successful connection to CID %d\n", evt->cid);

	}
@@ -1128,7 +1128,7 @@ static void wmi_evt_disconnect(struct wil6210_vif *vif, int id, 
	}



	mutex_lock(&wil->mutex);

	wil6210_disconnect(vif, evt->bssid, reason_code, true);

	wil6210_disconnect_complete(vif, evt->bssid, reason_code);

	mutex_unlock(&wil->mutex);

}
@@ -1676,7 +1676,7 @@ wmi_evt_auth_status(struct wil6210_vif *vif, int id, void *d, int len) 
	return;



fail:

	wil6210_disconnect(vif, NULL, WLAN_REASON_PREV_AUTH_NOT_VALID, false);

	wil6210_disconnect(vif, NULL, WLAN_REASON_PREV_AUTH_NOT_VALID);

}



static void
@@ -1817,7 +1817,7 @@ wmi_evt_reassoc_status(struct wil6210_vif *vif, int id, void *d, int len) 
	return;



fail:

	wil6210_disconnect(vif, NULL, WLAN_REASON_PREV_AUTH_NOT_VALID, false);

	wil6210_disconnect(vif, NULL, WLAN_REASON_PREV_AUTH_NOT_VALID);

}



/**
@@ -2629,12 +2629,11 @@ int wmi_get_temperature(struct wil6210_priv *wil, u32 *t_bb, u32 *t_rf) 
	return 0;

}



int wmi_disconnect_sta(struct wil6210_vif *vif, const u8 *mac,

		       u16 reason, bool full_disconnect, bool del_sta)

int wmi_disconnect_sta(struct wil6210_vif *vif, const u8 *mac, u16 reason,

		       bool del_sta)

{

	struct wil6210_priv *wil = vif_to_wil(vif);

	int rc;

	u16 reason_code;

	struct wmi_disconnect_sta_cmd disc_sta_cmd = {

		.disconnect_reason = cpu_to_le16(reason),

	};
@@ -2667,21 +2666,8 @@ int wmi_disconnect_sta(struct wil6210_vif *vif, const u8 *mac, 
		wil_fw_error_recovery(wil);

		return rc;

	}



	if (full_disconnect) {

		/* call event handler manually after processing wmi_call,

		 * to avoid deadlock - disconnect event handler acquires

		 * wil->mutex while it is already held here

		 */

		reason_code = le16_to_cpu(reply.evt.protocol_reason_status);



		wil_dbg_wmi(wil, "Disconnect %pM reason [proto %d wmi %d]\n",

			    reply.evt.bssid, reason_code,

			    reply.evt.disconnect_reason);



	wil->sinfo_gen++;

		wil6210_disconnect(vif, reply.evt.bssid, reason_code, true);

	}



	return 0;

}