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

mt76: mt7915: add MU-MIMO support 



Enable MU-MIMO DL/UL and add relative counters in debugfs.

Currently MU modules read WTBL first to notify BA changes to
other cross modules, so adjust mt7915_mcu_sta_ba() accordingly.

Tested-by: default avatarEvelyn Tsai <evelyn.tsai@mediatek.com>
Signed-off-by: default avatarRyder Lee <ryder.lee@mediatek.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent dcdecb12

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

+8 −1
Original line number Diff line number Diff line
@@ -178,7 +178,14 @@ mt7915_txbf_stat_read_phy(struct mt7915_phy *phy, struct seq_file *s) 
	seq_printf(s, "Tx Beamformee feedback triggered counts: %ld\n",

		   FIELD_GET(MT_ETBF_TX_FB_TRI, cnt));



	/* Tx SU counters */

	/* Tx SU & MU counters */

	cnt = mt76_rr(dev, MT_MIB_SDR34(ext_phy));

	seq_printf(s, "Tx multi-user Beamforming counts: %ld\n",

		   FIELD_GET(MT_MIB_MU_BF_TX_CNT, cnt));

	cnt = mt76_rr(dev, MT_MIB_DR8(ext_phy));

	seq_printf(s, "Tx multi-user MPDU counts: %d\n", cnt);

	cnt = mt76_rr(dev, MT_MIB_DR9(ext_phy));

	seq_printf(s, "Tx multi-user successful MPDU counts: %d\n", cnt);

	cnt = mt76_rr(dev, MT_MIB_DR11(ext_phy));

	seq_printf(s, "Tx single-user successful MPDU counts: %d\n", cnt);

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

+71 −6
Original line number Diff line number Diff line
@@ -1166,19 +1166,31 @@ mt7915_mcu_sta_ba(struct mt7915_dev *dev, 
	struct wtbl_req_hdr *wtbl_hdr;

	struct tlv *sta_wtbl;

	struct sk_buff *skb;

	int ret;



	skb = mt7915_mcu_alloc_sta_req(dev, mvif, msta,

				       MT7915_STA_UPDATE_MAX_SIZE);

	if (IS_ERR(skb))

		return PTR_ERR(skb);



	mt7915_mcu_sta_ba_tlv(skb, params, enable, tx);

	sta_wtbl = mt7915_mcu_add_tlv(skb, STA_REC_WTBL, sizeof(struct tlv));



	wtbl_hdr = mt7915_mcu_alloc_wtbl_req(dev, msta, WTBL_SET, sta_wtbl,

					     &skb);

	mt7915_mcu_wtbl_ba_tlv(skb, params, enable, tx, sta_wtbl, wtbl_hdr);



	ret = __mt76_mcu_skb_send_msg(&dev->mt76, skb,

				      MCU_EXT_CMD_STA_REC_UPDATE, true);

	if (ret)

		return ret;



	skb = mt7915_mcu_alloc_sta_req(dev, mvif, msta,

				       MT7915_STA_UPDATE_MAX_SIZE);

	if (IS_ERR(skb))

		return PTR_ERR(skb);



	mt7915_mcu_sta_ba_tlv(skb, params, enable, tx);



	return __mt76_mcu_skb_send_msg(&dev->mt76, skb,

				       MCU_EXT_CMD_STA_REC_UPDATE, true);

}
@@ -1466,16 +1478,39 @@ mt7915_mcu_sta_muru_tlv(struct sk_buff *skb, struct ieee80211_sta *sta) 
		HE_PHY(CAP2_UL_MU_PARTIAL_MU_MIMO, elem->phy_cap_info[2]);

}



static int

mt7915_mcu_add_mu(struct mt7915_dev *dev, struct ieee80211_vif *vif,

		  struct ieee80211_sta *sta)

{

	struct mt7915_vif *mvif = (struct mt7915_vif *)vif->drv_priv;

	struct mt7915_sta *msta = (struct mt7915_sta *)sta->drv_priv;

	struct sk_buff *skb;

	int len = sizeof(struct sta_req_hdr) + sizeof(struct sta_rec_muru);



	if (!sta->vht_cap.vht_supported && !sta->he_cap.has_he)

		return 0;



	skb = mt7915_mcu_alloc_sta_req(dev, mvif, msta, len);

	if (IS_ERR(skb))

		return PTR_ERR(skb);



	/* starec muru */

	mt7915_mcu_sta_muru_tlv(skb, sta);



	return __mt76_mcu_skb_send_msg(&dev->mt76, skb,

				       MCU_EXT_CMD_STA_REC_UPDATE, true);

}



static void

mt7915_mcu_sta_tlv(struct mt7915_dev *dev, struct sk_buff *skb,

		   struct ieee80211_sta *sta)

{

	struct tlv *tlv;



	/* starec ht */

