]> git.kernelconcepts.de Git - karo-tx-uboot.git/blobdiff - board/freescale/mpc8536ds/mpc8536ds.c
fsl: Clean up printing of PCI boot info
[karo-tx-uboot.git] / board / freescale / mpc8536ds / mpc8536ds.c
index 5bd20cee6d2ad48a5b27a078cdbc7fd91f11a65e..8ad75495172333fb97295ae19637f172189b2acc 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Freescale Semiconductor.
+ * Copyright 2008-2010 Freescale Semiconductor, Inc.
  *
  * See file CREDITS for list of people who contributed to this
  * project.
@@ -30,6 +30,7 @@
 #include <asm/fsl_pci.h>
 #include <asm/fsl_ddr_sdram.h>
 #include <asm/io.h>
+#include <asm/fsl_serdes.h>
 #include <spd.h>
 #include <miiphy.h>
 #include <libfdt.h>
@@ -39,7 +40,6 @@
 #include <netdev.h>
 #include <sata.h>
 
-#include "../common/pixis.h"
 #include "../common/sgmii_riser.h"
 
 phys_size_t fixed_sdram(void);
@@ -189,20 +189,26 @@ static struct pci_controller pcie2_hose;
 static struct pci_controller pcie3_hose;
 #endif
 
-int first_free_busno=0;
-
-void
-pci_init_board(void)
+#ifdef CONFIG_PCI
+void pci_init_board(void)
 {
-       volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
-       uint devdisr = gur->devdisr;
-       uint sdrs2_io_sel =
-               (gur->pordevsr & MPC85xx_PORDEVSR_SRDS2_IO_SEL) >> 27;
-       uint io_sel = (gur->pordevsr & MPC85xx_PORDEVSR_IO_SEL) >> 19;
-       uint host_agent = (gur->porbmsr & MPC85xx_PORBMSR_HA) >> 16;
+       ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
+       struct fsl_pci_info pci_info[4];
+       u32 devdisr, pordevsr, io_sel, sdrs2_io_sel;
+       u32 porpllsr, pci_agent, pci_speed, pci_32, pci_arb, pci_clk_sel;
+       int first_free_busno = 0;
+       int num = 0;
 
-       debug("   pci_init_board: devdisr=%x, sdrs2_io_sel=%x, io_sel=%x,\
-               host_agent=%x\n", devdisr, sdrs2_io_sel, io_sel, host_agent);
+       int pcie_ep, pcie_configured;
+
+       devdisr = in_be32(&gur->devdisr);
+       pordevsr = in_be32(&gur->pordevsr);
+       porpllsr = in_be32(&gur->porpllsr);
+       io_sel = (pordevsr & MPC85xx_PORDEVSR_IO_SEL) >> 19;
+       sdrs2_io_sel = (pordevsr & MPC85xx_PORDEVSR_SRDS2_IO_SEL) >> 27;
+
+       debug("   pci_init_board: devdisr=%x, sdrs2_io_sel=%x, io_sel=%x\n",
+               devdisr, sdrs2_io_sel, io_sel);
 
        if (sdrs2_io_sel == 7)
                printf("    Serdes2 disalbed\n");
@@ -212,240 +218,118 @@ pci_init_board(void)
        } else if (sdrs2_io_sel == 6)
                printf("    eTSEC1 is in sgmii mode.\n");
 
+       puts("\n");
 #ifdef CONFIG_PCIE3
