Commit aec65e48 authored by Felix Fietkau's avatar Felix Fietkau
Browse files

mt76: unify channel survey update code 



Host time is used to calculate the channel active time on mt7603 and mt7615.
Use the same on mt76x02 and move the lock to core code to get rid of some
duplicated code.

Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent dcff8d4d

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

+14 −2
Original line number Diff line number Diff line
@@ -416,13 +416,25 @@ mt76_channel_state(struct mt76_dev *dev, struct ieee80211_channel *c) 


void mt76_update_survey(struct mt76_dev *dev)

{

	struct mt76_channel_state *state;

	struct mt76_channel_state *state = dev->chan_state;

	ktime_t cur_time;



	if (!test_bit(MT76_STATE_RUNNING, &dev->state))

		return;



	spin_lock_bh(&dev->cc_lock);



	if (dev->drv->update_survey)

		dev->drv->update_survey(dev);



	cur_time = ktime_get_boottime();

	state->cc_active += ktime_to_us(ktime_sub(cur_time,

						  dev->survey_time));

	dev->survey_time = cur_time;



	spin_unlock_bh(&dev->cc_lock);



	if (dev->drv->drv_flags & MT_DRV_SW_RX_AIRTIME) {

		state = mt76_channel_state(dev, dev->chandef.chan);

		spin_lock_bh(&dev->rx_lock);

		spin_lock(&dev->cc_lock);

		state->cc_bss_rx += dev->cur_cc_bss_rx;

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

+1 −14
Original line number Diff line number Diff line
@@ -1571,22 +1571,9 @@ void mt7603_update_channel(struct mt76_dev *mdev) 
{

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

	struct mt76_channel_state *state;

	ktime_t cur_time;

	u32 busy;



	if (!test_bit(MT76_STATE_RUNNING, &dev->mt76.state))

		return;



	state = mdev->chan_state;

	busy = mt76_rr(dev, MT_MIB_STAT_CCA);



	spin_lock_bh(&dev->mt76.cc_lock);

	cur_time = ktime_get_boottime();

	state->cc_busy += busy;

	state->cc_active += ktime_to_us(ktime_sub(cur_time,

						  dev->mt76.survey_time));

	dev->mt76.survey_time = cur_time;

	spin_unlock_bh(&dev->mt76.cc_lock);

	state->cc_busy += mt76_rr(dev, MT_MIB_STAT_CCA);

}



void

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

+3 −15
Original line number Diff line number Diff line
@@ -1263,23 +1263,11 @@ void mt7615_update_channel(struct mt76_dev *mdev) 
{

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

	struct mt76_channel_state *state;

	ktime_t cur_time;

	u32 busy;



	if (!test_bit(MT76_STATE_RUNNING, &mdev->state))

		return;



	state = mdev->chan_state;

	/* TODO: add DBDC support */

	busy = mt76_get_field(dev, MT_MIB_SDR16(0), MT_MIB_BUSY_MASK);



	spin_lock_bh(&mdev->cc_lock);

	cur_time = ktime_get_boottime();

	state->cc_busy += busy;

	state->cc_active += ktime_to_us(ktime_sub(cur_time,

						  mdev->survey_time));

	mdev->survey_time = cur_time;

	spin_unlock_bh(&mdev->cc_lock);

	state = mdev->chan_state;

	state->cc_busy += mt76_get_field(dev, MT_MIB_SDR16(0),

					 MT_MIB_BUSY_MASK);

}



void mt7615_mac_work(struct work_struct *work)

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

+1 −4
Original line number Diff line number Diff line
@@ -19,10 +19,7 @@ mt76x0_set_channel(struct mt76x02_dev *dev, struct cfg80211_chan_def *chandef) 
	mt76_set_channel(&dev->mt76);

	mt76x0_phy_set_channel(dev, chandef);



	/* channel cycle counters read-and-clear */

	mt76_rr(dev, MT_CH_IDLE);

	mt76_rr(dev, MT_CH_BUSY);



	mt76x02_mac_cc_reset(dev);

	mt76x02_edcca_init(dev);



	if (mt76_is_mmio(dev)) {

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

+11 −9
Original line number Diff line number Diff line
@@ -984,17 +984,9 @@ void mt76x02_update_channel(struct mt76_dev *mdev) 
{

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

	struct mt76_channel_state *state;

	u32 active, busy;



	state = mdev->chan_state;



	busy = mt76_rr(dev, MT_CH_BUSY);

	active = busy + mt76_rr(dev, MT_CH_IDLE);



	spin_lock_bh(&dev->mt76.cc_lock);

	state->cc_busy += busy;

	state->cc_active += active;

	spin_unlock_bh(&dev->mt76.cc_lock);

	state->cc_busy += mt76_rr(dev, MT_CH_BUSY);

}

EXPORT_SYMBOL_GPL(mt76x02_update_channel);
@@ -1152,6 +1144,16 @@ void mt76x02_mac_work(struct work_struct *work) 
				     MT_MAC_WORK_INTERVAL);

}



void mt76x02_mac_cc_reset(struct mt76x02_dev *dev)

{

	dev->mt76.survey_time = ktime_get_boottime();



	/* channel cycle counters read-and-clear */

	mt76_rr(dev, MT_CH_BUSY);

	mt76_rr(dev, MT_CH_IDLE);

}

EXPORT_SYMBOL_GPL(mt76x02_mac_cc_reset);



void mt76x02_mac_set_bssid(struct mt76x02_dev *dev, u8 idx, const u8 *addr)

{

	idx &= 7;

CRA Git | Maintained and supported by SUSTech CRA and CCSE