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

wifi: mt76: mt792x: move more dma shared code in mt792x_dma 



Rely on irq_map support, move more dma shared code between mt7921 and
mt7925 in mt792x_dma.c
Move the following dma code in mt792x-lib
- mt792x_dma_enable
- mt792x_dma_reset
- mt792x_wpdma_reset
- mt792x_wpdma_reinit_cond

Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarDeren Wu <deren.wu@mediatek.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent c9072f11

drivers/net/wireless/mediatek/mt76/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ mt76x02-usb-y := mt76x02_usb_mcu.o mt76x02_usb_core.o 
mt76-connac-lib-y := mt76_connac_mcu.o mt76_connac_mac.o mt76_connac3_mac.o



mt792x-lib-y := mt792x_core.o mt792x_mac.o mt792x_trace.o \

		mt792x_debugfs.o

		mt792x_debugfs.o mt792x_dma.o



obj-$(CONFIG_MT76x0_COMMON) += mt76x0/

obj-$(CONFIG_MT76x2_COMMON) += mt76x2/

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

+2 −154
Original line number Diff line number Diff line
@@ -5,158 +5,6 @@ 
#include "../dma.h"

#include "../mt76_connac2_mac.h"



static int mt7921_poll_tx(struct napi_struct *napi, int budget)

{

	struct mt792x_dev *dev;



	dev = container_of(napi, struct mt792x_dev, mt76.tx_napi);



	if (!mt76_connac_pm_ref(&dev->mphy, &dev->pm)) {

		napi_complete(napi);

		queue_work(dev->mt76.wq, &dev->pm.wake_work);

		return 0;

	}



	mt76_connac_tx_cleanup(&dev->mt76);

	if (napi_complete(napi))

		mt76_connac_irq_enable(&dev->mt76,

				       dev->irq_map->tx.all_complete_mask);

	mt76_connac_pm_unref(&dev->mphy, &dev->pm);



	return 0;

}



static void mt7921_dma_prefetch(struct mt792x_dev *dev)

{

#define PREFETCH(base, depth)	((base) << 16 | (depth))



	mt76_wr(dev, MT_WFDMA0_RX_RING0_EXT_CTRL, PREFETCH(0x0, 0x4));

	mt76_wr(dev, MT_WFDMA0_RX_RING2_EXT_CTRL, PREFETCH(0x40, 0x4));

	mt76_wr(dev, MT_WFDMA0_RX_RING3_EXT_CTRL, PREFETCH(0x80, 0x4));

	mt76_wr(dev, MT_WFDMA0_RX_RING4_EXT_CTRL, PREFETCH(0xc0, 0x4));

	mt76_wr(dev, MT_WFDMA0_RX_RING5_EXT_CTRL, PREFETCH(0x100, 0x4));



	mt76_wr(dev, MT_WFDMA0_TX_RING0_EXT_CTRL, PREFETCH(0x140, 0x4));

	mt76_wr(dev, MT_WFDMA0_TX_RING1_EXT_CTRL, PREFETCH(0x180, 0x4));

	mt76_wr(dev, MT_WFDMA0_TX_RING2_EXT_CTRL, PREFETCH(0x1c0, 0x4));

	mt76_wr(dev, MT_WFDMA0_TX_RING3_EXT_CTRL, PREFETCH(0x200, 0x4));

	mt76_wr(dev, MT_WFDMA0_TX_RING4_EXT_CTRL, PREFETCH(0x240, 0x4));

	mt76_wr(dev, MT_WFDMA0_TX_RING5_EXT_CTRL, PREFETCH(0x280, 0x4));

	mt76_wr(dev, MT_WFDMA0_TX_RING6_EXT_CTRL, PREFETCH(0x2c0, 0x4));

	mt76_wr(dev, MT_WFDMA0_TX_RING16_EXT_CTRL, PREFETCH(0x340, 0x4));

	mt76_wr(dev, MT_WFDMA0_TX_RING17_EXT_CTRL, PREFETCH(0x380, 0x4));

}



static int mt7921_dma_enable(struct mt792x_dev *dev)

