Commit 65430028 authored by Ryder Lee's avatar Ryder Lee Committed by Felix Fietkau
Browse files

mt76: mt7915: use mt7915_mcu_get_mib_info() to get survey data 



Firmware functions (SCS, MU ...) also require read-clear phy counters,
hence firmware prepares a global task to read shared fields out to a
shared pool to avoid concurrency. Switch to event format accordingly.

Signed-off-by: default avatarRyder Lee <ryder.lee@mediatek.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 5ff4c4aa

drivers/net/wireless/mediatek/mt76/mt7915/init.c

+0 −1
Original line number Diff line number Diff line
@@ -287,7 +287,6 @@ mt7915_mac_init_band(struct mt7915_dev *dev, u8 band) 
	      FIELD_PREP(MT_MDP_RCFR1_RX_DROPPED_MCAST, MT_MDP_TO_HIF);

	mt76_rmw(dev, MT_MDP_BNRCFR1(band), mask, set);



	mt76_set(dev, MT_WF_RMAC_MIB_TIME0(band), MT_WF_RMAC_MIB_RXTIME_EN);

	mt76_set(dev, MT_WF_RMAC_MIB_AIRTIME0(band), MT_WF_RMAC_MIB_RXTIME_EN);



	mt76_rmw_field(dev, MT_DMA_DCR0(band), MT_DMA_DCR0_MAX_RX_LEN, 1536);

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

+6 −32
Original line number Diff line number Diff line
@@ -1374,14 +1374,10 @@ void mt7915_mac_reset_counters(struct mt7915_phy *phy) 
	memset(&dev->mt76.aggr_stats[i], 0, sizeof(dev->mt76.aggr_stats) / 2);



	/* reset airtime counters */

	mt76_rr(dev, MT_MIB_SDR9(ext_phy));

	mt76_rr(dev, MT_MIB_SDR36(ext_phy));

	mt76_rr(dev, MT_MIB_SDR37(ext_phy));



	mt76_set(dev, MT_WF_RMAC_MIB_TIME0(ext_phy),

		 MT_WF_RMAC_MIB_RXTIME_CLR);

	mt76_set(dev, MT_WF_RMAC_MIB_AIRTIME0(ext_phy),

		 MT_WF_RMAC_MIB_RXTIME_CLR);



	mt7915_mcu_get_chan_mib_info(phy, true);

}



void mt7915_mac_set_timing(struct mt7915_phy *phy)
@@ -1478,20 +1474,11 @@ mt7915_phy_get_nf(struct mt7915_phy *phy, int idx) 
static void

mt7915_phy_update_channel(struct mt76_phy *mphy, int idx)

{

	struct mt7915_dev *dev = container_of(mphy->dev, struct mt7915_dev, mt76);

	struct mt7915_phy *phy = (struct mt7915_phy *)mphy->priv;

	struct mt76_channel_state *state;

	u64 busy_time, tx_time, rx_time, obss_time;

	struct mt76_channel_state *state = mphy->chan_state;

	int nf;



	busy_time = mt76_get_field(dev, MT_MIB_SDR9(idx),

				   MT_MIB_SDR9_BUSY_MASK);

	tx_time = mt76_get_field(dev, MT_MIB_SDR36(idx),

				 MT_MIB_SDR36_TXTIME_MASK);

	rx_time = mt76_get_field(dev, MT_MIB_SDR37(idx),

				 MT_MIB_SDR37_RXTIME_MASK);

	obss_time = mt76_get_field(dev, MT_WF_RMAC_MIB_AIRTIME14(idx),

				   MT_MIB_OBSSTIME_MASK);

	mt7915_mcu_get_chan_mib_info(phy, false);



	nf = mt7915_phy_get_nf(phy, idx);

	if (!phy->noise)
@@ -1499,27 +1486,14 @@ mt7915_phy_update_channel(struct mt76_phy *mphy, int idx) 
	else if (nf)

		phy->noise += nf - (phy->noise >> 4);



	state = mphy->chan_state;

	state->cc_busy += busy_time;

	state->cc_tx += tx_time;

	state->cc_rx += rx_time + obss_time;

	state->cc_bss_rx += rx_time;

	state->noise = -(phy->noise >> 4);

}



void mt7915_update_channel(struct mt76_dev *mdev)

{

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



	mt7915_phy_update_channel(&mdev->phy, 0);

	if (mdev->phy2)

		mt7915_phy_update_channel(mdev->phy2, 1);



	/* reset obss airtime */

	mt76_set(dev, MT_WF_RMAC_MIB_TIME0(0), MT_WF_RMAC_MIB_RXTIME_CLR);

	if (mdev->phy2)

		mt76_set(dev, MT_WF_RMAC_MIB_TIME0(1),

			 MT_WF_RMAC_MIB_RXTIME_CLR);

}



static bool
@@ -1723,7 +1697,7 @@ void mt7915_mac_reset_work(struct work_struct *work) 
}



static void

mt7915_mac_update_mib_stats(struct mt7915_phy *phy)

mt7915_mac_update_stats(struct mt7915_phy *phy)

