Commit bdac593c authored by Felix Fietkau's avatar Felix Fietkau
Browse files

mt76: mt7915: add MSI support 



Move IRQ processing to a tasklet, similar to MT7615/MT7663

Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 0c337952

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

+1 −0
Original line number Diff line number Diff line
@@ -752,6 +752,7 @@ void mt7915_unregister_device(struct mt7915_dev *dev) 
	mt7915_mcu_exit(dev);

	mt7915_tx_token_put(dev);

	mt7915_dma_cleanup(dev);

	tasklet_disable(&dev->irq_tasklet);



	mt76_free_device(&dev->mt76);

}

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

+5 −2
Original line number Diff line number Diff line
@@ -169,6 +169,7 @@ struct mt7915_dev { 
	struct mt7915_hif *hif2;



	const struct mt76_bus_ops *bus_ops;

	struct tasklet_struct irq_tasklet;

	struct mt7915_phy phy;



	u16 chainmask;
@@ -374,9 +375,11 @@ void mt7915_dual_hif_set_irq_mask(struct mt7915_dev *dev, bool write_reg, 
static inline void mt7915_irq_enable(struct mt7915_dev *dev, u32 mask)

{

	if (dev->hif2)

		mt7915_dual_hif_set_irq_mask(dev, true, 0, mask);

		mt7915_dual_hif_set_irq_mask(dev, false, 0, mask);

	else

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

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



	tasklet_schedule(&dev->irq_tasklet);

}



static inline void mt7915_irq_disable(struct mt7915_dev *dev, u32 mask)

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

+33 −6
Original line number Diff line number Diff line
@@ -94,11 +94,15 @@ mt7915_rx_poll_complete(struct mt76_dev *mdev, enum mt76_rxq_id q) 
}



/* TODO: support 2/4/6/8 MSI-X vectors */

static irqreturn_t mt7915_irq_handler(int irq, void *dev_instance)

static void mt7915_irq_tasklet(struct tasklet_struct *t)

{

	struct mt7915_dev *dev = dev_instance;

	struct mt7915_dev *dev = from_tasklet(dev, t, irq_tasklet);

	u32 intr, intr1, mask;



	mt76_wr(dev, MT_INT_MASK_CSR, 0);

	if (dev->hif2)

		mt76_wr(dev, MT_INT1_MASK_CSR, 0);



	intr = mt76_rr(dev, MT_INT_SOURCE_CSR);

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

	mt76_wr(dev, MT_INT_SOURCE_CSR, intr);
@@ -111,9 +115,6 @@ static irqreturn_t mt7915_irq_handler(int irq, void *dev_instance) 
		intr |= intr1;

	}



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

		return IRQ_NONE;



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



	mask = intr & MT_INT_RX_DONE_ALL;
@@ -150,6 +151,20 @@ static irqreturn_t mt7915_irq_handler(int irq, void *dev_instance) 
			wake_up(&dev->reset_wait);

		}

	}

}



static irqreturn_t mt7915_irq_handler(int irq, void *dev_instance)

{

	struct mt7915_dev *dev = dev_instance;



	mt76_wr(dev, MT_INT_MASK_CSR, 0);

	if (dev->hif2)

		mt76_wr(dev, MT_INT1_MASK_CSR, 0);



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

		return IRQ_NONE;



	tasklet_schedule(&dev->irq_tasklet);



	return IRQ_HANDLED;

}
@@ -250,10 +265,18 @@ static int mt7915_pci_probe(struct pci_dev *pdev, 


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



	ret = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_ALL_TYPES);

	if (ret < 0)

		goto free;



	ret = mt7915_mmio_init(mdev, pcim_iomap_table(pdev)[0], pdev->irq);

	if (ret)

		goto error;



	tasklet_setup(&dev->irq_tasklet, mt7915_irq_tasklet);



	mt76_wr(dev, MT_INT_MASK_CSR, 0);



	/* master switch of PCIe tnterrupt enable */

	mt76_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0xff);
@@ -266,10 +289,14 @@ static int mt7915_pci_probe(struct pci_dev *pdev, 


	ret = mt7915_register_device(dev);

	if (ret)

		goto error;

		goto free_irq;



	return 0;

free_irq:

	devm_free_irq(mdev->dev, pdev->irq, dev);

error:

	pci_free_irq_vectors(pdev);

free:

	mt76_free_device(&dev->mt76);



	return ret;