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

mt76: add get_tx_txpwr_adj function pointer to mt76_driver_ops 



Add get_tx_txpwr_adj function pointer to mt76_driver_ops data structure
as a preliminary patch to unify txwi configuration between mt76x0 and
mt76x2 drivers since tpc is currently supported just by mt76x2 driver

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

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

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


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

		       bool ps);

	s8 (*get_tx_txpwr_adj)(struct mt76_dev *dev, s8 txpwr,

			       s8 max_txpwr_adj);

};



struct mt76_channel_state {

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

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ void mt76x2_mac_write_txwi(struct mt76x2_dev *dev, struct mt76x02_txwi *txwi, 
	}

	spin_unlock_bh(&dev->mt76.lock);



	txpwr_adj = mt76x2_tx_get_txpwr_adj(dev, dev->mt76.txpower_conf,

	txpwr_adj = mt76x2_tx_get_txpwr_adj(&dev->mt76, dev->mt76.txpower_conf,

					    max_txpwr_adj);

	txwi->ctl2 = FIELD_PREP(MT_TX_PWR_ADJ, txpwr_adj);

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

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ 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_txpwr_adj(struct mt76x2_dev *dev, s8 txpwr, s8 max_txpwr_adj);

s8 mt76x2_tx_get_txpwr_adj(struct mt76_dev *mdev, s8 txpwr, s8 max_txpwr_adj);

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

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

+1 −0
Original line number Diff line number Diff line
@@ -362,6 +362,7 @@ struct mt76x2_dev *mt76x2_alloc_device(struct device *pdev) 
		.rx_skb = mt76x2_queue_rx_skb,

		.rx_poll_complete = mt76x2_rx_poll_complete,

		.sta_ps = mt76x2_sta_ps,

		.get_tx_txpwr_adj = mt76x2_tx_get_txpwr_adj,

	};

	struct mt76x2_dev *dev;

	struct mt76_dev *mdev;

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

+4 −2
Original line number Diff line number Diff line
@@ -47,8 +47,10 @@ void mt76x2_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control, 
}

EXPORT_SYMBOL_GPL(mt76x2_tx);



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

s8 mt76x2_tx_get_txpwr_adj(struct mt76_dev *mdev, s8 txpwr, s8 max_txpwr_adj)

{

	struct mt76x2_dev  *dev = container_of(mdev, struct mt76x2_dev, mt76);



	txpwr = min_t(s8, txpwr, dev->mt76.txpower_conf);

	txpwr -= (dev->target_power + dev->target_power_delta[0]);

	txpwr = min_t(s8, txpwr, max_txpwr_adj);
@@ -66,7 +68,7 @@ void mt76x2_tx_set_txpwr_auto(struct mt76x2_dev *dev, s8 txpwr) 
{

	s8 txpwr_adj;



	txpwr_adj = mt76x2_tx_get_txpwr_adj(dev, txpwr,

	txpwr_adj = mt76x2_tx_get_txpwr_adj(&dev->mt76, txpwr,

					    dev->mt76.rate_power.ofdm[4]);

	mt76_rmw_field(dev, MT_PROT_AUTO_TX_CFG,

		       MT_PROT_AUTO_TX_CFG_PROT_PADJ, txpwr_adj);

CRA Git | Maintained and supported by SUSTech CRA and CCSE