Home Explore Help
Register Sign In
wareck
/
openwrt_lede
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: 488fc98adf
Branches Tags
openwrt_lede
/
target
/
linux
/
mediatek
/
patches-4.4
/
0095-net-next-mediatek-add-IRQ-locking.patch

0095-net-next-mediatek-add-IRQ-locking.patch 2.2 KB
History Raw

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364 
  1. From dd08d1ac4cfc86fbea5ee207b9615922ede88ec6 Mon Sep 17 00:00:00 2001
    2. 

  2. From: John Crispin <john@phrozen.org>
    3. 

  3. Date: Tue, 17 May 2016 06:01:45 +0200
    4. 

  4. Subject: [PATCH 095/102] net-next: mediatek: add IRQ locking
    5. 

  5. 

  6. The code that enables and disables IRQs is missing proper locking. After
    7. 

  7. adding the IRQ separation patch and routing the putting the RX and TX IRQs
    8. 

  8. on different cores we experienced IRQ stalls. Fix this by adding proper
    9. 

  9. locking. We use a dedicated lock to reduce the latency if the IRQ code.
    10. 

  10. Otherwise it might wait for bottom code to finish before reenabling or
    11. 

  11. disabling IRQs.
    12. 

  12. 

  13. Signed-off-by: Sean Wang <keyhaede@gmail.com>
    14. 

  14. Signed-off-by: John Crispin <john@phrozen.org>
    15. 

  15. ---
    16. 

  16.  drivers/net/ethernet/mediatek/mtk_eth_soc.c |    7 +++++++
    17. 

  17.  drivers/net/ethernet/mediatek/mtk_eth_soc.h |    1 +
    18. 

  18.  2 files changed, 8 insertions(+)
    19. 

  19. 

  20. --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
    21. 

  21. +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
    22. 

  22. @@ -331,18 +331,24 @@ static void mtk_mdio_cleanup(struct mtk_
    23. 

  23.  
    24. 

  24.  static inline void mtk_irq_disable(struct mtk_eth *eth, u32 mask)
    25. 

  25.  {
    26. 

  26. +	unsigned long flags;
    27. 

  27.  	u32 val;
    28. 

  28.  
    29. 

  29. +	spin_lock_irqsave(&eth->irq_lock, flags);
    30. 

  30.  	val = mtk_r32(eth, MTK_QDMA_INT_MASK);
    31. 

  31.  	mtk_w32(eth, val & ~mask, MTK_QDMA_INT_MASK);
    32. 

  32. +	spin_unlock_irqrestore(&eth->irq_lock, flags);
    33. 

  33.  }
    34. 

  34.  
    35. 

  35.  static inline void mtk_irq_enable(struct mtk_eth *eth, u32 mask)
    36. 

  36.  {
    37. 

  37. +	unsigned long flags;
    38. 

  38.  	u32 val;
    39. 

  39.  
    40. 

  40. +	spin_lock_irqsave(&eth->irq_lock, flags);
    41. 

  41.  	val = mtk_r32(eth, MTK_QDMA_INT_MASK);
    42. 

  42.  	mtk_w32(eth, val | mask, MTK_QDMA_INT_MASK);
    43. 

  43. +	spin_unlock_irqrestore(&eth->irq_lock, flags);
    44. 

  44.  }
    45. 

  45.  
    46. 

  46.  static int mtk_set_mac_address(struct net_device *dev, void *p)
    47. 

  47. @@ -1771,6 +1777,7 @@ static int mtk_probe(struct platform_dev
    48. 

  48.  		return -EADDRNOTAVAIL;
    49. 

  49.  
    50. 

  50.  	spin_lock_init(&eth->page_lock);
    51. 

  51. +	spin_lock_init(&eth->irq_lock);
    52. 

  52.  
    53. 

  53.  	eth->ethsys = syscon_regmap_lookup_by_phandle(pdev->dev.of_node,
    54. 

  54.  						      "mediatek,ethsys");
    55. 

  55. --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
    56. 

  56. +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
    57. 

  57. @@ -373,6 +373,7 @@ struct mtk_eth {
    58. 

  58.  	void __iomem			*base;
    59. 

  59.  	struct reset_control		*rstc;
    60. 

  60.  	spinlock_t			page_lock;
    61. 

  61. +	spinlock_t			irq_lock;
    62. 

  62.  	struct net_device		dummy_dev;
    63. 

  63.  	struct net_device		*netdev[MTK_MAX_DEVS];
    64. 

  64.  	struct mtk_mac			*mac[MTK_MAX_DEVS];
    65.