]> git.kernelconcepts.de Git - karo-tx-uboot.git/blobdiff - drivers/pci/fsl_pci_init.c
Merge remote-tracking branch 'u-boot-ti/master'
[karo-tx-uboot.git] / drivers / pci / fsl_pci_init.c
index 8858657b9ee5b3bc84b5cb80bbbee48c92c68ddf..48ae16374dc5c8cfa0391ebdd927c69abb5ee0a9 100644 (file)
@@ -1,9 +1,10 @@
 /*
- * Copyright 2007 Freescale Semiconductor, Inc.
+ * Copyright 2007-2012 Freescale Semiconductor, Inc.
  *
- * 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 by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,6 +18,8 @@
  */
 
 #include <common.h>
+#include <malloc.h>
+#include <asm/fsl_serdes.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -35,18 +38,14 @@ DECLARE_GLOBAL_DATA_PTR;
  */
 
 #include <pci.h>
+#include <asm/io.h>
 #include <asm/fsl_pci.h>
 
 /* Freescale-specific PCI config registers */
 #define FSL_PCI_PBFR           0x44
 #define FSL_PCIE_CAP_ID                0x4c
 #define FSL_PCIE_CFG_RDY       0x4b0
-
-void pciauto_prescan_setup_bridge(struct pci_controller *hose,
-                               pci_dev_t dev, int sub_bus);
-void pciauto_postscan_setup_bridge(struct pci_controller *hose,
-                               pci_dev_t dev, int sub_bus);
-void pciauto_config_init(struct pci_controller *hose);
+#define FSL_PROG_IF_AGENT      0x1
 
 #ifndef CONFIG_SYS_PCI_MEMORY_BUS
 #define CONFIG_SYS_PCI_MEMORY_BUS 0
@@ -60,35 +59,110 @@ void pciauto_config_init(struct pci_controller *hose);
 #define CONFIG_SYS_PCI64_MEMORY_BUS (64ull*1024*1024*1024)
 #endif
 