	if (sta->ht_cap.ht_supported) {

		struct sta_rec_ht *ht;



		/* starec ht */

		tlv = mt7915_mcu_add_tlv(skb, STA_REC_HT, sizeof(*ht));

		ht = (struct sta_rec_ht *)tlv;

		ht->ht_cap = cpu_to_le16(sta->ht_cap.cap);
@@ -1495,10 +1530,6 @@ mt7915_mcu_sta_tlv(struct mt7915_dev *dev, struct sk_buff *skb, 
	/* starec he */

	if (sta->he_cap.has_he)

		mt7915_mcu_sta_he_tlv(skb, sta);



	/* starec muru */

	if (sta->he_cap.has_he || sta->vht_cap.vht_supported)

		mt7915_mcu_sta_muru_tlv(skb, sta);

}



static void
@@ -2064,6 +2095,32 @@ int mt7915_mcu_add_rate_ctrl(struct mt7915_dev *dev, struct ieee80211_vif *vif, 
				       MCU_EXT_CMD_STA_REC_UPDATE, true);

}



static int

mt7915_mcu_add_group(struct mt7915_dev *dev, struct ieee80211_vif *vif,

		     struct ieee80211_sta *sta)

{

#define MT_STA_BSS_GROUP		1

	struct mt7915_vif *mvif = (struct mt7915_vif *)vif->drv_priv;

	struct mt7915_sta *msta = (struct mt7915_sta *)sta->drv_priv;

	struct {

		__le32 action;

		u8 wlan_idx_lo;

		u8 status;

		u8 wlan_idx_hi;

		u8 rsv0[5];

		__le32 val;

		u8 rsv1[8];

	} __packed req = {

		.action = cpu_to_le32(MT_STA_BSS_GROUP),

		.wlan_idx_lo = to_wcid_lo(msta->wcid.idx),

		.wlan_idx_hi = to_wcid_hi(msta->wcid.idx),

		.val = cpu_to_le32(mvif->idx),

	};



	return __mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD_SET_DRR_CTRL,

				   &req, sizeof(req), true);

}



int mt7915_mcu_add_sta_adv(struct mt7915_dev *dev, struct ieee80211_vif *vif,

			   struct ieee80211_sta *sta, bool enable)

{
@@ -2073,10 +2130,18 @@ int mt7915_mcu_add_sta_adv(struct mt7915_dev *dev, struct ieee80211_vif *vif, 
		return 0;



	/* must keep the order */

	ret = mt7915_mcu_add_group(dev, vif, sta);

	if (ret)

		return ret;



	ret = mt7915_mcu_add_txbf(dev, vif, sta, enable);

	if (ret)

		return ret;



	ret = mt7915_mcu_add_mu(dev, vif, sta);

	if (ret)

		return ret;



	if (enable)

		return mt7915_mcu_add_rate_ctrl(dev, vif, sta);

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

+3 −3
Original line number Diff line number Diff line
@@ -201,6 +201,7 @@ enum { 
	MCU_EXT_CMD_EDCA_UPDATE = 0x27,

	MCU_EXT_CMD_DEV_INFO_UPDATE = 0x2A,

	MCU_EXT_CMD_THERMAL_CTRL = 0x2c,

	MCU_EXT_CMD_SET_DRR_CTRL = 0x36,

	MCU_EXT_CMD_SET_RDD_CTRL = 0x3a,

	MCU_EXT_CMD_PROTECT_CTRL = 0x3e,

	MCU_EXT_CMD_MAC_INIT_CTRL = 0x46,
@@ -653,7 +654,7 @@ struct sta_rec_muru { 
		bool ofdma_ul_en;

		bool mimo_dl_en;

		bool mimo_ul_en;

		bool rsv[4];

		u8 rsv[4];

	} cfg;



	struct {
@@ -664,7 +665,7 @@ struct sta_rec_muru { 
		bool lt16_sigb;

		bool rx_su_comp_sigb;

		bool rx_su_non_comp_sigb;

		bool rsv;

		u8 rsv;

	} ofdma_dl;



	struct {
@@ -951,7 +952,6 @@ enum { 
					 sizeof(struct sta_rec_ba) +	\

					 sizeof(struct sta_rec_vht) +	\

					 sizeof(struct tlv) +		\

					 sizeof(struct sta_rec_muru) +	\

					 MT7915_WTBL_UPDATE_MAX_SIZE)



#define MT7915_WTBL_UPDATE_BA_SIZE	(sizeof(struct wtbl_req_hdr) +	\

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

+5 −0
Original line number Diff line number Diff line
@@ -117,11 +117,16 @@ 
#define MT_MIB_SDR16(_band)		MT_WF_MIB(_band, 0x048)

#define MT_MIB_SDR16_BUSY_MASK		GENMASK(23, 0)



#define MT_MIB_SDR34(_band)		MT_WF_MIB(_band, 0x090)

#define MT_MIB_MU_BF_TX_CNT		GENMASK(15, 0)



#define MT_MIB_SDR36(_band)		MT_WF_MIB(_band, 0x098)

#define MT_MIB_SDR36_TXTIME_MASK	GENMASK(23, 0)

#define MT_MIB_SDR37(_band)		MT_WF_MIB(_band, 0x09c)

#define MT_MIB_SDR37_RXTIME_MASK	GENMASK(23, 0)



#define MT_MIB_DR8(_band)		MT_WF_MIB(_band, 0x0c0)

#define MT_MIB_DR9(_band)		MT_WF_MIB(_band, 0x0c4)

#define MT_MIB_DR11(_band)		MT_WF_MIB(_band, 0x0cc)



#define MT_MIB_MB_SDR0(_band, n)	MT_WF_MIB(_band, 0x100 + ((n) << 4))