mt76: set interrupt mask register to 0 before requesting irq
Subsystems (2)
Felix Fietkau
maintainerPATCH 1/6 mt76: set interrupt mask register to 0 before requesting irq
Avoids spurious interrupts in case the hardware was running already
--- drivers/net/wireless/mediatek/mt76/mt7603/pci.c | 2 ++ drivers/net/wireless/mediatek/mt76/mt7603/soc.c | 2 ++ drivers/net/wireless/mediatek/mt76/mt7615/mmio.c | 2 ++ drivers/net/wireless/mediatek/mt76/mt76x0/pci.c | 2 ++ drivers/net/wireless/mediatek/mt76/mt76x2/pci.c | 2 ++ drivers/net/wireless/mediatek/mt76/mt7915/pci.c | 2 ++ 6 files changed, 12 insertions(+)
drivers/net/wireless/mediatek/mt76/mt7603/pci.c +2 -0
@@ -44,6 +44,8 @@ mt76pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) (mt76_rr (dev,MT_HW_REV ) &0xff );dev_info (mdev->dev,"ASIC revision: %04x\n" , mdev->rev); +mt76_wr (dev,MT_INT_MASK_CSR ,0 ); + ret =devm_request_irq (mdev->dev, pdev->irq, mt7603_irq_handler,IRQF_SHARED ,KBUILD_MODNAME , dev);if (ret)
drivers/net/wireless/mediatek/mt76/mt7603/soc.c +2 -0
@@ -35,6 +35,8 @@ mt76_wmac_probe(struct platform_device *pdev) (mt76_rr (dev,MT_HW_REV ) &0xff );dev_info (mdev->dev,"ASIC revision: %04x\n" , mdev->rev); +mt76_wr (dev,MT_INT_MASK_CSR ,0 ); + ret =devm_request_irq (mdev->dev, irq, mt7603_irq_handler,IRQF_SHARED ,KBUILD_MODNAME , dev);if (ret)
drivers/net/wireless/mediatek/mt76/mt7615/mmio.c +2 -0
@@ -227,6 +227,8 @@ int mt7615_mmio_probe(struct device *pdev, void __iomem *mem_base, bus_ops->rmw = mt7615_rmw; dev->mt76.bus = bus_ops; +mt76_wr (dev,MT_INT_MASK_CSR ,0 ); + ret =devm_request_irq (mdev->dev, irq, mt7615_irq_handler,IRQF_SHARED ,KBUILD_MODNAME , dev);if (ret)
drivers/net/wireless/mediatek/mt76/mt76x0/pci.c +2 -0
@@ -180,6 +180,8 @@ mt76x0e_probe(struct pci_dev *pdev, const struct pci_device_id *id) mdev->rev =mt76_rr (dev,MT_ASIC_VERSION );dev_info (mdev->dev,"ASIC revision: %08x\n" , mdev->rev); +mt76_wr (dev,MT_INT_MASK_CSR ,0 ); + ret =devm_request_irq (mdev->dev, pdev->irq, mt76x02_irq_handler,IRQF_SHARED ,KBUILD_MODNAME , dev);if (ret)
drivers/net/wireless/mediatek/mt76/mt76x2/pci.c +2 -0
@@ -63,6 +63,8 @@ mt76x2e_probe(struct pci_dev *pdev, const struct pci_device_id *id) mdev->rev =mt76_rr (dev,MT_ASIC_VERSION );dev_info (mdev->dev,"ASIC revision: %08x\n" , mdev->rev); +mt76_wr (dev,MT_INT_MASK_CSR ,0 ); + ret =devm_request_irq (mdev->dev, pdev->irq, mt76x02_irq_handler,IRQF_SHARED ,KBUILD_MODNAME , dev);if (ret)
drivers/net/wireless/mediatek/mt76/mt7915/pci.c +2 -0
@@ -124,6 +124,8 @@ static int mt7915_pci_probe(struct pci_dev *pdev, (mt7915_l1_rr (dev,MT_HW_REV ) &0xff );dev_dbg (mdev->dev,"ASIC revision: %04x\n" , mdev->rev); +mt76_wr (dev,MT_INT_MASK_CSR ,0 ); +/* master switch of PCIe tnterrupt enable */ mt7915_l1_wr (dev,MT_PCIE_MAC_INT_ENABLE ,0xff );
Signature · 1 line
2.28.0
Felix Fietkau
maintainerPATCH 2/6 mt76: mt7915: clean up and fix interrupt masking in the irq handler
Only clear unmasked interrupts. If an interrupt is temporarily masked, its pending events need to be processed later, even if another interrupt happened in the mean time.
--- .../net/wireless/mediatek/mt76/mt7915/pci.c | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/pci.c +11 -14
@@ -29,9 +29,10 @@ mt7915_rx_poll_complete(struct mt76_dev *mdev, enum mt76_rxq_id q)static irqreturn_t mt7915_irq_handler (int irq,void *dev_instance) {struct mt7915_dev *dev = dev_instance; -u32 intr; +u32 intr, mask; intr =mt76_rr (dev,MT_INT_SOURCE_CSR ); + intr &= dev->mt76.mmio.irqmask;mt76_wr (dev,MT_INT_SOURCE_CSR , intr);if (!test_bit (MT76_STATE_INITIALIZED , &dev->mphy.state))
@@ -39,27 +40,23 @@ static irqreturn_t mt7915_irq_handler(int irq, void *dev_instance)trace_dev_irq (&dev->mt76, intr, dev->mt76.mmio.irqmask); - intr &= dev->mt76.mmio.irqmask; + mask = intr &MT_INT_RX_DONE_ALL ; +if (intr &MT_INT_TX_DONE_ALL ) + mask |=MT_INT_TX_DONE_ALL ; -if (intr &MT_INT_TX_DONE_ALL ) { -mt7915_irq_disable (dev,MT_INT_TX_DONE_ALL ); +mt7915_irq_disable (dev, mask); + +if (intr &MT_INT_TX_DONE_ALL )napi_schedule (&dev->mt76.tx_napi); - } -if (intr &MT_INT_RX_DONE_DATA ) { -mt7915_irq_disable (dev,MT_INT_RX_DONE_DATA ); +if (intr &MT_INT_RX_DONE_DATA )napi_schedule (&dev->mt76.napi[0 ]); - } -if (intr &MT_INT_RX_DONE_WM ) { -mt7915_irq_disable (dev,MT_INT_RX_DONE_WM ); +if (intr &MT_INT_RX_DONE_WM )napi_schedule (&dev->mt76.napi[1 ]); - } -if (intr &MT_INT_RX_DONE_WA ) { -mt7915_irq_disable (dev,MT_INT_RX_DONE_WA ); +if (intr &MT_INT_RX_DONE_WA )napi_schedule (&dev->mt76.napi[2 ]); - }if (intr &MT_INT_MCU_CMD ) {u32 val =mt76_rr (dev,MT_MCU_CMD );
Signature · 1 line
2.28.0
Felix Fietkau
maintainerPATCH 3/6 mt76: mt7615: only clear unmasked interrupts in irq tasklet
In reply to Felix FietkauIf an interrupt is temporarily masked, its pending events need to be processed later, even if another interrupt happened in the mean time.
--- .../net/wireless/mediatek/mt76/mt7615/mmio.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7615/mmio.c +8 -11
@@ -106,25 +106,24 @@ static void mt7615_irq_tasklet(unsigned long data)mt76_wr (dev,MT_INT_MASK_CSR ,0 ); intr =mt76_rr (dev,MT_INT_SOURCE_CSR ); + intr &= dev->mt76.mmio.irqmask;mt76_wr (dev,MT_INT_SOURCE_CSR , intr);trace_dev_irq (&dev->mt76, intr, dev->mt76.mmio.irqmask); - intr &= dev->mt76.mmio.irqmask; -if (intr &MT_INT_TX_DONE_ALL ) { + mask |= intr &MT_INT_RX_DONE_ALL ; +if (intr &MT_INT_TX_DONE_ALL ) mask |=MT_INT_TX_DONE_ALL ; +mt76_set_irq_mask (&dev->mt76,MT_INT_MASK_CSR , mask,0 ); + +if (intr &MT_INT_TX_DONE_ALL )napi_schedule (&dev->mt76.tx_napi); - } -if (intr &MT_INT_RX_DONE (0 )) { - mask |=MT_INT_RX_DONE (0 ); +if (intr &MT_INT_RX_DONE (0 ))napi_schedule (&dev->mt76.napi[0 ]); - } -if (intr &MT_INT_RX_DONE (1 )) { - mask |=MT_INT_RX_DONE (1 ); +if (intr &MT_INT_RX_DONE (1 ))napi_schedule (&dev->mt76.napi[1 ]); - }if (intr &MT_INT_MCU_CMD ) {u32 val =mt76_rr (dev,MT_MCU_CMD );
@@ -135,8 +134,6 @@ static void mt7615_irq_tasklet(unsigned long data)wake_up (&dev->reset_wait); } } - -mt76_set_irq_mask (&dev->mt76,MT_INT_MASK_CSR , mask,0 ); }static u32 __mt7615_reg_addr (struct mt7615_dev *dev,u32 addr)
Signature · 1 line
2.28.0
Felix Fietkau
maintainerPATCH 4/6 mt76: mt76x02: clean up and fix interrupt masking in the irq handler
In reply to Felix FietkauOnly clear unmasked interrupts. If an interrupt is temporarily masked, its pending events need to be processed later, even if another interrupt happened in the mean time.
Disable interrupts in one call before scheduling
--- .../net/wireless/mediatek/mt76/mt76x02_mmio.c | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c +11 -14
@@ -263,9 +263,10 @@ EXPORT_SYMBOL_GPL(mt76x02_rx_poll_complete);irqreturn_t mt76x02_irq_handler (int irq,void *dev_instance) {struct mt76x02_dev *dev = dev_instance; -u32 intr; +u32 intr, mask; intr =mt76_rr (dev,MT_INT_SOURCE_CSR ); + intr &= dev->mt76.mmio.irqmask;mt76_wr (dev,MT_INT_SOURCE_CSR , intr);if (!test_bit (MT76_STATE_INITIALIZED , &dev->mphy.state))
@@ -273,17 +274,17 @@ irqreturn_t mt76x02_irq_handler(int irq, void *dev_instance)trace_dev_irq (&dev->mt76, intr, dev->mt76.mmio.irqmask); - intr &= dev->mt76.mmio.irqmask; + mask = intr & (MT_INT_RX_DONE_ALL |MT_INT_GPTIMER ); +if (intr & (MT_INT_TX_DONE_ALL |MT_INT_TX_STAT )) + mask |=MT_INT_TX_DONE_ALL ; + +mt76x02_irq_disable (dev, mask); -if (intr &MT_INT_RX_DONE (0 )) { -mt76x02_irq_disable (dev,MT_INT_RX_DONE (0 )); +if (intr &MT_INT_RX_DONE (0 ))napi_schedule (&dev->mt76.napi[0 ]); - } -if (intr &MT_INT_RX_DONE (1 )) { -mt76x02_irq_disable (dev,MT_INT_RX_DONE (1 )); +if (intr &MT_INT_RX_DONE (1 ))napi_schedule (&dev->mt76.napi[1 ]); - }if (intr &MT_INT_PRE_TBTT )tasklet_schedule (&dev->mt76.pre_tbtt_tasklet);
@@ -299,15 +300,11 @@ irqreturn_t mt76x02_irq_handler(int irq, void *dev_instance)if (intr &MT_INT_TX_STAT )mt76x02_mac_poll_tx_status (dev, true); -if (intr & (MT_INT_TX_STAT |MT_INT_TX_DONE_ALL )) { -mt76x02_irq_disable (dev,MT_INT_TX_DONE_ALL ); +if (intr & (MT_INT_TX_STAT |MT_INT_TX_DONE_ALL ))napi_schedule (&dev->mt76.tx_napi); - } -if (intr &MT_INT_GPTIMER ) { -mt76x02_irq_disable (dev,MT_INT_GPTIMER ); +if (intr &MT_INT_GPTIMER )tasklet_schedule (&dev->dfs_pd.dfs_tasklet); - }return IRQ_HANDLED ; }
Signature · 1 line
2.28.0
Felix Fietkau
maintainerPATCH 5/6 mt76: mt7615: do not do any work in napi poll after calling napi_complete_done()
In reply to Felix FietkauFixes a race condition where multiple tx cleanup tasks could run in parallel
--- drivers/net/wireless/mediatek/mt76/mt7615/dma.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7615/dma.c +3 -5
@@ -117,14 +117,12 @@ static int mt7615_poll_tx(struct napi_struct *napi, int budget)mt7615_tx_cleanup (dev); -if (napi_complete_done (napi,0 )) -mt7615_irq_enable (dev,MT_INT_TX_DONE_ALL ); - -mt7615_tx_cleanup (dev); -mt7615_pm_power_save_sched (dev);tasklet_schedule (&dev->mt76.tx_tasklet); +if (napi_complete_done (napi,0 )) +mt7615_irq_enable (dev,MT_INT_TX_DONE_ALL ); +return 0 ; }
Signature · 1 line
2.28.0
Felix Fietkau
maintainerPATCH 6/6 mt76: mt7915: do not do any work in napi poll after calling napi_complete_done()
In reply to Felix FietkauFixes a race condition where multiple tx cleanup or sta poll tasks could run in parallel.
--- drivers/net/wireless/mediatek/mt76/mt7915/dma.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/dma.c +3 -6
@@ -95,16 +95,13 @@ static int mt7915_poll_tx(struct napi_struct *napi, int budget) dev = container_of(napi, struct mt7915_dev, mt76.tx_napi);mt7915_tx_cleanup (dev); - -if (napi_complete_done (napi,0 )) -mt7915_irq_enable (dev,MT_INT_TX_DONE_ALL ); - -mt7915_tx_cleanup (dev); -mt7915_mac_sta_poll (dev);tasklet_schedule (&dev->mt76.tx_tasklet); +if (napi_complete_done (napi,0 )) +mt7915_irq_enable (dev,MT_INT_TX_DONE_ALL ); +return 0 ; }
Signature · 1 line
2.28.0