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

mt76: use mt76x02_dev instead of mt76_dev in mt76x02_phy.c 



Use mt76x02_dev data structure as reference in mt76x02_phy.c
instead of mt76_dev

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

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

+4 −4
Original line number Diff line number Diff line
@@ -618,7 +618,7 @@ void mt76x0_phy_set_txpower(struct mt76x02_dev *dev) 
	dev->mt76.txpower_cur = mt76x02_get_max_rate_power(t);

	mt76x02_add_rate_power_offset(t, -info[0]);



	mt76x02_phy_set_txpower(&dev->mt76, info[0], info[1]);

	mt76x02_phy_set_txpower(dev, info[0], info[1]);

}



int mt76x0_phy_set_channel(struct mt76x02_dev *dev,
@@ -815,7 +815,7 @@ static void mt76x0_dynamic_vga_tuning(struct mt76x02_dev *dev) 
	int avg_rssi;



	init_vga = chandef->chan->band == NL80211_BAND_5GHZ ? 0x54 : 0x4E;

	avg_rssi = mt76x02_phy_get_min_avg_rssi(&dev->mt76);

	avg_rssi = mt76x02_phy_get_min_avg_rssi(dev);

	if (avg_rssi > -60)

		init_vga -= 0x20;

	else if (avg_rssi > -70)
@@ -897,6 +897,6 @@ void mt76x0_phy_init(struct mt76x02_dev *dev) 
	INIT_DELAYED_WORK(&dev->cal_work, mt76x0_phy_calibrate);



	mt76x0_rf_init(dev);

	mt76x02_phy_set_rxpath(&dev->mt76);

	mt76x02_phy_set_txdac(&dev->mt76);

	mt76x02_phy_set_rxpath(dev);

	mt76x02_phy_set_txdac(dev);

}

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

+43 −46
Original line number Diff line number Diff line
@@ -17,18 +17,17 @@ 


#include <linux/kernel.h>



#include "mt76.h"

#include "mt76x02.h"

#include "mt76x02_phy.h"

#include "mt76x02_mac.h"



void mt76x02_phy_set_rxpath(struct mt76_dev *dev)

void mt76x02_phy_set_rxpath(struct mt76x02_dev *dev)

{

	u32 val;



	val = __mt76_rr(dev, MT_BBP(AGC, 0));

	val = mt76_rr(dev, MT_BBP(AGC, 0));

	val &= ~BIT(4);



	switch (dev->chainmask & 0xf) {

	switch (dev->mt76.chainmask & 0xf) {

	case 2:

		val |= BIT(3);

		break;
@@ -37,23 +36,23 @@ void mt76x02_phy_set_rxpath(struct mt76_dev *dev) 
		break;

	}



	__mt76_wr(dev, MT_BBP(AGC, 0), val);

	mt76_wr(dev, MT_BBP(AGC, 0), val);

	mb();

	val = __mt76_rr(dev, MT_BBP(AGC, 0));

	val = mt76_rr(dev, MT_BBP(AGC, 0));

}

EXPORT_SYMBOL_GPL(mt76x02_phy_set_rxpath);



void mt76x02_phy_set_txdac(struct mt76_dev *dev)

void mt76x02_phy_set_txdac(struct mt76x02_dev *dev)

{

	int txpath;



	txpath = (dev->chainmask >> 8) & 0xf;

	txpath = (dev->mt76.chainmask >> 8) & 0xf;

	switch (txpath) {

	case 2:

		__mt76_set(dev, MT_BBP(TXBE, 5), 0x3);

		mt76_set(dev, MT_BBP(TXBE, 5), 0x3);

		break;

	default:

		__mt76_clear(dev, MT_BBP(TXBE, 5), 0x3);

		mt76_clear(dev, MT_BBP(TXBE, 5), 0x3);

		break;

	}

}
@@ -102,40 +101,38 @@ void mt76x02_add_rate_power_offset(struct mt76_rate_power *r, int offset) 
}

EXPORT_SYMBOL_GPL(mt76x02_add_rate_power_offset);



void mt76x02_phy_set_txpower(struct mt76_dev *dev, int txp_0, int txp_1)

void mt76x02_phy_set_txpower(struct mt76x02_dev *dev, int txp_0, int txp_1)

