hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

lantiq: Fix initialization of the PCI IRQs when PCIe is also enabled 

There are already ifx_pcie_bios_{map_irq,plat_dev_init} hooks defined in
ifxmips_pcie.c. Instead of defining a new hook we simply re-use the
existing ones (this is basically what the lantiq BSP code does).

Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45718 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
John Crispin 2015-05-23 15:25:59 +00:00
parent b80601d35f
commit 507ec95999
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
target/linux/lantiq/patches-3.18/0001-MIPS-lantiq-add-pcie-driver.patch
View File

@ -174,26 +174,34 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+ ifx_pcie_rc_class_early_fixup); + ifx_pcie_rc_class_early_fixup);
--- a/arch/mips/pci/fixup-lantiq.c --- a/arch/mips/pci/fixup-lantiq.c
+++ b/arch/mips/pci/fixup-lantiq.c +++ b/arch/mips/pci/fixup-lantiq.c
@@ -11,11 +11,12 @@ @@ -8,12 +8,18 @@
#include <linux/of_irq.h>
#include <linux/of_pci.h>
+#include "ifxmips_pci_common.h"
int (*ltq_pci_plat_arch_init)(struct pci_dev *dev) = NULL; int (*ltq_pci_plat_arch_init)(struct pci_dev *dev) = NULL;
int (*ltq_pci_plat_dev_init)(struct pci_dev *dev) = NULL; int (*ltq_pci_plat_dev_init)(struct pci_dev *dev) = NULL;
+int (*ltq_pci_map_irq)(const struct pci_dev *dev, u8 slot, u8 pin);
int pcibios_plat_dev_init(struct pci_dev *dev) int pcibios_plat_dev_init(struct pci_dev *dev)
{ {
+#ifdef CONFIG_PCIE_LANTIQ
+ if (pci_find_capability(dev, PCI_CAP_ID_EXP))
+ ifx_pcie_bios_plat_dev_init(dev);
+#endif
+
if (ltq_pci_plat_arch_init) if (ltq_pci_plat_arch_init)
- return ltq_pci_plat_arch_init(dev); return ltq_pci_plat_arch_init(dev);
+ ltq_pci_plat_arch_init(dev);
if (ltq_pci_plat_dev_init) @@ -25,5 +31,10 @@
return ltq_pci_plat_dev_init(dev);
@@ -25,5 +26,7 @@ int pcibios_plat_dev_init(struct pci_dev
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
{ {
+ if (ltq_pci_map_irq) +#ifdef CONFIG_PCIE_LANTIQ
+ return ltq_pci_map_irq(dev, slot, pin); + if (pci_find_capability(dev, PCI_CAP_ID_EXP))
+ return ifx_pcie_bios_map_irq(dev, slot, pin);
+#endif
+
return of_irq_parse_and_map_pci(dev, slot, pin); return of_irq_parse_and_map_pci(dev, slot, pin);
} }
--- /dev/null --- /dev/null
@ -249,7 +257,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+extern int ifx_pci_bios_plat_dev_init(struct pci_dev *dev); +extern int ifx_pci_bios_plat_dev_init(struct pci_dev *dev);
+#endif /* COFNIG_IFX_PCI */ +#endif /* COFNIG_IFX_PCI */
+ +
+#ifdef CONFIG_IFX_PCIE +#ifdef CONFIG_PCIE_LANTIQ
+extern int ifx_pcie_bios_map_irq(IFX_PCI_CONST struct pci_dev *dev, u8 slot, u8 pin); +extern int ifx_pcie_bios_map_irq(IFX_PCI_CONST struct pci_dev *dev, u8 slot, u8 pin);
+extern int ifx_pcie_bios_plat_dev_init(struct pci_dev *dev); +extern int ifx_pcie_bios_plat_dev_init(struct pci_dev *dev);
+#endif +#endif
@ -258,7 +266,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+ +
--- /dev/null --- /dev/null
+++ b/arch/mips/pci/ifxmips_pcie.c +++ b/arch/mips/pci/ifxmips_pcie.c
@@ -0,0 +1,1099 @@ @@ -0,0 +1,1092 @@
+/* +/*
+ * This program is free software; you can redistribute it and/or modify it + * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published + * under the terms of the GNU General Public License version 2 as published
@ -1306,19 +1314,12 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+ return 0; + return 0;
+} +}
+ +
+extern int (*ltq_pci_plat_arch_init)(struct pci_dev *dev);
+extern int (*ltq_pci_map_irq)(const struct pci_dev *dev, u8 slot, u8 pin);
+
+static int __init ifx_pcie_bios_init(void) +static int __init ifx_pcie_bios_init(void)
+{ +{
+ void __iomem *io_map_base; + void __iomem *io_map_base;
+ int pcie_port; + int pcie_port;
+ int startup_port; + int startup_port;
+ +
+
+ ltq_pci_map_irq = ifx_pcie_bios_map_irq;
+ ltq_pci_plat_arch_init = ifx_pcie_bios_plat_dev_init;
+
+ /* Enable AHB Master/ Slave */ + /* Enable AHB Master/ Slave */
+ pcie_ahb_pmu_setup(); + pcie_ahb_pmu_setup();
+ +