-int fsl_pci_setup_inbound_windows(struct pci_region *r)
+/* Setup one inbound ATMU window.
+ *
+ * We let the caller decide what the window size should be
+ */
+static void set_inbound_window(volatile pit_t *pi,
+                               struct pci_region *r,
+                               u64 size)
+{
+       u32 sz = (__ilog2_u64(size) - 1);
+       u32 flag = PIWAR_EN | PIWAR_LOCAL |
+                       PIWAR_READ_SNOOP | PIWAR_WRITE_SNOOP;
+
+       out_be32(&pi->pitar, r->phys_start >> 12);
+       out_be32(&pi->piwbar, r->bus_start >> 12);
+#ifdef CONFIG_SYS_PCI_64BIT
+       out_be32(&pi->piwbear, r->bus_start >> 44);
+#else
+       out_be32(&pi->piwbear, 0);
+#endif
+       if (r->flags & PCI_REGION_PREFETCH)
+               flag |= PIWAR_PF;
+       out_be32(&pi->piwar, flag | sz);
+}
+
+int fsl_setup_hose(struct pci_controller *hose, unsigned long addr)
 {
-       struct pci_region *rgn_base = r;
-       u64 sz = min((u64)gd->ram_size, (1ull << 32) - 1);
+       volatile ccsr_fsl_pci_t *pci = (ccsr_fsl_pci_t *) addr;
+
+       /* Reset hose to make sure its in a clean state */
+       memset(hose, 0, sizeof(struct pci_controller));
+
+       pci_setup_indirect(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data);
+
+       return fsl_is_pci_agent(hose);
+}
+
+static int fsl_pci_setup_inbound_windows(struct pci_controller *hose,
+                                        u64 out_lo, u8 pcie_cap,
+                                        volatile pit_t *pi)
+{
+       struct pci_region *r = hose->regions + hose->region_count;
+       u64 sz = min((u64)gd->ram_size, (1ull << 32));
 
        phys_addr_t phys_start = CONFIG_SYS_PCI_MEMORY_PHYS;
        pci_addr_t bus_start = CONFIG_SYS_PCI_MEMORY_BUS;
-       pci_size_t pci_sz = 1ull << __ilog2_u64(sz);
+       pci_size_t pci_sz;
 
-       debug ("R0 bus_start: %llx phys_start: %llx size: %llx\n",
-               (u64)bus_start, (u64)phys_start, (u64)pci_sz);
-       pci_set_region(r++, bus_start, phys_start, pci_sz,
-                       PCI_REGION_MEM | PCI_REGION_SYS_MEMORY |
-                       PCI_REGION_PREFETCH);
+       /* we have no space available for inbound memory mapping */
+       if (bus_start > out_lo) {
+               printf ("no space for inbound mapping of memory\n");
+               return 0;
+       }
 
-       sz -= pci_sz;
-       bus_start += pci_sz;
-       phys_start += pci_sz;
+       /* limit size */
+       if ((bus_start + sz) > out_lo) {
+               sz = out_lo - bus_start;
+               debug ("limiting size to %llx\n", sz);
+       }
 
        pci_sz = 1ull << __ilog2_u64(sz);
-       if (sz) {
-               debug ("R1 bus_start: %llx phys_start: %llx size: %llx\n",
+       /*
+        * we can overlap inbound/outbound windows on PCI-E since RX & TX
+        * links a separate
+        */
+       if ((pcie_cap == PCI_CAP_ID_EXP) && (pci_sz < sz)) {
+               debug ("R0 bus_start: %llx phys_start: %llx size: %llx\n",
+                       (u64)bus_start, (u64)phys_start, (u64)sz);
+               pci_set_region(r, bus_start, phys_start, sz,
+                               PCI_REGION_MEM | PCI_REGION_SYS_MEMORY |
+                               PCI_REGION_PREFETCH);
+
+               /* if we aren't an exact power of two match, pci_sz is smaller
+                * round it up to the next power of two.  We report the actual
+                * size to pci region tracking.
+                */
+               if (pci_sz != sz)
+                       sz = 2ull << __ilog2_u64(sz);
+
+               set_inbound_window(pi--, r++, sz);
+               sz = 0; /* make sure we dont set the R2 window */
+       } else {
+               debug ("R0 bus_start: %llx phys_start: %llx size: %llx\n",
                        (u64)bus_start, (u64)phys_start, (u64)pci_sz);
-               pci_set_region(r++, bus_start, phys_start, pci_sz,
+               pci_set_region(r, bus_start, phys_start, pci_sz,
                                PCI_REGION_MEM | PCI_REGION_SYS_MEMORY |
                                PCI_REGION_PREFETCH);
+               set_inbound_window(pi--, r++, pci_sz);
+
                sz -= pci_sz;
                bus_start += pci_sz;
                phys_start += pci_sz;
+
+               pci_sz = 1ull << __ilog2_u64(sz);
+               if (sz) {
+                       debug ("R1 bus_start: %llx phys_start: %llx size: %llx\n",
+                               (u64)bus_start, (u64)phys_start, (u64)pci_sz);
+                       pci_set_region(r, bus_start, phys_start, pci_sz,
+                                       PCI_REGION_MEM | PCI_REGION_SYS_MEMORY |
+                                       PCI_REGION_PREFETCH);
+                       set_inbound_window(pi--, r++, pci_sz);
+                       sz -= pci_sz;
+                       bus_start += pci_sz;
+                       phys_start += pci_sz;
+               }
        }
 
 #if defined(CONFIG_PHYS_64BIT) && defined(CONFIG_SYS_PCI_64BIT)
@@ -104,23 +178,25 @@ int fsl_pci_setup_inbound_windows(struct pci_region *r)
                (u64)CONFIG_SYS_PCI64_MEMORY_BUS,
                (u64)CONFIG_SYS_PCI_MEMORY_PHYS,
                (u64)pci_sz);
-       pci_set_region(r++,
+       pci_set_region(r,
                        CONFIG_SYS_PCI64_MEMORY_BUS,
                        CONFIG_SYS_PCI_MEMORY_PHYS,
                        pci_sz,
                        PCI_REGION_MEM | PCI_REGION_SYS_MEMORY |
                        PCI_REGION_PREFETCH);
+       set_inbound_window(pi--, r++, pci_sz);
 #else
        pci_sz = 1ull << __ilog2_u64(sz);
        if (sz) {
                debug ("R2 bus_start: %llx phys_start: %llx size: %llx\n",
                        (u64)bus_start, (u64)phys_start, (u64)pci_sz);
-               pci_set_region(r++, bus_start, phys_start, pci_sz,
+               pci_set_region(r, bus_start, phys_start, pci_sz,
                                PCI_REGION_MEM | PCI_REGION_SYS_MEMORY |
                                PCI_REGION_PREFETCH);
                sz -= pci_sz;
                bus_start += pci_sz;
                phys_start += pci_sz;
+               set_inbound_window(pi--, r++, pci_sz);
        }
 #endif
 
@@ -130,101 +206,252 @@ int fsl_pci_setup_inbound_windows(struct pci_region *r)
                        "inbound windows -- %lld remaining\n", sz);
 #endif
 
-       return r - rgn_base;
+       hose->region_count = r - hose->regions;
+
+       return 1;
+}
+
+#ifdef CONFIG_SYS_FSL_SRIO_PCIE_BOOT_MASTER
+static void fsl_pcie_boot_master(pit_t *pi)
+{
+       /* configure inbound window for slave's u-boot image */
+       debug("PCIEBOOT - MASTER: Inbound window for slave's image; "
+                       "Local = 0x%llx, Bus = 0x%llx, Size = 0x%x\n",
+                       (u64)CONFIG_SRIO_PCIE_BOOT_IMAGE_MEM_PHYS,
+                       (u64)CONFIG_SRIO_PCIE_BOOT_IMAGE_MEM_BUS1,
+                       CONFIG_SRIO_PCIE_BOOT_IMAGE_SIZE);
+       struct pci_region r_inbound;
+       u32 sz_inbound = __ilog2_u64(CONFIG_SRIO_PCIE_BOOT_IMAGE_SIZE)
+                                       - 1;
+       pci_set_region(&r_inbound,
+               CONFIG_SRIO_PCIE_BOOT_IMAGE_MEM_BUS1,
+               CONFIG_SRIO_PCIE_BOOT_IMAGE_MEM_PHYS,
+               sz_inbound,
+               PCI_REGION_MEM | PCI_REGION_SYS_MEMORY);
+
+       set_inbound_window(pi--, &r_inbound,
+               CONFIG_SRIO_PCIE_BOOT_IMAGE_SIZE);
+
+       /* configure inbound window for slave's u-boot image */
+       debug("PCIEBOOT - MASTER: Inbound window for slave's image; "
+                       "Local = 0x%llx, Bus = 0x%llx, Size = 0x%x\n",
+                       (u64)CONFIG_SRIO_PCIE_BOOT_IMAGE_MEM_PHYS,
+                       (u64)CONFIG_SRIO_PCIE_BOOT_IMAGE_MEM_BUS2,
+                       CONFIG_SRIO_PCIE_BOOT_IMAGE_SIZE);
+       pci_set_region(&r_inbound,
+               CONFIG_SRIO_PCIE_BOOT_IMAGE_MEM_BUS2,
+               CONFIG_SRIO_PCIE_BOOT_IMAGE_MEM_PHYS,
+               sz_inbound,
+               PCI_REGION_MEM | PCI_REGION_SYS_MEMORY);
+
+       set_inbound_window(pi--, &r_inbound,
+               CONFIG_SRIO_PCIE_BOOT_IMAGE_SIZE);
+
+       /* configure inbound window for slave's ucode and ENV */
+       debug("PCIEBOOT - MASTER: Inbound window for slave's "
+                       "ucode and ENV; "
+                       "Local = 0x%llx, Bus = 0x%llx, Size = 0x%x\n",
+                       (u64)CONFIG_SRIO_PCIE_BOOT_UCODE_ENV_MEM_PHYS,
+                       (u64)CONFIG_SRIO_PCIE_BOOT_UCODE_ENV_MEM_BUS,
+                       CONFIG_SRIO_PCIE_BOOT_UCODE_ENV_SIZE);
+       sz_inbound = __ilog2_u64(CONFIG_SRIO_PCIE_BOOT_UCODE_ENV_SIZE)
+                               - 1;
+       pci_set_region(&r_inbound,
+               CONFIG_SRIO_PCIE_BOOT_UCODE_ENV_MEM_BUS,
+               CONFIG_SRIO_PCIE_BOOT_UCODE_ENV_MEM_PHYS,
+               sz_inbound,
+               PCI_REGION_MEM | PCI_REGION_SYS_MEMORY);
+
+       set_inbound_window(pi--, &r_inbound,
+               CONFIG_SRIO_PCIE_BOOT_UCODE_ENV_SIZE);
 }
 
-void fsl_pci_init(struct pci_controller *hose, u32 cfg_addr, u32 cfg_data)
+static void fsl_pcie_boot_master_release_slave(int port)
+{
+       unsigned long release_addr;
+
+       /* now release slave's core 0 */
+       switch (port) {
+       case 1:
+               release_addr = CONFIG_SYS_PCIE1_MEM_VIRT
+                       + CONFIG_SRIO_PCIE_BOOT_BRR_OFFSET;
+               break;
+#ifdef CONFIG_SYS_PCIE2_MEM_VIRT
+       case 2:
+               release_addr = CONFIG_SYS_PCIE2_MEM_VIRT
+                       + CONFIG_SRIO_PCIE_BOOT_BRR_OFFSET;
+               break;
+#endif
+#ifdef CONFIG_SYS_PCIE3_MEM_VIRT
+       case 3:
+               release_addr = CONFIG_SYS_PCIE3_MEM_VIRT
+                       + CONFIG_SRIO_PCIE_BOOT_BRR_OFFSET;
+               break;
+#endif
+       default:
+               release_addr = 0;
+               break;
+       }
+       if (release_addr != 0) {
+               out_be32((void *)release_addr,
+                       CONFIG_SRIO_PCIE_BOOT_RELEASE_MASK);
+               debug("PCIEBOOT - MASTER: "
+                       "Release slave successfully! Now the slave should start up!\n");
+       } else {
+               debug("PCIEBOOT - MASTER: "
+                       "Release slave failed!\n");
+       }
+}
+#endif
+
+void fsl_pci_init(struct pci_controller *hose, struct fsl_pci_info *pci_info)
 {
+       u32 cfg_addr = (u32)&((ccsr_fsl_pci_t *)pci_info->regs)->cfg_addr;
+       u32 cfg_data = (u32)&((ccsr_fsl_pci_t *)pci_info->regs)->cfg_data;
        u16 temp16;
        u32 temp32;
-       int busno = hose->first_busno;
-       int enabled;
+       u32 block_rev;
+       int enabled, r, inbound = 0;
        u16 ltssm;
-       u8 temp8;
-       int r;
-       int bridge;
-       int inbound = 0;
+       u8 temp8, pcie_cap;
        volatile ccsr_fsl_pci_t *pci = (ccsr_fsl_pci_t *)cfg_addr;
-       pci_dev_t dev = PCI_BDF(busno,0,0);
+       struct pci_region *reg = hose->regions + hose->region_count;
+       pci_dev_t dev = PCI_BDF(hose->first_busno, 0, 0);
 
        /* Initialize ATMU registers based on hose regions and flags */
        volatile pot_t *po = &pci->pot[1];      /* skip 0 */
-       volatile pit_t *pi = &pci->pit[0];      /* ranges from: 3 to 1 */
+       volatile pit_t *pi;
 
-#ifdef DEBUG
-       int neg_link_w;
-#endif
+       u64 out_hi = 0, out_lo = -1ULL;
+       u32 pcicsrbar, pcicsrbar_sz;
 
        pci_setup_indirect(hose, cfg_addr, cfg_data);
 
-       for (r=0; r<hose->region_count; r++) {
+       block_rev = in_be32(&pci->block_rev1);
+       if (PEX_IP_BLK_REV_2_2 <= block_rev) {
+               pi = &pci->pit[2];      /* 0xDC0 */
+       } else {
+               pi = &pci->pit[3];      /* 0xDE0 */
+       }
+
+       /* Handle setup of outbound windows first */
+       for (r = 0; r < hose->region_count; r++) {
+               unsigned long flags = hose->regions[r].flags;
                u32 sz = (__ilog2_u64((u64)hose->regions[r].size) - 1);
-               if (hose->regions[r].flags & PCI_REGION_SYS_MEMORY) { /* inbound */
-                       u32 flag = PIWAR_EN | PIWAR_LOCAL |
-                                       PIWAR_READ_SNOOP | PIWAR_WRITE_SNOOP;
-                       pi->pitar = (hose->regions[r].phys_start >> 12);
-                       pi->piwbar = (hose->regions[r].bus_start >> 12);
-#ifdef CONFIG_SYS_PCI_64BIT
-                       pi->piwbear = (hose->regions[r].bus_start >> 44);
-#else
-                       pi->piwbear = 0;
-#endif
-                       if (hose->regions[r].flags & PCI_REGION_PREFETCH)
-                               flag |= PIWAR_PF;
-                       pi->piwar = flag | sz;
-                       pi++;
-                       inbound = hose->regions[r].size > 0;
-               } else { /* Outbound */
-                       po->powbar = (hose->regions[r].phys_start >> 12);
-                       po->potar = (hose->regions[r].bus_start >> 12);
+
+               flags &= PCI_REGION_SYS_MEMORY|PCI_REGION_TYPE;
+               if (flags != PCI_REGION_SYS_MEMORY) {
+                       u64 start = hose->regions[r].bus_start;
+                       u64 end = start + hose->regions[r].size;
+
+                       out_be32(&po->powbar, hose->regions[r].phys_start >> 12);
+                       out_be32(&po->potar, start >> 12);
 #ifdef CONFIG_SYS_PCI_64BIT
-                       po->potear = (hose->regions[r].bus_start >> 44);
+                       out_be32(&po->potear, start >> 44);
 #else
-                       po->potear = 0;
+                       out_be32(&po->potear, 0);
 #endif
-                       if (hose->regions[r].flags & PCI_REGION_IO)
-                               po->powar = POWAR_EN | sz |
-                                       POWAR_IO_READ | POWAR_IO_WRITE;
-                       else
-                               po->powar = POWAR_EN | sz |
-                                       POWAR_MEM_READ | POWAR_MEM_WRITE;
+                       if (hose->regions[r].flags & PCI_REGION_IO) {
+                               out_be32(&po->powar, POWAR_EN | sz |
+                                       POWAR_IO_READ | POWAR_IO_WRITE);
+                       } else {
+                               out_be32(&po->powar, POWAR_EN | sz |
+                                       POWAR_MEM_READ | POWAR_MEM_WRITE);
+                               out_lo = min(start, out_lo);
+                               out_hi = max(end, out_hi);
+                       }
                        po++;
                }
        }
+       debug("Outbound memory range: %llx:%llx\n", out_lo, out_hi);
+
+       /* setup PCSRBAR/PEXCSRBAR */
+       pci_hose_write_config_dword(hose, dev, PCI_BASE_ADDRESS_0, 0xffffffff);
+       pci_hose_read_config_dword (hose, dev, PCI_BASE_ADDRESS_0, &pcicsrbar_sz);
+       pcicsrbar_sz = ~pcicsrbar_sz + 1;
+
+       if (out_hi < (0x100000000ull - pcicsrbar_sz) ||
+               (out_lo > 0x100000000ull))
+               pcicsrbar = 0x100000000ull - pcicsrbar_sz;
+       else
+               pcicsrbar = (out_lo - pcicsrbar_sz) & -pcicsrbar_sz;
+       pci_hose_write_config_dword(hose, dev, PCI_BASE_ADDRESS_0, pcicsrbar);
+
+       out_lo = min(out_lo, (u64)pcicsrbar);
+
+       debug("PCICSRBAR @ 0x%x\n", pcicsrbar);
+
+       pci_set_region(reg++, pcicsrbar, CONFIG_SYS_CCSRBAR_PHYS,
+                       pcicsrbar_sz, PCI_REGION_SYS_MEMORY);
+       hose->region_count++;
+
+       /* see if we are a PCIe or PCI controller */
+       pci_hose_read_config_byte(hose, dev, FSL_PCIE_CAP_ID, &pcie_cap);
+
+#ifdef CONFIG_SYS_FSL_SRIO_PCIE_BOOT_MASTER
+       /* boot from PCIE --master */
+       char *s = getenv("bootmaster");
+       char pcie[6];
+       sprintf(pcie, "PCIE%d", pci_info->pci_num);
+
+       if (s && (strcmp(s, pcie) == 0)) {
+               debug("PCIEBOOT - MASTER: Master port [ %d ] for pcie boot.\n",
+                               pci_info->pci_num);
+               fsl_pcie_boot_master((pit_t *)pi);
+       } else {
+               /* inbound */
+               inbound = fsl_pci_setup_inbound_windows(hose,
+                                       out_lo, pcie_cap, pi);
+       }
+#else
+       /* inbound */
+       inbound = fsl_pci_setup_inbound_windows(hose, out_lo, pcie_cap, pi);
+#endif
+
+       for (r = 0; r < hose->region_count; r++)
+               debug("PCI reg:%d %016llx:%016llx %016llx %08lx\n", r,
+                       (u64)hose->regions[r].phys_start,
+                       (u64)hose->regions[r].bus_start,
+                       (u64)hose->regions[r].size,
+                       hose->regions[r].flags);
 
        pci_register_hose(hose);
        pciauto_config_init(hose);      /* grab pci_{mem,prefetch,io} */
        hose->current_busno = hose->first_busno;
 
-       pci->pedr = 0xffffffff;         /* Clear any errors */
-       pci->peer = ~0x20140;           /* Enable All Error Interupts except
+       out_be32(&pci->pedr, 0xffffffff);       /* Clear any errors */
+       out_be32(&pci->peer, ~0x20140); /* Enable All Error Interrupts except
                                         * - Master abort (pci)
                                         * - Master PERR (pci)
                                         * - ICCA (PCIe)
                                         */
-       pci_hose_read_config_dword (hose, dev, PCI_DCR, &temp32);
+       pci_hose_read_config_dword(hose, dev, PCI_DCR, &temp32);
        temp32 |= 0xf000e;              /* set URR, FER, NFER (but not CER) */
        pci_hose_write_config_dword(hose, dev, PCI_DCR, temp32);
 
-       pci_hose_read_config_byte (hose, dev, PCI_HEADER_TYPE, &temp8);
-       bridge = temp8 & PCI_HEADER_TYPE_BRIDGE; /* Bridge, such as pcie */
-
-       if ( bridge ) {
-
+#if defined(CONFIG_FSL_PCIE_DISABLE_ASPM)
+       temp32 = 0;
+       pci_hose_read_config_dword(hose, dev, PCI_LCR, &temp32);
+       temp32 &= ~0x03;                /* Disable ASPM  */
+       pci_hose_write_config_dword(hose, dev, PCI_LCR, temp32);
+       udelay(1);
+#endif
+       if (pcie_cap == PCI_CAP_ID_EXP) {
                pci_hose_read_config_word(hose, dev, PCI_LTSSM, &ltssm);
                enabled = ltssm >= PCI_LTSSM_L0;
 
 #ifdef CONFIG_FSL_PCIE_RESET
                if (ltssm == 1) {
                        int i;
-                       debug("....PCIe link error. "
-                             "LTSSM=0x%02x.", ltssm);
-                       pci->pdb_stat |= 0x08000000; /* assert PCIe reset */
-                       temp32 = pci->pdb_stat;
+                       debug("....PCIe link error. " "LTSSM=0x%02x.", ltssm);
+                       /* assert PCIe reset */
+                       setbits_be32(&pci->pdb_stat, 0x08000000);
+                       (void) in_be32(&pci->pdb_stat);
                        udelay(100);
-                       debug("  Asserting PCIe reset @%x = %x\n",
-                             &pci->pdb_stat, pci->pdb_stat);
-                       pci->pdb_stat &= ~0x08000000; /* clear reset */
+                       debug("  Asserting PCIe reset @%p = %x\n",
+                             &pci->pdb_stat, in_be32(&pci->pdb_stat));
+                       /* clear PCIe reset */
+                       clrbits_be32(&pci->pdb_stat, 0x08000000);
                        asm("sync;isync");
                        for (i=0; i<100 && ltssm < PCI_LTSSM_L0; i++) {
                                pci_hose_read_config_word(hose, dev, PCI_LTSSM,
@@ -234,34 +461,38 @@ void fsl_pci_init(struct pci_controller *hose, u32 cfg_addr, u32 cfg_data)
                                      "LTSSM=0x%02x.\n", ltssm);
                        }
                        enabled = ltssm >= PCI_LTSSM_L0;
+
+                       /* we need to re-write the bar0 since a reset will
+                        * clear it
+                        */
+                       pci_hose_write_config_dword(hose, dev,
+                                       PCI_BASE_ADDRESS_0, pcicsrbar);
                }
 #endif
 
                if (!enabled) {
-                       debug("....PCIE link error.  Skipping scan."
-                             "LTSSM=0x%02x\n", ltssm);
+                       /* Let the user know there's no PCIe link */
+                       printf("no link, regs @ 0x%lx\n", pci_info->regs);
                        hose->last_busno = hose->first_busno;
                        return;
                }
 
-               pci->pme_msg_det = 0xffffffff;
-               pci->pme_msg_int_en = 0xffffffff;
-#ifdef DEBUG
+               out_be32(&pci->pme_msg_det, 0xffffffff);
+               out_be32(&pci->pme_msg_int_en, 0xffffffff);
+
+               /* Print the negotiated PCIe link width */
                pci_hose_read_config_word(hose, dev, PCI_LSR, &temp16);
-               neg_link_w = (temp16 & 0x3f0 ) >> 4;
-               printf("...PCIE LTSSM=0x%x, Negotiated link width=%d\n",
-                     ltssm, neg_link_w);
-#endif
+               printf("x%d, regs @ 0x%lx\n", (temp16 & 0x3f0 ) >> 4,
+                       pci_info->regs);
+
                hose->current_busno++; /* Start scan with secondary */
                pciauto_prescan_setup_bridge(hose, dev, hose->current_busno);
-
        }
 
        /* Use generic setup_device to initialize standard pci regs,
         * but do not allocate any windows since any BAR found (such
         * as PCSRBAR) is not in this cpu's memory space.
         */
-
        pciauto_setup_device(hose, dev, 0, hose->pci_mem,
                             hose->pci_prefetch, hose->pci_io);
 
@@ -272,23 +503,20 @@ void fsl_pci_init(struct pci_controller *hose, u32 cfg_addr, u32 cfg_data)
        }
 
 #ifndef CONFIG_PCI_NOSCAN
-       pci_hose_read_config_byte(hose, dev, PCI_CLASS_PROG, &temp8);
-
-       /* Programming Interface (PCI_CLASS_PROG)
-        * 0 == pci host or pcie root-complex,
-        * 1 == pci agent or pcie end-point
-        */
-       if (!temp8) {
-               printf("               Scanning PCI bus %02x\n",
+       if (!fsl_is_pci_agent(hose)) {
+               debug("           Scanning PCI bus %02x\n",
                        hose->current_busno);
                hose->last_busno = pci_hose_scan_bus(hose, hose->current_busno);
        } else {
-               debug("               Not scanning PCI bus %02x. PI=%x\n",
+               debug("           Not scanning PCI bus %02x. PI=%x\n",
                        hose->current_busno, temp8);
                hose->last_busno = hose->current_busno;
        }
 
-       if ( bridge ) { /* update limit regs and subordinate busno */
+       /* if we are PCIe - update limit regs and subordinate busno
+        * for the virtual P2P bridge
+        */
+       if (pcie_cap == PCI_CAP_ID_EXP) {
                pciauto_postscan_setup_bridge(hose, dev, hose->last_busno);
        }
 #else
@@ -296,15 +524,13 @@ void fsl_pci_init(struct pci_controller *hose, u32 cfg_addr, u32 cfg_data)
 #endif
 
        /* Clear all error indications */
-
-       if (bridge)
-               pci->pme_msg_det = 0xffffffff;
-       pci->pedr = 0xffffffff;
+       if (pcie_cap == PCI_CAP_ID_EXP)
+               out_be32(&pci->pme_msg_det, 0xffffffff);
+       out_be32(&pci->pedr, 0xffffffff);
 
        pci_hose_read_config_word (hose, dev, PCI_DSR, &temp16);
        if (temp16) {
-               pci_hose_write_config_word(hose, dev,
-                                       PCI_DSR, 0xffff);
+               pci_hose_write_config_word(hose, dev, PCI_DSR, 0xffff);
        }
 
        pci_hose_read_config_word (hose, dev, PCI_SEC_STATUS, &temp16);
@@ -313,16 +539,97 @@ void fsl_pci_init(struct pci_controller *hose, u32 cfg_addr, u32 cfg_data)
        }
 }
 
+int fsl_is_pci_agent(struct pci_controller *hose)
+{
+       u8 pcie_cap;
+       pci_dev_t dev = PCI_BDF(hose->first_busno, 0, 0);
+
+       pci_hose_read_config_byte(hose, dev, FSL_PCIE_CAP_ID, &pcie_cap);
+       if (pcie_cap == PCI_CAP_ID_EXP) {
+               u8 header_type;
+
+               pci_hose_read_config_byte(hose, dev, PCI_HEADER_TYPE,
+                                         &header_type);
+               return (header_type & 0x7f) == PCI_HEADER_TYPE_NORMAL;
+       } else {
+               u8 prog_if;
+
+               pci_hose_read_config_byte(hose, dev, PCI_CLASS_PROG, &prog_if);
+               return (prog_if == FSL_PROG_IF_AGENT);
+       }
+}
+
+int fsl_pci_init_port(struct fsl_pci_info *pci_info,
+                       struct pci_controller *hose, int busno)
+{
+       volatile ccsr_fsl_pci_t *pci;
+       struct pci_region *r;
+       pci_dev_t dev = PCI_BDF(busno,0,0);
+       u8 pcie_cap;
+
+       pci = (ccsr_fsl_pci_t *) pci_info->regs;
+
+       /* on non-PCIe controllers we don't have pme_msg_det so this code
+        * should do nothing since the read will return 0
+        */
+       if (in_be32(&pci->pme_msg_det)) {
+               out_be32(&pci->pme_msg_det, 0xffffffff);
+               debug (" with errors.  Clearing.  Now 0x%08x",
+                       pci->pme_msg_det);
+       }
+
+       r = hose->regions + hose->region_count;
+
+       /* outbound memory */
+       pci_set_region(r++,
+                       pci_info->mem_bus,
+                       pci_info->mem_phys,
+                       pci_info->mem_size,
+                       PCI_REGION_MEM);
+
+       /* outbound io */
+       pci_set_region(r++,
+                       pci_info->io_bus,
+                       pci_info->io_phys,
+                       pci_info->io_size,
+                       PCI_REGION_IO);
+
+       hose->region_count = r - hose->regions;
+       hose->first_busno = busno;
+
+       fsl_pci_init(hose, pci_info);
+
+       if (fsl_is_pci_agent(hose)) {
+               fsl_pci_config_unlock(hose);
+               hose->last_busno = hose->first_busno;
+#ifdef CONFIG_SYS_FSL_SRIO_PCIE_BOOT_MASTER
+       } else {
+               /* boot from PCIE --master releases slave's core 0 */
+               char *s = getenv("bootmaster");
+               char pcie[6];
+               sprintf(pcie, "PCIE%d", pci_info->pci_num);
+
+               if (s && (strcmp(s, pcie) == 0))
+                       fsl_pcie_boot_master_release_slave(pci_info->pci_num);
+#endif
+       }
+
+       pci_hose_read_config_byte(hose, dev, FSL_PCIE_CAP_ID, &pcie_cap);
+       printf("PCI%s%x: Bus %02x - %02x\n", pcie_cap == PCI_CAP_ID_EXP ?
+               "e" : "", pci_info->pci_num,
+               hose->first_busno, hose->last_busno);
+
+       return(hose->last_busno + 1);
+}
+
 /* Enable inbound PCI config cycles for agent/endpoint interface */
 void fsl_pci_config_unlock(struct pci_controller *hose)
 {
        pci_dev_t dev = PCI_BDF(hose->first_busno,0,0);
-       u8 agent;
        u8 pcie_cap;
        u16 pbfr;
 
-       pci_hose_read_config_byte(hose, dev, PCI_CLASS_PROG, &agent);
-       if (!agent)
+       if (!fsl_is_pci_agent(hose))
                return;
 
        pci_hose_read_config_byte(hose, dev, FSL_PCIE_CAP_ID, &pcie_cap);
@@ -337,18 +644,198 @@ void fsl_pci_config_unlock(struct pci_controller *hose)
        }
 }
 
+#if defined(CONFIG_PCIE1) || defined(CONFIG_PCIE2) || \
+    defined(CONFIG_PCIE3) || defined(CONFIG_PCIE4)
+int fsl_configure_pcie(struct fsl_pci_info *info,
+                       struct pci_controller *hose,
+                       const char *connected, int busno)
+{
+       int is_endpoint;
+
+       set_next_law(info->mem_phys, law_size_bits(info->mem_size), info->law);
+       set_next_law(info->io_phys, law_size_bits(info->io_size), info->law);
+
+       is_endpoint = fsl_setup_hose(hose, info->regs);
+       printf("PCIe%u: %s", info->pci_num,
+               is_endpoint ? "Endpoint" : "Root Complex");
+       if (connected)
+               printf(" of %s", connected);
+       puts(", ");
+
+       return fsl_pci_init_port(info, hose, busno);
+}
+
+#if defined(CONFIG_FSL_CORENET)
+#ifdef CONFIG_SYS_FSL_QORIQ_CHASSIS2
+       #define _DEVDISR_PCIE1 FSL_CORENET_DEVDISR3_PCIE1
+       #define _DEVDISR_PCIE2 FSL_CORENET_DEVDISR3_PCIE2
+       #define _DEVDISR_PCIE3 FSL_CORENET_DEVDISR3_PCIE3
+       #define _DEVDISR_PCIE4 FSL_CORENET_DEVDISR3_PCIE4
+#else
+       #define _DEVDISR_PCIE1 FSL_CORENET_DEVDISR_PCIE1
+       #define _DEVDISR_PCIE2 FSL_CORENET_DEVDISR_PCIE2
+       #define _DEVDISR_PCIE3 FSL_CORENET_DEVDISR_PCIE3
+       #define _DEVDISR_PCIE4 FSL_CORENET_DEVDISR_PCIE4
+#endif
+       #define CONFIG_SYS_MPC8xxx_GUTS_ADDR CONFIG_SYS_MPC85xx_GUTS_ADDR
+#elif defined(CONFIG_MPC85xx)
+       #define _DEVDISR_PCIE1 MPC85xx_DEVDISR_PCIE
+       #define _DEVDISR_PCIE2 MPC85xx_DEVDISR_PCIE2
+       #define _DEVDISR_PCIE3 MPC85xx_DEVDISR_PCIE3
+       #define _DEVDISR_PCIE4 0
+       #define CONFIG_SYS_MPC8xxx_GUTS_ADDR CONFIG_SYS_MPC85xx_GUTS_ADDR
+#elif defined(CONFIG_MPC86xx)
+       #define _DEVDISR_PCIE1 MPC86xx_DEVDISR_PCIE1
+       #define _DEVDISR_PCIE2 MPC86xx_DEVDISR_PCIE2
+       #define _DEVDISR_PCIE3 0
+       #define _DEVDISR_PCIE4 0
+       #define CONFIG_SYS_MPC8xxx_GUTS_ADDR \
+               (&((immap_t *)CONFIG_SYS_IMMR)->im_gur)
+#else
+#error "No defines for DEVDISR_PCIE"
+#endif
+
+/* Implement a dummy function for those platforms w/o SERDES */
+static const char *__board_serdes_name(enum srds_prtcl device)
+{
+       switch (device) {
+#ifdef CONFIG_SYS_PCIE1_NAME
+       case PCIE1:
+               return CONFIG_SYS_PCIE1_NAME;
+#endif
+#ifdef CONFIG_SYS_PCIE2_NAME
+       case PCIE2:
+               return CONFIG_SYS_PCIE2_NAME;
+#endif
+#ifdef CONFIG_SYS_PCIE3_NAME
+       case PCIE3:
+               return CONFIG_SYS_PCIE3_NAME;
+#endif
+#ifdef CONFIG_SYS_PCIE4_NAME
+       case PCIE4:
+               return CONFIG_SYS_PCIE4_NAME;
+#endif
+       default:
+               return NULL;
+       }
+
+       return NULL;
+}
+
+__attribute__((weak, alias("__board_serdes_name"))) const char *
+board_serdes_name(enum srds_prtcl device);
+
+static u32 devdisr_mask[] = {
+       _DEVDISR_PCIE1,
+       _DEVDISR_PCIE2,
+       _DEVDISR_PCIE3,
+       _DEVDISR_PCIE4,
+};
+
+int fsl_pcie_init_ctrl(int busno, u32 devdisr, enum srds_prtcl dev,
+                       struct fsl_pci_info *pci_info)
+{
+       struct pci_controller *hose;
+       int num = dev - PCIE1;
+
+       hose = calloc(1, sizeof(struct pci_controller));
+       if (!hose)
+               return busno;
+
+       if (is_serdes_configured(dev) && !(devdisr & devdisr_mask[num])) {
+               busno = fsl_configure_pcie(pci_info, hose,
+                               board_serdes_name(dev), busno);
+       } else {
+               printf("PCIe%d: disabled\n", num + 1);
+       }
+
+       return busno;
+}
+
+int fsl_pcie_init_board(int busno)
+{
+       struct fsl_pci_info pci_info;
+       ccsr_gur_t *gur = (void *)CONFIG_SYS_MPC8xxx_GUTS_ADDR;
+       u32 devdisr;
+       u32 *addr;
+
+#ifdef CONFIG_SYS_FSL_QORIQ_CHASSIS2
+       addr = &gur->devdisr3;
+#else
+       addr = &gur->devdisr;
+#endif
+       devdisr = in_be32(addr);
+
+#ifdef CONFIG_PCIE1
+       SET_STD_PCIE_INFO(pci_info, 1);
+       busno = fsl_pcie_init_ctrl(busno, devdisr, PCIE1, &pci_info);
+#else
+       setbits_be32(addr, _DEVDISR_PCIE1); /* disable */
+#endif
+
+#ifdef CONFIG_PCIE2
+       SET_STD_PCIE_INFO(pci_info, 2);
+       busno = fsl_pcie_init_ctrl(busno, devdisr, PCIE2, &pci_info);
+#else
+       setbits_be32(addr, _DEVDISR_PCIE2); /* disable */
+#endif
+
+#ifdef CONFIG_PCIE3
+       SET_STD_PCIE_INFO(pci_info, 3);
+       busno = fsl_pcie_init_ctrl(busno, devdisr, PCIE3, &pci_info);
+#else
+       setbits_be32(addr, _DEVDISR_PCIE3); /* disable */
+#endif
+
+#ifdef CONFIG_PCIE4
+       SET_STD_PCIE_INFO(pci_info, 4);
+       busno = fsl_pcie_init_ctrl(busno, devdisr, PCIE4, &pci_info);
+#else
+       setbits_be32(addr, _DEVDISR_PCIE4); /* disable */
+#endif
+
+       return busno;
+}
+#else
+int fsl_pcie_init_ctrl(int busno, u32 devdisr, enum srds_prtcl dev,
+                       struct fsl_pci_info *pci_info)
+{
+       return busno;
+}
+
+int fsl_pcie_init_board(int busno)
+{
+       return busno;
+}
+#endif
+
 #ifdef CONFIG_OF_BOARD_SETUP
 #include <libfdt.h>
 #include <fdt_support.h>
 
-void ft_fsl_pci_setup(void *blob, const char *pci_alias,
-                       struct pci_controller *hose)
+void ft_fsl_pci_setup(void *blob, const char *pci_compat,
+                       unsigned long ctrl_addr)
 {
-       int off = fdt_path_offset(blob, pci_alias);
+       int off;
+       u32 bus_range[2];
+       phys_addr_t p_ctrl_addr = (phys_addr_t)ctrl_addr;
+       struct pci_controller *hose;
 
-       if (off >= 0) {
-               u32 bus_range[2];
+       hose = find_hose_by_cfg_addr((void *)(ctrl_addr));
 
+       /* convert ctrl_addr to true physical address */
+       p_ctrl_addr = (phys_addr_t)ctrl_addr - CONFIG_SYS_CCSRBAR;
+       p_ctrl_addr += CONFIG_SYS_CCSRBAR_PHYS;
+
+       off = fdt_node_offset_by_compat_reg(blob, pci_compat, p_ctrl_addr);
+
+       if (off < 0)
+               return;
+
+       /* We assume a cfg_addr not being set means we didn't setup the controller */
+       if ((hose == NULL) || (hose->cfg_addr == NULL)) {
+               fdt_del_node(blob, off);
+       } else {
                bus_range[0] = 0;
                bus_range[1] = hose->last_busno - hose->first_busno;
                fdt_setprop(blob, off, "bus-range", &bus_range[0], 2*4);