ppc4xx: Consolidate pci_master_init() function
PATCH 3/3 ppc4xx: Consolidate pci_master_init() function
This patch removes the duplicted implementations of the pci_master_init() function by introducing a weak default function for it. It can be overridden by a board specific version.
Signed-off-by Stefan Roese <[email protected]>
--- board/amcc/bamboo/bamboo.c | 21 --------------------- board/amcc/sequoia/sequoia.c | 17 ----------------- board/amcc/yosemite/yosemite.c | 21 --------------------- board/esd/du440/du440.c | 17 ----------------- board/esd/pmc440/pmc440.c | 18 ++++++------------ board/gdsys/gdppc440etx/gdppc440etx.c | 21 --------------------- board/korat/korat.c | 17 ----------------- board/lwmon5/lwmon5.c | 21 --------------------- board/netstal/hcu5/hcu5.c | 21 +++++++-------------- board/pcs440ep/pcs440ep.c | 21 --------------------- cpu/ppc4xx/4xx_pci.c | 18 ++++++++++++++++++ include/asm-ppc/4xx_pci.h | 1 + 12 files changed, 32 insertions(+), 182 deletions(-)
board/amcc/bamboo/bamboo.c +0 -21
@@ -466,27 +466,6 @@ phys_size_t initdram (int board_type)#endif } -/************************************************************************* -* pci_master_init -* -************************************************************************/ -#if defined(CONFIG_PCI ) && defined(CONFIG_SYS_PCI_MASTER_INIT ) -void pci_master_init (struct pci_controller *hose) -{ -unsigned short temp_short; - -/*--------------------------------------------------------------------------+ -| Write the PowerPC440 EP PCI Configuration regs. -| Enable PowerPC440 EP to be a master on the PCI bus (PMM). -| Enable PowerPC440 EP to act as a PCI memory target (PTM). -+--------------------------------------------------------------------------*/ -pci_read_config_word (0 ,PCI_COMMAND , &temp_short); -pci_write_config_word (0 ,PCI_COMMAND , - temp_short |PCI_COMMAND_MASTER | -PCI_COMMAND_MEMORY ); -} -#endif /* defined(CONFIG_PCI) && defined(CONFIG_SYS_PCI_MASTER_INIT) */ -/*----------------------------------------------------------------------------+ | is_powerpc440ep_pass1. +----------------------------------------------------------------------------*/
board/amcc/sequoia/sequoia.c +0 -17
@@ -370,23 +370,6 @@ void board_pci_fixup_irq(struct pci_controller *hose, pci_dev_t dev) }#endif -#if defined(CONFIG_PCI ) && defined(CONFIG_SYS_PCI_MASTER_INIT ) -void pci_master_init (struct pci_controller *hose) -{ -unsigned short temp_short; - -/* -* Write the PowerPC440 EP PCI Configuration regs. -* Enable PowerPC440 EP to be a master on the PCI bus (PMM). -* Enable PowerPC440 EP to act as a PCI memory target (PTM). -*/ -pci_read_config_word (0 ,PCI_COMMAND , &temp_short); -pci_write_config_word (0 ,PCI_COMMAND , - temp_short |PCI_COMMAND_MASTER | -PCI_COMMAND_MEMORY ); -} -#endif /* defined(CONFIG_PCI) && defined(CONFIG_SYS_PCI_MASTER_INIT) */ -#if defined(CONFIG_POST )/* * Returns 1 if keys pressed to start the power-on long-running tests
board/amcc/yosemite/yosemite.c +0 -21
@@ -353,27 +353,6 @@ phys_size_t initdram(int board) }/************************************************************************* -* pci_master_init -* -************************************************************************/ -#if defined(CONFIG_PCI ) && defined(CONFIG_SYS_PCI_MASTER_INIT ) -void pci_master_init (struct pci_controller *hose) -{ -unsigned short temp_short; - -/*--------------------------------------------------------------------------+ -| Write the PowerPC440 EP PCI Configuration regs. -| Enable PowerPC440 EP to be a master on the PCI bus (PMM). -| Enable PowerPC440 EP to act as a PCI memory target (PTM). -+--------------------------------------------------------------------------*/ -pci_read_config_word (0 ,PCI_COMMAND , &temp_short); -pci_write_config_word (0 ,PCI_COMMAND , - temp_short |PCI_COMMAND_MASTER | -PCI_COMMAND_MEMORY ); -} -#endif /* defined(CONFIG_PCI) && defined(CONFIG_SYS_PCI_MASTER_INIT) */ - -/************************************************************************* * hw_watchdog_reset * * This routine is called to reset (keep alive) the watchdog timer
board/esd/du440/du440.c +0 -17
@@ -360,23 +360,6 @@ int checkboard(void)return (0 ); } -#if defined(CONFIG_PCI ) && defined(CONFIG_SYS_PCI_MASTER_INIT ) -void pci_master_init (struct pci_controller *hose) -{ -unsigned short temp_short; - -/* -* Write the PowerPC440 EP PCI Configuration regs. -* Enable PowerPC440 EP to be a master on the PCI bus (PMM). -* Enable PowerPC440 EP to act as a PCI memory target (PTM). -*/ -pci_read_config_word (0 ,PCI_COMMAND , &temp_short); -pci_write_config_word (0 ,PCI_COMMAND , - temp_short |PCI_COMMAND_MASTER | -PCI_COMMAND_MEMORY ); -} -#endif /* defined(CONFIG_PCI) && defined(CONFIG_SYS_PCI_MASTER_INIT) */ -int last_stage_init (void ) {int e, i;
board/esd/pmc440/pmc440.c +6 -12
@@ -39,6 +39,8 @@#include <miiphy.h> #endif #include <serial.h> +#include <asm/4xx_pci.h> +#include "fpga.h" #include "pmc440.h"
@@ -600,24 +602,16 @@ void pci_target_init(struct pci_controller *hose)#endif /* defined(CONFIG_PCI) && defined(CONFIG_SYS_PCI_TARGET_INIT) */ /* -* pci_master_init +* Override weak default pci_master_init() */ #if defined(CONFIG_PCI ) && defined(CONFIG_SYS_PCI_MASTER_INIT )void pci_master_init (struct pci_controller *hose) { -unsigned short temp_short; -/* -* Write the PowerPC440 EP PCI Configuration regs. -* Enable PowerPC440 EP to be a master on the PCI bus (PMM). -* Enable PowerPC440 EP to act as a PCI memory target (PTM). +* Only configure the master in monach mode */ -if (is_monarch ()) { -pci_read_config_word (0 ,PCI_COMMAND , &temp_short); -pci_write_config_word (0 ,PCI_COMMAND , - temp_short |PCI_COMMAND_MASTER | -PCI_COMMAND_MEMORY ); - } +if (is_monarch ()) +__pci_master_init (hose); }#endif /* defined(CONFIG_PCI) && defined(CONFIG_SYS_PCI_MASTER_INIT) */
board/gdsys/gdppc440etx/gdppc440etx.c +0 -21
@@ -174,24 +174,3 @@ int pci_pre_init(struct pci_controller *hose) return 1; }#endif /* defined(CONFIG_PCI) */ - -/* -* pci_master_init -* -*/ -#if defined(CONFIG_PCI ) && defined(CONFIG_SYS_PCI_MASTER_INIT ) -void pci_master_init (struct pci_controller *hose) -{ -unsigned short temp_short; - -/* -* Write the PowerPC440 EP PCI Configuration regs. -* Enable PowerPC440 EP to be a master on the PCI bus (PMM). -* Enable PowerPC440 EP to act as a PCI memory target (PTM). -*/ -pci_read_config_word (0 ,PCI_COMMAND , &temp_short); -pci_write_config_word (0 ,PCI_COMMAND , - temp_short |PCI_COMMAND_MASTER | -PCI_COMMAND_MEMORY ); -} -#endif /* defined(CONFIG_PCI) && defined(CONFIG_SYS_PCI_MASTER_INIT) */
board/korat/korat.c +0 -17
@@ -622,23 +622,6 @@ void pci_target_init(struct pci_controller *hose) }#endif /* defined(CONFIG_PCI) && defined(CONFIG_SYS_PCI_TARGET_INIT) */ -#if defined(CONFIG_PCI ) && defined(CONFIG_SYS_PCI_MASTER_INIT ) -void pci_master_init (struct pci_controller *hose) -{ -unsigned short temp_short; - -/* -* Write the PowerPC440 EP PCI Configuration regs. -* Enable PowerPC440 EP to be a master on the PCI bus (PMM). -* Enable PowerPC440 EP to act as a PCI memory target (PTM). -*/ -pci_read_config_word (0 ,PCI_COMMAND , &temp_short); -pci_write_config_word (0 ,PCI_COMMAND , - temp_short |PCI_COMMAND_MASTER | -PCI_COMMAND_MEMORY ); -} -#endif -#if defined(CONFIG_POST )/* * Returns 1 if keys pressed to start the power-on long-running tests
board/lwmon5/lwmon5.c +0 -21
@@ -275,27 +275,6 @@ int checkboard(void)return (0 ); } -/************************************************************************* -* pci_master_init -* -************************************************************************/ -#if defined(CONFIG_PCI ) && defined(CONFIG_SYS_PCI_MASTER_INIT ) -void pci_master_init (struct pci_controller *hose) -{ -unsigned short temp_short; - -/*--------------------------------------------------------------------------+ -| Write the PowerPC440 EP PCI Configuration regs. -| Enable PowerPC440 EP to be a master on the PCI bus (PMM). -| Enable PowerPC440 EP to act as a PCI memory target (PTM). -+--------------------------------------------------------------------------*/ -pci_read_config_word (0 ,PCI_COMMAND , &temp_short); -pci_write_config_word (0 ,PCI_COMMAND , - temp_short |PCI_COMMAND_MASTER | -PCI_COMMAND_MEMORY ); -} -#endif /* defined(CONFIG_PCI) && defined(CONFIG_SYS_PCI_MASTER_INIT) */ -void hw_watchdog_reset (void ) {int val;
board/netstal/hcu5/hcu5.c +7 -14
@@ -22,6 +22,8 @@#include <asm/processor.h> #include <ppc440.h> #include <asm/io.h> +#include <asm/4xx_pci.h> +#include "../common/nm.h" DECLARE_GLOBAL_DATA_PTR ;
@@ -377,23 +379,14 @@ int pci_pre_init(struct pci_controller *hose) }/* -* pci_master_init -* +* Override weak default pci_master_init() */ void pci_master_init (struct pci_controller *hose) { -unsigned short temp_short; -if (!board_with_pci ()) {return ; } - -/*--------------------------------------------------------------- -* Write the PowerPC440 EP PCI Configuration regs. -* Enable PowerPC440 EP to be a master on the PCI bus (PMM). -* Enable PowerPC440 EP to act as a PCI memory target (PTM). -*--------------------------------------------------------------*/ -pci_read_config_word (0 ,PCI_COMMAND , &temp_short); -pci_write_config_word (0 ,PCI_COMMAND , - temp_short |PCI_COMMAND_MASTER | -PCI_COMMAND_MEMORY ); +if (!board_with_pci ()) +return ; + +__pci_master_init (hose); }#endif /* defined(CONFIG_PCI) */
board/pcs440ep/pcs440ep.c +0 -21
@@ -551,27 +551,6 @@ phys_size_t initdram (int board_type) }/************************************************************************* -* pci_master_init -* -************************************************************************/ -#if defined(CONFIG_PCI ) && defined(CONFIG_SYS_PCI_MASTER_INIT ) -void pci_master_init (struct pci_controller *hose) -{ -unsigned short temp_short; - -/*--------------------------------------------------------------------------+ -| Write the PowerPC440 EP PCI Configuration regs. -| Enable PowerPC440 EP to be a master on the PCI bus (PMM). -| Enable PowerPC440 EP to act as a PCI memory target (PTM). -+--------------------------------------------------------------------------*/ -pci_read_config_word (0 ,PCI_COMMAND , &temp_short); -pci_write_config_word (0 ,PCI_COMMAND , - temp_short |PCI_COMMAND_MASTER | -PCI_COMMAND_MEMORY ); -} -#endif /* defined(CONFIG_PCI) && defined(CONFIG_SYS_PCI_MASTER_INIT) */ - -/************************************************************************* * hw_watchdog_reset * * This routine is called to reset (keep alive) the watchdog timer
cpu/ppc4xx/4xx_pci.c +18 -0
@@ -686,6 +686,24 @@ void pci_target_init(struct pci_controller * hose)int pci_pre_init (struct pci_controller *hose) __attribute__((weak,alias ("__pci_pre_init" ))); +#if defined(CONFIG_SYS_PCI_MASTER_INIT ) +void __pci_master_init (struct pci_controller *hose) +{ +u16 reg; + +/* +* Write the PowerPC440 EP PCI Configuration regs. +* Enable PowerPC440 EP to be a master on the PCI bus (PMM). +* Enable PowerPC440 EP to act as a PCI memory target (PTM). +*/ +pci_read_config_word (0 ,PCI_COMMAND , ®); +pci_write_config_word (0 ,PCI_COMMAND , reg | +PCI_COMMAND_MASTER |PCI_COMMAND_MEMORY ); +} +void pci_master_init (struct pci_controller *hose) + __attribute__((weak,alias ("__pci_master_init" ))); +#endif /* CONFIG_SYS_PCI_MASTER_INIT */ +int pci_440_init (struct pci_controller *hose) {int reg_num =0 ;
include/asm-ppc/4xx_pci.h +1 -0
@@ -55,5 +55,6 @@ void board_pci_fixup_irq(struct pci_controller *hose, pci_dev_t dev);int pci_arbiter_enabled (void );int __pci_pre_init (struct pci_controller *hose);void __pci_target_init (struct pci_controller *hose); +void __pci_master_init (struct pci_controller *hose);#endif
Signature · 1 line
1.6.5.2
PATCH 3/3 ppc4xx: Consolidate pci_master_init() function
Quoted 3 lines · On Friday 13 November 2009 11:24:21 Stefan Roese wrote:
This patch removes the duplicted implementations of the
pci_master_init()function by introducing a weak default function for it. It can be overridden by a board specific version.
Applied to u-boot-ppc4xx/next. 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