ar71xx: fix potential IRQ misses during dispatch for qca953x
authorKoen Vandeputte <koen.vandeputte@ncentric.com>
Wed, 11 Sep 2019 10:47:27 +0000 (12:47 +0200)
committerRISCi_ATOM <bob@bobcall.me>
Fri, 13 Sep 2019 20:31:45 +0000 (16:31 -0400)
If both interrupts are set in the current implementation
only the 1st will be handled and the 2nd will be skipped
due to the "if else" condition.

Fix this by using the same approach as done for QCA955x
just below it.

Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
(cherry picked from commit 9e8c36557cc0582986862f5a36e17adf6db2b90e)

target/linux/ar71xx/patches-4.14/955-qca953x-fix-potential-missing-irq-dispatch.patch [new file with mode: 0644]

diff --git a/target/linux/ar71xx/patches-4.14/955-qca953x-fix-potential-missing-irq-dispatch.patch b/target/linux/ar71xx/patches-4.14/955-qca953x-fix-potential-missing-irq-dispatch.patch
new file mode 100644 (file)
index 0000000..5174029
--- /dev/null
@@ -0,0 +1,27 @@
+--- a/arch/mips/ath79/irq.c
++++ b/arch/mips/ath79/irq.c
+@@ -69,15 +69,21 @@ static void qca953x_ip2_irq_dispatch(str
+       u32 status;
+       status = ath79_reset_rr(QCA953X_RESET_REG_PCIE_WMAC_INT_STATUS);
++      status &= QCA953X_PCIE_WMAC_INT_PCIE_ALL | QCA953X_PCIE_WMAC_INT_WMAC_ALL;
++
++      if (status == 0) {
++              spurious_interrupt();
++              return;
++      }
+       if (status & QCA953X_PCIE_WMAC_INT_PCIE_ALL) {
+               ath79_ddr_wb_flush(3);
+               generic_handle_irq(ATH79_IP2_IRQ(0));
+-      } else if (status & QCA953X_PCIE_WMAC_INT_WMAC_ALL) {
++      }
++
++      if (status & QCA953X_PCIE_WMAC_INT_WMAC_ALL) {
+               ath79_ddr_wb_flush(4);
+               generic_handle_irq(ATH79_IP2_IRQ(1));
+-      } else {
+-              spurious_interrupt();
+       }
+ }