Commit 7c1f8881 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by Felix Fietkau
Browse files

mt76: unify send_tx_status and related helpers 



Merge send_tx_status and helper functions from mt76x0 and mt76x2.

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent b490b1df

drivers/net/wireless/mediatek/mt76/mt76x0/mac.c

+0 −147
Original line number Diff line number Diff line
@@ -17,153 +17,6 @@ 
#include "trace.h"

#include <linux/etherdevice.h>



static void

mt76_mac_process_tx_rate(struct ieee80211_tx_rate *txrate, u16 rate,

			 enum nl80211_band band)

{

	u8 idx = FIELD_GET(MT_RXWI_RATE_INDEX, rate);



	txrate->idx = 0;

	txrate->flags = 0;

	txrate->count = 1;



	switch (FIELD_GET(MT_RXWI_RATE_PHY, rate)) {

	case MT_PHY_TYPE_OFDM:

		if (band == NL80211_BAND_2GHZ)

			idx += 4;



		txrate->idx = idx;

		return;

	case MT_PHY_TYPE_CCK:

		if (idx >= 8)

			idx -= 8;



		txrate->idx = idx;

		return;

	case MT_PHY_TYPE_HT_GF:

		txrate->flags |= IEEE80211_TX_RC_GREEN_FIELD;

		/* fall through */

	case MT_PHY_TYPE_HT:

		txrate->flags |= IEEE80211_TX_RC_MCS;

		txrate->idx = idx;

		break;

	case MT_PHY_TYPE_VHT:

		txrate->flags |= IEEE80211_TX_RC_VHT_MCS;

		txrate->idx = idx;

		break;

	default:

		WARN_ON(1);

		return;

	}



	switch (FIELD_GET(MT_RXWI_RATE_BW, rate)) {

	case MT_PHY_BW_20:

		break;

	case MT_PHY_BW_40:

		txrate->flags |= IEEE80211_TX_RC_40_MHZ_WIDTH;

		break;

	case MT_PHY_BW_80:

		txrate->flags |= IEEE80211_TX_RC_80_MHZ_WIDTH;

		break;

	default:

		WARN_ON(1);

		return;

	}



	if (rate & MT_RXWI_RATE_SGI)

		txrate->flags |= IEEE80211_TX_RC_SHORT_GI;

}



static void

mt76_mac_fill_tx_status(struct mt76x0_dev *dev, struct ieee80211_tx_info *info,

			struct mt76x02_tx_status *st, int n_frames)

{

	struct ieee80211_tx_rate *rate = info->status.rates;

	int cur_idx, last_rate;

	int i;



	if (!n_frames)

		return;



	last_rate = min_t(int, st->retry, IEEE80211_TX_MAX_RATES - 1);

	mt76_mac_process_tx_rate(&rate[last_rate], st->rate,

				 dev->mt76.chandef.chan->band);

	if (last_rate < IEEE80211_TX_MAX_RATES - 1)

		rate[last_rate + 1].idx = -1;



	cur_idx = rate[last_rate].idx + last_rate;

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

		rate[i].flags = rate[last_rate].flags;

		rate[i].idx = max_t(int, 0, cur_idx - i);

		rate[i].count = 1;

	}



	rate[last_rate - 1].count = st->retry + 1 - last_rate;



	info->status.ampdu_len = n_frames;

	info->status.ampdu_ack_len = st->success ? n_frames : 0;



	if (st->pktid & MT_TXWI_PKTID_PROBE)

		info->flags |= IEEE80211_TX_CTL_RATE_CTRL_PROBE;



	if (st->aggr)

		info->flags |= IEEE80211_TX_CTL_AMPDU |

			       IEEE80211_TX_STAT_AMPDU;



	if (!st->ack_req)

		info->flags |= IEEE80211_TX_CTL_NO_ACK;

	else if (st->success)

		info->flags |= IEEE80211_TX_STAT_ACK;

}



void mt76x0_send_tx_status(struct mt76x0_dev *dev, struct mt76x02_tx_status *stat, u8 *update)

