ath79: fix ar7100 PCI IRQ handling

Currently all PCI devices get the same IRQ that affects performance badly.

This commit adresses this problem and cleans the code.

ar7100 has a special PCI interrupt controller@18060018 that works exactly
the same way as misc interrupt controller.

This patch does the following:

1. Defines pci-intc interrupt controller@18060018 in dtsi.
2. Removes interrupt-controller property from PCI node.
3. Sets a correct interrupt mask for PCI devices.
4. Removes all IRQ handling code from the PCI driver.

"qca,ar7100-misc-intc" should be used as the compatible property, becuase on ar7100
the controlled status register is read-only and the ack method used in
"qca,ar7240-misc-intc" won't work properly.

There are two very minor downsides of this patch that don't affect perormance:

1. We allocate an IRQ domain of 32 IRQ, whan we need only 5. But ar7100 aren't tiny un terms of RAM
and that is not very important and can be tuned if we implement "nr-interrupts" property".

2. It reuses the same irg chip name "MISC" for both controllers.

Run tested on DIR-825 B1.

Signed-off-by: Dmitry Tunin <hanipouspilot@gmail.com>

diff --git a/target/linux/ath79/dts/ar7100.dtsi b/target/linux/ath79/dts/ar7100.dtsi
index 6402657841fd88f739ed207e06bd42efc704c546..5d5c97cd891e7af3b6abe284eb81987360525fca 100644 (file)
--- a/target/linux/ath79/dts/ar7100.dtsi
+++ b/target/linux/ath79/dts/ar7100.dtsi
@@ -88,6 +88,14 @@
                                clock-names = "wdt";
                        };
 
+                       pci_intc: interrupt-controller@18060018 {
+                               compatible = "qca,ar7100-misc-intc";
+                               reg = <0x18060018 0x4>;
+                               interrupt-parent = <&cpuintc>;
+                               interrupts = <2>;
+                               interrupt-controller;
+                               #interrupt-cells = <1>;
+                       };
 
                        rst: reset-controller@18060024 {
                                compatible = "qca,ar7100-reset";
@@ -105,14 +113,17 @@
                                reg-names = "cfg_base";
                                ranges = <0x2000000 0 0x10000000 0x10000000 0 0x07000000        /* pci memory */
                                          0x1000000 0 0x00000000 0x0000000 0 0x000001>;         /* io space */
-                               interrupt-parent = <&cpuintc>;
-                               interrupts = <2>;
 
-                               interrupt-controller;
+                               interrupt-parent = <&pci_intc>;
+                               interrupts = <4>;
+
                                #interrupt-cells = <1>;
 
-                               interrupt-map-mask = <0 0 0 1>;
-                               interrupt-map = <0 0 0 0 &pcie0 0>;
+                               interrupt-map-mask = <0xf800 0 0 0>;
+                               interrupt-map = <0x8800 0 0 0 &pci_intc 0
+                                                0x9000 0 0 0 &pci_intc 1
+                                                0x9800 0 0 0 &pci_intc 2>;
+
                                status = "disabled";
                        };
                };

diff --git a/target/linux/ath79/patches-4.14/0036-MIPS-ath79-remove-irq-code-from-pci.patch b/target/linux/ath79/patches-4.14/0036-MIPS-ath79-remove-irq-code-from-pci.patch
new file mode 100644 (file)
index 0000000..e69de29