ppc4xx: Consolidate pci_target_init() function
PATCH 1/3 ppc4xx: Consolidate pci_target_init() function
This patch removes the duplicted implementations of the pci_target_init() function by introducing a weak default function for it. This weak default has a different implementation for 440EP(x)/GR(x) PPC's. It can be overridden by a board specific version (e.g. PMC440, korat).
--- board/amcc/bamboo/bamboo.c | 61 ------------------- board/amcc/canyonlands/canyonlands.c | 37 ----------- board/amcc/ebony/ebony.c | 39 ------------ board/amcc/katmai/katmai.c | 40 +------------ board/amcc/luan/luan.c | 40 ------------ board/amcc/ocotea/ocotea.c | 40 ------------ board/amcc/sequoia/sequoia.c | 65 -------------------- board/amcc/taishan/taishan.c | 39 ------------ board/amcc/yosemite/yosemite.c | 61 ------------------- board/amcc/yucca/yucca.c | 38 ------------ board/esd/du440/du440.c | 67 --------------------- board/esd/du440/du440.h | 3 - board/gdsys/gdppc440etx/gdppc440etx.c | 63 ------------------- board/gdsys/intip/intip.c | 37 ----------- board/korat/korat.c | 57 +----------------- board/lwmon5/lwmon5.c | 61 ------------------- board/netstal/hcu5/hcu5.c | 65 -------------------- board/pcs440ep/pcs440ep.c | 61 ------------------- board/prodrive/alpr/alpr.c | 39 ------------ board/prodrive/p3p440/p3p440.c | 39 ------------ board/sandburst/common/sb_common.c | 40 ------------ board/xes/xpedite1000/xpedite1000.c | 32 ---------- cpu/ppc4xx/4xx_pci.c | 106 +++++++++++++++++++++++++++++++++ include/asm-ppc/4xx_pci.h | 2 + include/configs/DU440.h | 5 +- include/configs/PMC440.h | 1 + include/configs/korat.h | 1 + 27 files changed, 117 insertions(+), 1022 deletions(-)
board/amcc/bamboo/bamboo.c +0 -61
@@ -522,67 +522,6 @@ int pci_pre_init(struct pci_controller *hose)#endif /* defined(CONFIG_PCI) */ /************************************************************************* -* pci_target_init -* -* The bootstrap configuration provides default settings for the pci -* inbound map (PIM). But the bootstrap config choices are limited and -* may not be sufficient for a given board. -* -************************************************************************/ -#if defined(CONFIG_PCI ) && defined(CONFIG_SYS_PCI_TARGET_INIT ) -void pci_target_init (struct pci_controller *hose) -{ -/*--------------------------------------------------------------------------+ -* Set up Direct MMIO registers -*--------------------------------------------------------------------------*/ -/*--------------------------------------------------------------------------+ -| PowerPC440 EP PCI Master configuration. -| Map one 1Gig range of PLB/processor addresses to PCI memory space. -| PLB address 0xA0000000-0xDFFFFFFF ==> PCI address 0xA0000000-0xDFFFFFFF -| Use byte reversed out routines to handle endianess. -| Make this region non-prefetchable. -+--------------------------------------------------------------------------*/ -out32r (PCIL0_PMM0MA ,0x00000000 );/* PMM0 Mask/Attribute - disabled b4 setting */ -out32r (PCIL0_PMM0LA ,CONFIG_SYS_PCI_MEMBASE );/* PMM0 Local Address */ -out32r (PCIL0_PMM0PCILA ,CONFIG_SYS_PCI_MEMBASE );/* PMM0 PCI Low Address */ -out32r (PCIL0_PMM0PCIHA ,0x00000000 );/* PMM0 PCI High Address */ -out32r (PCIL0_PMM0MA ,0xE0000001 );/* 512M + No prefetching, and enable region */ - -out32r (PCIL0_PMM1MA ,0x00000000 );/* PMM0 Mask/Attribute - disabled b4 setting */ -out32r (PCIL0_PMM1LA ,CONFIG_SYS_PCI_MEMBASE2 );/* PMM0 Local Address */ -out32r (PCIL0_PMM1PCILA ,CONFIG_SYS_PCI_MEMBASE2 );/* PMM0 PCI Low Address */ -out32r (PCIL0_PMM1PCIHA ,0x00000000 );/* PMM0 PCI High Address */ -out32r (PCIL0_PMM1MA ,0xE0000001 );/* 512M + No prefetching, and enable region */ - -out32r (PCIL0_PTM1MS ,0x00000001 );/* Memory Size/Attribute */ -out32r (PCIL0_PTM1LA ,0 );/* Local Addr. Reg */ -out32r (PCIL0_PTM2MS ,0 );/* Memory Size/Attribute */ -out32r (PCIL0_PTM2LA ,0 );/* Local Addr. Reg */ - -/*--------------------------------------------------------------------------+ -* Set up Configuration registers -*--------------------------------------------------------------------------*/ - -/* Program the board's subsystem id/vendor id */ -pci_write_config_word (0 ,PCI_SUBSYSTEM_VENDOR_ID , -CONFIG_SYS_PCI_SUBSYS_VENDORID ); -pci_write_config_word (0 ,PCI_SUBSYSTEM_ID ,CONFIG_SYS_PCI_SUBSYS_ID ); - -/* Configure command register as bus master */ -pci_write_config_word (0 ,PCI_COMMAND ,PCI_COMMAND_MASTER ); - -/* 240nS PCI clock */ -pci_write_config_word (0 ,PCI_LATENCY_TIMER ,1 ); - -/* No error reporting */ -pci_write_config_word (0 ,PCI_ERREN ,0 ); - -pci_write_config_dword (0 ,PCI_BRDGOPT2 ,0x00000101 ); - -} -#endif /* defined(CONFIG_PCI) && defined(CONFIG_SYS_PCI_TARGET_INIT) */ - -/************************************************************************* * pci_master_init * ************************************************************************/
board/amcc/canyonlands/canyonlands.c +0 -37
@@ -326,43 +326,6 @@ phys_size_t initdram(int board_type) }#endif -/* -* pci_target_init -* -* The bootstrap configuration provides default settings for the pci -* inbound map (PIM). But the bootstrap config choices are limited and -* may not be sufficient for a given board. -*/ -#if defined(CONFIG_PCI ) && defined(CONFIG_SYS_PCI_TARGET_INIT ) -void pci_target_init (struct pci_controller * hose ) -{ -/* -* Disable everything -*/ -out_le32 ((void *)PCIL0_PIM0SA ,0 );/* disable */ -out_le32 ((void *)PCIL0_PIM1SA ,0 );/* disable */ -out_le32 ((void *)PCIL0_PIM2SA ,0 );/* disable */ -out_le32 ((void *)PCIL0_EROMBA ,0 );/* disable expansion rom */ - -/* -* Map all of SDRAM to PCI address 0x0000_0000. Note that the 440 -* strapping options to not support sizes such as 128/256 MB. -*/ -out_le32 ((void *)PCIL0_PIM0LAL ,CONFIG_SYS_SDRAM_BASE ); -out_le32 ((void *)PCIL0_PIM0LAH ,0 ); -out_le32 ((void *)PCIL0_PIM0SA , ~(gd->ram_size -1 ) |1 ); -out_le32 ((void *)PCIL0_BAR0 ,0 ); - -/* -* Program the board's subsystem id/vendor id -*/ -out_le16 ((void *)PCIL0_SBSYSVID ,CONFIG_SYS_PCI_SUBSYS_VENDORID ); -out_le16 ((void *)PCIL0_SBSYSID ,CONFIG_SYS_PCI_SUBSYS_DEVICEID ); - -out_le16 ((void *)PCIL0_CMD ,in16r (PCIL0_CMD ) |PCI_COMMAND_MEMORY ); -} -#endif /* defined(CONFIG_PCI) && defined(CONFIG_SYS_PCI_TARGET_INIT) */ -#if defined(CONFIG_PCI )int board_pcie_first (void ) {
board/amcc/ebony/ebony.c +0 -39
@@ -195,42 +195,3 @@ int pci_pre_init(struct pci_controller *hose) return 1; }#endif /* defined(CONFIG_PCI) */ - -/************************************************************************* -* pci_target_init -* -* The bootstrap configuration provides default settings for the pci -* inbound map (PIM). But the bootstrap config choices are limited and -* may not be sufficient for a given board. -* -************************************************************************/ -#if defined(CONFIG_PCI ) && defined(CONFIG_SYS_PCI_TARGET_INIT ) -void pci_target_init (struct pci_controller *hose) -{ -/*--------------------------------------------------------------------------+ -* Disable everything -*--------------------------------------------------------------------------*/ -out32r (PCIL0_PIM0SA ,0 );/* disable */ -out32r (PCIL0_PIM1SA ,0 );/* disable */ -out32r (PCIL0_PIM2SA ,0 );/* disable */ -out32r (PCIL0_EROMBA ,0 );/* disable expansion rom */ - -/*--------------------------------------------------------------------------+ -* Map all of SDRAM to PCI address 0x0000_0000. Note that the 440 strapping -* options to not support sizes such as 128/256 MB. -*--------------------------------------------------------------------------*/ -out32r (PCIL0_PIM0LAL ,CONFIG_SYS_SDRAM_BASE ); -out32r (PCIL0_PIM0LAH ,0 ); -out32r (PCIL0_PIM0SA , ~(gd->ram_size -1 ) |1 ); - -out32r (PCIL0_BAR0 ,0 ); - -/*--------------------------------------------------------------------------+ -* Program the board's subsystem id/vendor id -*--------------------------------------------------------------------------*/ -out16r (PCIL0_SBSYSVID ,CONFIG_SYS_PCI_SUBSYS_VENDORID ); -out16r (PCIL0_SBSYSID ,CONFIG_SYS_PCI_SUBSYS_DEVICEID ); - -out16r (PCIL0_CMD ,in16r (PCIL0_CMD ) |PCI_COMMAND_MEMORY ); -} -#endif /* defined(CONFIG_PCI) && defined(CONFIG_SYS_PCI_TARGET_INIT) */
board/amcc/katmai/katmai.c +1 -39
@@ -1,5 +1,5 @@/* -* (C) Copyright 2007-2008 +* (C) Copyright 2007-2009 * Stefan Roese, DENX Software Engineering, sr at denx.de. * * See file CREDITS for list of people who contributed to this
@@ -291,44 +291,6 @@ int pci_pre_init(struct pci_controller * hose ) }#endif /* defined(CONFIG_PCI) */ -/************************************************************************* -* pci_target_init -* -* The bootstrap configuration provides default settings for the pci -* inbound map (PIM). But the bootstrap config choices are limited and -* may not be sufficient for a given board. -* -************************************************************************/ -#if defined(CONFIG_PCI ) && defined(CONFIG_SYS_PCI_TARGET_INIT ) -void pci_target_init (struct pci_controller * hose ) -{ -/*-------------------------------------------------------------------+ -* Disable everything -*-------------------------------------------------------------------*/ -out32r (PCIL0_PIM0SA ,0 );/* disable */ -out32r (PCIL0_PIM1SA ,0 );/* disable */ -out32r (PCIL0_PIM2SA ,0 );/* disable */ -out32r (PCIL0_EROMBA ,0 );/* disable expansion rom */ - -/*-------------------------------------------------------------------+ -* Map all of SDRAM to PCI address 0x0000_0000. Note that the 440 -* strapping options to not support sizes such as 128/256 MB. -*-------------------------------------------------------------------*/ -out32r (PCIL0_PIM0LAL ,CONFIG_SYS_SDRAM_BASE ); -out32r (PCIL0_PIM0LAH ,0 ); -out32r (PCIL0_PIM0SA , ~(gd->ram_size -1 ) |1 ); -out32r (PCIL0_BAR0 ,0 ); - -/*-------------------------------------------------------------------+ -* Program the board's subsystem id/vendor id -*-------------------------------------------------------------------*/ -out16r (PCIL0_SBSYSVID ,CONFIG_SYS_PCI_SUBSYS_VENDORID ); -out16r (PCIL0_SBSYSID ,CONFIG_SYS_PCI_SUBSYS_DEVICEID ); - -out16r (PCIL0_CMD ,in16r (PCIL0_CMD ) |PCI_COMMAND_MEMORY ); -} -#endif /* defined(CONFIG_PCI) && defined(CONFIG_SYS_PCI_TARGET_INIT) */ -#if defined(CONFIG_PCI )int board_pcie_card_present (int port) {
board/amcc/luan/luan.c +0 -40
@@ -160,46 +160,6 @@ int pci_pre_init( struct pci_controller *hose )/************************************************************************* -* pci_target_init -* -* The bootstrap configuration provides default settings for the pci -* inbound map (PIM). But the bootstrap config choices are limited and -* may not be sufficient for a given board. -* -************************************************************************/ -#if defined(CONFIG_PCI ) && defined(CONFIG_SYS_PCI_TARGET_INIT ) -void pci_target_init (struct pci_controller *hose) -{ -/*--------------------------------------------------------------------------+ -* Disable everything -*--------------------------------------------------------------------------*/ -out32r (PCIL0_PIM0SA ,0 );/* disable */ -out32r (PCIL0_PIM1SA ,0 );/* disable */ -out32r (PCIL0_PIM2SA ,0 );/* disable */ -out32r (PCIL0_EROMBA ,0 );/* disable expansion rom */ - -/*--------------------------------------------------------------------------+ -* Map all of SDRAM to PCI address 0x0000_0000. Note that the 440 strapping -* options to not support sizes such as 128/256 MB. -*--------------------------------------------------------------------------*/ -out32r (PCIL0_PIM0LAL ,CONFIG_SYS_SDRAM_BASE ); -out32r (PCIL0_PIM0LAH ,0 ); -out32r (PCIL0_PIM0SA , ~(gd->ram_size -1 ) |1 ); - -out32r (PCIL0_BAR0 ,0 ); - -/*--------------------------------------------------------------------------+ -* Program the board's subsystem id/vendor id -*--------------------------------------------------------------------------*/ -out16r (PCIL0_SBSYSVID ,CONFIG_SYS_PCI_SUBSYS_VENDORID ); -out16r (PCIL0_SBSYSID ,CONFIG_SYS_PCI_SUBSYS_DEVICEID ); - -out16r (PCIL0_CMD ,in16r (PCIL0_CMD ) |PCI_COMMAND_MEMORY ); -} -#endif /* defined(CONFIG_PCI) && defined(CONFIG_SYS_PCI_TARGET_INIT) */ - - -/************************************************************************* * hw_watchdog_reset * * This routine is called to reset (keep alive) the watchdog timer
board/amcc/ocotea/ocotea.c +0 -40
@@ -307,46 +307,6 @@ int pci_pre_init(struct pci_controller * hose ) }#endif /* defined(CONFIG_PCI) */ -/************************************************************************* -* pci_target_init -* -* The bootstrap configuration provides default settings for the pci -* inbound map (PIM). But the bootstrap config choices are limited and -* may not be sufficient for a given board. -* -************************************************************************/ -#if defined(CONFIG_PCI ) && defined(CONFIG_SYS_PCI_TARGET_INIT ) -void pci_target_init (struct pci_controller * hose ) -{ -/*--------------------------------------------------------------------------+ -* Disable everything -*--------------------------------------------------------------------------*/ -out32r (PCIL0_PIM0SA ,0 );/* disable */ -out32r (PCIL0_PIM1SA ,0 );/* disable */ -out32r (PCIL0_PIM2SA ,0 );/* disable */ -out32r (PCIL0_EROMBA ,0 );/* disable expansion rom */ - -/*--------------------------------------------------------------------------+ -* Map all of SDRAM to PCI address 0x0000_0000. Note that the 440 strapping -* options to not support sizes such as 128/256 MB. -*--------------------------------------------------------------------------*/ -out32r (PCIL0_PIM0LAL ,CONFIG_SYS_SDRAM_BASE ); -out32r (PCIL0_PIM0LAH ,0 ); -out32r (PCIL0_PIM0SA , ~(gd->ram_size -1 ) |1 ); - -out32r (PCIL0_BAR0 ,0 ); - -/*--------------------------------------------------------------------------+ -* Program the board's subsystem id/vendor id -*--------------------------------------------------------------------------*/ -out16r (PCIL0_SBSYSVID ,CONFIG_SYS_PCI_SUBSYS_VENDORID ); -out16r (PCIL0_SBSYSID ,CONFIG_SYS_PCI_SUBSYS_DEVICEID ); - -out16r (PCIL0_CMD ,in16r (PCIL0_CMD ) |PCI_COMMAND_MEMORY ); -} -#endif /* defined(CONFIG_PCI) && defined(CONFIG_SYS_PCI_TARGET_INIT) */ - -void fpga_init (void ) {unsigned long group;
board/amcc/sequoia/sequoia.c +0 -65
71 lines not on this page · raw message
board/amcc/taishan/taishan.c +0 -39
@@ -240,45 +240,6 @@ int pci_pre_init(struct pci_controller * hose ) }#endif /* defined(CONFIG_PCI) */ -/************************************************************************* -* pci_target_init -* -* The bootstrap configuration provides default settings for the pci -* inbound map (PIM). But the bootstrap config choices are limited and -* may not be sufficient for a given board. -* -************************************************************************/ -#if defined(CONFIG_PCI ) && defined(CONFIG_SYS_PCI_TARGET_INIT ) -void pci_target_init (struct pci_controller * hose ) -{ -/*--------------------------------------------------------------------------+ -* Disable everything -*--------------------------------------------------------------------------*/ -out32r (PCIL0_PIM0SA ,0 );/* disable */ -out32r (PCIL0_PIM1SA ,0 );/* disable */ -out32r (PCIL0_PIM2SA ,0 );/* disable */ -out32r (PCIL0_EROMBA ,0 );/* disable expansion rom */ - -/*--------------------------------------------------------------------------+ -* Map all of SDRAM to PCI address 0x0000_0000. Note that the 440 strapping -* options to not support sizes such as 128/256 MB. -*--------------------------------------------------------------------------*/ -out32r (PCIL0_PIM0LAL ,CONFIG_SYS_SDRAM_BASE ); -out32r (PCIL0_PIM0LAH ,0 ); -out32r (PCIL0_PIM0SA , ~(gd->ram_size -1 ) |1 ); - -out32r (PCIL0_BAR0 ,0 ); - -/*--------------------------------------------------------------------------+ -* Program the board's subsystem id/vendor id -*--------------------------------------------------------------------------*/ -out16r (PCIL0_SBSYSVID ,CONFIG_SYS_PCI_SUBSYS_VENDORID ); -out16r (PCIL0_SBSYSID ,CONFIG_SYS_PCI_SUBSYS_DEVICEID ); - -out16r (PCIL0_CMD ,in16r (PCIL0_CMD ) |PCI_COMMAND_MEMORY ); -} -#endif /* defined(CONFIG_PCI) && defined(CONFIG_SYS_PCI_TARGET_INIT) */ -#ifdef CONFIG_POST /* * Returns 1 if keys pressed to start the power-on long-running tests
board/amcc/yosemite/yosemite.c +0 -61
67 lines not on this page · raw message
board/amcc/yucca/yucca.c +0 -38
@@ -619,44 +619,6 @@ int pci_pre_init(struct pci_controller * hose ) }#endif /* defined(CONFIG_PCI) */ -/************************************************************************* -* pci_target_init -* -* The bootstrap configuration provides default settings for the pci -* inbound map (PIM). But the bootstrap config choices are limited and -* may not be sufficient for a given board. -* -************************************************************************/ -#if defined(CONFIG_PCI ) && defined(CONFIG_SYS_PCI_TARGET_INIT ) -void pci_target_init (struct pci_controller * hose ) -{ -/*-------------------------------------------------------------------+ -* Disable everything -*-------------------------------------------------------------------*/ -out32r (PCIL0_PIM0SA ,0 );/* disable */ -out32r (PCIL0_PIM1SA ,0 );/* disable */ -out32r (PCIL0_PIM2SA ,0 );/* disable */ -out32r (PCIL0_EROMBA ,0 );/* disable expansion rom */ - -/*-------------------------------------------------------------------+ -* Map all of SDRAM to PCI address 0x0000_0000. Note that the 440 -* strapping options to not support sizes such as 128/256 MB. -*-------------------------------------------------------------------*/ -out32r (PCIL0_PIM0LAL ,CONFIG_SYS_SDRAM_BASE ); -out32r (PCIL0_PIM0LAH ,0 ); -out32r (PCIL0_PIM0SA , ~(gd->ram_size -1 ) |1 ); -out32r (PCIL0_BAR0 ,0 ); - -/*-------------------------------------------------------------------+ -* Program the board's subsystem id/vendor id -*-------------------------------------------------------------------*/ -out16r (PCIL0_SBSYSVID ,CONFIG_SYS_PCI_SUBSYS_VENDORID ); -out16r (PCIL0_SBSYSID ,CONFIG_SYS_PCI_SUBSYS_DEVICEID ); - -out16r (PCIL0_CMD ,in16r (PCIL0_CMD ) |PCI_COMMAND_MEMORY ); -} -#endif /* defined(CONFIG_PCI) && defined(CONFIG_SYS_PCI_TARGET_INIT) */ -#if defined(CONFIG_PCI )int board_pcie_card_present (int port) {
board/esd/du440/du440.c +0 -67
73 lines not on this page · raw message
board/esd/du440/du440.h +0 -3
@@ -38,6 +38,3 @@#define PWR_RDY 0x10#define CPLD_IRQ (32+30) - -#define PCI_VENDOR_ID_ESDGMBH 0x12fe -#define PCI_DEVICE_ID_DU440 0x0444
board/gdsys/gdppc440etx/gdppc440etx.c +0 -63
69 lines not on this page · raw message
board/gdsys/intip/intip.c +0 -37
@@ -141,43 +141,6 @@ int checkboard(void)return 0 ; } -/* -* pci_target_init -* -* The bootstrap configuration provides default settings for the pci -* inbound map (PIM). But the bootstrap config choices are limited and -* may not be sufficient for a given board. -*/ -#if defined(CONFIG_PCI ) && defined(CONFIG_SYS_PCI_TARGET_INIT ) -void pci_target_init (struct pci_controller *hose) -{ -/* -* Disable everything -*/ -out_le32 ((void *)PCIL0_PIM0SA ,0 );/* disable */ -out_le32 ((void *)PCIL0_PIM1SA ,0 );/* disable */ -out_le32 ((void *)PCIL0_PIM2SA ,0 );/* disable */ -out_le32 ((void *)PCIL0_EROMBA ,0 );/* disable expansion rom */ - -/* -* Map all of SDRAM to PCI address 0x0000_0000. Note that the 440 -* strapping options to not support sizes such as 128/256 MB. -*/ -out_le32 ((void *)PCIL0_PIM0LAL ,CONFIG_SYS_SDRAM_BASE ); -out_le32 ((void *)PCIL0_PIM0LAH ,0 ); -out_le32 ((void *)PCIL0_PIM0SA , ~(gd->ram_size -1 ) |1 ); -out_le32 ((void *)PCIL0_BAR0 ,0 ); - -/* -* Program the board's subsystem id/vendor id -*/ -out_le16 ((void *)PCIL0_SBSYSVID ,CONFIG_SYS_PCI_SUBSYS_VENDORID ); -out_le16 ((void *)PCIL0_SBSYSID ,CONFIG_SYS_PCI_SUBSYS_DEVICEID ); - -out_le16 ((void *)PCIL0_CMD ,in16r (PCIL0_CMD ) |PCI_COMMAND_MEMORY ); -} -#endif /* defined(CONFIG_PCI) && defined(CONFIG_SYS_PCI_TARGET_INIT) */ -int board_early_init_r (void ) {/*
board/korat/korat.c +3 -54
69 lines not on this page · raw message
board/lwmon5/lwmon5.c +0 -61
67 lines not on this page · raw message
board/netstal/hcu5/hcu5.c +0 -65
71 lines not on this page · raw message
board/pcs440ep/pcs440ep.c +0 -61
67 lines not on this page · raw message
board/prodrive/alpr/alpr.c +0 -39
@@ -179,45 +179,6 @@ int pci_pre_init(struct pci_controller * hose )#endif /* defined(CONFIG_PCI) */ /************************************************************************* -* pci_target_init -* -* The bootstrap configuration provides default settings for the pci -* inbound map (PIM). But the bootstrap config choices are limited and -* may not be sufficient for a given board. -* -************************************************************************/ -#if defined(CONFIG_PCI ) && defined(CONFIG_SYS_PCI_TARGET_INIT ) -void pci_target_init (struct pci_controller * hose ) -{ -/*--------------------------------------------------------------------------+ -* Disable everything -*--------------------------------------------------------------------------*/ -out32r (PCIL0_PIM0SA ,0 );/* disable */ -out32r (PCIL0_PIM1SA ,0 );/* disable */ -out32r (PCIL0_PIM2SA ,0 );/* disable */ -out32r (PCIL0_EROMBA ,0 );/* disable expansion rom */ - -/*--------------------------------------------------------------------------+ -* Map all of SDRAM to PCI address 0x0000_0000. Note that the 440 strapping -* options to not support sizes such as 128/256 MB. -*--------------------------------------------------------------------------*/ -out32r (PCIL0_PIM0LAL ,CONFIG_SYS_SDRAM_BASE ); -out32r (PCIL0_PIM0LAH ,0 ); -out32r (PCIL0_PIM0SA , ~(gd->ram_size -1 ) |1 ); - -out32r (PCIL0_BAR0 ,0 ); - -/*--------------------------------------------------------------------------+ -* Program the board's subsystem id/vendor id -*--------------------------------------------------------------------------*/ -out16r (PCIL0_SBSYSVID ,CONFIG_SYS_PCI_SUBSYS_VENDORID ); -out16r (PCIL0_SBSYSID ,CONFIG_SYS_PCI_SUBSYS_DEVICEID ); - -out16r (PCIL0_CMD ,in16r (PCIL0_CMD ) |PCI_COMMAND_MEMORY |PCI_COMMAND_MASTER ); -} -#endif /* defined(CONFIG_PCI) && defined(CONFIG_SYS_PCI_TARGET_INIT) */ - -/************************************************************************* * Override weak is_pci_host() * * This routine is called to determine if a pci scan should be
board/prodrive/p3p440/p3p440.c +0 -39
@@ -196,45 +196,6 @@ int pci_pre_init(struct pci_controller *hose)#endif /* defined(CONFIG_PCI) */ /************************************************************************* -* pci_target_init -* -* The bootstrap configuration provides default settings for the pci -* inbound map (PIM). But the bootstrap config choices are limited and -* may not be sufficient for a given board. -* -************************************************************************/ -#if defined(CONFIG_PCI ) && defined(CONFIG_SYS_PCI_TARGET_INIT ) -void pci_target_init (struct pci_controller *hose) -{ -/*--------------------------------------------------------------------------+ -* Disable everything -*--------------------------------------------------------------------------*/ -out32r (PCIL0_PIM0SA ,0 );/* disable */ -out32r (PCIL0_PIM1SA ,0 );/* disable */ -out32r (PCIL0_PIM2SA ,0 );/* disable */ -out32r (PCIL0_EROMBA ,0 );/* disable expansion rom */ - -/*--------------------------------------------------------------------------+ -* Map all of SDRAM to PCI address 0x0000_0000. Note that the 440 strapping -* options to not support sizes such as 128/256 MB. -*--------------------------------------------------------------------------*/ -out32r (PCIL0_PIM0LAL ,CONFIG_SYS_SDRAM_BASE ); -out32r (PCIL0_PIM0LAH ,0 ); -out32r (PCIL0_PIM0SA , ~(gd->ram_size -1 ) |1 ); - -out32r (PCIL0_BAR0 ,0 ); - -/*--------------------------------------------------------------------------+ -* Program the board's subsystem id/vendor id -*--------------------------------------------------------------------------*/ -out16r (PCIL0_SBSYSVID ,CONFIG_SYS_PCI_SUBSYS_VENDORID ); -out16r (PCIL0_SBSYSID ,CONFIG_SYS_PCI_SUBSYS_DEVICEID ); - -out16r (PCIL0_CMD ,in16r (PCIL0_CMD ) |PCI_COMMAND_MEMORY ); -} -#endif /* defined(CONFIG_PCI) && defined(CONFIG_SYS_PCI_TARGET_INIT) */ - -/************************************************************************* * Override weak is_pci_host() * * This routine is called to determine if a pci scan should be
board/sandburst/common/sb_common.c +0 -40
@@ -333,46 +333,6 @@ int pci_pre_init(struct pci_controller * hose )#endif /* defined(CONFIG_PCI) */ /************************************************************************* -* pci_target_init -* -* The bootstrap configuration provides default settings for the pci -* inbound map (PIM). But the bootstrap config choices are limited and -* may not be sufficient for a given board. -* -************************************************************************/ -#if defined(CONFIG_PCI ) && defined(CONFIG_SYS_PCI_TARGET_INIT ) -void pci_target_init (struct pci_controller * hose ) -{ -/*--------------------------------------------------------------------------+ -* Disable everything -*--------------------------------------------------------------------------*/ -out32r (PCIL0_PIM0SA ,0 );/* disable */ -out32r (PCIL0_PIM1SA ,0 );/* disable */ -out32r (PCIL0_PIM2SA ,0 );/* disable */ -out32r (PCIL0_EROMBA ,0 );/* disable expansion rom */ - -/*--------------------------------------------------------------------------+ -* Map all of SDRAM to PCI address 0x0000_0000. Note that the 440 strapping -* options to not support sizes such as 128/256 MB. -*--------------------------------------------------------------------------*/ -out32r (PCIL0_PIM0LAL ,CONFIG_SYS_SDRAM_BASE ); -out32r (PCIL0_PIM0LAH ,0 ); -out32r (PCIL0_PIM0SA , ~(gd->ram_size -1 ) |1 ); - -out32r (PCIL0_BAR0 ,0 ); - -/*--------------------------------------------------------------------------+ -* Program the board's subsystem id/vendor id -*--------------------------------------------------------------------------*/ -out16r (PCIL0_SBSYSVID ,CONFIG_SYS_PCI_SUBSYS_VENDORID ); -out16r (PCIL0_SBSYSID ,CONFIG_SYS_PCI_SUBSYS_DEVICEID ); - -out16r (PCIL0_CMD ,in16r (PCIL0_CMD ) |PCI_COMMAND_MEMORY ); -} -#endif /* defined(CONFIG_PCI) && defined(CONFIG_SYS_PCI_TARGET_INIT) */ - - -/************************************************************************* * board_get_enetaddr * * Get the ethernet MAC address for the management ethernet from the
board/xes/xpedite1000/xpedite1000.c +0 -32
@@ -166,38 +166,6 @@ int pci_pre_init(struct pci_controller * hose) }#endif /* defined(CONFIG_PCI) */ -#if defined(CONFIG_PCI ) && defined(CONFIG_SYS_PCI_TARGET_INIT ) -/* -* The bootstrap configuration provides default settings for the pci -* inbound map (PIM). But the bootstrap config choices are limited and -* may not be sufficient for a given board. -*/ -void pci_target_init (struct pci_controller * hose) -{ -/* Disable everything */ -out32r (PCIL0_PIM0SA ,0 ); -out32r (PCIL0_PIM1SA ,0 ); -out32r (PCIL0_PIM2SA ,0 ); -out32r (PCIL0_EROMBA ,0 );/* disable expansion rom */ - -/* -* Map all of SDRAM to PCI address 0x0000_0000. Note that the 440 strapping -* options to not support sizes such as 128/256 MB. -*/ -out32r (PCIL0_PIM0LAL ,CONFIG_SYS_SDRAM_BASE ); -out32r (PCIL0_PIM0LAH ,0 ); -out32r (PCIL0_PIM0SA , ~(gd->ram_size -1 ) |1 ); - -out32r (PCIL0_BAR0 ,0 ); - -/* Program the board's subsystem id/vendor id */ -out16r (PCIL0_SBSYSVID ,CONFIG_SYS_PCI_SUBSYS_VENDORID ); -out16r (PCIL0_SBSYSID ,CONFIG_SYS_PCI_SUBSYS_DEVICEID ); - -out16r (PCIL0_CMD ,in16r (PCIL0_CMD ) |PCI_COMMAND_MEMORY ); -} -#endif /* defined(CONFIG_PCI) && defined(CONFIG_SYS_PCI_TARGET_INIT) */ -#if defined(CONFIG_PCI )/* * Override weak is_pci_host()
cpu/ppc4xx/4xx_pci.c +106 -0
118 lines not on this page · raw message
include/asm-ppc/4xx_pci.h +2 -0
@@ -49,4 +49,6 @@#define PCIDEVID_405GP 0x0 +void __pci_target_init (struct pci_controller *hose); +#endif
include/configs/DU440.h +3 -2
@@ -60,8 +60,9 @@#define CONFIG_SYS_PCI_MEMBASE1 CONFIG_SYS_PCI_MEMBASE + 0x10000000#define CONFIG_SYS_PCI_MEMBASE2 CONFIG_SYS_PCI_MEMBASE1 + 0x10000000#define CONFIG_SYS_PCI_MEMBASE3 CONFIG_SYS_PCI_MEMBASE2 + 0x10000000 -#define CONFIG_SYS_PCI_IOBASE 0xe8000000 - +#define CONFIG_SYS_PCI_IOBASE 0xe8000000 +#define CONFIG_SYS_PCI_SUBSYS_VENDORID PCI_VENDOR_ID_ESDGMBH +#define CONFIG_SYS_PCI_SUBSYS_ID 0x0444/* device ID for DU440 */ /* Don't change either of these */ #define CONFIG_SYS_PERIPHERAL_BASE 0xef600000/* internal peripherals */
include/configs/PMC440.h +1 -0
@@ -440,6 +440,7 @@#define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x12FE/* PCI Vendor ID: esd gmbh */ #define CONFIG_SYS_PCI_SUBSYS_ID_NONMONARCH 0x0441/* PCI Device ID: Non-Monarch */ #define CONFIG_SYS_PCI_SUBSYS_ID_MONARCH 0x0440/* PCI Device ID: Monarch */ +#define CONFIG_SYS_PCI_SUBSYS_ID 0x0440/* for weak __pci_target_init() */ #define CONFIG_SYS_PCI_CLASSCODE_NONMONARCH PCI_CLASS_PROCESSOR_POWERPC#define CONFIG_SYS_PCI_CLASSCODE_MONARCH PCI_CLASS_BRIDGE_HOST
include/configs/korat.h +1 -0
@@ -69,6 +69,7 @@#define CONFIG_SYS_OCM_DATA_ADDR CONFIG_SYS_OCM_BASE#define CONFIG_SYS_PCI_BASE 0xe0000000/* Internal PCI regs */ #define CONFIG_SYS_PCI_MEMBASE 0x80000000/* mapped pci memory */ +#define CONFIG_SYS_PCI_MEMBASE2 (CONFIG_SYS_PCI_MEMBASE + 0x20000000)/* Don't change either of these */ #define CONFIG_SYS_PERIPHERAL_BASE 0xef600000/* internal peripherals */
Signature · 1 line
1.6.5.2
PATCH 1/3 ppc4xx: Consolidate pci_target_init() function
Hi Stefan,
good job. Please see two comments and one question below.
Quoted 48 lines
This patch removes the duplicted implementations of the
pci_target_init()function by introducing a weak default function for it. This weak default has a different implementation for 440EP(x)/GR(x) PPC's. It can be overridden by a board specific version (e.g. PMC440, korat).Signed-off-by Stefan Roese <[email protected]>---
cpu/ppc4xx/4xx_pci.c +26
-0@@ -77,6 +77,7 @@#include <asm/4xx_pci.h> #endif #include <asm/processor.h> +#include <asm/io.h> #include <pci.h> #ifdef CONFIG_PCI @@ -499,6 +500,111 @@ int __is_pci_host(struct pci_controller *hose)int is_pci_host (struct pci_controller *hose) __attribute__((weak,alias ("__is_pci_host" ))); +/* +* pci_target_init +* +* The bootstrap configuration provides default settings for the pci +* inbound map (PIM). But the bootstrap config choices are limited and +* may not be sufficient for a given board. +*/ +#if defined(CONFIG_SYS_PCI_TARGET_INIT) +#if defined(CONFIG_440EP) || defined(CONFIG_440EPX) || \ + defined(CONFIG_440GR) || defined(CONFIG_440GRX) +void __pci_target_init(struct pci_controller *hose) +{ + /* + * Set up Direct MMIO registers + */ + + /* + * PowerPC440 EP PCI Master configuration. + * Map one 1Gig range of PLB/processor addresses to PCI memory space. + * PLB address 0xA0000000-0xDFFFFFFF ==> PCI address 0xA0000000-0xDFFFFFFF + * Use byte reversed out routines to handle endianess. + * Make this region non-prefetchable. + */ + /* PMM0 Mask/Attribute - disabled b4 setting */ + out_le32((void *)PCIL0_PMM0MA, 0x00000000);
cpu/ppc4xx/4xx_pci.c int __is_pci_host(struct pci_controller *hose) · line 537
Quoted 10 lines
cpu/ppc4xx/4xx_pci.c +10
-0+/* PMM0 Local Address */ +out_le32 ((void *)PCIL0_PMM0LA ,CONFIG_SYS_PCI_MEMBASE ); +/* PMM0 PCI Low Address */ +out_le32 ((void *)PCIL0_PMM0PCILA ,CONFIG_SYS_PCI_MEMBASE ); +/* PMM0 PCI High Address */ +out_le32 ((void *)PCIL0_PMM0PCIHA ,0x00000000 ); +/* 512M + No prefetching, and enable region */ +out_le32 ((void *)PCIL0_PMM0MA ,0xE0000001 ); + +/* PMM0 Mask/Attribute - disabled b4 setting */
Typo. PMM0<->PMM1 inside comments. 4x.
cpu/ppc4xx/4xx_pci.c int __is_pci_host(struct pci_controller *hose) · line 546
Quoted 9 lines
cpu/ppc4xx/4xx_pci.c +9
-0+out_le32 ((void *)PCIL0_PMM1MA ,0x00000000 ); +/* PMM0 Local Address */ +out_le32 ((void *)PCIL0_PMM1LA ,CONFIG_SYS_PCI_MEMBASE2 ); +/* PMM0 PCI Low Address */ +out_le32 ((void *)PCIL0_PMM1PCILA ,CONFIG_SYS_PCI_MEMBASE2 ); +/* PMM0 PCI High Address */ +out_le32 ((void *)PCIL0_PMM1PCIHA ,0x00000000 ); +/* 512M + No prefetching, and enable region */ +out_le32 ((void *)PCIL0_PMM1MA ,0xE0000001 );
BTW, do you know why most 440 boards use PMM0+1 to map 1GB? PMC440 uses PMM0 for this only. I don't see a problem with this when CONFIG_SYS_PCI_MEMBASE is aligned to CONFIG_SYS_PCI_MEMBASE.
Quoted 64 lines
cpu/ppc4xx/4xx_pci.c +61
-0+ +out_le32 ((void *)PCIL0_PTM1MS ,0x00000001 );/* Memory Size/Attribute */ +out_le32 ((void *)PCIL0_PTM1LA ,0 );/* Local Addr. Reg */ +out_le32 ((void *)PCIL0_PTM2MS ,0 );/* Memory Size/Attribute */ +out_le32 ((void *)PCIL0_PTM2LA ,0 );/* Local Addr. Reg */ + +/* +* Set up Configuration registers +*/ + +/* Program the board's subsystem id/vendor id */ +pci_write_config_word (0 ,PCI_SUBSYSTEM_VENDOR_ID , +CONFIG_SYS_PCI_SUBSYS_VENDORID ); +pci_write_config_word (0 ,PCI_SUBSYSTEM_ID ,CONFIG_SYS_PCI_SUBSYS_ID ); + +/* Configure command register as bus master */ +pci_write_config_word (0 ,PCI_COMMAND ,PCI_COMMAND_MASTER ); + +/* 240nS PCI clock */ +pci_write_config_word (0 ,PCI_LATENCY_TIMER ,1 ); + +/* No error reporting */ +pci_write_config_word (0 ,PCI_ERREN ,0 ); + +pci_write_config_dword (0 ,PCI_BRDGOPT2 ,0x00000101 ); +} +#else /* defined(CONFIG_440EP) ... */ +void __pci_target_init (struct pci_controller * hose) +{ +/* +* Disable everything +*/ +out_le32 ((void *)PCIL0_PIM0SA ,0 );/* disable */ +out_le32 ((void *)PCIL0_PIM1SA ,0 );/* disable */ +out_le32 ((void *)PCIL0_PIM2SA ,0 );/* disable */ +out_le32 ((void *)PCIL0_EROMBA ,0 );/* disable expansion rom */ + +/* +* Map all of SDRAM to PCI address 0x0000_0000. Note that the 440 +* strapping options do not support sizes such as 128/256 MB. +*/ +out_le32 ((void *)PCIL0_PIM0LAL ,CONFIG_SYS_SDRAM_BASE ); +out_le32 ((void *)PCIL0_PIM0LAH ,0 ); +out_le32 ((void *)PCIL0_PIM0SA , ~(gd->ram_size -1 ) |1 ); +out_le32 ((void *)PCIL0_BAR0 ,0 ); + +/* +* Program the board's subsystem id/vendor id +*/ +out_le16 ((void *)PCIL0_SBSYSVID ,CONFIG_SYS_PCI_SUBSYS_VENDORID ); +out_le16 ((void *)PCIL0_SBSYSID ,CONFIG_SYS_PCI_SUBSYS_DEVICEID ); + +out_le16 ((void *)PCIL0_CMD ,in_le16 ((void *)PCIL0_CMD ) | +PCI_COMMAND_MEMORY ); +} +#endif /* defined(CONFIG_440EP) ... */ +void pci_target_init (struct pci_controller * hose) + __attribute__((weak,alias ("__pci_target_init" ))); + +#endif /* defined(CONFIG_SYS_PCI_TARGET_INIT) */ +int pci_440_init (struct pci_controller *hose) {int reg_num =0 ;
...
include/configs/PMC440.h line 443
Quoted 9 lines
include/configs/PMC440.h +1
-0@@ -440,6 +440,7 @@#define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x12FE/* PCI Vendor ID: esd gmbh */ #define CONFIG_SYS_PCI_SUBSYS_ID_NONMONARCH 0x0441/* PCI Device ID: Non-Monarch */ #define CONFIG_SYS_PCI_SUBSYS_ID_MONARCH 0x0440/* PCI Device ID: Monarch */ +#define CONFIG_SYS_PCI_SUBSYS_ID 0x0440/* for weak __pci_target_init() */
I would prefer:
#define CONFIG_SYS_PCI_SUBSYS_ID CONFIG_SYS_PCI_SUBSYS_ID_MONARCH /* for weak __pci_target_init() */
On the other side I am also not very happy with defines that are required just to satisfy some overwritten weak code. But in this case it probably the easiest way to go.
include/configs/PMC440.h line 446
Quoted 3 lines
include/configs/PMC440.h +0
-0#define CONFIG_SYS_PCI_CLASSCODE_NONMONARCH PCI_CLASS_PROCESSOR_POWERPC#define CONFIG_SYS_PCI_CLASSCODE_MONARCH PCI_CLASS_BRIDGE_HOST
Matthias
PATCH 1/3 ppc4xx: Consolidate pci_target_init() function
Hi Matthias,
Quoted 8 lines · On Sunday 15 November 2009 15:01:45 Matthias Fuchs wrote:
Quoted 8 lines
cpu/ppc4xx/4xx_pci.c +8
-0+* Make this region non-prefetchable. +*/ +/* PMM0 Mask/Attribute - disabled b4 setting */ +out_le32 ((void *)PCIL0_PMM0MA ,0x00000000 ); +/* PMM0 Local Address */ +out_le32 ((void *)PCIL0_PMM0LA ,CONFIG_SYS_PCI_MEMBASE ); +/* PMM0 PCI Low Address */ +out_le32 ((void *)PCIL0_PMM0PCILA ,CONFIG_SYS_PCI_MEMBASE );
Quoted 8 lines
cpu/ppc4xx/4xx_pci.c int __is_pci_host(struct pci_controller *hose) · line 537
Quoted 6 lines
cpu/ppc4xx/4xx_pci.c +6
-0+/* PMM0 PCI High Address */ +out_le32 ((void *)PCIL0_PMM0PCIHA ,0x00000000 ); +/* 512M + No prefetching, and enable region */ +out_le32 ((void *)PCIL0_PMM0MA ,0xE0000001 ); + +/* PMM0 Mask/Attribute - disabled b4 setting */ Typo. PMM0<->PMM1 inside comments. 4x.
Thanks for spotting. Will fix.
Quoted 5 lines
Quoted 5 lines
cpu/ppc4xx/4xx_pci.c +5
-0+out_le32 ((void *)PCIL0_PMM1MA ,0x00000000 ); +/* PMM0 Local Address */ +out_le32 ((void *)PCIL0_PMM1LA ,CONFIG_SYS_PCI_MEMBASE2 ); +/* PMM0 PCI Low Address */ +out_le32 ((void *)PCIL0_PMM1PCILA ,CONFIG_SYS_PCI_MEMBASE2 );
Quoted 8 lines
cpu/ppc4xx/4xx_pci.c int __is_pci_host(struct pci_controller *hose) · line 546
Quoted 4 lines
cpu/ppc4xx/4xx_pci.c +4
-0+/* PMM0 PCI High Address */ +out_le32 ((void *)PCIL0_PMM1PCIHA ,0x00000000 ); +/* 512M + No prefetching, and enable region */ +out_le32 ((void *)PCIL0_PMM1MA ,0xE0000001 );BTW, do you know why most 440 boards use PMM0+1 to map 1GB? PMC440 uses PMM0 for this only. I don't see a problem with this when
CONFIG_SYS_PCI_MEMBASEis aligned toCONFIG_SYS_PCI_MEMBASE.
No, I don't see a problem with this either. We should probably address this in a follow-up patch.
<snip>
Quoted 6 lines
Quoted 6 lines
include/configs/PMC440.h +0
-0@@ -440,6 +440,7 @@#define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x12FE/* PCI Vendor ID: esd gmbh
Quoted 8 lines
Quoted 4 lines
include/configs/PMC440.h +0
-0*/ #define CONFIG_SYS_PCI_SUBSYS_ID_NONMONARCH 0x0441/* PCI Device ID: Non-Monarch */ #define
CONFIG_SYS_PCI_SUBSYS_ID_MONARCH0x0440/* PCI
Device ID: Monarch */ +#defineCONFIG_SYS_PCI_SUBSYS_ID0x0440/* for
weak__pci_target_init()*/I would prefer:
#defineCONFIG_SYS_PCI_SUBSYS_IDCONFIG_SYS_PCI_SUBSYS_ID_MONARCH/* for
weak__pci_target_init()*/
OK, will change.
Quoted 3 lines
On the other side I am also not very happy with defines that are required
just to satisfy some overwritten weak code. But in this case it probably the easiest way to go.
Yes, I didn't see an easier way out of this, without introducing another #ifdef.
New patch will follow soon. Please feel free to send you Acked-by if you are ok with it.
Thanks.
Cheers,
Stefan
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: office at denx.de