{

	struct ieee80211_tx_info info = {};

	struct ieee80211_sta *sta = NULL;

	struct mt76_wcid *wcid = NULL;

	struct mt76x02_sta *msta = NULL;



	rcu_read_lock();

	if (stat->wcid < ARRAY_SIZE(dev->mt76.wcid))

		wcid = rcu_dereference(dev->mt76.wcid[stat->wcid]);



	if (wcid) {

		void *priv;

		priv = msta = container_of(wcid, struct mt76x02_sta, wcid);

		sta = container_of(priv, struct ieee80211_sta, drv_priv);

	}



	if (msta && stat->aggr) {

		u32 stat_val, stat_cache;



		stat_val = stat->rate;

		stat_val |= ((u32) stat->retry) << 16;

		stat_cache = msta->status.rate;

		stat_cache |= ((u32) msta->status.retry) << 16;



		if (*update == 0 && stat_val == stat_cache &&

		    stat->wcid == msta->status.wcid && msta->n_frames < 32) {

			msta->n_frames++;

			goto out;

		}



		mt76_mac_fill_tx_status(dev, &info, &msta->status,

					msta->n_frames);

		msta->status = *stat;

		msta->n_frames = 1;

		*update = 0;

	} else {

		mt76_mac_fill_tx_status(dev, &info, stat, 1);

		*update = 1;

	}



	spin_lock_bh(&dev->mac_lock);

	ieee80211_tx_status_noskb(dev->mt76.hw, sta, &info);

	spin_unlock_bh(&dev->mac_lock);

out:

	rcu_read_unlock();

}



void mt76x0_mac_set_protection(struct mt76x0_dev *dev, bool legacy_prot,

				int ht_mode)

{

drivers/net/wireless/mediatek/mt76/mt76x0/mac.h

+0 −4
Original line number Diff line number Diff line
@@ -17,8 +17,4 @@ 


u32 mt76x0_mac_process_rx(struct mt76x0_dev *dev, struct sk_buff *skb,

			u8 *data, void *rxi);

struct mt76x02_tx_status

mt76x0_mac_fetch_tx_status(struct mt76x0_dev *dev);

void mt76x0_send_tx_status(struct mt76x0_dev *dev, struct mt76x02_tx_status *stat, u8 *update);



#endif

drivers/net/wireless/mediatek/mt76/mt76x0/tx.c

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ void mt76x0_tx_stat(struct work_struct *work) 
		if (!mt76x02_mac_load_tx_status(&dev->mt76, &stat))

			break;



		mt76x0_send_tx_status(dev, &stat, &update);

		mt76x02_send_tx_status(&dev->mt76, &stat, &update);



		cleaned++;

	}

drivers/net/wireless/mediatek/mt76/mt76x02_mac.c

+151 −0
Original line number Diff line number Diff line
@@ -241,3 +241,154 @@ bool mt76x02_mac_load_tx_status(struct mt76_dev *dev, 
	return true;

}

EXPORT_SYMBOL_GPL(mt76x02_mac_load_tx_status);



static int

mt76x02_mac_process_tx_rate(struct ieee80211_tx_rate *txrate, u16 rate,

			   enum nl80211_band band)

{

	u8 idx = FIELD_GET(MT_RXWI_RATE_INDEX, rate);



	txrate->idx = 0;

	txrate->flags = 0;

	txrate->count = 1;



	switch (FIELD_GET(MT_RXWI_RATE_PHY, rate)) {

	case MT_PHY_TYPE_OFDM:

		if (band == NL80211_BAND_2GHZ)

			idx += 4;



		txrate->idx = idx;

		return 0;

	case MT_PHY_TYPE_CCK:

		if (idx >= 8)

			idx -= 8;



		txrate->idx = idx;

		return 0;

	case MT_PHY_TYPE_HT_GF:

		txrate->flags |= IEEE80211_TX_RC_GREEN_FIELD;

		/* fall through */

	case MT_PHY_TYPE_HT:

		txrate->flags |= IEEE80211_TX_RC_MCS;

		txrate->idx = idx;

		break;

	case MT_PHY_TYPE_VHT:

		txrate->flags |= IEEE80211_TX_RC_VHT_MCS;

		txrate->idx = idx;

		break;

	default:

		return -EINVAL;

	}