{

	/* configure perfetch settings */

	mt7921_dma_prefetch(dev);



	/* reset dma idx */

	mt76_wr(dev, MT_WFDMA0_RST_DTX_PTR, ~0);



	/* configure delay interrupt */

	mt76_wr(dev, MT_WFDMA0_PRI_DLY_INT_CFG0, 0);



	mt76_set(dev, MT_WFDMA0_GLO_CFG,

		 MT_WFDMA0_GLO_CFG_TX_WB_DDONE |

		 MT_WFDMA0_GLO_CFG_FIFO_LITTLE_ENDIAN |

		 MT_WFDMA0_GLO_CFG_CLK_GAT_DIS |

		 MT_WFDMA0_GLO_CFG_OMIT_TX_INFO |

		 MT_WFDMA0_GLO_CFG_CSR_DISP_BASE_PTR_CHAIN_EN |

		 MT_WFDMA0_GLO_CFG_OMIT_RX_INFO_PFET2);



	mt76_set(dev, MT_WFDMA0_GLO_CFG,

		 MT_WFDMA0_GLO_CFG_TX_DMA_EN | MT_WFDMA0_GLO_CFG_RX_DMA_EN);



	mt76_set(dev, MT_WFDMA_DUMMY_CR, MT_WFDMA_NEED_REINIT);



	/* enable interrupts for TX/RX rings */

	mt76_connac_irq_enable(&dev->mt76,

			       dev->irq_map->tx.all_complete_mask |

			       MT_INT_RX_DONE_ALL | MT_INT_MCU_CMD);

	mt76_set(dev, MT_MCU2HOST_SW_INT_ENA, MT_MCU_CMD_WAKE_RX_PCIE);



	return 0;

}



static int mt7921_dma_reset(struct mt792x_dev *dev, bool force)

{

	int i, err;



	err = mt792x_dma_disable(dev, force);

	if (err)

		return err;



	/* reset hw queues */

	for (i = 0; i < __MT_TXQ_MAX; i++)

		mt76_queue_reset(dev, dev->mphy.q_tx[i]);



	for (i = 0; i < __MT_MCUQ_MAX; i++)

		mt76_queue_reset(dev, dev->mt76.q_mcu[i]);



	mt76_for_each_q_rx(&dev->mt76, i)

		mt76_queue_reset(dev, &dev->mt76.q_rx[i]);



	mt76_tx_status_check(&dev->mt76, true);



	return mt7921_dma_enable(dev);

}



int mt7921_wpdma_reset(struct mt792x_dev *dev, bool force)

{

	int i, err;



	/* clean up hw queues */

	for (i = 0; i < ARRAY_SIZE(dev->mt76.phy.q_tx); i++)

		mt76_queue_tx_cleanup(dev, dev->mphy.q_tx[i], true);



	for (i = 0; i < ARRAY_SIZE(dev->mt76.q_mcu); i++)

		mt76_queue_tx_cleanup(dev, dev->mt76.q_mcu[i], true);



	mt76_for_each_q_rx(&dev->mt76, i)

		mt76_queue_rx_cleanup(dev, &dev->mt76.q_rx[i]);



	if (force) {

		err = mt792x_wfsys_reset(dev, MT_WFSYS_SW_RST_B);

		if (err)

			return err;

	}

	err = mt7921_dma_reset(dev, force);

	if (err)

		return err;



	mt76_for_each_q_rx(&dev->mt76, i)

		mt76_queue_rx_reset(dev, i);



	return 0;

}



int mt7921_wpdma_reinit_cond(struct mt792x_dev *dev)

{

	struct mt76_connac_pm *pm = &dev->pm;

	int err;



	/* check if the wpdma must be reinitialized */

	if (mt792x_dma_need_reinit(dev)) {

		/* disable interrutpts */

		mt76_wr(dev, dev->irq_map->host_irq_enable, 0);

		mt76_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0x0);



		err = mt7921_wpdma_reset(dev, false);

		if (err) {

			dev_err(dev->mt76.dev, "wpdma reset failed\n");

			return err;

		}



		/* enable interrutpts */

		mt76_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0xff);

		pm->stats.lp_wake++;

	}



	return 0;

}



