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

mt76: move tpc routines in mt76x02-lib module 



Move mt76x02_tx_get_txpwr_adj and mt76x02_tx_set_txpwr_auto routines
in mt76x02-lib module since they are shared between mt76x0 and mt76x2
drivers. Moreover remove get_txpwr_adj function pointer

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

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_tx_txpwr_adj)(struct mt76_dev *dev, s8 txpwr,

			       s8 max_txpwr_adj);

};



struct mt76_channel_state {

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

+2 −0
Original line number Diff line number Diff line
@@ -138,6 +138,8 @@ void mt76x02_sta_rate_tbl_update(struct ieee80211_hw *hw, 
				struct ieee80211_sta *sta);

s8 mt76x02_tx_get_max_txpwr_adj(struct mt76_dev *dev,

				const struct ieee80211_tx_rate *rate);

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

void mt76x02_tx_set_txpwr_auto(struct mt76x02_dev *dev, s8 txpwr);

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/mt76x02_mac.c

+3 −5
Original line number Diff line number Diff line
@@ -384,11 +384,9 @@ void mt76x02_mac_write_txwi(struct mt76_dev *dev, struct mt76x02_txwi *txwi, 
	}

	spin_unlock_bh(&dev->lock);



	if (dev->drv->get_tx_txpwr_adj) {

		txpwr_adj = dev->drv->get_tx_txpwr_adj(dev, dev->txpower_conf,

	txpwr_adj = mt76x02_tx_get_txpwr_adj(dev, dev->txpower_conf,

					     max_txpwr_adj);

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

	}



	if (nstreams > 1 && mt76_rev(dev) >= MT76XX_REV_E4)

		txwi->txstream = 0x13;

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

+30 −0
Original line number Diff line number Diff line
@@ -112,6 +112,36 @@ s8 mt76x02_tx_get_max_txpwr_adj(struct mt76_dev *dev, 
}

EXPORT_SYMBOL_GPL(mt76x02_tx_get_max_txpwr_adj);



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

{

	struct mt76x02_dev *dev = container_of(mdev, struct mt76x02_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);



	if (!dev->enable_tpc)

		return 0;

	else if (txpwr >= 0)

		return min_t(s8, txpwr, 7);

	else

		return (txpwr < -16) ? 8 : (txpwr + 32) / 2;

}

EXPORT_SYMBOL_GPL(mt76x02_tx_get_txpwr_adj);



void mt76x02_tx_set_txpwr_auto(struct mt76x02_dev *dev, s8 txpwr)

{

	s8 txpwr_adj;



	txpwr_adj = mt76x02_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);

	mt76_rmw_field(dev, MT_PROT_AUTO_TX_CFG,

		       MT_PROT_AUTO_TX_CFG_AUTO_PADJ, txpwr_adj);

}

EXPORT_SYMBOL_GPL(mt76x02_tx_set_txpwr_auto);



static void mt76x02_remove_dma_hdr(struct sk_buff *skb)

{

	int hdr_len;

drivers/net/wireless/mediatek/mt76/mt76x2/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ obj-$(CONFIG_MT76x2E) += mt76x2e.o 
obj-$(CONFIG_MT76x2U) += mt76x2u.o



mt76x2-common-y := \

	eeprom.o tx.o mac.o init.o phy.o debugfs.o mcu.o

	eeprom.o mac.o init.o phy.o debugfs.o mcu.o



mt76x2e-y := \

	pci.o pci_dma.o pci_main.o pci_init.o pci_tx.o \

CRA Git | Maintained and supported by SUSTech CRA and CCSE