-{
-       volatile ccsr_fsl_pci_t *pci = (ccsr_fsl_pci_t *) CONFIG_SYS_PCIE3_ADDR;
-       struct pci_controller *hose = &pcie3_hose;
-       int pcie_ep = (host_agent == 1);
-       int pcie_configured  = (io_sel == 7);
-       struct pci_region *r = hose->regions;
-
-       if (pcie_configured && !(devdisr & MPC85xx_DEVDISR_PCIE)){
-               printf ("\n    PCIE3 connected to Slot3 as %s (base address %x)",
-                       pcie_ep ? "End Point" : "Root Complex",
-                       (uint)pci);
-               if (pci->pme_msg_det) {
-                       pci->pme_msg_det = 0xffffffff;
-                       debug (" with errors.  Clearing.  Now 0x%08x",pci->pme_msg_det);
-               }
-               printf ("\n");
-
-               /* outbound memory */
-               pci_set_region(r++,
-                              CONFIG_SYS_PCIE3_MEM_BUS,
-                              CONFIG_SYS_PCIE3_MEM_PHYS,
-                              CONFIG_SYS_PCIE3_MEM_SIZE,
-                              PCI_REGION_MEM);
-
-               /* outbound io */
-               pci_set_region(r++,
-                              CONFIG_SYS_PCIE3_IO_BUS,
-                              CONFIG_SYS_PCIE3_IO_PHYS,
-                              CONFIG_SYS_PCIE3_IO_SIZE,
-                              PCI_REGION_IO);
-
-               hose->region_count = r - hose->regions;
-
-               hose->first_busno=first_free_busno;
-
-               fsl_pci_init(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data);
-
-               first_free_busno=hose->last_busno+1;
-               printf ("    PCIE3 on bus %02x - %02x\n",
-                       hose->first_busno,hose->last_busno);
+       pcie_configured = is_serdes_configured(PCIE3);
+
+       if (pcie_configured && !(devdisr & MPC85xx_DEVDISR_PCIE3)){
+               set_next_law(CONFIG_SYS_PCIE3_MEM_PHYS, LAW_SIZE_512M,
+                               LAW_TRGT_IF_PCIE_3);
+               set_next_law(CONFIG_SYS_PCIE3_IO_PHYS, LAW_SIZE_64K,
+                               LAW_TRGT_IF_PCIE_3);
+               SET_STD_PCIE_INFO(pci_info[num], 3);
+               pcie_ep = fsl_setup_hose(&pcie3_hose, pci_info[num].regs);
+               printf("PCIE3: connected to Slot3 as %s (base address %lx)\n",
+                       pcie_ep ? "Endpoint" : "Root Complex",
+                       pci_info[num].regs);
+               first_free_busno = fsl_pci_init_port(&pci_info[num++],
+                                       &pcie3_hose, first_free_busno);
        } else {
-               printf ("    PCIE3: disabled\n");
+               printf("PCIE3: disabled\n");
        }
 
- }
+       puts("\n");
 #else
-       gur->devdisr |= MPC85xx_DEVDISR_PCIE3; /* disable */
+       setbits_be32(&gur->devdisr, MPC85xx_DEVDISR_PCIE3); /* disable */
 #endif
 
 #ifdef CONFIG_PCIE1
- {
-       volatile ccsr_fsl_pci_t *pci = (ccsr_fsl_pci_t *) CONFIG_SYS_PCIE1_ADDR;
-       struct pci_controller *hose = &pcie1_hose;
-       int pcie_ep = (host_agent == 5);
-       int pcie_configured  = (io_sel == 2 || io_sel == 3
-                               || io_sel == 5 || io_sel == 7);
-       struct pci_region *r = hose->regions;
+       pcie_configured = is_serdes_configured(PCIE1);
 
        if (pcie_configured && !(devdisr & MPC85xx_DEVDISR_PCIE)){
-               printf ("\n    PCIE1 connected to Slot1 as %s (base address %x)",
-                       pcie_ep ? "End Point" : "Root Complex",
-                       (uint)pci);
-               if (pci->pme_msg_det) {
-                       pci->pme_msg_det = 0xffffffff;
-                       debug (" with errors.  Clearing.  Now 0x%08x",pci->pme_msg_det);
-               }
-               printf ("\n");
-
-               /* outbound memory */
-               pci_set_region(r++,
-                              CONFIG_SYS_PCIE1_MEM_BUS,
-                              CONFIG_SYS_PCIE1_MEM_PHYS,
-                              CONFIG_SYS_PCIE1_MEM_SIZE,
-                              PCI_REGION_MEM);
-
-               /* outbound io */
-               pci_set_region(r++,
-                              CONFIG_SYS_PCIE1_IO_BUS,
-                              CONFIG_SYS_PCIE1_IO_PHYS,
-                              CONFIG_SYS_PCIE1_IO_SIZE,
-                              PCI_REGION_IO);
-
-#ifdef CONFIG_SYS_PCIE1_MEM_BUS2
-               /* outbound memory */
-               pci_set_region(r++,
-                              CONFIG_SYS_PCIE1_MEM_BUS2,
-                              CONFIG_SYS_PCIE1_MEM_PHYS2,
-                              CONFIG_SYS_PCIE1_MEM_SIZE2,
-                              PCI_REGION_MEM);
-#endif
-               hose->region_count = r - hose->regions;
-               hose->first_busno=first_free_busno;
-
-               fsl_pci_init(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data);
-
-               first_free_busno=hose->last_busno+1;
-               printf("    PCIE1 on bus %02x - %02x\n",
-                      hose->first_busno,hose->last_busno);
-
+               set_next_law(CONFIG_SYS_PCIE1_MEM_PHYS, LAW_SIZE_128M,
+                               LAW_TRGT_IF_PCIE_1);
+               set_next_law(CONFIG_SYS_PCIE1_IO_PHYS, LAW_SIZE_64K,
+                               LAW_TRGT_IF_PCIE_1);
+               SET_STD_PCIE_INFO(pci_info[num], 1);
+               pcie_ep = fsl_setup_hose(&pcie1_hose, pci_info[num].regs);
+               printf("PCIE1: connected to Slot1 as %s (base address %lx)\n",
+                       pcie_ep ? "Endpoint" : "Root Complex",
+                       pci_info[num].regs);
+               first_free_busno = fsl_pci_init_port(&pci_info[num++],
+                                       &pcie1_hose, first_free_busno);
        } else {
-               printf ("    PCIE1: disabled\n");
+               printf("PCIE1: disabled\n");
        }
 
- }
+       puts("\n");
 #else
-       gur->devdisr |= MPC85xx_DEVDISR_PCIE; /* disable */
+       setbits_be32(&gur->devdisr, MPC85xx_DEVDISR_PCIE); /* disable */
 #endif
 
 #ifdef CONFIG_PCIE2
- {
-       volatile ccsr_fsl_pci_t *pci = (ccsr_fsl_pci_t *) CONFIG_SYS_PCIE2_ADDR;
-       struct pci_controller *hose = &pcie2_hose;
-       int pcie_ep = (host_agent == 3);
-       int pcie_configured  = (io_sel == 5 || io_sel == 7);
-       struct pci_region *r = hose->regions;
-
-       if (pcie_configured && !(devdisr & MPC85xx_DEVDISR_PCIE)){
-               printf ("\n    PCIE2 connected to Slot 2 as %s (base address %x)",
-                       pcie_ep ? "End Point" : "Root Complex",
-                       (uint)pci);
-               if (pci->pme_msg_det) {
-                       pci->pme_msg_det = 0xffffffff;
-                       debug (" with errors.  Clearing.  Now 0x%08x",pci->pme_msg_det);
-               }
-               printf ("\n");
-
-               /* outbound memory */
-               pci_set_region(r++,
-                              CONFIG_SYS_PCIE2_MEM_BUS,
-                              CONFIG_SYS_PCIE2_MEM_PHYS,
-                              CONFIG_SYS_PCIE2_MEM_SIZE,
-                              PCI_REGION_MEM);
-
-               /* outbound io */
-               pci_set_region(r++,
-                              CONFIG_SYS_PCIE2_IO_BUS,
-                              CONFIG_SYS_PCIE2_IO_PHYS,
-                              CONFIG_SYS_PCIE2_IO_SIZE,
-                              PCI_REGION_IO);
-
-#ifdef CONFIG_SYS_PCIE2_MEM_BUS2
-               /* outbound memory */
-               pci_set_region(r++,
-                              CONFIG_SYS_PCIE2_MEM_BUS2,
-                              CONFIG_SYS_PCIE2_MEM_PHYS2,
-                              CONFIG_SYS_PCIE2_MEM_SIZE2,
-                              PCI_REGION_MEM);
-#endif
-               hose->region_count = r - hose->regions;
-               hose->first_busno=first_free_busno;
-
-               fsl_pci_init(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data);
-               first_free_busno=hose->last_busno+1;
-               printf ("    PCIE2 on bus %02x - %02x\n",
-                       hose->first_busno,hose->last_busno);
-
+       pcie_configured = is_serdes_configured(PCIE2);
+
+       if (pcie_configured && !(devdisr & MPC85xx_DEVDISR_PCIE2)){
+               set_next_law(CONFIG_SYS_PCIE2_MEM_PHYS, LAW_SIZE_128M,
+                               LAW_TRGT_IF_PCIE_2);
+               set_next_law(CONFIG_SYS_PCIE2_IO_PHYS, LAW_SIZE_64K,
+                               LAW_TRGT_IF_PCIE_2);
+               SET_STD_PCIE_INFO(pci_info[num], 2);
+               pcie_ep = fsl_setup_hose(&pcie2_hose, pci_info[num].regs);
+               printf("PCIE2: connected to Slot 2 as %s (base address %lx)\n",
+                       pcie_ep ? "Endpoint" : "Root Complex",
+                       pci_info[num].regs);
+               first_free_busno = fsl_pci_init_port(&pci_info[num++],
+                                       &pcie2_hose, first_free_busno);
        } else {
-               printf ("    PCIE2: disabled\n");
+               printf("PCIE2: disabled\n");
        }
 
- }
+       puts("\n");
 #else
-       gur->devdisr |= MPC85xx_DEVDISR_PCIE2; /* disable */
+       setbits_be32(&gur->devdisr, MPC85xx_DEVDISR_PCIE2); /* disable */
 #endif
 
-
 #ifdef CONFIG_PCI1
-{
-       volatile ccsr_fsl_pci_t *pci = (ccsr_fsl_pci_t *) CONFIG_SYS_PCI1_ADDR;
-       struct pci_controller *hose = &pci1_hose;
-       struct pci_region *r = hose->regions;
-
-       uint pci_agent = (host_agent == 6);
-       uint pci_speed = 66666000; /*get_clock_freq (); PCI PSPEED in [4:5] */
-       uint pci_32 = 1;
-       uint pci_arb = gur->pordevsr & MPC85xx_PORDEVSR_PCI1_ARB;       /* PORDEVSR[14] */
-       uint pci_clk_sel = gur->porpllsr & MPC85xx_PORDEVSR_PCI1_SPD;   /* PORPLLSR[16] */
-
+       pci_speed = 66666000;
+       pci_32 = 1;
+       pci_arb = pordevsr & MPC85xx_PORDEVSR_PCI1_ARB;
+       pci_clk_sel = porpllsr & MPC85xx_PORDEVSR_PCI1_SPD;
 
        if (!(devdisr & MPC85xx_DEVDISR_PCI1)) {
-               printf ("\n    PCI: %d bit, %s MHz, %s, %s, %s (base address %x)\n",
+               set_next_law(CONFIG_SYS_PCI1_MEM_PHYS, LAW_SIZE_256M,
+                               LAW_TRGT_IF_PCI);
+               set_next_law(CONFIG_SYS_PCI1_IO_PHYS, LAW_SIZE_64K,
+                               LAW_TRGT_IF_PCI);
+               SET_STD_PCI_INFO(pci_info[num], 1);
+               pci_agent = fsl_setup_hose(&pci1_hose, pci_info[num].regs);
+               printf("PCI: %d bit, %s MHz, %s, %s, %s (base address %lx)\n",
                        (pci_32) ? 32 : 64,
                        (pci_speed == 33333000) ? "33" :
                        (pci_speed == 66666000) ? "66" : "unknown",
                        pci_clk_sel ? "sync" : "async",
                        pci_agent ? "agent" : "host",
                        pci_arb ? "arbiter" : "external-arbiter",
-                       (uint)pci
-                       );
-
-               /* outbound memory */
-               pci_set_region(r++,
-                              CONFIG_SYS_PCI1_MEM_BUS,
-                              CONFIG_SYS_PCI1_MEM_PHYS,
-                              CONFIG_SYS_PCI1_MEM_SIZE,
-                              PCI_REGION_MEM);
-
-               /* outbound io */
-               pci_set_region(r++,
-                              CONFIG_SYS_PCI1_IO_BUS,
-                              CONFIG_SYS_PCI1_IO_PHYS,
-                              CONFIG_SYS_PCI1_IO_SIZE,
-                              PCI_REGION_IO);
-
-#ifdef CONFIG_SYS_PCI1_MEM_BUS2
-               /* outbound memory */
-               pci_set_region(r++,
-                              CONFIG_SYS_PCI1_MEM_BUS2,
-                              CONFIG_SYS_PCI1_MEM_PHYS2,
-                              CONFIG_SYS_PCI1_MEM_SIZE2,
-                              PCI_REGION_MEM);
-#endif
-               hose->region_count = r - hose->regions;
-               hose->first_busno=first_free_busno;
+                       pci_info[num].regs);
 
-               fsl_pci_init(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data);
-               first_free_busno=hose->last_busno+1;
-               printf ("PCI on bus %02x - %02x\n",
-                       hose->first_busno,hose->last_busno);
+               first_free_busno = fsl_pci_init_port(&pci_info[num++],
+                                       &pci1_hose, first_free_busno);
        } else {
-               printf ("    PCI: disabled\n");
+               printf("PCI: disabled\n");
        }
-}
+
+       puts("\n");
 #else
-       gur->devdisr |= MPC85xx_DEVDISR_PCI1; /* disable */
+       setbits_be32(&gur->devdisr, MPC85xx_DEVDISR_PCI1); /* disable */
 #endif
 }
-
+#endif
 
 int board_early_init_r(void)
 {
        const unsigned int flashbase = CONFIG_SYS_FLASH_BASE;
-       const u8 flash_esel = 1;
+       const u8 flash_esel = find_tlb_idx((void *)flashbase, 1);
 
        /*
         * Remap Boot flash + PROMJET region to caching-inhibited
@@ -466,165 +350,6 @@ int board_early_init_r(void)
        return 0;
 }
 
-#ifdef CONFIG_GET_CLK_FROM_ICS307
-/* decode S[0-2] to Output Divider (OD) */
-static unsigned char
-ics307_S_to_OD[] = {
-       10, 2, 8, 4, 5, 7, 3, 6
-};
-
-/* Calculate frequency being generated by ICS307-02 clock chip based upon
- * the control bytes being programmed into it. */
-/* XXX: This function should probably go into a common library */
-static unsigned long
-ics307_clk_freq (unsigned char cw0, unsigned char cw1, unsigned char cw2)
-{
-       const unsigned long long InputFrequency = CONFIG_ICS307_REFCLK_HZ;
-       unsigned long VDW = ((cw1 << 1) & 0x1FE) + ((cw2 >> 7) & 1);
-       unsigned long RDW = cw2 & 0x7F;
-       unsigned long OD = ics307_S_to_OD[cw0 & 0x7];
-       unsigned long freq;
-
-       /* CLK1Frequency = InputFrequency * 2 * (VDW + 8) / ((RDW + 2) * OD) */
-
-       /* cw0:  C1 C0 TTL F1 F0 S2 S1 S0
-        * cw1:  V8 V7 V6 V5 V4 V3 V2 V1
-        * cw2:  V0 R6 R5 R4 R3 R2 R1 R0
-        *
-        * R6:R0 = Reference Divider Word (RDW)
-        * V8:V0 = VCO Divider Word (VDW)
-        * S2:S0 = Output Divider Select (OD)
-        * F1:F0 = Function of CLK2 Output
-        * TTL = duty cycle
-        * C1:C0 = internal load capacitance for cyrstal
-        */
-
-       /* Adding 1 to get a "nicely" rounded number, but this needs
-        * more tweaking to get a "properly" rounded number. */
-
-       freq = 1 + (InputFrequency * 2 * (VDW + 8) / ((RDW + 2) * OD));
-
-       debug("ICS307: CW[0-2]: %02X %02X %02X => %u Hz\n", cw0, cw1, cw2,
-               freq);
-       return freq;
-}
-
-unsigned long
-get_board_sys_clk(ulong dummy)
-{
-       u8 *pixis_base = (u8 *)PIXIS_BASE;
-
-       return ics307_clk_freq (
-           in_8(pixis_base + PIXIS_VSYSCLK0),
-           in_8(pixis_base + PIXIS_VSYSCLK1),
-           in_8(pixis_base + PIXIS_VSYSCLK2)
-       );
-}
-
-unsigned long
-get_board_ddr_clk(ulong dummy)
-{
-       u8 *pixis_base = (u8 *)PIXIS_BASE;
-
-       return ics307_clk_freq (
-           in_8(pixis_base + PIXIS_VDDRCLK0),
-           in_8(pixis_base + PIXIS_VDDRCLK1),
-           in_8(pixis_base + PIXIS_VDDRCLK2)
-       );
-}
-#else
-unsigned long
-get_board_sys_clk(ulong dummy)
-{
-       u8 i;
-       ulong val = 0;
-       u8 *pixis_base = (u8 *)PIXIS_BASE;
-
-       i = in_8(pixis_base + PIXIS_SPD);
-       i &= 0x07;
-
-       switch (i) {
-       case 0:
-               val = 33333333;
-               break;
-       case 1:
-               val = 40000000;
-               break;
-       case 2:
-               val = 50000000;
-               break;
-       case 3:
-               val = 66666666;
-               break;
-       case 4:
-               val = 83333333;
-               break;
-       case 5:
-               val = 100000000;
-               break;
-       case 6:
-               val = 133333333;
-               break;
-       case 7:
-               val = 166666666;
-               break;
-       }
-
-       return val;
-}
-
-unsigned long
-get_board_ddr_clk(ulong dummy)
-{
-       u8 i;
-       ulong val = 0;
-       u8 *pixis_base = (u8 *)PIXIS_BASE;
-
-       i = in_8(pixis_base + PIXIS_SPD);
-       i &= 0x38;
-       i >>= 3;
-
-       switch (i) {
-       case 0:
-               val = 33333333;
-               break;
-       case 1:
-               val = 40000000;
-               break;
-       case 2:
-               val = 50000000;
-               break;
-       case 3:
-               val = 66666666;
-               break;
-       case 4:
-               val = 83333333;
-               break;
-       case 5:
-               val = 100000000;
-               break;
-       case 6:
-               val = 133333333;
-               break;
-       case 7:
-               val = 166666666;
-               break;
-       }
-       return val;
-}
-#endif
-
-int sata_initialize(void)
-{
-       volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
-       uint sdrs2_io_sel =
-               (gur->pordevsr & MPC85xx_PORDEVSR_SRDS2_IO_SEL) >> 27;
-       if (sdrs2_io_sel & 0x04)
-               return 1;
-
-       return __sata_initialize();
-}
-
 int board_eth_init(bd_t *bis)
 {
 #ifdef CONFIG_TSEC_ENET
@@ -671,18 +396,8 @@ void ft_board_setup(void *blob, bd_t *bd)
 {
        ft_cpu_setup(blob, bd);
 
-#ifdef CONFIG_PCI1
-       ft_fsl_pci_setup(blob, "pci0", &pci1_hose);
-#endif
-#ifdef CONFIG_PCIE2
-       ft_fsl_pci_setup(blob, "pci1", &pcie2_hose);
-#endif
-#ifdef CONFIG_PCIE2
-       ft_fsl_pci_setup(blob, "pci2", &pcie1_hose);
-#endif
-#ifdef CONFIG_PCIE1
-       ft_fsl_pci_setup(blob, "pci3", &pcie3_hose);
-#endif
+       FT_FSL_PCI_SETUP;
+
 #ifdef CONFIG_FSL_SGMII_RISER
        fsl_sgmii_riser_fdt_fixup(blob);
 #endif