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

Commit 2c512059 authored by Michal Kazior's avatar Michal Kazior Committed by Kalle Valo
Browse files

ath10k: defer AP self-peer removal wait 



Some firmware revisions don't notify host about
self-bss-peer removal until after associated vdev
is deleted. This has been observed with qca6174
WLAN.RM.2.0-00073 firmware.

This patch fixes AP teardown slowdowns and
prevents delays and warnings:

 ath10k_pci 0000:00:05.0: failed to remove peer for AP vdev 0: -110
 ath10k_pci 0000:00:05.0: removing stale peer xx:xx:xx:xx:xx:xx from vdev_id 0
 ath10k_pci 0000:00:05.0: peer-unmap-event: unknown peer id 24
 ath10k_pci 0000:00:05.0: peer-unmap-event: unknown peer id 8

Signed-off-by: default avatarMichal Kazior <michal.kazior@tieto.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 99fc6f3a

drivers/net/wireless/ath/ath10k/mac.c

+18 −2
Original line number Diff line number Diff line
@@ -3332,9 +3332,10 @@ static void ath10k_remove_interface(struct ieee80211_hw *hw, 
	list_del(&arvif->list);



	if (arvif->vdev_type == WMI_VDEV_TYPE_AP) {

		ret = ath10k_peer_delete(arvif->ar, arvif->vdev_id, vif->addr);

		ret = ath10k_wmi_peer_delete(arvif->ar, arvif->vdev_id,

					     vif->addr);

		if (ret)

			ath10k_warn(ar, "failed to remove peer for AP vdev %i: %d\n",

			ath10k_warn(ar, "failed to submit AP self-peer removal on vdev %i: %d\n",

				    arvif->vdev_id, ret);



		kfree(arvif->u.ap.noa_data);
@@ -3348,6 +3349,21 @@ static void ath10k_remove_interface(struct ieee80211_hw *hw, 
		ath10k_warn(ar, "failed to delete WMI vdev %i: %d\n",

			    arvif->vdev_id, ret);



	/* Some firmware revisions don't notify host about self-peer removal

	 * until after associated vdev is deleted.

	 */

	if (arvif->vdev_type == WMI_VDEV_TYPE_AP) {

		ret = ath10k_wait_for_peer_deleted(ar, arvif->vdev_id,

						   vif->addr);

		if (ret)

			ath10k_warn(ar, "failed to remove AP self-peer on vdev %i: %d\n",

				    arvif->vdev_id, ret);



		spin_lock_bh(&ar->data_lock);

		ar->num_peers--;

		spin_unlock_bh(&ar->data_lock);

	}



	ath10k_peer_cleanup(ar, arvif->vdev_id);



	mutex_unlock(&ar->conf_mutex);