ar71xx: init get_mac_revision on AR9330 rev 1

[openwrt.git] / target / linux / ar71xx / files / arch / mips / pci / pci-ar724x.c

diff --git a/target/linux/ar71xx/files/arch/mips/pci/pci-ar724x.c b/target/linux/ar71xx/files/arch/mips/pci/pci-ar724x.c
index 0f9bd2f..bf8e369 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/pci/pci-ar724x.c
+++ b/target/linux/ar71xx/files/arch/mips/pci/pci-ar724x.c
@@ -1,7 +1,7 @@
 /*
  *  Atheros AR724x PCI host controller driver
  *
 /*
  *  Atheros AR724x PCI host controller driver
  *

- *  Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2009-2010 Gabor Juhos <juhosg@openwrt.org>

  *
  *  Parts of this file are based on Atheros' 2.6.15 BSP
  *
  *
  *  Parts of this file are based on Atheros' 2.6.15 BSP
  *


@@ -16,6 +16,7 @@
 #include <linux/bitops.h>
 #include <linux/pci.h>
 #include <linux/pci_regs.h>
 #include <linux/bitops.h>
 #include <linux/pci.h>
 #include <linux/pci_regs.h>

+#include <linux/interrupt.h>

 
 #include <asm/mach-ar71xx/ar71xx.h>
 #include <asm/mach-ar71xx/pci.h>
 
 #include <asm/mach-ar71xx/ar71xx.h>
 #include <asm/mach-ar71xx/pci.h>


@@ -29,6 +30,8 @@
 
 static void __iomem *ar724x_pci_localcfg_base;
 static void __iomem *ar724x_pci_devcfg_base;
 
 static void __iomem *ar724x_pci_localcfg_base;
 static void __iomem *ar724x_pci_devcfg_base;

+static void __iomem *ar724x_pci_ctrl_base;
+static int ar724x_pci_fixup_enable;

 
 static DEFINE_SPINLOCK(ar724x_pci_lock);
 
 
 static DEFINE_SPINLOCK(ar724x_pci_lock);
 


@@ -75,7 +78,7 @@ static void ar724x_pci_write(void __iomem *base, int where, int size, u32 value)
                data |= ((value & 0xFF) << s);
                break;
        case 2:
                data |= ((value & 0xFF) << s);
                break;
        case 2:

-               s = ((where & 2) << 4);
+               s = ((where & 2) << 3);

                data &= ~(0xFFFF << s);
                data |= ((value & 0xFFFF) << s);
                break;
                data &= ~(0xFFFF << s);
                data |= ((value & 0xFFFF) << s);
                break;


@@ -107,8 +110,11 @@ static int ar724x_pci_read_config(struct pci_bus *bus, unsigned int devfn,
         * WAR for BAR issue - We are unable to access the PCI device space
         * if we set the BAR with proper base address
         */
         * WAR for BAR issue - We are unable to access the PCI device space
         * if we set the BAR with proper base address
         */

-       if ((where == 0x10) && (size == 4))
-               ar724x_pci_write(ar724x_pci_devcfg_base, where, size, 0xffff);
+       if ((where == 0x10) && (size == 4)) {
+               u32 val;
+               val = (ar71xx_soc == AR71XX_SOC_AR7240) ? 0xffff : 0x1000ffff;
+               ar724x_pci_write(ar724x_pci_devcfg_base, where, size, val);
+       }

 
        return PCIBIOS_SUCCESSFUL;
 }
 
        return PCIBIOS_SUCCESSFUL;
 }


@@ -128,6 +134,26 @@ static int ar724x_pci_write_config(struct pci_bus *bus, unsigned int devfn,
        return PCIBIOS_SUCCESSFUL;
 }
 
        return PCIBIOS_SUCCESSFUL;
 }
 

