diff options
| author | Luka Perkov <luka.perkov@sartura.hr> | 2016-06-23 13:57:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-23 13:57:21 +0200 |
| commit | 282b917e47d9ae5017e1e426face9b75cb7aabd0 (patch) | |
| tree | 3284ca2d20d9c8d7a4563c6446675c1ecf3feac2 /target/linux/mediatek/patches-4.4/0095-net-next-mediatek-add-IRQ-locking.patch | |
| parent | 34d432b05312de6d9575c559db8209809489096d (diff) | |
| parent | 441a9c879ba6562ea9f431cf33bbb0c0400d5fd0 (diff) | |
| download | master-187ad058-282b917e47d9ae5017e1e426face9b75cb7aabd0.tar.gz master-187ad058-282b917e47d9ae5017e1e426face9b75cb7aabd0.tar.bz2 master-187ad058-282b917e47d9ae5017e1e426face9b75cb7aabd0.zip | |
Merge pull request #11 from wigyori/master
pull req for 4.4.12, ar71xx/mediatek updates, package upgrades
Diffstat (limited to 'target/linux/mediatek/patches-4.4/0095-net-next-mediatek-add-IRQ-locking.patch')
| -rw-r--r-- | target/linux/mediatek/patches-4.4/0095-net-next-mediatek-add-IRQ-locking.patch | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/target/linux/mediatek/patches-4.4/0095-net-next-mediatek-add-IRQ-locking.patch b/target/linux/mediatek/patches-4.4/0095-net-next-mediatek-add-IRQ-locking.patch new file mode 100644 index 0000000000..bf27aac15c --- /dev/null +++ b/target/linux/mediatek/patches-4.4/0095-net-next-mediatek-add-IRQ-locking.patch @@ -0,0 +1,64 @@ +From dd08d1ac4cfc86fbea5ee207b9615922ede88ec6 Mon Sep 17 00:00:00 2001 +From: John Crispin <john@phrozen.org> +Date: Tue, 17 May 2016 06:01:45 +0200 +Subject: [PATCH 095/102] net-next: mediatek: add IRQ locking + +The code that enables and disables IRQs is missing proper locking. After +adding the IRQ separation patch and routing the putting the RX and TX IRQs +on different cores we experienced IRQ stalls. Fix this by adding proper +locking. We use a dedicated lock to reduce the latency if the IRQ code. +Otherwise it might wait for bottom code to finish before reenabling or +disabling IRQs. + +Signed-off-by: Sean Wang <keyhaede@gmail.com> +Signed-off-by: John Crispin <john@phrozen.org> +--- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 7 +++++++ + drivers/net/ethernet/mediatek/mtk_eth_soc.h | 1 + + 2 files changed, 8 insertions(+) + +--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c ++++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c +@@ -331,18 +331,24 @@ static void mtk_mdio_cleanup(struct mtk_ + + static inline void mtk_irq_disable(struct mtk_eth *eth, u32 mask) + { ++ unsigned long flags; + u32 val; + ++ spin_lock_irqsave(ð->irq_lock, flags); + val = mtk_r32(eth, MTK_QDMA_INT_MASK); + mtk_w32(eth, val & ~mask, MTK_QDMA_INT_MASK); ++ spin_unlock_irqrestore(ð->irq_lock, flags); + } + + static inline void mtk_irq_enable(struct mtk_eth *eth, u32 mask) + { ++ unsigned long flags; + u32 val; + ++ spin_lock_irqsave(ð->irq_lock, flags); + val = mtk_r32(eth, MTK_QDMA_INT_MASK); + mtk_w32(eth, val | mask, MTK_QDMA_INT_MASK); ++ spin_unlock_irqrestore(ð->irq_lock, flags); + } + + static int mtk_set_mac_address(struct net_device *dev, void *p) +@@ -1771,6 +1777,7 @@ static int mtk_probe(struct platform_dev + return -EADDRNOTAVAIL; + + spin_lock_init(ð->page_lock); ++ spin_lock_init(ð->irq_lock); + + eth->ethsys = syscon_regmap_lookup_by_phandle(pdev->dev.of_node, + "mediatek,ethsys"); +--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h ++++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h +@@ -373,6 +373,7 @@ struct mtk_eth { + void __iomem *base; + struct reset_control *rstc; + spinlock_t page_lock; ++ spinlock_t irq_lock; + struct net_device dummy_dev; + struct net_device *netdev[MTK_MAX_DEVS]; + struct mtk_mac *mac[MTK_MAX_DEVS]; |