int mt7921_dma_init(struct mt792x_dev *dev)

{

	int ret;
@@ -216,8 +64,8 @@ int mt7921_dma_init(struct mt792x_dev *dev) 
		return ret;



	netif_napi_add_tx(&dev->mt76.tx_napi_dev, &dev->mt76.tx_napi,

			  mt7921_poll_tx);

			  mt792x_poll_tx);

	napi_enable(&dev->mt76.tx_napi);



	return mt7921_dma_enable(dev);

	return mt792x_dma_enable(dev);

}

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

+0 −2
Original line number Diff line number Diff line
@@ -203,8 +203,6 @@ int __mt7921_start(struct mt792x_phy *phy); 
int mt7921_register_device(struct mt792x_dev *dev);

void mt7921_unregister_device(struct mt792x_dev *dev);

int mt7921_dma_init(struct mt792x_dev *dev);

int mt7921_wpdma_reset(struct mt792x_dev *dev, bool force);

int mt7921_wpdma_reinit_cond(struct mt792x_dev *dev);

int mt7921_run_firmware(struct mt792x_dev *dev);

int mt7921_mcu_set_bss_pm(struct mt792x_dev *dev, struct ieee80211_vif *vif,

			  bool enable);

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

+7 −81
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
#include "mt7921.h"

#include "../mt76_connac2_mac.h"

#include "mcu.h"

#include "../trace.h"