{

	struct mt7915_dev *dev = phy->dev;

	struct mib_stats *mib = &phy->mib;
@@ -1834,7 +1808,7 @@ void mt7915_mac_work(struct work_struct *work) 
	if (++mphy->mac_work_count == 5) {

		mphy->mac_work_count = 0;



		mt7915_mac_update_mib_stats(phy);

		mt7915_mac_update_stats(phy);

	}



	if (++phy->sta_work_count == 10) {

drivers/net/wireless/mediatek/mt76/mt7915/mcu.c

+46 −0
Original line number Diff line number Diff line
@@ -3580,6 +3580,52 @@ int mt7915_mcu_apply_tx_dpd(struct mt7915_phy *phy) 
	return 0;

}



int mt7915_mcu_get_chan_mib_info(struct mt7915_phy *phy, bool chan_switch)

{

	/* strict order */

	static const enum mt7915_chan_mib_offs offs[] = {

		MIB_BUSY_TIME, MIB_TX_TIME, MIB_RX_TIME, MIB_OBSS_AIRTIME

	};

	struct mt76_channel_state *state = phy->mt76->chan_state;

	struct mt76_channel_state *state_ts = &phy->state_ts;

	struct mt7915_dev *dev = phy->dev;

	struct mt7915_mcu_mib *res, req[4];

	struct sk_buff *skb;

	int i, ret;



	for (i = 0; i < 4; i++) {

		req[i].band = cpu_to_le32(phy != &dev->phy);

		req[i].offs = cpu_to_le32(offs[i]);

	}



	ret = mt76_mcu_send_and_get_msg(&dev->mt76, MCU_EXT_CMD(GET_MIB_INFO),

					req, sizeof(req), true, &skb);

	if (ret)

		return ret;



	res = (struct mt7915_mcu_mib *)(skb->data + 20);



	if (chan_switch)

		goto out;



#define __res_u64(s) le64_to_cpu(res[s].data)

	state->cc_busy += __res_u64(0) - state_ts->cc_busy;

	state->cc_tx += __res_u64(1) - state_ts->cc_tx;

	state->cc_bss_rx += __res_u64(2) - state_ts->cc_bss_rx;

	state->cc_rx += __res_u64(2) + __res_u64(3) - state_ts->cc_rx;



out:

	state_ts->cc_busy = __res_u64(0);

	state_ts->cc_tx = __res_u64(1);

	state_ts->cc_bss_rx = __res_u64(2);

	state_ts->cc_rx = __res_u64(2) + __res_u64(3);

#undef __res_u64



	dev_kfree_skb(skb);



	return 0;

}



int mt7915_mcu_get_temperature(struct mt7915_phy *phy)

{

	struct mt7915_dev *dev = phy->dev;

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

+14 −0
Original line number Diff line number Diff line
@@ -216,6 +216,19 @@ struct mt7915_mcu_phy_rx_info { 
#define MT_RA_RATE_DCM_EN		BIT(4)

#define MT_RA_RATE_BW			GENMASK(14, 13)



struct mt7915_mcu_mib {

	__le32 band;

	__le32 offs;

	__le64 data;

} __packed;



enum mt7915_chan_mib_offs {

	MIB_BUSY_TIME = 14,

	MIB_TX_TIME = 81,

	MIB_RX_TIME,

	MIB_OBSS_AIRTIME = 86

};



struct edca {

	u8 queue;

	u8 set;
@@ -301,6 +314,7 @@ enum { 
	MCU_EXT_CMD_MUAR_UPDATE = 0x48,

	MCU_EXT_CMD_SET_RX_PATH = 0x4e,

	MCU_EXT_CMD_TX_POWER_FEATURE_CTRL = 0x58,

	MCU_EXT_CMD_GET_MIB_INFO = 0x5a,

	MCU_EXT_CMD_MWDS_SUPPORT = 0x80,

	MCU_EXT_CMD_SET_SER_TRIGGER = 0x81,

	MCU_EXT_CMD_SCS_CTRL = 0x82,

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

+2 −0
Original line number Diff line number Diff line
@@ -149,6 +149,7 @@ struct mt7915_phy { 
	u32 ampdu_ref;



	struct mib_stats mib;

	struct mt76_channel_state state_ts;

	struct list_head stats_list;



	u8 sta_work_count;
@@ -364,6 +365,7 @@ int mt7915_mcu_set_radar_th(struct mt7915_dev *dev, int index, 
			    const struct mt7915_dfs_pattern *pattern);

int mt7915_mcu_apply_group_cal(struct mt7915_dev *dev);

int mt7915_mcu_apply_tx_dpd(struct mt7915_phy *phy);

int mt7915_mcu_get_chan_mib_info(struct mt7915_phy *phy, bool chan_switch);

int mt7915_mcu_get_temperature(struct mt7915_phy *phy);

int mt7915_mcu_set_thermal_throttling(struct mt7915_phy *phy, u8 state);

int mt7915_mcu_get_tx_rate(struct mt7915_dev *dev, u32 cmd, u16 wlan_idx);