ar71xx: flush DDR writeback buffers for WMAC and PCIe on AR934X

[openwrt/svn-archive/archive.git] / target / linux / ar71xx / files / arch / mips / ar71xx / irq.c

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/irq.c b/target/linux/ar71xx/files/arch/mips/ar71xx/irq.c
index 77acdfd635e85f2a454d0feadd5aac6dcaa11477..c4297d399a722d842791e0e5bf1e46eb0e5801e5 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/irq.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/irq.c
@@ -231,6 +231,40 @@ static void __init ar71xx_misc_irq_init(void)
        setup_irq(AR71XX_CPU_IRQ_MISC, &ar71xx_misc_irqaction);
 }
 
+static void ar934x_ip2_irq_dispatch(unsigned int irq, struct irq_desc *desc)
+{
+       u32 status;
+
+       disable_irq_nosync(irq);
+
+       status = ar71xx_reset_rr(AR934X_RESET_REG_PCIE_WMAC_INT_STATUS);
+
+       if (status & AR934X_PCIE_WMAC_INT_PCIE_ALL) {
+               ar71xx_ddr_flush(AR934X_DDR_REG_FLUSH_PCIE);
+               generic_handle_irq(AR934X_IP2_IRQ_PCIE);
+       } else if (status & AR934X_PCIE_WMAC_INT_WMAC_ALL) {
+               ar71xx_ddr_flush(AR934X_DDR_REG_FLUSH_WMAC);
+               generic_handle_irq(AR934X_IP2_IRQ_WMAC);
+       } else {
+               spurious_interrupt();
+       }
+
+       enable_irq(irq);
+}
+
+static void ar934x_ip2_irq_init(void)
+{
+       int i;
+
+       for (i = AR934X_IP2_IRQ_BASE;
+            i < AR934X_IP2_IRQ_BASE + AR934X_IP2_IRQ_COUNT; i++)
+               irq_set_chip_and_handler(i, &dummy_irq_chip,
+                                        handle_level_irq);
+
+       irq_set_chained_handler(AR71XX_CPU_IRQ_IP2, ar934x_ip2_irq_dispatch);
+}
+
+
 /*
  * The IP2/IP3 lines are tied to a PCI/WMAC/USB device. Drivers for
  * these devices typically allocate coherent DMA memory, however the
@@ -264,7 +298,6 @@ static void ar933x_ip2_handler(void)
 
 static void ar934x_ip2_handler(void)
 {
-       ar71xx_ddr_flush(AR934X_DDR_REG_FLUSH_PCIE);
        do_IRQ(AR71XX_CPU_IRQ_IP2);
 }
 
@@ -324,7 +357,8 @@ asmlinkage void plat_irq_dispatch(void)
        else if (pending & STATUSF_IP6)
                ar71xx_misc_irq_dispatch();
 
-       spurious_interrupt();
+       else
+               spurious_interrupt();
 }
 
 void __init arch_init_irq(void)
@@ -371,6 +405,11 @@ void __init arch_init_irq(void)
 
        ar71xx_misc_irq_init();
 
+       if (ar71xx_soc == AR71XX_SOC_AR9341 ||
+           ar71xx_soc == AR71XX_SOC_AR9342 ||
+           ar71xx_soc == AR71XX_SOC_AR9344)
+               ar934x_ip2_irq_init();
+
        cp0_perfcount_irq = AR71XX_MISC_IRQ_PERFC;
 
        ar71xx_gpio_irq_init();