static const struct pci_device_id mt7921_pci_device_table[] = {

	{ PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7961),
@@ -28,82 +27,9 @@ static bool mt7921_disable_aspm; 
module_param_named(disable_aspm, mt7921_disable_aspm, bool, 0644);

MODULE_PARM_DESC(disable_aspm, "disable PCI ASPM support");



static void

mt7921_rx_poll_complete(struct mt76_dev *mdev, enum mt76_rxq_id q)

{

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

	const struct mt792x_irq_map *irq_map = dev->irq_map;



	if (q == MT_RXQ_MAIN)

		mt76_connac_irq_enable(mdev, irq_map->rx.data_complete_mask);

	else if (q == MT_RXQ_MCU_WA)

		mt76_connac_irq_enable(mdev, irq_map->rx.wm2_complete_mask);

	else

		mt76_connac_irq_enable(mdev, irq_map->rx.wm_complete_mask);

}



static irqreturn_t mt7921_irq_handler(int irq, void *dev_instance)

{

	struct mt792x_dev *dev = dev_instance;



	mt76_wr(dev, dev->irq_map->host_irq_enable, 0);



	if (!test_bit(MT76_STATE_INITIALIZED, &dev->mphy.state))

		return IRQ_NONE;



	tasklet_schedule(&dev->mt76.irq_tasklet);



	return IRQ_HANDLED;

}



static void mt7921_irq_tasklet(unsigned long data)

{

	struct mt792x_dev *dev = (struct mt792x_dev *)data;

	const struct mt792x_irq_map *irq_map = dev->irq_map;

	u32 intr, mask = 0;



	mt76_wr(dev, irq_map->host_irq_enable, 0);



	intr = mt76_rr(dev, MT_WFDMA0_HOST_INT_STA);

	intr &= dev->mt76.mmio.irqmask;

	mt76_wr(dev, MT_WFDMA0_HOST_INT_STA, intr);



	trace_dev_irq(&dev->mt76, intr, dev->mt76.mmio.irqmask);



	mask |= intr & MT_INT_RX_DONE_ALL;

	if (intr & irq_map->tx.mcu_complete_mask)

		mask |= irq_map->tx.mcu_complete_mask;



	if (intr & MT_INT_MCU_CMD) {

		u32 intr_sw;



		intr_sw = mt76_rr(dev, MT_MCU_CMD);

		/* ack MCU2HOST_SW_INT_STA */

		mt76_wr(dev, MT_MCU_CMD, intr_sw);

		if (intr_sw & MT_MCU_CMD_WAKE_RX_PCIE) {

			mask |= irq_map->rx.data_complete_mask;

			intr |= irq_map->rx.data_complete_mask;

		}

	}



	mt76_set_irq_mask(&dev->mt76, irq_map->host_irq_enable, mask, 0);



	if (intr & irq_map->tx.all_complete_mask)

		napi_schedule(&dev->mt76.tx_napi);



	if (intr & irq_map->rx.wm_complete_mask)

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



	if (intr & irq_map->rx.wm2_complete_mask)

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



	if (intr & irq_map->rx.data_complete_mask)

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

}



static int mt7921e_init_reset(struct mt792x_dev *dev)

{

	return mt7921_wpdma_reset(dev, true);

	return mt792x_wpdma_reset(dev, true);

}



static void mt7921e_unregister_device(struct mt792x_dev *dev)
@@ -122,7 +48,7 @@ static void mt7921e_unregister_device(struct mt792x_dev *dev) 
	mt76_connac2_tx_token_put(&dev->mt76);

	__mt7921_mcu_drv_pmctrl(dev);

	mt792x_dma_cleanup(dev);

	mt792x_wfsys_reset(dev, MT_WFSYS_SW_RST_B);

	mt792x_wfsys_reset(dev);

	skb_queue_purge(&dev->mt76.mcu.res_q);



	tasklet_disable(&dev->mt76.irq_tasklet);
@@ -245,7 +171,7 @@ static int mt7921_pci_probe(struct pci_dev *pdev, 
		.tx_complete_skb = mt76_connac_tx_complete_skb,

		.rx_check = mt7921_rx_check,

		.rx_skb = mt7921_queue_rx_skb,

		.rx_poll_complete = mt7921_rx_poll_complete,

		.rx_poll_complete = mt792x_rx_poll_complete,

		.sta_add = mt7921_mac_sta_add,

		.sta_assoc = mt7921_mac_sta_assoc,

		.sta_remove = mt7921_mac_sta_remove,
@@ -324,7 +250,7 @@ static int mt7921_pci_probe(struct pci_dev *pdev, 
	dev->hif_ops = &mt7921_pcie_ops;

	dev->irq_map = &irq_map;

	mt76_mmio_init(&dev->mt76, pcim_iomap_table(pdev)[0]);

	tasklet_init(&mdev->irq_tasklet, mt7921_irq_tasklet, (unsigned long)dev);

	tasklet_init(&mdev->irq_tasklet, mt792x_irq_tasklet, (unsigned long)dev);



	dev->phy.dev = dev;

	dev->phy.mt76 = &dev->mt76.phy;
@@ -354,7 +280,7 @@ static int mt7921_pci_probe(struct pci_dev *pdev, 
		    (mt7921_l1_rr(dev, MT_HW_REV) & 0xff);

	dev_info(mdev->dev, "ASIC revision: %04x\n", mdev->rev);



	ret = mt792x_wfsys_reset(dev, MT_WFSYS_SW_RST_B);

	ret = mt792x_wfsys_reset(dev);

	if (ret)

		goto err_free_dev;
@@ -362,7 +288,7 @@ static int mt7921_pci_probe(struct pci_dev *pdev, 


	mt76_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0xff);



	ret = devm_request_irq(mdev->dev, pdev->irq, mt7921_irq_handler,

	ret = devm_request_irq(mdev->dev, pdev->irq, mt792x_irq_handler,

			       IRQF_SHARED, KBUILD_MODNAME, dev);

	if (ret)

		goto err_free_dev;
@@ -484,7 +410,7 @@ static int mt7921_pci_resume(struct device *device) 
	if (err < 0)

		goto failed;



	mt7921_wpdma_reinit_cond(dev);

	mt792x_wpdma_reinit_cond(dev);



	/* enable interrupt */

	mt76_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0xff);

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

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ int mt7921e_mac_reset(struct mt792x_dev *dev) 
	mt76_connac2_tx_token_put(&dev->mt76);

	idr_init(&dev->mt76.token);



	mt7921_wpdma_reset(dev, true);

	mt792x_wpdma_reset(dev, true);



	local_bh_disable();

	mt76_for_each_q_rx(&dev->mt76, i) {