Commit 48fab5bb authored by Sean Wang's avatar Sean Wang Committed by Felix Fietkau
Browse files

mt76: mt7921: introduce mt7921s support 



Introduce support for mt7921s 802.11ax (Wi-Fi 6) 2x2:2SS chipset.

Tested-by: default avatarDeren Wu <deren.wu@mediatek.com>
Co-developed-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarSean Wang <sean.wang@mediatek.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent fe0195f7

drivers/net/wireless/mediatek/mt76/mt7921/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -13,3 +13,13 @@ config MT7921E 
	  This adds support for MT7921E 802.11ax 2x2:2SS wireless devices.



	  To compile this driver as a module, choose M here.



config MT7921S

	tristate "MediaTek MT7921S (SDIO) support"

	select MT76_SDIO

	select MT7921_COMMON

	depends on MAC80211

	help

	  This adds support for MT7921S 802.11ax 2x2:2SS wireless devices.



	  To compile this driver as a module, choose M here.

drivers/net/wireless/mediatek/mt76/mt7921/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -2,9 +2,11 @@ 


obj-$(CONFIG_MT7921_COMMON) += mt7921-common.o

obj-$(CONFIG_MT7921E) += mt7921e.o

obj-$(CONFIG_MT7921S) += mt7921s.o



CFLAGS_trace.o := -I$(src)



mt7921-common-y := mac.o mcu.o main.o init.o debugfs.o trace.o

mt7921-common-$(CONFIG_NL80211_TESTMODE) += testmode.o

mt7921e-y := pci.o pci_mac.o pci_mcu.o dma.o

mt7921s-y := sdio.o sdio_mac.o sdio_mcu.o

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

+17 −1
Original line number Diff line number Diff line
@@ -413,6 +413,20 @@ static int mt7921_chip_reset(void *data, u64 val) 


DEFINE_DEBUGFS_ATTRIBUTE(fops_reset, NULL, mt7921_chip_reset, "%lld\n");



static int

mt7921s_sched_quota_read(struct seq_file *s, void *data)

{

	struct mt7921_dev *dev = dev_get_drvdata(s->private);

	struct mt76_sdio *sdio = &dev->mt76.sdio;



	seq_printf(s, "pse_data_quota\t%d\n", sdio->sched.pse_data_quota);

	seq_printf(s, "ple_data_quota\t%d\n", sdio->sched.ple_data_quota);

	seq_printf(s, "pse_mcu_quota\t%d\n", sdio->sched.pse_mcu_quota);

	seq_printf(s, "sched_deficit\t%d\n", sdio->sched.deficit);



	return 0;

}



int mt7921_init_debugfs(struct mt7921_dev *dev)

{

	struct dentry *dir;
@@ -436,6 +450,8 @@ int mt7921_init_debugfs(struct mt7921_dev *dev) 
	debugfs_create_devm_seqfile(dev->mt76.dev, "runtime_pm_stats", dir,

				    mt7921_pm_stats);

	debugfs_create_file("deep-sleep", 0600, dir, dev, &fops_ds);



	if (mt76_is_sdio(&dev->mt76))

		debugfs_create_devm_seqfile(dev->mt76.dev, "sched-quota", dir,

					    mt7921s_sched_quota_read);

	return 0;

}

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

+9 −2
Original line number Diff line number Diff line
@@ -231,8 +231,15 @@ int mt7921_register_device(struct mt7921_dev *dev) 
	dev->pm.idle_timeout = MT7921_PM_TIMEOUT;

	dev->pm.stats.last_wake_event = jiffies;

	dev->pm.stats.last_doze_event = jiffies;



	/* TODO: mt7921s run sleep mode on default  */

	if (mt76_is_mmio(&dev->mt76)) {

		dev->pm.enable = true;

		dev->pm.ds_enable = true;

	}



	if (mt76_is_sdio(&dev->mt76))

		hw->extra_tx_headroom += MT_SDIO_TXD_SIZE + MT_SDIO_HDR_SIZE;



	ret = mt7921_init_hardware(dev);

	if (ret)

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

+15 −7
Original line number Diff line number Diff line
@@ -843,6 +843,8 @@ void mt7921_mac_write_txwi(struct mt7921_dev *dev, __le32 *txwi, 
	struct ieee80211_vif *vif = info->control.vif;

	struct mt76_phy *mphy = &dev->mphy;

	u8 p_fmt, q_idx, omac_idx = 0, wmm_idx = 0;

	bool is_mmio = mt76_is_mmio(&dev->mt76);

	u32 sz_txd = is_mmio ? MT_TXD_SIZE : MT_SDIO_TXD_SIZE;

	bool is_8023 = info->flags & IEEE80211_TX_CTL_HW_80211_ENCAP;

	u16 tx_count = 15;

	u32 val;
@@ -858,15 +860,15 @@ void mt7921_mac_write_txwi(struct mt7921_dev *dev, __le32 *txwi, 
		p_fmt = MT_TX_TYPE_FW;

		q_idx = MT_LMAC_BCN0;

	} else if (skb_get_queue_mapping(skb) >= MT_TXQ_PSD) {

		p_fmt = MT_TX_TYPE_CT;

		p_fmt = is_mmio ? MT_TX_TYPE_CT : MT_TX_TYPE_SF;

		q_idx = MT_LMAC_ALTX0;

	} else {

		p_fmt = MT_TX_TYPE_CT;

		p_fmt = is_mmio ? MT_TX_TYPE_CT : MT_TX_TYPE_SF;

		q_idx = wmm_idx * MT7921_MAX_WMM_SETS +

			mt7921_lmac_mapping(dev, skb_get_queue_mapping(skb));

	}



	val = FIELD_PREP(MT_TXD0_TX_BYTES, skb->len + MT_TXD_SIZE) |

	val = FIELD_PREP(MT_TXD0_TX_BYTES, skb->len + sz_txd) |

	      FIELD_PREP(MT_TXD0_PKT_FMT, p_fmt) |

	      FIELD_PREP(MT_TXD0_Q_IDX, q_idx);

	txwi[0] = cpu_to_le32(val);
@@ -1384,12 +1386,18 @@ void mt7921_pm_wake_work(struct work_struct *work) 
	mphy = dev->phy.mt76;



	if (!mt7921_mcu_drv_pmctrl(dev)) {

		struct mt76_dev *mdev = &dev->mt76;

		int i;



		mt76_for_each_q_rx(&dev->mt76, i)

			napi_schedule(&dev->mt76.napi[i]);

		if (mt76_is_sdio(mdev)) {

			mt76_connac_pm_dequeue_skbs(mphy, &dev->pm);

			mt76_worker_schedule(&mdev->sdio.txrx_worker);

		} else {

			mt76_for_each_q_rx(mdev, i)

				napi_schedule(&mdev->napi[i]);

			mt76_connac_pm_dequeue_skbs(mphy, &dev->pm);

			mt7921_mcu_tx_cleanup(dev);

		}

		if (test_bit(MT76_STATE_RUNNING, &mphy->state))

			ieee80211_queue_delayed_work(mphy->hw, &mphy->mac_work,

						     MT7921_WATCHDOG_TIME);