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

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

ath10k: fix Rx aggregation reordering 



Firmware doesn't perform Rx reordering so it is
left to the host driver to do that.

Use mac80211 to perform reordering instead of
re-inventing the wheel.

This fixes TCP throughput issues in some
environments.

Reported-by: default avatarDenton Gentry <denton.gentry@gmail.com>
Signed-off-by: default avatarMichal Kazior <michal.kazior@tieto.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 30d88ce3

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

+91 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include "txrx.h"

#include "debug.h"

#include "trace.h"

#include "mac.h"



#include <linux/log2.h>
@@ -1422,6 +1423,86 @@ static void ath10k_htt_rx_frm_tx_compl(struct ath10k *ar, 
	}

}



static void ath10k_htt_rx_addba(struct ath10k *ar, struct htt_resp *resp)

{

	struct htt_rx_addba *ev = &resp->rx_addba;

	struct ath10k_peer *peer;

	struct ath10k_vif *arvif;

	u16 info0, tid, peer_id;



	info0 = __le16_to_cpu(ev->info0);

	tid = MS(info0, HTT_RX_BA_INFO0_TID);

	peer_id = MS(info0, HTT_RX_BA_INFO0_PEER_ID);



	ath10k_dbg(ATH10K_DBG_HTT,

		   "htt rx addba tid %hu peer_id %hu size %hhu\n",

		   tid, peer_id, ev->window_size);



	spin_lock_bh(&ar->data_lock);

	peer = ath10k_peer_find_by_id(ar, peer_id);

	if (!peer) {

		ath10k_warn("received addba event for invalid peer_id: %hu\n",

			    peer_id);

		spin_unlock_bh(&ar->data_lock);

		return;

	}



	arvif = ath10k_get_arvif(ar, peer->vdev_id);

	if (!arvif) {

		ath10k_warn("received addba event for invalid vdev_id: %u\n",

			    peer->vdev_id);

		spin_unlock_bh(&ar->data_lock);

		return;

	}



	ath10k_dbg(ATH10K_DBG_HTT,

		   "htt rx start rx ba session sta %pM tid %hu size %hhu\n",

		   peer->addr, tid, ev->window_size);



	ieee80211_start_rx_ba_session_offl(arvif->vif, peer->addr, tid);

	spin_unlock_bh(&ar->data_lock);

}



static void ath10k_htt_rx_delba(struct ath10k *ar, struct htt_resp *resp)

{

	struct htt_rx_delba *ev = &resp->rx_delba;

	struct ath10k_peer *peer;

	struct ath10k_vif *arvif;

	u16 info0, tid, peer_id;



	info0 = __le16_to_cpu(ev->info0);

	tid = MS(info0, HTT_RX_BA_INFO0_TID);

	peer_id = MS(info0, HTT_RX_BA_INFO0_PEER_ID);



	ath10k_dbg(ATH10K_DBG_HTT,

		   "htt rx delba tid %hu peer_id %hu\n",

		   tid, peer_id);



	spin_lock_bh(&ar->data_lock);

	peer = ath10k_peer_find_by_id(ar, peer_id);

	if (!peer) {

		ath10k_warn("received addba event for invalid peer_id: %hu\n",

			    peer_id);

		spin_unlock_bh(&ar->data_lock);

		return;

	}



	arvif = ath10k_get_arvif(ar, peer->vdev_id);

	if (!arvif) {

		ath10k_warn("received addba event for invalid vdev_id: %u\n",

			    peer->vdev_id);

		spin_unlock_bh(&ar->data_lock);

		return;

	}



	ath10k_dbg(ATH10K_DBG_HTT,

		   "htt rx stop rx ba session sta %pM tid %hu\n",

		   peer->addr, tid);



	ieee80211_stop_rx_ba_session_offl(arvif->vif, peer->addr, tid);

	spin_unlock_bh(&ar->data_lock);

}



void ath10k_htt_t2h_msg_handler(struct ath10k *ar, struct sk_buff *skb)

