diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-09-11 12:47:27 +0200 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-09-13 16:40:29 +0200 |
commit | 713561a10b6e9a7100a860651b700207223c09ef (patch) | |
tree | ce855848bc9454d02f5e762c729c3d1d2e9cc4ab | |
parent | 00d48bcac08afc5a586c074894f96d9237fbe823 (diff) | |
download | upstream-713561a10b6e9a7100a860651b700207223c09ef.tar.gz upstream-713561a10b6e9a7100a860651b700207223c09ef.tar.bz2 upstream-713561a10b6e9a7100a860651b700207223c09ef.zip |
ar71xx: fix potential IRQ misses during dispatch for qca953x
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>
-rw-r--r-- | target/linux/ar71xx/patches-4.14/955-qca953x-fix-potential-missing-irq-dispatch.patch | 27 |
1 files changed, 27 insertions, 0 deletions
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 index 0000000000..5174029989 --- /dev/null +++ b/target/linux/ar71xx/patches-4.14/955-qca953x-fix-potential-missing-irq-dispatch.patch @@ -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(); + } + } + |