{

	struct mt76_rate_power *t = &dev->rate_power;

	struct mt76_rate_power *t = &dev->mt76.rate_power;



	__mt76_rmw_field(dev, MT_TX_ALC_CFG_0, MT_TX_ALC_CFG_0_CH_INIT_0,

			 txp_0);

	__mt76_rmw_field(dev, MT_TX_ALC_CFG_0, MT_TX_ALC_CFG_0_CH_INIT_1,

			 txp_1);

	mt76_rmw_field(dev, MT_TX_ALC_CFG_0, MT_TX_ALC_CFG_0_CH_INIT_0, txp_0);

	mt76_rmw_field(dev, MT_TX_ALC_CFG_0, MT_TX_ALC_CFG_0_CH_INIT_1, txp_1);



	__mt76_wr(dev, MT_TX_PWR_CFG_0,

	mt76_wr(dev, MT_TX_PWR_CFG_0,

		mt76x02_tx_power_mask(t->cck[0], t->cck[2], t->ofdm[0],

				      t->ofdm[2]));

	__mt76_wr(dev, MT_TX_PWR_CFG_1,

	mt76_wr(dev, MT_TX_PWR_CFG_1,

		mt76x02_tx_power_mask(t->ofdm[4], t->ofdm[6], t->ht[0],

				      t->ht[2]));

	__mt76_wr(dev, MT_TX_PWR_CFG_2,

	mt76_wr(dev, MT_TX_PWR_CFG_2,

		mt76x02_tx_power_mask(t->ht[4], t->ht[6], t->ht[8],

				      t->ht[10]));

	__mt76_wr(dev, MT_TX_PWR_CFG_3,

	mt76_wr(dev, MT_TX_PWR_CFG_3,

		mt76x02_tx_power_mask(t->ht[12], t->ht[14], t->stbc[0],

				      t->stbc[2]));

	__mt76_wr(dev, MT_TX_PWR_CFG_4,

	mt76_wr(dev, MT_TX_PWR_CFG_4,

		mt76x02_tx_power_mask(t->stbc[4], t->stbc[6], 0, 0));

	__mt76_wr(dev, MT_TX_PWR_CFG_7,

	mt76_wr(dev, MT_TX_PWR_CFG_7,

		mt76x02_tx_power_mask(t->ofdm[7], t->vht[8], t->ht[7],

				      t->vht[9]));

	__mt76_wr(dev, MT_TX_PWR_CFG_8,

	mt76_wr(dev, MT_TX_PWR_CFG_8,

		mt76x02_tx_power_mask(t->ht[14], 0, t->vht[8], t->vht[9]));

	__mt76_wr(dev, MT_TX_PWR_CFG_9,

	mt76_wr(dev, MT_TX_PWR_CFG_9,

		mt76x02_tx_power_mask(t->ht[7], 0, t->stbc[8], t->stbc[9]));

}

EXPORT_SYMBOL_GPL(mt76x02_phy_set_txpower);



int mt76x02_phy_get_min_avg_rssi(struct mt76_dev *dev)

int mt76x02_phy_get_min_avg_rssi(struct mt76x02_dev *dev)

{

	struct mt76x02_sta *sta;

	struct mt76_wcid *wcid;
@@ -145,8 +142,8 @@ int mt76x02_phy_get_min_avg_rssi(struct mt76_dev *dev) 
	local_bh_disable();

	rcu_read_lock();



	for (i = 0; i < ARRAY_SIZE(dev->wcid_mask); i++) {

		unsigned long mask = dev->wcid_mask[i];

	for (i = 0; i < ARRAY_SIZE(dev->mt76.wcid_mask); i++) {

		unsigned long mask = dev->mt76.wcid_mask[i];



		if (!mask)

			continue;
@@ -155,17 +152,17 @@ int mt76x02_phy_get_min_avg_rssi(struct mt76_dev *dev) 
			if (!(mask & 1))

				continue;



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

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

			if (!wcid)

				continue;



			sta = container_of(wcid, struct mt76x02_sta, wcid);

			spin_lock(&dev->rx_lock);

			spin_lock(&dev->mt76.rx_lock);

			if (sta->inactive_count++ < 5)

				cur_rssi = ewma_signal_read(&sta->rssi);

			else

				cur_rssi = 0;

			spin_unlock(&dev->rx_lock);

			spin_unlock(&dev->mt76.rx_lock);



			if (cur_rssi < min_rssi)

				min_rssi = cur_rssi;

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

+4 −4
Original line number Diff line number Diff line
@@ -20,11 +20,11 @@ 
#include "mt76x02_regs.h"



void mt76x02_add_rate_power_offset(struct mt76_rate_power *r, int offset);

void mt76x02_phy_set_txpower(struct mt76_dev *dev, int txp_0, int txp_2);

void mt76x02_phy_set_txpower(struct mt76x02_dev *dev, int txp_0, int txp_2);

void mt76x02_limit_rate_power(struct mt76_rate_power *r, int limit);

int mt76x02_get_max_rate_power(struct mt76_rate_power *r);

void mt76x02_phy_set_rxpath(struct mt76_dev *dev);

void mt76x02_phy_set_txdac(struct mt76_dev *dev);

int mt76x02_phy_get_min_avg_rssi(struct mt76_dev *dev);

void mt76x02_phy_set_rxpath(struct mt76x02_dev *dev);

void mt76x02_phy_set_txdac(struct mt76x02_dev *dev);

int mt76x02_phy_get_min_avg_rssi(struct mt76x02_dev *dev);



#endif /* __MT76x02_PHY_H */

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

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ mt76x2_phy_update_channel_gain(struct mt76x02_dev *dev) 
	int low_gain;

	u32 val;



	dev->cal.avg_rssi_all = mt76x02_phy_get_min_avg_rssi(&dev->mt76);

	dev->cal.avg_rssi_all = mt76x02_phy_get_min_avg_rssi(dev);



	low_gain = (dev->cal.avg_rssi_all > mt76x2_get_rssi_gain_thresh(dev)) +

		   (dev->cal.avg_rssi_all > mt76x2_get_low_rssi_gain_thresh(dev));

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

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ void mt76x2_phy_set_txpower(struct mt76x02_dev *dev) 
	dev->target_power_delta[1] = txp_1 - txp.chain[0].target_power;

	dev->mt76.rate_power = t;



	mt76x02_phy_set_txpower(&dev->mt76, txp_0, txp_1);

	mt76x02_phy_set_txpower(dev, txp_0, txp_1);

}

EXPORT_SYMBOL_GPL(mt76x2_phy_set_txpower);

CRA Git | Maintained and supported by SUSTech CRA and CCSE