+static void ar724x_pci_fixup(struct pci_dev *dev)
+{
+       u16 cmd;
+
+       if (!ar724x_pci_fixup_enable)
+               return;
+
+       if (dev->bus->number != 0 || dev->devfn != 0)
+               return;
+
+       /* setup COMMAND register */
+       pci_read_config_word(dev, PCI_COMMAND, &cmd);
+       cmd |= PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER |
+              PCI_COMMAND_INVALIDATE | PCI_COMMAND_PARITY | PCI_COMMAND_SERR |
+              PCI_COMMAND_FAST_BACK;
+
+       pci_write_config_word(dev, PCI_COMMAND, cmd);
+}
+DECLARE_PCI_FIXUP_EARLY(PCI_ANY_ID, PCI_ANY_ID, ar724x_pci_fixup);
+

 int __init ar724x_pcibios_map_irq(const struct pci_dev *dev, uint8_t slot,
                                  uint8_t pin)
 {
 int __init ar724x_pcibios_map_irq(const struct pci_dev *dev, uint8_t slot,
                                  uint8_t pin)
 {


@@ -179,23 +205,191 @@ static struct pci_controller ar724x_pci_controller = {
        .io_resource    = &ar724x_pci_io_resource,
 };
 
        .io_resource    = &ar724x_pci_io_resource,
 };
 

-int __init ar724x_pcibios_init(void)
+static void __init ar724x_pci_reset(void)

 {
 {

+       ar71xx_device_stop(AR724X_RESET_PCIE);
+       ar71xx_device_stop(AR724X_RESET_PCIE_PHY);
+       ar71xx_device_stop(AR724X_RESET_PCIE_PHY_SERIAL);
+       udelay(100);
+
+       ar71xx_device_start(AR724X_RESET_PCIE_PHY_SERIAL);
+       udelay(100);
+       ar71xx_device_start(AR724X_RESET_PCIE_PHY);
+       ar71xx_device_start(AR724X_RESET_PCIE);
+}
+
+static int __init ar724x_pci_setup(void)
+{
+       void __iomem *base = ar724x_pci_ctrl_base;

        u32 t;
 
        u32 t;
 

+       /* setup COMMAND register */
+       t = PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER | PCI_COMMAND_INVALIDATE |
+           PCI_COMMAND_PARITY|PCI_COMMAND_SERR|PCI_COMMAND_FAST_BACK;
+
+       ar724x_pci_write(ar724x_pci_localcfg_base, PCI_COMMAND, 4, t);
+       ar724x_pci_write(ar724x_pci_localcfg_base, 0x20, 4, 0x1ff01000);
+       ar724x_pci_write(ar724x_pci_localcfg_base, 0x24, 4, 0x1ff01000);
+
+       t = __raw_readl(base + AR724X_PCI_REG_RESET);
+       if (t != 0x7) {
+               udelay(100000);
+               __raw_writel(0, base + AR724X_PCI_REG_RESET);
+               udelay(100);
+               __raw_writel(4, base + AR724X_PCI_REG_RESET);
+               udelay(100000);
+       }
+
+       if (ar71xx_soc == AR71XX_SOC_AR7240)
+               t = AR724X_PCI_APP_LTSSM_ENABLE;
+       else
+               t = 0x1ffc1;
+       __raw_writel(t, base + AR724X_PCI_REG_APP);
+       /* flush write */
+       (void) __raw_readl(base + AR724X_PCI_REG_APP);
+       udelay(1000);
+
+       t = __raw_readl(base + AR724X_PCI_REG_RESET);
+       if ((t & AR724X_PCI_RESET_LINK_UP) == 0x0) {
+               printk(KERN_WARNING "PCI: no PCIe module found\n");
+               return -ENODEV;
+       }
+
+       if (ar71xx_soc == AR71XX_SOC_AR7241 ||
+           ar71xx_soc == AR71XX_SOC_AR7242) {
+               t = __raw_readl(base + AR724X_PCI_REG_APP);
+               t |= BIT(16);
+               __raw_writel(t, base + AR724X_PCI_REG_APP);
+       }
+
+       return 0;
+}
+
+static void ar724x_pci_irq_handler(unsigned int irq, struct irq_desc *desc)
+{
+       void __iomem *base = ar724x_pci_ctrl_base;
+       u32 pending;
+
+       pending = __raw_readl(base + AR724X_PCI_REG_INT_STATUS) &
+                 __raw_readl(base + AR724X_PCI_REG_INT_MASK);
+
+       if (pending & AR724X_PCI_INT_DEV0)
+               generic_handle_irq(AR71XX_PCI_IRQ_DEV0);
+
+       else
+               spurious_interrupt();
+}
+
+static void ar724x_pci_irq_unmask(unsigned int irq)
+{
+       void __iomem *base = ar724x_pci_ctrl_base;
+       u32 t;
+
+       switch (irq) {
+       case AR71XX_PCI_IRQ_DEV0:
+               irq -= AR71XX_PCI_IRQ_BASE;
+
+               t = __raw_readl(base + AR724X_PCI_REG_INT_MASK);
+               __raw_writel(t | AR724X_PCI_INT_DEV0,
+                            base + AR724X_PCI_REG_INT_MASK);
+               /* flush write */
+               (void) __raw_readl(base + AR724X_PCI_REG_INT_MASK);
+       }
+}
+
+static void ar724x_pci_irq_mask(unsigned int irq)
+{
+       void __iomem *base = ar724x_pci_ctrl_base;
+       u32 t;
+
+       switch (irq) {
+       case AR71XX_PCI_IRQ_DEV0:
+               irq -= AR71XX_PCI_IRQ_BASE;
+
+               t = __raw_readl(base + AR724X_PCI_REG_INT_MASK);
+               __raw_writel(t & ~AR724X_PCI_INT_DEV0,
+                            base + AR724X_PCI_REG_INT_MASK);
+
+               /* flush write */
+               (void) __raw_readl(base + AR724X_PCI_REG_INT_MASK);
+
+               t = __raw_readl(base + AR724X_PCI_REG_INT_STATUS);
+               __raw_writel(t | AR724X_PCI_INT_DEV0,
+                            base + AR724X_PCI_REG_INT_STATUS);
+
+               /* flush write */
+               (void) __raw_readl(base + AR724X_PCI_REG_INT_STATUS);
+       }
+}
+
+static struct irq_chip ar724x_pci_irq_chip = {
+       .name           = "AR724X PCI ",
+       .mask           = ar724x_pci_irq_mask,
+       .unmask         = ar724x_pci_irq_unmask,
+       .mask_ack       = ar724x_pci_irq_mask,
+};
+
+static void __init ar724x_pci_irq_init(void)
+{
+       void __iomem *base = ar724x_pci_ctrl_base;
+       u32 t;
+       int i;
+
+       t = ar71xx_reset_rr(AR724X_RESET_REG_RESET_MODULE);
+       if (t & (AR724X_RESET_PCIE | AR724X_RESET_PCIE_PHY |
+                AR724X_RESET_PCIE_PHY_SERIAL)) {
+               return;
+       }
+
+       __raw_writel(0, base + AR724X_PCI_REG_INT_MASK);
+       __raw_writel(0, base + AR724X_PCI_REG_INT_STATUS);
+
+       for (i = AR71XX_PCI_IRQ_BASE;
+            i < AR71XX_PCI_IRQ_BASE + AR71XX_PCI_IRQ_COUNT; i++) {
+               irq_desc[i].status = IRQ_DISABLED;
+               set_irq_chip_and_handler(i, &ar724x_pci_irq_chip,
+                                        handle_level_irq);
+       }
+
+       set_irq_chained_handler(AR71XX_CPU_IRQ_IP2, ar724x_pci_irq_handler);
+}
+
+int __init ar724x_pcibios_init(void)
+{
+       int ret = -ENOMEM;
+

        ar724x_pci_localcfg_base = ioremap_nocache(AR724X_PCI_CRP_BASE,
                                                   AR724X_PCI_CRP_SIZE);
        ar724x_pci_localcfg_base = ioremap_nocache(AR724X_PCI_CRP_BASE,
                                                   AR724X_PCI_CRP_SIZE);

+       if (ar724x_pci_localcfg_base == NULL)
+               goto err;

 
        ar724x_pci_devcfg_base = ioremap_nocache(AR724X_PCI_CFG_BASE,
                                                 AR724X_PCI_CFG_SIZE);
 
        ar724x_pci_devcfg_base = ioremap_nocache(AR724X_PCI_CFG_BASE,
                                                 AR724X_PCI_CFG_SIZE);

+       if (ar724x_pci_devcfg_base == NULL)
+               goto err_unmap_localcfg;

 
 

-       /* setup COMMAND register */
-       t = PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER | PCI_COMMAND_INVALIDATE |
-           PCI_COMMAND_PARITY | PCI_COMMAND_SERR | PCI_COMMAND_FAST_BACK;
+       ar724x_pci_ctrl_base = ioremap_nocache(AR724X_PCI_CTRL_BASE,
+                                              AR724X_PCI_CTRL_SIZE);
+       if (ar724x_pci_ctrl_base == NULL)
+               goto err_unmap_devcfg;

 
 

-       ar724x_pci_write(ar724x_pci_localcfg_base, PCI_COMMAND, 4, t);
+       ar724x_pci_reset();
+       ret = ar724x_pci_setup();
+       if (ret)
+               goto err_unmap_ctrl;

 
 

+       ar724x_pci_fixup_enable = 1;
+       ar724x_pci_irq_init();

        register_pci_controller(&ar724x_pci_controller);
 
        return 0;
        register_pci_controller(&ar724x_pci_controller);
 
        return 0;

+
+err_unmap_ctrl:
+       iounmap(ar724x_pci_ctrl_base);
+err_unmap_devcfg:
+       iounmap(ar724x_pci_devcfg_base);
+err_unmap_localcfg:
+       iounmap(ar724x_pci_localcfg_base);
+err:
+       return ret;

 }
 }