ppc/85xx: Clean up mpc8536DS PCI setup code
PATCH v2 1/1 ppc/85xx: Clean up mpc8536DS PCI setup code
From: Mingkai Hu <[email protected]>
Use new fsl_pci_init_port() that reduces amount of duplicated code in the board ports, use IO accessors and clean up printing of status info.
Signed-off-by Mingkai Hu <[email protected]>
Signed-off-by Kumar Gala <[email protected]>
---
Updated to not pass pcie_ep to fsl_pci_init_port.
- k
board/freescale/mpc8536ds/mpc8536ds.c | 254 +++++++++------------------------ 1 files changed, 65 insertions(+), 189 deletions(-)
board/freescale/mpc8536ds/mpc8536ds.c +65 -189
@@ -1,5 +1,5 @@/* -* Copyright 2008 Freescale Semiconductor. +* Copyright 2008-2009 Freescale Semiconductor, Inc. * * See file CREDITS for list of people who contributed to this * project.
@@ -189,17 +189,24 @@ 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, host_agent; +u32 porpllsr, pci_agent, pci_speed, pci_32, pci_arb, pci_clk_sel; +int first_free_busno =0 ; +int num =0 ; + +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 ; + host_agent = (in_be32 (&gur->porbmsr) & MPC85xx_PORBMSR_HA) >>16 ;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);
@@ -212,228 +219,97 @@ 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 =is_fsl_pci_agent (LAW_TRGT_IF_PCIE_3 , host_agent); -int pcie_configured =is_fsl_pci_cfg (LAW_TRGT_IF_PCIE_3 , io_sel); -struct pci_region *r = hose->regions; + pcie_ep =is_fsl_pci_agent (LAW_TRGT_IF_PCIE_3 , host_agent); + pcie_configured =is_fsl_pci_cfg (LAW_TRGT_IF_PCIE_3 , io_sel); -if (pcie_configured && !(devdisr & MPC85xx_DEVDISR_PCIE)){ -printf ("\n PCIE3 connected to Slot3 as %s (base address %x)" , +if (pcie_configured && !(devdisr & MPC85xx_DEVDISR_PCIE3)){ +SET_STD_PCIE_INFO (pci_info[num],3 ); +printf (" PCIE3 connected to Slot3 as %s (base address %lx)\n" , 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); + pci_info[num].regs); + first_free_busno =fsl_pci_init_port (&pci_info[num++], + &pcie3_hose, first_free_busno); }else {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 =is_fsl_pci_agent (LAW_TRGT_IF_PCIE_1 , host_agent); -int pcie_configured =is_fsl_pci_cfg (LAW_TRGT_IF_PCIE_1 , io_sel); -struct pci_region *r = hose->regions; + pcie_ep =is_fsl_pci_agent (LAW_TRGT_IF_PCIE_1 , host_agent); + pcie_configured =is_fsl_pci_cfg (LAW_TRGT_IF_PCIE_1 , io_sel);if (pcie_configured && !(devdisr & MPC85xx_DEVDISR_PCIE)){ -printf ("\n PCIE1 connected to Slot1 as %s (base address %x)" , +SET_STD_PCIE_INFO (pci_info[num],1 ); +printf (" PCIE1 connected to Slot1 as %s (base address %lx)\n" , 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); - + pci_info[num].regs); + first_free_busno =fsl_pci_init_port (&pci_info[num++], + &pcie1_hose, first_free_busno); }else {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 =is_fsl_pci_agent (LAW_TRGT_IF_PCIE_2 , host_agent); -int pcie_configured =is_fsl_pci_cfg (LAW_TRGT_IF_PCIE_2 , io_sel); -struct pci_region *r = hose->regions; + pcie_ep =is_fsl_pci_agent (LAW_TRGT_IF_PCIE_2 , host_agent); + pcie_configured =is_fsl_pci_cfg (LAW_TRGT_IF_PCIE_2 , io_sel); -if (pcie_configured && !(devdisr & MPC85xx_DEVDISR_PCIE)){ -printf ("\n PCIE2 connected to Slot 2 as %s (base address %x)" , +if (pcie_configured && !(devdisr & MPC85xx_DEVDISR_PCIE2)){ +SET_STD_PCIE_INFO (pci_info[num],2 ); +printf (" PCIE2 connected to Slot 2 as %s (base address %lx)\n" , 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); - + pci_info[num].regs); + first_free_busno =fsl_pci_init_port (&pci_info[num++], + &pcie2_hose, first_free_busno); }else {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 =is_fsl_pci_agent (LAW_TRGT_IF_PCI , host_agent); -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_agent =is_fsl_pci_agent (LAW_TRGT_IF_PCI , host_agent); + 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_STD_PCI_INFO (pci_info[num],1 ); +printf ("\n 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" ); } -} + +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 ) {
Signature · 1 line
1.6.0.6