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

mt76: convert MT_TX_HW_QUEUE_EXT_PHY to MT_TX_HW_QUEUE_PHY 



Report phy_indx in tx_info->hw_queue. This is a preliminary patch to add
newer chipset support

Co-developed-by: default avatarBo Jiao <bo.jiao@mediatek.com>
Signed-off-by: default avatarBo Jiao <bo.jiao@mediatek.com>
Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent a1a99d7b

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

+4 −6
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ enum mt76_wcid_flags { 
#define MT76_N_WCIDS 544



/* stored in ieee80211_tx_info::hw_queue */

#define MT_TX_HW_QUEUE_EXT_PHY		BIT(3)

#define MT_TX_HW_QUEUE_PHY		GENMASK(3, 2)



DECLARE_EWMA(signal, 10, 8);
@@ -1255,12 +1255,10 @@ static inline struct ieee80211_hw * 
mt76_tx_status_get_hw(struct mt76_dev *dev, struct sk_buff *skb)

{

	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);

	struct ieee80211_hw *hw = dev->phy.hw;

	u8 phy_idx = (info->hw_queue & MT_TX_HW_QUEUE_PHY) >> 2;

	struct ieee80211_hw *hw = mt76_phy_hw(dev, phy_idx);



	if ((info->hw_queue & MT_TX_HW_QUEUE_EXT_PHY) && dev->phys[MT_BAND1])

		hw = dev->phys[MT_BAND1]->hw;



	info->hw_queue &= ~MT_TX_HW_QUEUE_EXT_PHY;

	info->hw_queue &= ~MT_TX_HW_QUEUE_PHY;



	return hw;

}

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

+4 −4
Original line number Diff line number Diff line
@@ -727,7 +727,7 @@ int mt7615_mac_write_txwi(struct mt7615_dev *dev, __le32 *txwi, 
	u8 fc_type, fc_stype, p_fmt, q_idx, omac_idx = 0, wmm_idx = 0;

	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);

	struct ieee80211_tx_rate *rate = &info->control.rates[0];

	bool ext_phy = info->hw_queue & MT_TX_HW_QUEUE_EXT_PHY;

	u8 phy_idx = (info->hw_queue & MT_TX_HW_QUEUE_PHY) >> 2;

	bool multicast = is_multicast_ether_addr(hdr->addr1);

	struct ieee80211_vif *vif = info->control.vif;

	bool is_mmio = mt76_is_mmio(&dev->mt76);
@@ -750,7 +750,7 @@ int mt7615_mac_write_txwi(struct mt7615_dev *dev, __le32 *txwi, 
		tx_count = msta->rate_count;

	}



	if (ext_phy && dev->mt76.phys[MT_BAND1])

	if (phy_idx && dev->mt76.phys[MT_BAND1])

		mphy = dev->mt76.phys[MT_BAND1];



	fc_type = (le16_to_cpu(fc) & IEEE80211_FCTL_FTYPE) >> 2;
@@ -758,10 +758,10 @@ int mt7615_mac_write_txwi(struct mt7615_dev *dev, __le32 *txwi, 


	if (beacon) {

		p_fmt = MT_TX_TYPE_FW;

		q_idx = ext_phy ? MT_LMAC_BCN1 : MT_LMAC_BCN0;

		q_idx = phy_idx ? MT_LMAC_BCN1 : MT_LMAC_BCN0;

	} else if (qid >= MT_TXQ_PSD) {

		p_fmt = is_mmio ? MT_TX_TYPE_CT : MT_TX_TYPE_SF;

		q_idx = ext_phy ? MT_LMAC_ALTX1 : MT_LMAC_ALTX0;

		q_idx = phy_idx ? MT_LMAC_ALTX1 : MT_LMAC_ALTX0;

	} else {

		p_fmt = is_mmio ? MT_TX_TYPE_CT : MT_TX_TYPE_SF;

		q_idx = wmm_idx * MT7615_MAX_WMM_SETS +

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

+2 −4
Original line number Diff line number Diff line
@@ -708,10 +708,8 @@ mt7615_mcu_add_beacon_offload(struct mt7615_dev *dev, 
		return -EINVAL;

	}



	if (mvif->mt76.band_idx) {

	info = IEEE80211_SKB_CB(skb);

		info->hw_queue |= MT_TX_HW_QUEUE_EXT_PHY;

	}

	info->hw_queue |= FIELD_PREP(MT_TX_HW_QUEUE_PHY, mvif->mt76.band_idx);



	mt7615_mac_write_txwi(dev, (__le32 *)(req.pkt), skb, wcid, NULL,

			      0, NULL, 0, true);

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

+2 −1
Original line number Diff line number Diff line
@@ -77,8 +77,9 @@ int mt7615_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr, 


	if ((info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE) && msta) {

		struct mt7615_phy *phy = &dev->phy;

		u8 phy_idx = (info->hw_queue & MT_TX_HW_QUEUE_PHY) >> 2;



		if ((info->hw_queue & MT_TX_HW_QUEUE_EXT_PHY) && mdev->phys[MT_BAND1])

		if (phy_idx && mdev->phys[MT_BAND1])

			phy = mdev->phys[MT_BAND1]->priv;



		spin_lock_bh(&dev->mt76.lock);

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

+3 −3
Original line number Diff line number Diff line
@@ -455,7 +455,7 @@ void mt76_connac2_mac_write_txwi(struct mt76_dev *dev, __le32 *txwi, 
				 enum mt76_txq_id qid, u32 changed)

{

	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);

	bool ext_phy = info->hw_queue & MT_TX_HW_QUEUE_EXT_PHY;

	u8 phy_idx = (info->hw_queue & MT_TX_HW_QUEUE_PHY) >> 2;

	struct ieee80211_vif *vif = info->control.vif;

	struct mt76_phy *mphy = &dev->phy;

	u8 p_fmt, q_idx, omac_idx = 0, wmm_idx = 0, band_idx = 0;
@@ -474,7 +474,7 @@ void mt76_connac2_mac_write_txwi(struct mt76_dev *dev, __le32 *txwi, 
		band_idx = mvif->band_idx;

	}



	if (ext_phy && dev->phys[MT_BAND1])

	if (phy_idx && dev->phys[MT_BAND1])

		mphy = dev->phys[MT_BAND1];



	if (inband_disc) {
@@ -502,7 +502,7 @@ void mt76_connac2_mac_write_txwi(struct mt76_dev *dev, __le32 *txwi, 
	      FIELD_PREP(MT_TXD1_OWN_MAC, omac_idx);

	if (!is_mt7921(dev))

		val |= MT_TXD1_VTA;

	if (ext_phy || band_idx)

	if (phy_idx || band_idx)

		val |= MT_TXD1_TGID;



	txwi[1] = cpu_to_le32(val);