Commit d697b00b authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files

mt76: move mt76x02_tx_get_max_txpwr_adj in mt76x02_util.c 



Move mt76x02_tx_get_max_txpwr_adj routine in mt76x02-lib module
since now both mt76x0 and mt76x2 drivers read rate tx power gain from
rate_power data structure. Moreover remove get_max_txpwr_adj function
pointer from mt76_driver_ops data structure

Signed-off-by: default avatarLorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 14190227

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

+0 −2
Original line number Diff line number Diff line
@@ -262,8 +262,6 @@ struct mt76_driver_ops { 


	void (*sta_ps)(struct mt76_dev *dev, struct ieee80211_sta *sta,

		       bool ps);

	s8 (*get_max_txpwr_adj)(struct mt76_dev *dev,

				const struct ieee80211_tx_rate *rate);

};



struct mt76_channel_state {

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

+42 −3
Original line number Diff line number Diff line
@@ -358,6 +358,47 @@ int mt76x02_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
}

EXPORT_SYMBOL_GPL(mt76x02_conf_tx);



s8 mt76x02_tx_get_max_txpwr_adj(struct mt76_dev *dev,

				const struct ieee80211_tx_rate *rate)

{

	s8 max_txpwr;



	if (rate->flags & IEEE80211_TX_RC_VHT_MCS) {

		u8 mcs = ieee80211_rate_get_vht_mcs(rate);



		if (mcs == 8 || mcs == 9) {

			max_txpwr = dev->rate_power.vht[8];

		} else {

			u8 nss, idx;



			nss = ieee80211_rate_get_vht_nss(rate);

			idx = ((nss - 1) << 3) + mcs;

			max_txpwr = dev->rate_power.ht[idx & 0xf];

		}

	} else if (rate->flags & IEEE80211_TX_RC_MCS) {

		max_txpwr = dev->rate_power.ht[rate->idx & 0xf];

	} else {

		enum nl80211_band band = dev->chandef.chan->band;



		if (band == NL80211_BAND_2GHZ) {

			const struct ieee80211_rate *r;

			struct wiphy *wiphy = dev->hw->wiphy;

			struct mt76_rate_power *rp = &dev->rate_power;



			r = &wiphy->bands[band]->bitrates[rate->idx];

			if (r->flags & IEEE80211_RATE_SHORT_PREAMBLE)

				max_txpwr = rp->cck[r->hw_value & 0x3];

			else

				max_txpwr = rp->ofdm[r->hw_value & 0x7];

		} else {

			max_txpwr = dev->rate_power.ofdm[rate->idx & 0x7];

		}

	}



	return max_txpwr;

}

EXPORT_SYMBOL_GPL(mt76x02_tx_get_max_txpwr_adj);



void mt76x02_sta_rate_tbl_update(struct ieee80211_hw *hw,

				struct ieee80211_vif *vif,

				struct ieee80211_sta *sta)
@@ -373,9 +414,7 @@ void mt76x02_sta_rate_tbl_update(struct ieee80211_hw *hw, 
	rate.idx = rates->rate[0].idx;

	rate.flags = rates->rate[0].flags;

	mt76x02_mac_wcid_set_rate(dev, &msta->wcid, &rate);



	if (dev->drv && dev->drv->get_max_txpwr_adj)

		msta->wcid.max_txpwr_adj = dev->drv->get_max_txpwr_adj(dev, &rate);

	msta->wcid.max_txpwr_adj = mt76x02_tx_get_max_txpwr_adj(dev, &rate);

}

EXPORT_SYMBOL_GPL(mt76x02_sta_rate_tbl_update);

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

+2 −0
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ int mt76x02_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
void mt76x02_sta_rate_tbl_update(struct ieee80211_hw *hw,

				struct ieee80211_vif *vif,

				struct ieee80211_sta *sta);

s8 mt76x02_tx_get_max_txpwr_adj(struct mt76_dev *dev,

				const struct ieee80211_tx_rate *rate);

int mt76x02_insert_hdr_pad(struct sk_buff *skb);

void mt76x02_remove_hdr_pad(struct sk_buff *skb, int len);

void mt76x02_tx_complete(struct mt76_dev *dev, struct sk_buff *skb);

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

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ void mt76x2_mac_write_txwi(struct mt76x2_dev *dev, struct mt76x02_txwi *txwi, 
		nss = wcid->tx_rate_nss;

	} else {

		txwi->rate = mt76x02_mac_tx_rate_val(&dev->mt76, rate, &nss);

		max_txpwr_adj = mt76x2_tx_get_max_txpwr_adj(&dev->mt76, rate);

		max_txpwr_adj = mt76x02_tx_get_max_txpwr_adj(&dev->mt76, rate);

	}

	spin_unlock_bh(&dev->mt76.lock);

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

+0 −2
Original line number Diff line number Diff line
@@ -176,8 +176,6 @@ void mt76x2_sta_ps(struct mt76_dev *dev, struct ieee80211_sta *sta, bool ps); 


void mt76x2_update_channel(struct mt76_dev *mdev);



s8 mt76x2_tx_get_max_txpwr_adj(struct mt76_dev *dev,

			       const struct ieee80211_tx_rate *rate);

s8 mt76x2_tx_get_txpwr_adj(struct mt76x2_dev *dev, s8 txpwr, s8 max_txpwr_adj);

void mt76x2_tx_set_txpwr_auto(struct mt76x2_dev *dev, s8 txpwr);

CRA Git | Maintained and supported by SUSTech CRA and CCSE