{

	struct ath10k_htt *htt = &ar->htt;
@@ -1524,8 +1605,17 @@ void ath10k_htt_t2h_msg_handler(struct ath10k *ar, struct sk_buff *skb) 
		ath10k_warn("received an unexpected htt tx inspect event\n");

		break;

	case HTT_T2H_MSG_TYPE_RX_ADDBA:

		ath10k_htt_rx_addba(ar, resp);

		break;

	case HTT_T2H_MSG_TYPE_RX_DELBA:

	case HTT_T2H_MSG_TYPE_RX_FLUSH:

		ath10k_htt_rx_delba(ar, resp);

		break;

	case HTT_T2H_MSG_TYPE_RX_FLUSH: {

		/* Ignore this event because mac80211 takes care of Rx

		 * aggregation reordering.

		 */

		break;

	}

	default:

		ath10k_dbg(ATH10K_DBG_HTT, "htt event (%d) not handled\n",

			   resp->hdr.msg_type);

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

+33 −0
Original line number Diff line number Diff line
@@ -4333,6 +4333,38 @@ static u64 ath10k_get_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif) 
	return 0;

}



static int ath10k_ampdu_action(struct ieee80211_hw *hw,

			       struct ieee80211_vif *vif,

			       enum ieee80211_ampdu_mlme_action action,

			       struct ieee80211_sta *sta, u16 tid, u16 *ssn,

			       u8 buf_size)

{

	struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);



	ath10k_dbg(ATH10K_DBG_MAC, "mac ampdu vdev_id %i sta %pM tid %hu action %d\n",

		   arvif->vdev_id, sta->addr, tid, action);



	switch (action) {

	case IEEE80211_AMPDU_RX_START:

	case IEEE80211_AMPDU_RX_STOP:

		/* HTT AddBa/DelBa events trigger mac80211 Rx BA session

		 * creation/removal. Do we need to verify this?

		 */

		return 0;

	case IEEE80211_AMPDU_TX_START:

	case IEEE80211_AMPDU_TX_STOP_CONT:

	case IEEE80211_AMPDU_TX_STOP_FLUSH:

	case IEEE80211_AMPDU_TX_STOP_FLUSH_CONT:

	case IEEE80211_AMPDU_TX_OPERATIONAL:

		/* Firmware offloads Tx aggregation entirely so deny mac80211

		 * Tx aggregation requests.

		 */

		return -EOPNOTSUPP;

	}



	return -EINVAL;

}



static const struct ieee80211_ops ath10k_ops = {

	.tx				= ath10k_tx,

	.start				= ath10k_start,
@@ -4360,6 +4392,7 @@ static const struct ieee80211_ops ath10k_ops = { 
	.set_bitrate_mask		= ath10k_set_bitrate_mask,

	.sta_rc_update			= ath10k_sta_rc_update,

	.get_tsf			= ath10k_get_tsf,

	.ampdu_action			= ath10k_ampdu_action,

#ifdef CONFIG_PM

	.suspend			= ath10k_suspend,

	.resume				= ath10k_resume,

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

+1 −2
Original line number Diff line number Diff line
@@ -119,8 +119,7 @@ struct ath10k_peer *ath10k_peer_find(struct ath10k *ar, int vdev_id, 
	return NULL;

}



static struct ath10k_peer *ath10k_peer_find_by_id(struct ath10k *ar,

						  int peer_id)

struct ath10k_peer *ath10k_peer_find_by_id(struct ath10k *ar, int peer_id)

{

	struct ath10k_peer *peer;

drivers/net/wireless/ath/ath10k/txrx.h

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ void ath10k_txrx_tx_unref(struct ath10k_htt *htt, 


struct ath10k_peer *ath10k_peer_find(struct ath10k *ar, int vdev_id,

				     const u8 *addr);

struct ath10k_peer *ath10k_peer_find_by_id(struct ath10k *ar, int peer_id);

int ath10k_wait_for_peer_created(struct ath10k *ar, int vdev_id,

				 const u8 *addr);

int ath10k_wait_for_peer_deleted(struct ath10k *ar, int vdev_id,