ppc/85xx: Clean up MPC8536 DS PCI setup code
PATCH 1/12 ppc/85xx: Clean up MPC8536 DS 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.
---
V3:
* use fsl_setup_hose
board/freescale/mpc8536ds/mpc8536ds.c | 257 +++++++++------------------------ 1 files changed, 66 insertions(+), 191 deletions(-)
board/freescale/mpc8536ds/mpc8536ds.c +66 -191
@@ -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,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 ; + +int pcie_ep, pcie_configured; -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); + 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,228 +218,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_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 ); + pcie_ep =fsl_setup_hose (&pcie3_hose, pci_info[num].regs); +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_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 ); + pcie_ep =fsl_setup_hose (&pcie1_hose, pci_info[num].regs); +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_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 ); + 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 ?"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_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 ); + pci_agent =fsl_setup_hose (&pci1_hose, pci_info[num].regs); +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
PATCH 2/12 ppc/85xx: Clean up MPC8544 DS PCI setup code
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.
--- board/freescale/mpc8544ds/mpc8544ds.c | 249 +++++++++----------------------- 1 files changed, 70 insertions(+), 179 deletions(-)
board/freescale/mpc8544ds/mpc8544ds.c +70 -179
@@ -1,5 +1,5 @@/* -* Copyright 2007 Freescale Semiconductor, Inc. +* Copyright 2007,2009 Freescale Semiconductor, Inc. * * See file CREDITS for list of people who contributed to this * project.
@@ -101,18 +101,23 @@ static struct pci_controller pcie2_hose;static struct pci_controller pcie3_hose;#endif -int first_free_busno=0 ; - -void -pci_init_board (void ) +void pci_init_board (void ) {volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); -uint devdisr = gur->devdisr; -uint io_sel = (gur->pordevsr & MPC85xx_PORDEVSR_IO_SEL) >>19 ; -uint host_agent = (gur->porbmsr & MPC85xx_PORBMSR_HA) >>16 ; +struct fsl_pci_info pci_info[4 ]; +u32 devdisr, pordevsr, io_sel; +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; -debug (" pci_init_board: devdisr=%x, io_sel=%x, host_agent=%x\n" , - devdisr, io_sel, host_agent); + devdisr =in_be32 (&gur->devdisr); + pordevsr =in_be32 (&gur->pordevsr); + porpllsr =in_be32 (&gur->porpllsr); + io_sel = (pordevsr & MPC85xx_PORDEVSR_IO_SEL) >>19 ; + +debug (" pci_init_board: devdisr=%x, io_sel=%x\n" , devdisr, io_sel);if (io_sel &1 ) {if (!(gur->pordevsr & MPC85xx_PORDEVSR_SGMII1_DIS))
@@ -120,55 +125,29 @@ pci_init_board(void)if (!(gur->pordevsr & MPC85xx_PORDEVSR_SGMII3_DIS))printf (" eTSEC3 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; - -if (pcie_configured && !(devdisr & MPC85xx_DEVDISR_PCIE)){ -printf ("\n PCIE3 connected to ULI 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 ); + pcie_configured =is_fsl_pci_cfg (LAW_TRGT_IF_PCIE_3 , io_sel); +if (pcie_configured && !(devdisr & MPC85xx_DEVDISR_PCIE3)){ +SET_STD_PCIE_INFO (pci_info[num],3 ); + pcie_ep =fsl_setup_hose (&pcie3_hose, pci_info[num].regs);#ifdef CONFIG_SYS_PCIE3_MEM_BUS2 /* outbound memory */ -pci_set_region (r++, +pci_set_region (&pcie3_hose.regions[0 ],CONFIG_SYS_PCIE3_MEM_BUS2 ,CONFIG_SYS_PCIE3_MEM_PHYS2 ,CONFIG_SYS_PCIE3_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 (" PCIE3 on bus %02x - %02x\n" , - hose->first_busno,hose->last_busno); + pcie3_hose.region_count =1 ; +#endif +printf (" PCIE3 connected to ULI as %s (base addr %lx)\n" , + pcie_ep ?"End Point" :"Root Complex" , + pci_info[num].regs); + first_free_busno =fsl_pci_init_port (&pci_info[num++], + &pcie3_hose, first_free_busno);/* * Activate ULI1575 legacy chip by performing a fake
@@ -178,187 +157,99 @@ pci_init_board(void) } 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_configured =is_fsl_pci_cfg (LAW_TRGT_IF_PCIE_1 , io_sel);if (pcie_configured && !(devdisr & MPC85xx_DEVDISR_PCIE)){ -printf ("\n PCIE1 connected to Slot2 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 ); - +SET_STD_PCIE_INFO (pci_info[num],1 ); + pcie_ep =fsl_setup_hose (&pcie1_hose, pci_info[num].regs);#ifdef CONFIG_SYS_PCIE1_MEM_BUS2 /* outbound memory */ -pci_set_region (r++, +pci_set_region (&pcie1_hose.regions[0 ],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); + pcie1_hose.region_count =1 ; +#endif +printf (" PCIE1 connected to Slot 2 as %s (base addr %lx)\n" , + pcie_ep ?"End Point" :"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" ); } - } +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; - -if (pcie_configured && !(devdisr & MPC85xx_DEVDISR_PCIE)){ -printf ("\n PCIE2 connected to Slot 1 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 ); + pcie_configured =is_fsl_pci_cfg (LAW_TRGT_IF_PCIE_2 , io_sel); +if (pcie_configured && !(devdisr & MPC85xx_DEVDISR_PCIE2)){ +SET_STD_PCIE_INFO (pci_info[num],2 ); + pcie_ep =fsl_setup_hose (&pcie2_hose, pci_info[num].regs);#ifdef CONFIG_SYS_PCIE2_MEM_BUS2 /* outbound memory */ -pci_set_region (r++, +pci_set_region (&pcie2_hose.regions[0 ],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); + pcie2_hose.region_count =1 ; +#endif +printf (" PCIE2 connected to Slot 1 as %s (base addr %lx)\n" , + pcie_ep ?"End Point" :"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" ); } - } +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_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 ); + pci_agent =fsl_setup_hose (&pci1_hose, pci_info[num].regs); +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 - ); + pci_info[num].regs); -/* 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_PCIE3_MEM_BUS2 -/* outbound memory */ -pci_set_region (r++, -CONFIG_SYS_PCIE3_MEM_BUS2 , -CONFIG_SYS_PCIE3_MEM_PHYS2 , -CONFIG_SYS_PCIE3_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 ("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 }
Signature · 1 line
1.6.0.6
PATCH 3/12 ppc/85xx: Clean up MPC8569 MDS PCI setup code
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.
--- board/freescale/mpc8569mds/mpc8569mds.c | 86 +++++++++--------------------- 1 files changed, 26 insertions(+), 60 deletions(-)
board/freescale/mpc8569mds/mpc8569mds.c +26 -60
@@ -514,77 +514,43 @@ static void fdt_board_fixup_qe_usb(void *blob, bd_t *bd)static struct pci_controller pcie1_hose;#endif /* CONFIG_PCIE1 */ -int first_free_busno =0 ; -#ifdef CONFIG_PCI -void -pci_init_board (void ) +void pci_init_board (void ) { -volatile ccsr_gur_t *gur; -uint io_sel; -uint host_agent; - - gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); - io_sel = (gur->pordevsr & MPC85xx_PORDEVSR_IO_SEL) >>19 ; - host_agent = (gur->porbmsr & MPC85xx_PORBMSR_HA) >>16 ; - -#ifdef CONFIG_PCIE1 -{ -volatile ccsr_fsl_pci_t *pci; -struct pci_controller *hose; -int pcie_ep; -struct pci_region *r; -int pcie_configured; - - pci = (ccsr_fsl_pci_t *)CONFIG_SYS_PCIE1_ADDR ; - hose = &pcie1_hose; - pcie_ep =is_fsl_pci_agent (LAW_TRGT_IF_PCIE_1 , host_agent); - r = hose->regions; - pcie_configured =is_fsl_pci_cfg (LAW_TRGT_IF_PCIE_1 , io_sel); - -if (pcie_configured && !(gur->devdisr & MPC85xx_DEVDISR_PCIE)){ -printf ("\n PCIE connected to slot 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 ); +volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); +struct fsl_pci_info pci_info[1 ]; +u32 devdisr, pordevsr, io_sel; +int first_free_busno =0 ; +int num =0 ; - hose->region_count = r - hose->regions; +int pcie_ep, pcie_configured; - hose->first_busno=first_free_busno; + devdisr =in_be32 (&gur->devdisr); + pordevsr =in_be32 (&gur->pordevsr); + io_sel = (pordevsr & MPC85xx_PORDEVSR_IO_SEL) >>19 ; -fsl_pci_init (hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data); -printf ("PCIE on bus %02x - %02x\n" , - hose->first_busno,hose->last_busno); +debug (" pci_init_board: devdisr=%x, io_sel=%x\n" , devdisr, io_sel); - first_free_busno=hose->last_busno+1 ; +#ifdef CONFIG_PCIE1 + pcie_configured =is_fsl_pci_cfg (LAW_TRGT_IF_PCIE_1 , io_sel); +if (pcie_configured && !(devdisr & MPC85xx_DEVDISR_PCIE)){ +SET_STD_PCIE_INFO (pci_info[num],1 ); + pcie_ep =fsl_setup_hose (&pcie1_hose, pci_info[num].regs); +printf (" PCIE1 connected to Slot as %s (base addr %lx)\n" , + pcie_ep ?"End Point" :"Root Complex" , + pci_info[num].regs); + first_free_busno =fsl_pci_init_port (&pci_info[num++], + &pcie1_hose, first_free_busno); }else { -printf (" PCIE: disabled\n" ); +printf (" PCIE1: disabled\n" ); } -} + +puts ("\n" );#else - gur->devdisr |= MPC85xx_DEVDISR_PCIE;/* disable */ +setbits_be32 (&gur->devdisr, MPC85xx_DEVDISR_PCIE);/* disable */ #endif + }#endif /* CONFIG_PCI */
Signature · 1 line
1.6.0.6
PATCH 4/12 ppc/85xx: Clean up MPC8568 MDS PCI setup code
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.
--- board/freescale/mpc8568mds/mpc8568mds.c | 137 ++++++++++--------------------- 1 files changed, 45 insertions(+), 92 deletions(-)
board/freescale/mpc8568mds/mpc8568mds.c +45 -92
@@ -1,5 +1,5 @@/* -* Copyright 2007 Freescale Semiconductor. +* Copyright 2007,2009 Freescale Semiconductor, Inc. * * (C) Copyright 2002 Scott McNutt <[email protected]> *
@@ -311,8 +311,6 @@ static struct pci_controller pci1_hose = {static struct pci_controller pcie1_hose;#endif /* CONFIG_PCIE1 */ -int first_free_busno =0 ; -/* * pib_init() -- Initialize the PCA9555 IO expander on the PIB board */
@@ -356,117 +354,72 @@ pib_init(void) }#ifdef CONFIG_PCI -void -pci_init_board (void ) +void pci_init_board (void ) {volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); -uint io_sel = (gur->pordevsr & MPC85xx_PORDEVSR_IO_SEL) >>19 ; -uint host_agent = (gur->porbmsr & MPC85xx_PORBMSR_HA) >>16 ; - -#ifdef CONFIG_PCI1 -{ -pib_init (); - -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; +struct fsl_pci_info pci_info[2 ]; +u32 devdisr, pordevsr, io_sel; +u32 porpllsr, pci_agent, pci_speed, pci_32, pci_arb, pci_clk_sel; +int first_free_busno =0 ; +int num =0 ; -uint pci_32 =1 ;/* PORDEVSR[15] */ -uint pci_arb = gur->pordevsr & MPC85xx_PORDEVSR_PCI1_ARB;/* PORDEVSR[14] */ -uint pci_clk_sel = gur->porpllsr & MPC85xx_PORDEVSR_PCI1_SPD;/* PORPLLSR[16] */ +int pcie_ep, pcie_configured; -uint pci_agent = (host_agent ==3 ) || (host_agent ==4 ) || (host_agent ==6 ); + devdisr =in_be32 (&gur->devdisr); + pordevsr =in_be32 (&gur->pordevsr); + porpllsr =in_be32 (&gur->porpllsr); + io_sel = (pordevsr & MPC85xx_PORDEVSR_IO_SEL) >>19 ; -uint pci_speed =66666000 ; +debug (" pci_init_board: devdisr=%x, io_sel=%x\n" , devdisr, io_sel); -if (!(gur->devdisr & MPC85xx_DEVDISR_PCI1)) { -printf (" PCI: %d bit, %s MHz, %s, %s, %s\n" , +#ifdef CONFIG_PCI1 + 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)) { +SET_STD_PCI_INFO (pci_info[num],1 ); + pci_agent =fsl_setup_hose (&pci1_hose, pci_info[num].regs); +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" - ); - -/* 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 ); - - 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 ("PCI on bus %02x - %02x\n" ,hose->first_busno,hose->last_busno); + pci_arb ?"arbiter" :"external-arbiter" , + pci_info[num].regs); + + 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 #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); -struct pci_region *r = hose->regions; + pcie_configured =is_fsl_pci_cfg (LAW_TRGT_IF_PCIE_1 , io_sel); -int pcie_configured =is_fsl_pci_cfg (LAW_TRGT_IF_PCIE_1 , io_sel); - -if (pcie_configured && !(gur->devdisr & MPC85xx_DEVDISR_PCIE)){ -printf ("\n PCIE connected to slot 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 ); - - hose->region_count = r - hose->regions; - - hose->first_busno=first_free_busno; - -fsl_pci_init (hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data); -printf ("PCIE on bus %02x - %02x\n" ,hose->first_busno,hose->last_busno); - - first_free_busno=hose->last_busno+1 ; +if (pcie_configured && !(devdisr & MPC85xx_DEVDISR_PCIE)){ +SET_STD_PCIE_INFO (pci_info[num],1 ); + pcie_ep =fsl_setup_hose (&pcie1_hose, pci_info[num].regs); +printf (" PCIE1 connected to Slot as %s (base addr %lx)\n" , + pcie_ep ?"End Point" :"Root Complex" , + pci_info[num].regs); + first_free_busno =fsl_pci_init_port (&pci_info[num++], + &pcie1_hose, first_free_busno); }else { -printf (" PCIE: disabled\n" ); +printf (" PCIE1: disabled\n" ); } -} + +puts ("\n" );#else - gur->devdisr |= MPC85xx_DEVDISR_PCIE;/* disable */ +setbits_be32 (&gur->devdisr, MPC85xx_DEVDISR_PCIE);/* disable */ #endif }#endif /* CONFIG_PCI */
Signature · 1 line
1.6.0.6
PATCH 5/12 ppc/85xx: Clean up ATUM8548 PCI setup code
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.
--- board/atum8548/atum8548.c | 162 ++++++++++++++------------------------------ include/configs/ATUM8548.h | 18 +++--- 2 files changed, 59 insertions(+), 121 deletions(-)
board/atum8548/atum8548.c +50 -112
@@ -170,22 +170,26 @@ static struct pci_controller pci2_hose;static struct pci_controller pcie1_hose;#endif -int first_free_busno=0 ; - -void -pci_init_board (void ) +void pci_init_board (void ) {volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); +struct fsl_pci_info pci_info[3 ]; +u32 devdisr, pordevsr, io_sel; +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; -uint devdisr = gur->devdisr; -uint io_sel = (gur->pordevsr & MPC85xx_PORDEVSR_IO_SEL) >>19 ; -uint host_agent = (gur->porbmsr & MPC85xx_PORBMSR_HA) >>16 ; + devdisr =in_be32 (&gur->devdisr); + pordevsr =in_be32 (&gur->pordevsr); + porpllsr =in_be32 (&gur->porpllsr); + io_sel = (pordevsr & MPC85xx_PORDEVSR_IO_SEL) >>19 ; -debug (" pci_init_board: devdisr=%x, io_sel=%x, host_agent=%x\n" , - devdisr, io_sel, host_agent); +debug (" pci_init_board: devdisr=%x, io_sel=%x\n" , devdisr, io_sel);/* explicitly set 'Clock out select register' to echo SYSCLK input to our CPLD */ - gur->clkocr |= MPC85xx_ATUM_CLKOCR; +setbits_be32 (&gur->clkocr, MPC85xx_ATUM_CLKOCR);if (io_sel &1 ) {if (!(gur->pordevsr & MPC85xx_PORDEVSR_SGMII1_DIS))
@@ -199,145 +203,79 @@ pci_init_board(void) }#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_configured =is_fsl_pci_cfg (LAW_TRGT_IF_PCIE_1 , io_sel);if (pcie_configured && !(devdisr & MPC85xx_DEVDISR_PCIE)){ -printf ("\n PCIE1 connected to slot 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" ); - +SET_STD_PCIE_INFO (pci_info[num],1 ); + pcie_ep =fsl_setup_hose (&pcie1_hose, pci_info[num].regs); +#ifdef CONFIG_SYS_PCIE1_MEM_BUS2 /* outbound memory */ -pci_set_region (r++, -CONFIG_SYS_PCIE1_MEM_BASE , -CONFIG_SYS_PCIE1_MEM_PHYS , -CONFIG_SYS_PCIE1_MEM_SIZE , -PCI_REGION_MEM ); - -/* outbound io */ -pci_set_region (r++, -CONFIG_SYS_PCIE1_IO_BASE , -CONFIG_SYS_PCIE1_IO_PHYS , -CONFIG_SYS_PCIE1_IO_SIZE , -PCI_REGION_IO ); - -#ifdef CONFIG_SYS_PCIE1_MEM_BASE2 -/* outbound memory */ -pci_set_region (r++, -CONFIG_SYS_PCIE1_MEM_BASE2 , +pci_set_region (&pcie1_hose.regions[0 ], +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); + pcie1_hose.region_count =1 ; +#endif +printf (" PCIE1 connected to Slot as %s (base addr %lx)\n" , + pcie_ep ?"End Point" :"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" ); } - } +puts ("\n" );#else - gur->devdisr |= MPC85xx_DEVDISR_PCIE;/* disable */ +setbits_be32 (&gur->devdisr, MPC85xx_DEVDISR_PCIE);/* 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_1 , host_agent); -uint pci_speed =33333000 ;/*get_clock_freq (); PCI PSPEED in [4:5] */ -uint pci_32 = gur->pordevsr & MPC85xx_PORDEVSR_PCI1_PCI32;/* PORDEVSR[15] */ -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 =33333000 ;/*get_clock_freq (); PCI PSPEED in [4:5] */ + pci_32 = pordevsr & MPC85xx_PORDEVSR_PCI1_PCI32;/* PORDEVSR[15] */ + pci_arb = pordevsr & MPC85xx_PORDEVSR_PCI1_ARB; + pci_clk_sel = porpllsr & MPC85xx_PORDEVSR_PCI1_SPD;if (!(devdisr & MPC85xx_DEVDISR_PCI1)) { -printf ("\n PCI1: %d bit, %s MHz, %s, %s, %s (base address %x)\n" , +SET_STD_PCI_INFO (pci_info[num],1 ); + pci_agent =fsl_setup_hose (&pci1_hose, pci_info[num].regs); +printf ("\n PCI1: %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_BASE , -CONFIG_SYS_PCI1_MEM_PHYS , -CONFIG_SYS_PCI1_MEM_SIZE , -PCI_REGION_MEM ); + pci_info[num].regs); -/* outbound io */ -pci_set_region (r++, -CONFIG_SYS_PCI1_IO_BASE , -CONFIG_SYS_PCI1_IO_PHYS , -CONFIG_SYS_PCI1_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 ("PCI1 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 (" PCI1: disabled\n" ); +printf (" PCI: disabled\n" ); } -} + +puts ("\n" );#else - gur->devdisr |= MPC85xx_DEVDISR_PCI1;/* disable */ +setbits_be32 (&gur->devdisr, MPC85xx_DEVDISR_PCI1);/* disable */ #endif #ifdef CONFIG_PCI2 -{ -volatile ccsr_fsl_pci_t *pci = (ccsr_fsl_pci_t *)CONFIG_SYS_PCI2_ADDR ; -struct pci_controller *hose = &pci2_hose; -struct pci_region *r = hose->regions; -if (!(devdisr & MPC85xx_DEVDISR_PCI2)) { -pci_set_region (r++, -CONFIG_SYS_PCI2_MEM_BASE , -CONFIG_SYS_PCI2_MEM_PHYS , -CONFIG_SYS_PCI2_MEM_SIZE , -PCI_REGION_MEM ); +SET_STD_PCI_INFO (pci_info[num],2 ); + pci_agent =fsl_setup_hose (&pci2_hose, pci_info[num].regs); -pci_set_region (r++, -CONFIG_SYS_PCI2_IO_BASE , -CONFIG_SYS_PCI2_IO_PHYS , -CONFIG_SYS_PCI2_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 ("PCI2 on bus %02x - %02x\n" , - hose->first_busno,hose->last_busno); +puts (" PCI2\n" ); + first_free_busno =fsl_pci_init_port (&pci_info[num++], + &pci1_hose, first_free_busno); }else {printf (" PCI2: disabled\n" ); } -} +puts ("\n" );#else - gur->devdisr |= MPC85xx_DEVDISR_PCI2; +setbits_be32 (&gur->devdisr, MPC85xx_DEVDISR_PCI2);/* disable */ #endif }
include/configs/ATUM8548.h +9 -9
@@ -243,27 +243,27 @@*/ #define CONFIG_SYS_PCI_PHYS 0x80000000/* 1G PCI TLB */ -#define CONFIG_SYS_PCI1_MEM_BASE 0x80000000 -#define CONFIG_SYS_PCI1_MEM_PHYS CONFIG_SYS_PCI1_MEM_BASE +#define CONFIG_SYS_PCI1_MEM_BUS 0x80000000 +#define CONFIG_SYS_PCI1_MEM_PHYS CONFIG_SYS_PCI1_MEM_BUS#define CONFIG_SYS_PCI1_MEM_SIZE 0x20000000/* 512M */ -#define CONFIG_SYS_PCI1_IO_BASE 0x00000000 +#define CONFIG_SYS_PCI1_IO_BUS 0x00000000#define CONFIG_SYS_PCI1_IO_PHYS 0xe2000000#define CONFIG_SYS_PCI1_IO_SIZE 0x00100000/* 1M */ #ifdef CONFIG_PCI2 -#define CONFIG_SYS_PCI2_MEM_BASE 0xC0000000 -#define CONFIG_SYS_PCI2_MEM_PHYS CONFIG_SYS_PCI2_MEM_BASE +#define CONFIG_SYS_PCI2_MEM_BUS 0xC0000000 +#define CONFIG_SYS_PCI2_MEM_PHYS CONFIG_SYS_PCI2_MEM_BUS#define CONFIG_SYS_PCI2_MEM_SIZE 0x20000000/* 512M */ -#define CONFIG_SYS_PCI2_IO_BASE 0x00000000 +#define CONFIG_SYS_PCI2_IO_BUS 0x00000000#define CONFIG_SYS_PCI2_IO_PHYS 0xe2800000#define CONFIG_SYS_PCI2_IO_SIZE 0x00100000/* 1M */ #endif #ifdef CONFIG_PCIE1 -#define CONFIG_SYS_PCIE1_MEM_BASE 0xa0000000 -#define CONFIG_SYS_PCIE1_MEM_PHYS CONFIG_SYS_PCIE1_MEM_BASE +#define CONFIG_SYS_PCIE1_MEM_BUS 0xa0000000 +#define CONFIG_SYS_PCIE1_MEM_PHYS CONFIG_SYS_PCIE1_MEM_BUS#define CONFIG_SYS_PCIE1_MEM_SIZE 0x20000000/* 512M */ -#define CONFIG_SYS_PCIE1_IO_BASE 0x00000000 +#define CONFIG_SYS_PCIE1_IO_BUS 0x00000000#define CONFIG_SYS_PCIE1_IO_PHYS 0xe3000000#define CONFIG_SYS_PCIE1_IO_SIZE 0x00100000/* 1M */ #endif
Signature · 1 line
1.6.0.6
PATCH 6/12 ppc/85xx: Clean up MPC8548 CDS PCI setup code
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.
--- board/freescale/mpc8548cds/mpc8548cds.c | 141 +++++++++++-------------------- 1 files changed, 48 insertions(+), 93 deletions(-)
board/freescale/mpc8548cds/mpc8548cds.c +48 -93
@@ -1,5 +1,5 @@/* -* Copyright 2004, 2007 Freescale Semiconductor. +* Copyright 2004, 2007, 200 Freescale Semiconductor, Inc. * * (C) Copyright 2002 Scott McNutt <[email protected]> *
@@ -262,62 +262,47 @@ static struct pci_controller pci2_hose;static struct pci_controller pcie1_hose;#endif /* CONFIG_PCIE1 */ -int first_free_busno=0 ; - -void -pci_init_board (void ) +void pci_init_board(void) { volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); -uint io_sel = (gur->pordevsr & MPC85xx_PORDEVSR_IO_SEL) >>19 ; -uint host_agent = (gur->porbmsr & MPC85xx_PORBMSR_HA) >>16 ; - - -#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; + struct fsl_pci_info pci_info[4]; + u32 devdisr, pordevsr, io_sel; + u32 porpllsr, pci_agent, pci_speed, pci_32, pci_arb, pci_clk_sel; + int first_free_busno = 0; + int num = 0; -uint pci_32 = gur->pordevsr & MPC85xx_PORDEVSR_PCI1_PCI32;/* PORDEVSR[15] */ -uint pci_arb = gur->pordevsr & MPC85xx_PORDEVSR_PCI1_ARB;/* PORDEVSR[14] */ -uint pci_clk_sel = gur->porpllsr & MPC85xx_PORDEVSR_PCI1_SPD;/* PORPLLSR[16] */ + int pcie_ep, pcie_configured; -uint pci_agent =is_fsl_pci_agent (LAW_TRGT_IF_PCI_1 , host_agent); + devdisr = in_be32(&gur->devdisr); + pordevsr = in_be32(&gur->pordevsr); + porpllsr = in_be32(&gur->porpllsr); + io_sel = (pordevsr & MPC85xx_PORDEVSR_IO_SEL) >> 19; -uint pci_speed =get_clock_freq ();/* PCI PSPEED in [4:5] */ + debug (" pci_init_board: devdisr=%x, io_sel=%x\n", devdisr, io_sel); -if (!(gur->devdisr & MPC85xx_DEVDISR_PCI1)) { -printf (" PCI: %d bit, %s MHz, %s, %s, %s\n" , +#ifdef CONFIG_PCI1 + pci_speed = get_clock_freq (); /* PCI PSPEED in [4:5] */ + pci_32 = pordevsr & MPC85xx_PORDEVSR_PCI1_PCI32; /* PORDEVSR[15] */ + pci_arb = pordevsr & MPC85xx_PORDEVSR_PCI1_ARB; + pci_clk_sel = porpllsr & MPC85xx_PORDEVSR_PCI1_SPD; + + if (!(devdisr & MPC85xx_DEVDISR_PCI1)) { + SET_STD_PCI_INFO(pci_info[num], 1); + pci_agent = fsl_setup_hose(&pci1_hose, pci_info[num].regs); + 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" - ); - -/* 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 ); - 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 ("PCI on bus %02x - %02x\n" ,hose->first_busno,hose->last_busno); + pci_arb ? "arbiter" : "external-arbiter", + pci_info[num].regs); + + first_free_busno = fsl_pci_init_port(&pci_info[num++], + &pci1_hose, first_free_busno); + #ifdef CONFIG_PCIX_CHECK -if (!(gur->pordevsr & MPC85xx_PORDEVSR_PCI1)) { + if (!(pordevsr & MPC85xx_PORDEVSR_PCI1)) { /* PCI-X init */ if (CONFIG_SYS_CLK_FREQ < 66000000) printf("PCI-X will only work@66 MHz\n");
@@ -330,14 +315,15 @@ pci_init_board(void) } else {printf (" PCI: disabled\n" ); } -} + +puts ("\n" );#else - gur->devdisr |= MPC85xx_DEVDISR_PCI1;/* disable */ +setbits_be32 (&gur->devdisr, MPC85xx_DEVDISR_PCI1);/* disable */ #endif #ifdef CONFIG_PCI2 { -uint pci2_clk_sel = gur->porpllsr &0x4000 ;/* PORPLLSR[17] */ +uint pci2_clk_sel = porpllsr &0x4000 ;/* PORPLLSR[17] */ uint pci_dual =get_pci_dual ();/* PCI DUAL in CM_PCI[3] */ if (pci_dual) { printf (" PCI2: 32 bit, 66 MHz, %s\n",
@@ -347,60 +333,29 @@ pci_init_board(void) } }#else - gur->devdisr |= MPC85xx_DEVDISR_PCI2;/* disable */ +setbits_be32 (&gur->devdisr, MPC85xx_DEVDISR_PCI2);/* disable */ #endif /* CONFIG_PCI2 */ #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); -struct pci_region *r = hose->regions; + pcie_configured =is_fsl_pci_cfg (LAW_TRGT_IF_PCIE_1 , io_sel); -int pcie_configured =is_fsl_pci_cfg (LAW_TRGT_IF_PCIE_1 , io_sel); - -if (pcie_configured && !(gur->devdisr & MPC85xx_DEVDISR_PCIE)){ -printf ("\n PCIE connected to slot 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 ); - - hose->region_count = r - hose->regions; - - hose->first_busno=first_free_busno; - -fsl_pci_init (hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data); -printf ("PCIE on bus %d - %d\n" ,hose->first_busno,hose->last_busno); - - first_free_busno=hose->last_busno+1 ; +if (pcie_configured && !(devdisr & MPC85xx_DEVDISR_PCIE)){ +SET_STD_PCIE_INFO (pci_info[num],1 ); + pcie_ep =fsl_setup_hose (&pcie1_hose, pci_info[num].regs); +printf (" PCIE1 connected to Slot as %s (base addr %lx)\n" , + pcie_ep ?"End Point" :"Root Complex" , + pci_info[num].regs); + first_free_busno =fsl_pci_init_port (&pci_info[num++], + &pcie1_hose, first_free_busno); }else { -printf (" PCIE: disabled\n" ); +printf (" PCIE1: disabled\n" ); } - } + +puts ("\n" );#else - gur->devdisr |= MPC85xx_DEVDISR_PCIE;/* disable */ +setbits_be32 (&gur->devdisr, MPC85xx_DEVDISR_PCIE);/* disable */ #endif - }int last_stage_init (void )
Signature · 1 line
1.6.0.6
PATCH 7/12 ppc/86xx: Clean up MPC8610 HPCD PCI setup code
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.
--- board/freescale/mpc8610hpcd/mpc8610hpcd.c | 199 +++++++++-------------------- 1 files changed, 62 insertions(+), 137 deletions(-)
board/freescale/mpc8610hpcd/mpc8610hpcd.c +62 -137
@@ -1,5 +1,5 @@/* -* Copyright 2007 Freescale Semiconductor, Inc. +* Copyright 2007,2009 Freescale Semiconductor, Inc. * * See file CREDITS for list of people who contributed to this * project.
@@ -224,158 +224,83 @@ static struct pci_controller pcie1_hose;static struct pci_controller pcie2_hose;#endif -int first_free_busno =0 ; -void pci_init_board (void ) {volatile immap_t *immap = (immap_t *)CONFIG_SYS_CCSRBAR ;volatile ccsr_gur_t *gur = &immap->im_gur; -uint devdisr = gur->devdisr; -uint io_sel = (gur->pordevsr &MPC8610_PORDEVSR_IO_SEL ) - >>MPC8610_PORDEVSR_IO_SEL_SHIFT ; -uint host_agent = (gur->porbmsr &MPC8610_PORBMSR_HA ) - >>MPC8610_PORBMSR_HA_SHIFT ; +struct fsl_pci_info pci_info[3 ]; +u32 devdisr, pordevsr, io_sel; +int first_free_busno =0 ; +int num =0 ; + +int pci_agent, pcie_ep, pcie_configured; + + devdisr =in_be32 (&gur->devdisr); + pordevsr =in_be32 (&gur->pordevsr); + io_sel = (pordevsr &MPC8610_PORDEVSR_IO_SEL ) + >>MPC8610_PORDEVSR_IO_SEL_SHIFT ; -printf (" pci_init_board: devdisr=%x, io_sel=%x, host_agent=%x\n" , - devdisr, io_sel, host_agent); +debug (" pci_init_board: devdisr=%x, io_sel=%x\n" , devdisr, io_sel);#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_configured =is_fsl_pci_cfg (LAW_TRGT_IF_PCIE_1 , io_sel); -int pcie_ep =is_fsl_pci_agent (LAW_TRGT_IF_PCIE_1 , host_agent); -struct pci_region *r = hose->regions; - -if (pcie_configured && !(devdisr & MPC86xx_DEVDISR_PCIE1)) { -printf (" PCIe 1 connected to Uli as %s (base address %x)\n" , - pcie_ep ?"End Point" :"Root Complex" , - (uint )pci); -if (pci->pme_msg_det) - pci->pme_msg_det =0xffffffff ; - -/* 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 ); - - 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 (" PCI-Express 1 on bus %02x - %02x\n" , - hose->first_busno, hose->last_busno); - - }else -puts (" PCI-Express 1: Disabled\n" ); - } -#else -puts ("PCI-Express 1: Disabled\n" ); -#endif /* CONFIG_PCIE1 */ + pcie_configured =is_fsl_pci_cfg (LAW_TRGT_IF_PCIE_1 , io_sel); + +if (pcie_configured && !(devdisr & MPC86xx_DEVDISR_PCIE1)){ +SET_STD_PCIE_INFO (pci_info[num],1 ); + pcie_ep =fsl_setup_hose (&pcie1_hose, pci_info[num].regs); +printf (" PCIE1 connected to ULI as %s (base addr %lx)\n" , + pcie_ep ?"End Point" :"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" ); + } +puts ("\n" ); +#else +setbits_be32 (&gur->devdisr, MPC86xx_DEVDISR_PCIE1);/* 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; -struct pci_region *r = hose->regions; - -int pcie_configured =is_fsl_pci_cfg (LAW_TRGT_IF_PCIE_2 , io_sel); -int pcie_ep =is_fsl_pci_agent (LAW_TRGT_IF_PCIE_2 , host_agent); - -if (pcie_configured && !(devdisr & MPC86xx_DEVDISR_PCIE2)) { -printf (" PCI-Express 2 connected to slot as %s" \ -" (base address %x)\n" , - pcie_ep ?"End Point" :"Root Complex" , - (uint )pci); -if (pci->pme_msg_det) - pci->pme_msg_det =0xffffffff ; - -/* 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 ); - - 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 (" PCI-Express 2 on bus %02x - %02x\n" , - hose->first_busno, hose->last_busno); - }else -puts (" PCI-Express 2: Disabled\n" ); - } -#else -puts ("PCI-Express 2: Disabled\n" ); -#endif /* CONFIG_PCIE2 */ + pcie_configured =is_fsl_pci_cfg (LAW_TRGT_IF_PCIE_2 , io_sel); + +if (pcie_configured && !(devdisr & MPC86xx_DEVDISR_PCIE2)){ +SET_STD_PCIE_INFO (pci_info[num],2 ); + pcie_ep =fsl_setup_hose (&pcie2_hose, pci_info[num].regs); +printf (" PCIE2 connected to Slot as %s (base addr %lx)\n" , + pcie_ep ?"End Point" :"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" ); + } +puts ("\n" ); +#else +setbits_be32 (&gur->devdisr, MPC86xx_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; -int pci_agent =is_fsl_pci_agent (LAW_TRGT_IF_PCI_1 , host_agent); -struct pci_region *r = hose->regions; - -if ( !(devdisr & MPC86xx_DEVDISR_PCI1)) { +if (!(devdisr & MPC86xx_DEVDISR_PCI1)) { +SET_STD_PCI_INFO (pci_info[num],1 ); + pci_agent =fsl_setup_hose (&pci1_hose, pci_info[num].regs);printf (" PCI connected to PCI slots as %s" \ -" (base address %x)\n" , +" (base address %lx)\n" , pci_agent ?"Agent" :"Host" , - (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 ); - - 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 (" PCI 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++], + &pci1_hose, first_free_busno); + }else { +printf (" PCI: disabled\n" ); + } - }else -puts (" PCI: Disabled\n" ); - } -#endif /* CONFIG_PCI1 */ +puts ("\n" ); +#else +setbits_be32 (&gur->devdisr, MPC86xx_DEVDISR_PCI1);/* disable */ +#endif }#if defined(CONFIG_OF_BOARD_SETUP )
Signature · 1 line
1.6.0.6
PATCH 8/12 ppc/85xx: Move to using fsl_setup_hose on MPC8572 DS
We can use fsl_setup_hose to determine if we are a agent/end-point or a host. Rather than using some SoC specific register we can just look at the PCI cfg space of the host controller to determine this.
--- board/freescale/mpc8572ds/mpc8572ds.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-)
board/freescale/mpc8572ds/mpc8572ds.c +6 -8
@@ -1,5 +1,5 @@/* -* Copyright 2007-2008 Freescale Semiconductor, Inc. +* Copyright 2007-2009 Freescale Semiconductor, Inc. * * See file CREDITS for list of people who contributed to this * project.
@@ -165,7 +165,7 @@ void pci_init_board(void) {volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);struct fsl_pci_info pci_info[3 ]; -u32 devdisr, pordevsr, io_sel, host_agent, temp32; +u32 devdisr, pordevsr, io_sel, temp32;int first_free_busno =0 ;int num =0 ;
@@ -174,10 +174,8 @@ void pci_init_board(void) devdisr =in_be32 (&gur->devdisr); pordevsr =in_be32 (&gur->pordevsr); io_sel = (pordevsr & MPC85xx_PORDEVSR_IO_SEL) >>19 ; - host_agent = (in_be32 (&gur->porbmsr) & MPC85xx_PORBMSR_HA) >>16 ; -debug (" pci_init_board: devdisr=%x, io_sel=%x, host_agent=%x\n" , - devdisr, io_sel, host_agent); +debug (" pci_init_board: devdisr=%x, io_sel=%x\n" , devdisr, io_sel);if (!(pordevsr & MPC85xx_PORDEVSR_SGMII1_DIS))printf (" eTSEC1 is in sgmii mode.\n" );
@@ -190,11 +188,11 @@ void pci_init_board(void)puts ("\n" );#ifdef CONFIG_PCIE3 - 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_PCIE3)){SET_STD_PCIE_INFO (pci_info[num],3 ); + pcie_ep =fsl_setup_hose (&pcie3_hose, pci_info[num].regs);printf (" PCIE3 connected to ULI as %s (base addr %lx)\n" , pcie_ep ?"End Point" :"Root Complex" , pci_info[num].regs);
@@ -222,11 +220,11 @@ void pci_init_board(void)#endif #ifdef CONFIG_PCIE2 - 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_PCIE2)){SET_STD_PCIE_INFO (pci_info[num],2 ); + pcie_ep =fsl_setup_hose (&pcie2_hose, pci_info[num].regs);printf (" PCIE2 connected to Slot 1 as %s (base addr %lx)\n" , pcie_ep ?"End Point" :"Root Complex" , pci_info[num].regs);
@@ -242,11 +240,11 @@ void pci_init_board(void)#endif #ifdef CONFIG_PCIE1 - 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)){SET_STD_PCIE_INFO (pci_info[num],1 ); + pcie_ep =fsl_setup_hose (&pcie1_hose, pci_info[num].regs);printf (" PCIE1 connected to Slot 2 as %s (base addr %lx)\n" , pcie_ep ?"End Point" :"Root Complex" , pci_info[num].regs);
Signature · 1 line
1.6.0.6
PATCH 9/12 ppc/85xx: Move to using fsl_setup_hose on P1/P2 RDB
We can use fsl_setup_hose to determine if we are a agent/end-point or a host. Rather than using some SoC specific register we can just look at the PCI cfg space of the host controller to determine this.
--- board/freescale/p1_p2_rdb/pci.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-)
board/freescale/p1_p2_rdb/pci.c +4 -6
@@ -43,7 +43,7 @@ void pci_init_board(void) {volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);struct fsl_pci_info pci_info[2 ]; -u32 devdisr, pordevsr, io_sel, host_agent; +u32 devdisr, pordevsr, io_sel;int first_free_busno =0 ;int num =0 ;
@@ -52,21 +52,19 @@ void pci_init_board(void) devdisr =in_be32 (&gur->devdisr); pordevsr =in_be32 (&gur->pordevsr); io_sel = (pordevsr & MPC85xx_PORDEVSR_IO_SEL) >>19 ; - host_agent = (in_be32 (&gur->porbmsr) & MPC85xx_PORBMSR_HA) >>16 ; -debug (" pci_init_board: devdisr=%x, io_sel=%x, host_agent=%x\n" , - devdisr, io_sel, host_agent); +debug (" pci_init_board: devdisr=%x, io_sel=%x\n" , devdisr, io_sel);if (!(pordevsr & MPC85xx_PORDEVSR_SGMII2_DIS))printf (" eTSEC2 is in sgmii mode.\n" );puts ("\n" );#ifdef CONFIG_PCIE2 - 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)){SET_STD_PCIE_INFO (pci_info[num],2 ); + pcie_ep =fsl_setup_hose (&pcie2_hose, pci_info[num].regs);printf (" PCIE2 connected to Slot 1 as %s (base addr %lx)\n" , pcie_ep ?"End Point" :"Root Complex" , pci_info[num].regs);
@@ -81,11 +79,11 @@ void pci_init_board(void)#endif #ifdef CONFIG_PCIE1 - 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)){SET_STD_PCIE_INFO (pci_info[num],1 ); + pcie_ep =fsl_setup_hose (&pcie1_hose, pci_info[num].regs);printf (" PCIE1 connected to Slot 2 as %s (base addr %lx)\n" , pcie_ep ?"End Point" :"Root Complex" , pci_info[num].regs);
Signature · 1 line
1.6.0.6
PATCH 10/12 ppc/85xx: Move to using fsl_setup_hose on P2020 DS
We can use fsl_setup_hose to determine if we are a agent/end-point or a host. Rather than using some SoC specific register we can just look at the PCI cfg space of the host controller to determine this.
--- board/freescale/p2020ds/p2020ds.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-)
board/freescale/p2020ds/p2020ds.c +5 -7
@@ -197,7 +197,7 @@ void pci_init_board(void) {volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);struct fsl_pci_info pci_info[3 ]; -u32 devdisr, pordevsr, io_sel, host_agent; +u32 devdisr, pordevsr, io_sel;int first_free_busno =0 ;int num =0 ;
@@ -206,10 +206,8 @@ void pci_init_board(void) devdisr =in_be32 (&gur->devdisr); pordevsr =in_be32 (&gur->pordevsr); io_sel = (pordevsr & MPC85xx_PORDEVSR_IO_SEL) >>19 ; - host_agent = (in_be32 (&gur->porbmsr) & MPC85xx_PORBMSR_HA) >>16 ; -debug (" pci_init_board: devdisr=%x, io_sel=%x, host_agent=%x\n" , - devdisr, io_sel, host_agent); +debug (" pci_init_board: devdisr=%x, io_sel=%x\n" , devdisr, io_sel);if (!(pordevsr & MPC85xx_PORDEVSR_SGMII2_DIS))printf (" eTSEC2 is in sgmii mode.\n" );
@@ -218,11 +216,11 @@ void pci_init_board(void)puts ("\n" );#ifdef CONFIG_PCIE2 - 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_PCIE2)) {SET_STD_PCIE_INFO (pci_info[num],2 ); + pcie_ep =fsl_setup_hose (&pcie2_hose, pci_info[num].regs);printf (" PCIE2 connected to ULI as %s (base addr %lx)\n" , pcie_ep ?"End Point" :"Root Complex" , pci_info[num].regs);
@@ -258,11 +256,11 @@ void pci_init_board(void)#endif #ifdef CONFIG_PCIE3 - 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_PCIE3)) {SET_STD_PCIE_INFO (pci_info[num],3 ); + pcie_ep =fsl_setup_hose (&pcie3_hose, pci_info[num].regs);printf (" PCIE3 connected to Slot 1 as %s (base addr %lx)\n" , pcie_ep ?"End Point" :"Root Complex" , pci_info[num].regs);
@@ -277,11 +275,11 @@ void pci_init_board(void)#endif #ifdef CONFIG_PCIE1 - 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)) {SET_STD_PCIE_INFO (pci_info[num],1 ); + pcie_ep =fsl_setup_hose (&pcie1_hose, pci_info[num].regs);printf (" PCIE1 connected to Slot 2 as %s (base addr %lx)\n" , pcie_ep ?"End Point" :"Root Complex" , pci_info[num].regs);
Signature · 1 line
1.6.0.6
PATCH 11/12 ppc/85xx: Move to using fsl_setup_hose on TQM 85xx
We can use fsl_setup_hose to determine if we are a agent/end-point or a host. Rather than using some SoC specific register we can just look at the PCI cfg space of the host controller to determine this.
--- board/tqc/tqm85xx/tqm85xx.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
board/tqc/tqm85xx/tqm85xx.c +4 -4
@@ -549,7 +549,6 @@ static inline void init_pci1(void) {volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);#ifdef CONFIG_PCI1 -uint host_agent = (gur->porbmsr & MPC85xx_PORBMSR_HA) >>16 ;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;
@@ -561,7 +560,7 @@ static inline void init_pci1(void)/* PORPLLSR[16] */ uint pci_clk_sel = gur->porpllsr & MPC85xx_PORDEVSR_PCI1_SPD; -uint pci_agent =is_fsl_pci_agent (LAW_TRGT_IF_PCI_1 , host_agent); +int pci_agent =fsl_setup_hose (hose,CONFIG_SYS_PCI1_ADDR );uint pci_speed =CONFIG_SYS_CLK_FREQ ;/* PCI PSPEED in [4:5] */
@@ -626,14 +625,15 @@ static inline void init_pcie1(void)volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);#ifdef CONFIG_PCIE1 uint io_sel = (gur->pordevsr & MPC85xx_PORDEVSR_IO_SEL) >>19 ; -uint host_agent = (gur->porbmsr & MPC85xx_PORBMSR_HA) >>16 ;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_ep;struct pci_region *r = hose->regions;int pcie_configured =is_fsl_pci_cfg (LAW_TRGT_IF_PCIE_1 , io_sel); + pcie_ep =fsl_setup_hose (hose,CONFIG_SYS_PCIE1_ADDR ); +if (pcie_configured && !(gur->devdisr & MPC85xx_DEVDISR_PCIE)){printf ("PCIe: %s, base address %x" , pcie_ep ?"End point" :"Root complex" , (uint )pci);
Signature · 1 line
1.6.0.6
PATCH 12/12 ppc/8xxx: Remove is_fsl_pci_agent
All users of is_fsl_pci_agent have been converted to fsl_is_pci_agent that uses the standard PCI programming model to determine host vs agent/end-point.
--- cpu/mpc8xxx/pci_cfg.c | 44 +++----------------------------------------- drivers/pci/fsl_pci_init.c | 9 +++++++++ include/asm-ppc/fsl_pci.h | 5 +++-- 3 files changed, 15 insertions(+), 43 deletions(-)
cpu/mpc8xxx/pci_cfg.c +3 -41
@@ -25,19 +25,14 @@#include <pci.h> struct pci_info { -u16 agent;u16 cfg; }; -/* The agent field is a bit mask in which each bit represents the value of -* cfg_host_agt[] signal and the bit is set of the given interface would be -* in agent/end-point mode for the given interface. -* -* The same idea is true of the cfg field. The bit will be set if the -* interface would be enabled based on the value of cfg_IO_ports[] signal +/* The cfg field is a bit mask in which each bit represents the value of +* cfg_IO_ports[] signal and the bit is set if the interface would be +* enabled based on the value of cfg_IO_ports[] signal * * On MPC86xx/PQ3 based systems: -* we extract cfg_host_agt from GUTS register PORBMSR * we extract cfg_IO_ports from GUTS register PORDEVSR * * cfg_IO_ports only exist on systems w/PCIe (we set cfg 0 for systems
@@ -48,7 +43,6 @@ struct pci_info {static struct pci_info pci_config_info[] = { [LAW_TRGT_IF_PCI ] = { - .agent = (1 <<0 ) | (1 <<2 ), .cfg =0 , }, };
@@ -56,7 +50,6 @@ static struct pci_info pci_config_info[] =static struct pci_info pci_config_info[] = { [LAW_TRGT_IF_PCI ] = { - .agent = (1 <<0 ), .cfg =0 , }, };
@@ -64,19 +57,15 @@ static struct pci_info pci_config_info[] =static struct pci_info pci_config_info[] = { [LAW_TRGT_IF_PCI ] = { - .agent = (1 <<6 ), .cfg =0 , }, [LAW_TRGT_IF_PCIE_1 ] = { - .agent = (1 <<5 ), .cfg = (1 <<2 ) | (1 <<3 ) | (1 <<5 ) | (1 <<7 ), }, [LAW_TRGT_IF_PCIE_2 ] = { - .agent = (1 <<3 ), .cfg = (1 <<5 ) | (1 <<7 ), }, [LAW_TRGT_IF_PCIE_3 ] = { - .agent = (1 <<1 ), .cfg = (1 <<7 ), }, };
@@ -84,20 +73,16 @@ static struct pci_info pci_config_info[] =static struct pci_info pci_config_info[] = { [LAW_TRGT_IF_PCI ] = { - .agent = (1 <<6 ), .cfg =0 , }, [LAW_TRGT_IF_PCIE_1 ] = { - .agent = (1 <<5 ), .cfg = (1 <<2 ) | (1 <<3 ) | (1 <<4 ) | (1 <<5 ) | (1 <<6 ) | (1 <<7 ), }, [LAW_TRGT_IF_PCIE_2 ] = { - .agent = (1 <<3 ), .cfg = (1 <<4 ) | (1 <<5 ) | (1 <<6 ) | (1 <<7 ), }, [LAW_TRGT_IF_PCIE_3 ] = { - .agent = (1 <<1 ), .cfg = (1 <<6 ) | (1 <<7 ), }, };
@@ -105,16 +90,13 @@ static struct pci_info pci_config_info[] =static struct pci_info pci_config_info[] = { [LAW_TRGT_IF_PCI_1 ] = { - .agent = (1 <<4 ) | (1 <<6 ), .cfg =0 , }, [LAW_TRGT_IF_PCI_2 ] = { - .agent = (1 <<4 ) | (1 <<6 ), .cfg =0 , },/* PCI_2 is always host and we dont use iosel to determine enable/disable */ [LAW_TRGT_IF_PCIE_1 ] = { - .agent = (1 <<0 ) | (1 <<2 ), .cfg = (1 <<3 ) | (1 <<4 ) | (1 <<7 ), }, };
@@ -122,11 +104,9 @@ static struct pci_info pci_config_info[] =static struct pci_info pci_config_info[] = { [LAW_TRGT_IF_PCI ] = { - .agent = (1 <<0 ) | (1 <<4 ) | (1 <<6 ), .cfg =0 , }, [LAW_TRGT_IF_PCIE_1 ] = { - .agent = (1 <<0 ) | (1 <<2 ) | (1 <<4 ), .cfg = (1 <<3 ) | (1 <<4 ) | (1 <<7 ), }, };
@@ -134,7 +114,6 @@ static struct pci_info pci_config_info[] =static struct pci_info pci_config_info[] = { [LAW_TRGT_IF_PCIE_1 ] = { - .agent = (1 <<0 ) | (1 <<6 ), .cfg = (1 <<0 ) | (1 <<4 ) | (1 <<5 ) | (1 <<6 ) | (1 <<7 ) | (1 <<8 ) | (1 <<0xc ) | (1 <<0xf ), },
@@ -143,16 +122,13 @@ static struct pci_info pci_config_info[] =static struct pci_info pci_config_info[] = { [LAW_TRGT_IF_PCIE_1 ] = { - .agent = (1 <<0 ) | (1 <<1 ) | (1 <<4 ) | (1 <<5 ), .cfg = (1 <<2 ) | (1 <<3 ) | (1 <<7 ) | (1 <<0xb ) | (1 <<0xc ) | (1 <<0xf ), }, [LAW_TRGT_IF_PCIE_2 ] = { - .agent = (1 <<0 ) | (1 <<2 ) | (1 <<4 ) | (1 <<6 ), .cfg = (1 <<3 ) | (1 <<7 ), }, [LAW_TRGT_IF_PCIE_3 ] = { - .agent = (1 <<0 ) | (1 <<3 ) | (1 <<5 ) | (1 <<6 ), .cfg = (1 <<7 ), }, };
@@ -160,15 +136,12 @@ static struct pci_info pci_config_info[] =static struct pci_info pci_config_info[] = { [LAW_TRGT_IF_PCI_1 ] = { - .agent = (1 <<4 ) | (1 <<5 ) | (1 <<6 ), .cfg =0 , }, [LAW_TRGT_IF_PCIE_1 ] = { - .agent = (1 <<0 ) | (1 <<2 ) | (1 <<5 ), .cfg = (1 <<1 ) | (1 <<4 ), }, [LAW_TRGT_IF_PCIE_2 ] = { - .agent = (1 <<0 ) | (1 <<1 ) | (1 <<4 ), .cfg = (1 <<0 ) | (1 <<4 ), }, };
@@ -176,7 +149,6 @@ static struct pci_info pci_config_info[] =static struct pci_info pci_config_info[] = { [LAW_TRGT_IF_PCIE_1 ] = { - .agent =0 ,/* we dont use agent on 8641 */ .cfg = (1 <<2 ) | (1 <<3 ) | (1 <<5 ) | (1 <<6 ) | (1 <<7 ) | (1 <<0xe ) | (1 <<0xf ), },
@@ -185,11 +157,9 @@ static struct pci_info pci_config_info[] =static struct pci_info pci_config_info[] = { [LAW_TRGT_IF_PCIE_1 ] = { - .agent = (1 <<0 ) | (1 <<1 ), .cfg = (1 <<0 ) | (1 <<6 ) | (1 <<0xe ) | (1 <<0xf ), }, [LAW_TRGT_IF_PCIE_2 ] = { - .agent = (1 <<0 ) | (1 <<2 ), .cfg = (1 <<0xe ), }, };
@@ -197,16 +167,13 @@ static struct pci_info pci_config_info[] =static struct pci_info pci_config_info[] = { [LAW_TRGT_IF_PCIE_1 ] = { - .agent = (1 <<0 ) | (1 <<1 ) | (1 <<4 ) | (1 <<5 ), .cfg = (1 <<0 ) | (1 <<2 ) | (1 <<4 ) | (1 <<6 ) | (1 <<0xd ) | (1 <<0xe ) | (1 <<0xf ), }, [LAW_TRGT_IF_PCIE_2 ] = { - .agent = (1 <<0 ) | (1 <<2 ) | (1 <<4 ) | (1 <<6 ), .cfg = (1 <<2 ) | (1 <<0xe ), }, [LAW_TRGT_IF_PCIE_3 ] = { - .agent = (1 <<0 ) | (1 <<3 ) | (1 <<5 ) | (1 <<6 ), .cfg = (1 <<2 ) | (1 <<4 ), }, };
@@ -216,11 +183,6 @@ static struct pci_info pci_config_info[] =#endif #ifndef CONFIG_FSL_CORENET -int is_fsl_pci_agent (enum law_trgt_if trgt,u32 host_agent) -{ -return ((1 << host_agent) & pci_config_info[trgt].agent); -} -int is_fsl_pci_cfg (enum law_trgt_if trgt,u32 io_sel) {return ((1 << io_sel) & pci_config_info[trgt].cfg);
drivers/pci/fsl_pci_init.c +9 -0
@@ -86,6 +86,15 @@ static void set_inbound_window(volatile pit_t *pi,out_be32 (&pi->piwar, flag | sz); } +int fsl_setup_hose (struct pci_controller *hose,unsigned long addr) +{ +volatile ccsr_fsl_pci_t *pci = (ccsr_fsl_pci_t *) addr; + +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)
include/asm-ppc/fsl_pci.h +3 -2
@@ -1,4 +1,5 @@ -/* (C) Copyright 2007 Freescale Semiconductor, Inc. +/* +* Copyright 2007,2009 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 as
@@ -22,9 +23,9 @@#include <asm/fsl_law.h> -int is_fsl_pci_agent (enum law_trgt_if trgt,u32 host_agent);int is_fsl_pci_cfg (enum law_trgt_if trgt,u32 io_sel); +int fsl_setup_hose (struct pci_controller *hose,unsigned long addr);int fsl_is_pci_agent (struct pci_controller *hose);void fsl_pci_init (struct pci_controller *hose,u32 cfg_addr,u32 cfg_data);void fsl_pci_config_unlock (struct pci_controller *hose);
Signature · 1 line
1.6.0.6