	switch (FIELD_GET(MT_RXWI_RATE_BW, rate)) {

	case MT_PHY_BW_20:

		break;

	case MT_PHY_BW_40:

		txrate->flags |= IEEE80211_TX_RC_40_MHZ_WIDTH;

		break;

	case MT_PHY_BW_80:

		txrate->flags |= IEEE80211_TX_RC_80_MHZ_WIDTH;

		break;

	default:

		return -EINVAL;

	}



	if (rate & MT_RXWI_RATE_SGI)

		txrate->flags |= IEEE80211_TX_RC_SHORT_GI;



	return 0;

}



static void

mt76x02_mac_fill_tx_status(struct mt76_dev *dev,

			  struct ieee80211_tx_info *info,

			  struct mt76x02_tx_status *st, int n_frames)

{

	struct ieee80211_tx_rate *rate = info->status.rates;

	int cur_idx, last_rate;

	int i;



	if (!n_frames)

		return;



	last_rate = min_t(int, st->retry, IEEE80211_TX_MAX_RATES - 1);

	mt76x02_mac_process_tx_rate(&rate[last_rate], st->rate,

				   dev->chandef.chan->band);

	if (last_rate < IEEE80211_TX_MAX_RATES - 1)

		rate[last_rate + 1].idx = -1;



	cur_idx = rate[last_rate].idx + last_rate;

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

		rate[i].flags = rate[last_rate].flags;

		rate[i].idx = max_t(int, 0, cur_idx - i);

		rate[i].count = 1;

	}

	rate[last_rate].count = st->retry + 1 - last_rate;



	info->status.ampdu_len = n_frames;

	info->status.ampdu_ack_len = st->success ? n_frames : 0;



	if (st->pktid & MT_TXWI_PKTID_PROBE)

		info->flags |= IEEE80211_TX_CTL_RATE_CTRL_PROBE;



	if (st->aggr)

		info->flags |= IEEE80211_TX_CTL_AMPDU |

			       IEEE80211_TX_STAT_AMPDU;



	if (!st->ack_req)

		info->flags |= IEEE80211_TX_CTL_NO_ACK;

	else if (st->success)

		info->flags |= IEEE80211_TX_STAT_ACK;

}



void mt76x02_send_tx_status(struct mt76_dev *dev,

			   struct mt76x02_tx_status *stat, u8 *update)

{

	struct ieee80211_tx_info info = {};

	struct ieee80211_sta *sta = NULL;

	struct mt76_wcid *wcid = NULL;

	struct mt76x02_sta *msta = NULL;



	rcu_read_lock();

	if (stat->wcid < ARRAY_SIZE(dev->wcid))

		wcid = rcu_dereference(dev->wcid[stat->wcid]);



	if (wcid) {

		void *priv;



		priv = msta = container_of(wcid, struct mt76x02_sta, wcid);

		sta = container_of(priv, struct ieee80211_sta,

				   drv_priv);

	}



	if (msta && stat->aggr) {

		u32 stat_val, stat_cache;



		stat_val = stat->rate;

		stat_val |= ((u32) stat->retry) << 16;

		stat_cache = msta->status.rate;

		stat_cache |= ((u32) msta->status.retry) << 16;



		if (*update == 0 && stat_val == stat_cache &&

		    stat->wcid == msta->status.wcid && msta->n_frames < 32) {

			msta->n_frames++;

			goto out;

		}



		mt76x02_mac_fill_tx_status(dev, &info, &msta->status,

					  msta->n_frames);



		msta->status = *stat;

		msta->n_frames = 1;

		*update = 0;

	} else {

		mt76x02_mac_fill_tx_status(dev, &info, stat, 1);

		*update = 1;

	}



	ieee80211_tx_status_noskb(dev->hw, sta, &info);



out:

	rcu_read_unlock();

}

EXPORT_SYMBOL_GPL(mt76x02_send_tx_status);

drivers/net/wireless/mediatek/mt76/mt76x02_mac.h

+2 −0
Original line number Diff line number Diff line
@@ -197,4 +197,6 @@ mt76x02_mac_tx_rate_val(struct mt76_dev *dev, 
		       const struct ieee80211_tx_rate *rate, u8 *nss_val);

bool mt76x02_mac_load_tx_status(struct mt76_dev *dev,

			       struct mt76x02_tx_status *stat);

void mt76x02_send_tx_status(struct mt76_dev *dev,

			   struct mt76x02_tx_status *stat, u8 *update);

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE