ar71xx: add initial support for 3.6

[15.05/openwrt.git] / target / linux / ar71xx / patches-3.6 / 151-MIPS-pci-ar724x-use-per-controller-IRQ-base.patch

diff --git a/target/linux/ar71xx/patches-3.6/151-MIPS-pci-ar724x-use-per-controller-IRQ-base.patch b/target/linux/ar71xx/patches-3.6/151-MIPS-pci-ar724x-use-per-controller-IRQ-base.patch
new file mode 100644 (file)
index 0000000..5b690ab
--- /dev/null
+++ b/target/linux/ar71xx/patches-3.6/151-MIPS-pci-ar724x-use-per-controller-IRQ-base.patch
@@ -0,0 +1,110 @@
+From d258929cd4c8c495f619f0e66d9d1c23f3f9246f Mon Sep 17 00:00:00 2001
+From: Gabor Juhos <juhosg@openwrt.org>
+Date: Tue, 26 Jun 2012 11:59:45 +0200
+Subject: [PATCH 12/34] MIPS: pci-ar724x: use per-controller IRQ base
+
+Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
+---
+ arch/mips/pci/pci-ar724x.c |   31 +++++++++++++++++++++----------
+ 1 files changed, 21 insertions(+), 10 deletions(-)
+
+--- a/arch/mips/pci/pci-ar724x.c
++++ b/arch/mips/pci/pci-ar724x.c
+@@ -34,6 +34,7 @@ struct ar724x_pci_controller {
+       void __iomem *ctrl_base;
+ 
+       int irq;
++      int irq_base;
+ 
+       bool link_up;
+       bool bar0_is_cached;
+@@ -205,7 +206,7 @@ static void ar724x_pci_irq_handler(unsig
+                 __raw_readl(base + AR724X_PCI_REG_INT_MASK);
+ 
+       if (pending & AR724X_PCI_INT_DEV0)
+-              generic_handle_irq(ATH79_PCI_IRQ(0));
++              generic_handle_irq(apc->irq_base + 0);
+ 
+       else
+               spurious_interrupt();
+@@ -215,13 +216,15 @@ static void ar724x_pci_irq_unmask(struct
+ {
+       struct ar724x_pci_controller *apc;
+       void __iomem *base;
++      int offset;
+       u32 t;
+ 
+       apc = irq_data_get_irq_chip_data(d);
+       base = apc->ctrl_base;
++      offset = apc->irq_base - d->irq;
+ 
+-      switch (d->irq) {
+-      case ATH79_PCI_IRQ(0):
++      switch (offset) {
++      case 0:
+               t = __raw_readl(base + AR724X_PCI_REG_INT_MASK);
+               __raw_writel(t | AR724X_PCI_INT_DEV0,
+                            base + AR724X_PCI_REG_INT_MASK);
+@@ -234,13 +237,15 @@ static void ar724x_pci_irq_mask(struct i
+ {
+       struct ar724x_pci_controller *apc;
+       void __iomem *base;
++      int offset;
+       u32 t;
+ 
+       apc = irq_data_get_irq_chip_data(d);
+       base = apc->ctrl_base;
++      offset = apc->irq_base - d->irq;
+ 
+-      switch (d->irq) {
+-      case ATH79_PCI_IRQ(0):
++      switch (offset) {
++      case 0:
+               t = __raw_readl(base + AR724X_PCI_REG_INT_MASK);
+               __raw_writel(t & ~AR724X_PCI_INT_DEV0,
+                            base + AR724X_PCI_REG_INT_MASK);
+@@ -264,7 +269,8 @@ static struct irq_chip ar724x_pci_irq_ch
+       .irq_mask_ack   = ar724x_pci_irq_mask,
+ };
+ 
+-static void __devinit ar724x_pci_irq_init(struct ar724x_pci_controller *apc)
++static void __devinit ar724x_pci_irq_init(struct ar724x_pci_controller *apc,
++                                        int id)
+ {
+       void __iomem *base;
+       int i;
+@@ -274,10 +280,10 @@ static void __devinit ar724x_pci_irq_ini
+       __raw_writel(0, base + AR724X_PCI_REG_INT_MASK);
+       __raw_writel(0, base + AR724X_PCI_REG_INT_STATUS);
+ 
+-      BUILD_BUG_ON(ATH79_PCI_IRQ_COUNT < AR724X_PCI_IRQ_COUNT);
++      apc->irq_base = ATH79_PCI_IRQ_BASE + (id * AR724X_PCI_IRQ_COUNT);
+ 
+-      for (i = ATH79_PCI_IRQ_BASE;
+-           i < ATH79_PCI_IRQ_BASE + AR724X_PCI_IRQ_COUNT; i++) {
++      for (i = apc->irq_base;
++           i < apc->irq_base + AR724X_PCI_IRQ_COUNT; i++) {
+               irq_set_chip_and_handler(i, &ar724x_pci_irq_chip,
+                                        handle_level_irq);
+               irq_set_chip_data(i, apc);
+@@ -291,6 +297,11 @@ static int __devinit ar724x_pci_probe(st
+ {
+       struct ar724x_pci_controller *apc;
+       struct resource *res;
++      int id;
++
++      id = pdev->id;
++      if (id == -1)
++              id = 0;
+ 
+       apc = devm_kzalloc(&pdev->dev, sizeof(struct ar724x_pci_controller),
+                           GFP_KERNEL);
+@@ -347,7 +358,7 @@ static int __devinit ar724x_pci_probe(st
+       if (!apc->link_up)
+               dev_warn(&pdev->dev, "PCIe link is down\n");
+ 
+-      ar724x_pci_irq_init(apc);
++      ar724x_pci_irq_init(apc, id);
+ 
+       register_pci_controller(&apc->pci_controller);
+