Home Explore Help
Register Sign In
wareck
/
openwrt-archive
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Branch: master
Branches Tags
openwrt-archive
/
target
/
linux
/
ar71xx
/
patches-4.1
/
630-MIPS-ath79-fix-chained-irq-disable.patch

630-MIPS-ath79-fix-chained-irq-disable.patch 3.1 KB
Permalink History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100 
  1. --- a/arch/mips/ath79/irq.c
    2. 

  2. +++ b/arch/mips/ath79/irq.c
    3. 

  3. @@ -26,6 +26,8 @@
    4. 

  4.  
    5. 

  5.  static void (*ath79_ip2_handler)(void);
    6. 

  6.  static void (*ath79_ip3_handler)(void);
    7. 

  7. +static struct irq_chip ip2_chip;
    8. 

  8. +static struct irq_chip ip3_chip;
    9. 

  9.  
    10. 

  10.  static void ath79_misc_irq_handler(unsigned int irq, struct irq_desc *desc)
    11. 

  11.  {
    12. 

  12. @@ -150,8 +152,7 @@ static void ar934x_ip2_irq_init(void)
    13. 

  13.  
    14. 

  14.  	for (i = ATH79_IP2_IRQ_BASE;
    15. 

  15.  	     i < ATH79_IP2_IRQ_BASE + ATH79_IP2_IRQ_COUNT; i++)
    16. 

  16. -		irq_set_chip_and_handler(i, &dummy_irq_chip,
    17. 

  17. -					 handle_level_irq);
    18. 

  18. +		irq_set_chip_and_handler(i, &ip2_chip, handle_level_irq);
    19. 

  19.  
    20. 

  20.  	irq_set_chained_handler(ATH79_CPU_IRQ(2), ar934x_ip2_irq_dispatch);
    21. 

  21.  }
    22. 

  22. @@ -183,7 +184,7 @@ static void qca953x_irq_init(void)
    23. 

  23.  
    24. 

  24.  	for (i = ATH79_IP2_IRQ_BASE;
    25. 

  25.  	     i < ATH79_IP2_IRQ_BASE + ATH79_IP2_IRQ_COUNT; i++)
    26. 

  26. -		irq_set_chip_and_handler(i, &dummy_irq_chip, handle_level_irq);
    27. 

  27. +		irq_set_chip_and_handler(i, &ip2_chip, handle_level_irq);
    28. 

  28.  
    29. 

  29.  	irq_set_chained_handler(ATH79_CPU_IRQ(2), qca953x_ip2_irq_dispatch);
    30. 

  30.  }
    31. 

  31. @@ -257,15 +258,13 @@ static void qca955x_irq_init(void)
    32. 

  32.  
    33. 

  33.  	for (i = ATH79_IP2_IRQ_BASE;
    34. 

  34.  	     i < ATH79_IP2_IRQ_BASE + ATH79_IP2_IRQ_COUNT; i++)
    35. 

  35. -		irq_set_chip_and_handler(i, &dummy_irq_chip,
    36. 

  36. -					 handle_level_irq);
    37. 

  37. +		irq_set_chip_and_handler(i, &ip2_chip, handle_level_irq);
    38. 

  38.  
    39. 

  39.  	irq_set_chained_handler(ATH79_CPU_IRQ(2), qca955x_ip2_irq_dispatch);
    40. 

  40.  
    41. 

  41.  	for (i = ATH79_IP3_IRQ_BASE;
    42. 

  42.  	     i < ATH79_IP3_IRQ_BASE + ATH79_IP3_IRQ_COUNT; i++)
    43. 

  43. -		irq_set_chip_and_handler(i, &dummy_irq_chip,
    44. 

  44. -					 handle_level_irq);
    45. 

  45. +		irq_set_chip_and_handler(i, &ip3_chip, handle_level_irq);
    46. 

  46.  
    47. 

  47.  	irq_set_chained_handler(ATH79_CPU_IRQ(3), qca955x_ip3_irq_dispatch);
    48. 

  48.  }
    49. 

  49. @@ -346,13 +345,13 @@ static void qca956x_irq_init(void)
    50. 

  50.  
    51. 

  51.  	for (i = ATH79_IP2_IRQ_BASE;
    52. 

  52.  	     i < ATH79_IP2_IRQ_BASE + ATH79_IP2_IRQ_COUNT; i++)
    53. 

  53. -		irq_set_chip_and_handler(i, &dummy_irq_chip, handle_level_irq);
    54. 

  54. +		irq_set_chip_and_handler(i, &ip2_chip, handle_level_irq);
    55. 

  55.  
    56. 

  56.  	irq_set_chained_handler(ATH79_CPU_IRQ(2), qca956x_ip2_irq_dispatch);
    57. 

  57.  
    58. 

  58.  	for (i = ATH79_IP3_IRQ_BASE;
    59. 

  59.  	     i < ATH79_IP3_IRQ_BASE + ATH79_IP3_IRQ_COUNT; i++)
    60. 

  60. -		irq_set_chip_and_handler(i, &dummy_irq_chip, handle_level_irq);
    61. 

  61. +		irq_set_chip_and_handler(i, &ip3_chip, handle_level_irq);
    62. 

  62.  
    63. 

  63.  	irq_set_chained_handler(ATH79_CPU_IRQ(3), qca956x_ip3_irq_dispatch);
    64. 

  64.  
    65. 

  65. @@ -467,8 +466,35 @@ static void qca953x_ip3_handler(void)
    66. 

  66.  	do_IRQ(ATH79_CPU_IRQ(3));
    67. 

  67.  }
    68. 

  68.  
    69. 

  69. +static void ath79_ip2_disable(struct irq_data *data)
    70. 

  70. +{
    71. 

  71. +	disable_irq(ATH79_CPU_IRQ(2));
    72. 

  72. +}
    73. 

  73. +
    74. 

  74. +static void ath79_ip2_enable(struct irq_data *data)
    75. 

  75. +{
    76. 

  76. +	enable_irq(ATH79_CPU_IRQ(2));
    77. 

  77. +}
    78. 

  78. +
    79. 

  79. +static void ath79_ip3_disable(struct irq_data *data)
    80. 

  80. +{
    81. 

  81. +	disable_irq(ATH79_CPU_IRQ(3));
    82. 

  82. +}
    83. 

  83. +
    84. 

  84. +static void ath79_ip3_enable(struct irq_data *data)
    85. 

  85. +{
    86. 

  86. +	enable_irq(ATH79_CPU_IRQ(3));
    87. 

  87. +}
    88. 

  88. +
    89. 

  89.  void __init arch_init_irq(void)
    90. 

  90.  {
    91. 

  91. +	ip2_chip = dummy_irq_chip;
    92. 

  92. +	ip3_chip = dummy_irq_chip;
    93. 

  93. +	ip2_chip.irq_disable = ath79_ip2_disable;
    94. 

  94. +	ip2_chip.irq_enable = ath79_ip2_enable;
    95. 

  95. +	ip3_chip.irq_disable = ath79_ip3_disable;
    96. 

  96. +	ip3_chip.irq_enable = ath79_ip3_enable;
    97. 

  97. +
    98. 

  98.  	if (soc_is_ar71xx()) {
    99. 

  99.  		ath79_ip2_handler = ar71xx_ip2_handler;
    100. 

  100.  		ath79_ip3_handler = ar71xx_ip3_handler;
    101.