aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Merhar <mattmerhar@protonmail.com>2018-07-30 14:11:09 -0400
committerJohn Crispin <john@phrozen.org>2018-07-30 20:22:44 +0200
commitaf3b1756f00bfd1e6726d85ce23336112201afce (patch)
tree067b4ce9cb97b2e4768388ca8ac5a670e7c58782
parentaf9a96d23eda3c9989e8b80c9ad2a9c41334aefd (diff)
downloadupstream-af3b1756f00bfd1e6726d85ce23336112201afce.tar.gz
upstream-af3b1756f00bfd1e6726d85ce23336112201afce.tar.bz2
upstream-af3b1756f00bfd1e6726d85ce23336112201afce.zip
ath79: fix irq assignment for pci-ar71xx driver
In the new DT-based pci-ar71xx driver, ar71xx_pci_irq_init() was being called before populating the PCI controller's device_node struct member. This led to no IRQ being assigned to connected PCI devices (e.g. ath9k cards) and caused them to be non-functional aside from simply being detected. The previous errors encountered in dmesg were: "irq: no irq domain found for /ahb/apb/pcie-controller@180c0000 !". /proc/interrupts listed an IRQ of 0 for the cards. While this has been only been tested on a yet-to-be-merged RouterStation Pro target, it should also fix the broken wifi people have reported for the ath79 WNDR3800 target. Signed-off-by: Matt Merhar <mattmerhar@protonmail.com>
-rw-r--r--target/linux/ath79/patches-4.14/0020-MIPS-ath79-turn-pci-ar71xx-driver-into-a-pure-OF-dri.patch10
1 files changed, 7 insertions, 3 deletions
diff --git a/target/linux/ath79/patches-4.14/0020-MIPS-ath79-turn-pci-ar71xx-driver-into-a-pure-OF-dri.patch b/target/linux/ath79/patches-4.14/0020-MIPS-ath79-turn-pci-ar71xx-driver-into-a-pure-OF-dri.patch
index 2d9ddf4a2c..ea3514a528 100644
--- a/target/linux/ath79/patches-4.14/0020-MIPS-ath79-turn-pci-ar71xx-driver-into-a-pure-OF-dri.patch
+++ b/target/linux/ath79/patches-4.14/0020-MIPS-ath79-turn-pci-ar71xx-driver-into-a-pure-OF-dri.patch
@@ -175,15 +175,19 @@ Signed-off-by: John Crispin <john@phrozen.org>
ar71xx_pci_reset();
/* setup COMMAND register */
-@@ -380,9 +376,11 @@ static int ar71xx_pci_probe(struct platf
-
- ar71xx_pci_irq_init(apc);
+@@ -378,11 +374,13 @@ static int ar71xx_pci_probe(struct platf
+ /* clear bus errors */
+ ar71xx_pci_check_error(apc, 1);
+- ar71xx_pci_irq_init(apc);
+-
+ apc->np = pdev->dev.of_node;
apc->pci_ctrl.pci_ops = &ar71xx_pci_ops;
apc->pci_ctrl.mem_resource = &apc->mem_res;
apc->pci_ctrl.io_resource = &apc->io_res;
+ pci_load_of_ranges(&apc->pci_ctrl, pdev->dev.of_node);
++
++ ar71xx_pci_irq_init(apc);
register_pci_controller(&apc->pci_ctrl);