From c8514622e2713d9c47919acfe23fce386782afe7 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Thu, 2 Apr 2009 13:22:48 -0500 Subject: [PATCH 1/3] fsl_pci: Renamed immap_fsl_pci.h to fsl_pci.h Rename the pci header for FSL HW so we can move some prototypes in there and stop doing explicit externs Signed-off-by: Kumar Gala --- board/atum8548/atum8548.c | 2 +- board/freescale/mpc8536ds/mpc8536ds.c | 2 +- board/freescale/mpc8544ds/mpc8544ds.c | 2 +- board/freescale/mpc8548cds/mpc8548cds.c | 2 +- board/freescale/mpc8568mds/mpc8568mds.c | 2 +- board/freescale/mpc8569mds/mpc8569mds.c | 2 +- board/freescale/mpc8572ds/mpc8572ds.c | 2 +- board/freescale/mpc8610hpcd/mpc8610hpcd.c | 2 +- board/freescale/mpc8641hpcn/mpc8641hpcn.c | 2 +- board/sbc8548/sbc8548.c | 2 +- board/sbc8641d/sbc8641d.c | 2 +- board/tqc/tqm85xx/tqm85xx.c | 2 +- board/xes/common/fsl_85xx_pci.c | 2 +- board/xes/xpedite5200/xpedite5200.c | 2 +- board/xes/xpedite5370/xpedite5370.c | 2 +- drivers/pci/fsl_pci_init.c | 2 +- include/asm-ppc/{immap_fsl_pci.h => fsl_pci.h} | 0 17 files changed, 16 insertions(+), 16 deletions(-) rename include/asm-ppc/{immap_fsl_pci.h => fsl_pci.h} (100%) diff --git a/board/atum8548/atum8548.c b/board/atum8548/atum8548.c index 6ef663eeb..3e5da08eb 100644 --- a/board/atum8548/atum8548.c +++ b/board/atum8548/atum8548.c @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/freescale/mpc8536ds/mpc8536ds.c b/board/freescale/mpc8536ds/mpc8536ds.c index 31c1e1503..88c6480d4 100644 --- a/board/freescale/mpc8536ds/mpc8536ds.c +++ b/board/freescale/mpc8536ds/mpc8536ds.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/freescale/mpc8544ds/mpc8544ds.c b/board/freescale/mpc8544ds/mpc8544ds.c index 13760db78..4edf420d4 100644 --- a/board/freescale/mpc8544ds/mpc8544ds.c +++ b/board/freescale/mpc8544ds/mpc8544ds.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/freescale/mpc8548cds/mpc8548cds.c index efb2c5b8c..4d8c698ad 100644 --- a/board/freescale/mpc8548cds/mpc8548cds.c +++ b/board/freescale/mpc8548cds/mpc8548cds.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/freescale/mpc8568mds/mpc8568mds.c b/board/freescale/mpc8568mds/mpc8568mds.c index 97f465122..c0e4f4999 100644 --- a/board/freescale/mpc8568mds/mpc8568mds.c +++ b/board/freescale/mpc8568mds/mpc8568mds.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/freescale/mpc8569mds/mpc8569mds.c b/board/freescale/mpc8569mds/mpc8569mds.c index 53fef43f3..49a85462d 100644 --- a/board/freescale/mpc8569mds/mpc8569mds.c +++ b/board/freescale/mpc8569mds/mpc8569mds.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/freescale/mpc8572ds/mpc8572ds.c b/board/freescale/mpc8572ds/mpc8572ds.c index 33cf0e49e..0542bf4ae 100644 --- a/board/freescale/mpc8572ds/mpc8572ds.c +++ b/board/freescale/mpc8572ds/mpc8572ds.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd.c b/board/freescale/mpc8610hpcd/mpc8610hpcd.c index b419dcc5b..1a6f8b421 100644 --- a/board/freescale/mpc8610hpcd/mpc8610hpcd.c +++ b/board/freescale/mpc8610hpcd/mpc8610hpcd.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/freescale/mpc8641hpcn/mpc8641hpcn.c b/board/freescale/mpc8641hpcn/mpc8641hpcn.c index ef0095ab7..0239abe5f 100644 --- a/board/freescale/mpc8641hpcn/mpc8641hpcn.c +++ b/board/freescale/mpc8641hpcn/mpc8641hpcn.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/sbc8548/sbc8548.c b/board/sbc8548/sbc8548.c index 088f8045d..70b8119be 100644 --- a/board/sbc8548/sbc8548.c +++ b/board/sbc8548/sbc8548.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/sbc8641d/sbc8641d.c b/board/sbc8641d/sbc8641d.c index 9f696387e..ff489564a 100644 --- a/board/sbc8641d/sbc8641d.c +++ b/board/sbc8641d/sbc8641d.c @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/tqc/tqm85xx/tqm85xx.c b/board/tqc/tqm85xx/tqm85xx.c index e1e75b83a..b96e7c2b9 100644 --- a/board/tqc/tqm85xx/tqm85xx.c +++ b/board/tqc/tqm85xx/tqm85xx.c @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/xes/common/fsl_85xx_pci.c b/board/xes/common/fsl_85xx_pci.c index 9673a02b5..683297cb2 100644 --- a/board/xes/common/fsl_85xx_pci.c +++ b/board/xes/common/fsl_85xx_pci.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include diff --git a/board/xes/xpedite5200/xpedite5200.c b/board/xes/xpedite5200/xpedite5200.c index e266d1dd8..77afdbcbf 100644 --- a/board/xes/xpedite5200/xpedite5200.c +++ b/board/xes/xpedite5200/xpedite5200.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/xes/xpedite5370/xpedite5370.c b/board/xes/xpedite5370/xpedite5370.c index 487509527..22cf29431 100644 --- a/board/xes/xpedite5370/xpedite5370.c +++ b/board/xes/xpedite5370/xpedite5370.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/pci/fsl_pci_init.c b/drivers/pci/fsl_pci_init.c index 20b2dcc76..19cf1ce1a 100644 --- a/drivers/pci/fsl_pci_init.c +++ b/drivers/pci/fsl_pci_init.c @@ -35,7 +35,7 @@ DECLARE_GLOBAL_DATA_PTR; */ #include -#include +#include /* Freescale-specific PCI config registers */ #define FSL_PCI_PBFR 0x44 diff --git a/include/asm-ppc/immap_fsl_pci.h b/include/asm-ppc/fsl_pci.h similarity index 100% rename from include/asm-ppc/immap_fsl_pci.h rename to include/asm-ppc/fsl_pci.h From 32049b4048ff8e59bd5ba6160d6d5206d283b2a2 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Thu, 2 Apr 2009 13:57:05 -0500 Subject: [PATCH 2/3] fsl_pci: Move prototypes into fsl_pci.h and remove explicit externs Signed-off-by: Kumar Gala --- board/atum8548/atum8548.c | 7 ------- board/freescale/mpc8536ds/mpc8536ds.c | 6 ------ board/freescale/mpc8544ds/mpc8544ds.c | 6 ------ board/freescale/mpc8548cds/mpc8548cds.c | 6 ------ board/freescale/mpc8568mds/mpc8568mds.c | 6 ------ board/freescale/mpc8569mds/mpc8569mds.c | 6 ------ board/freescale/mpc8572ds/mpc8572ds.c | 6 ------ board/freescale/mpc8610hpcd/mpc8610hpcd.c | 6 ------ board/freescale/mpc8641hpcn/mpc8641hpcn.c | 6 ------ board/sbc8548/sbc8548.c | 6 ------ board/sbc8641d/sbc8641d.c | 6 ------ board/tqc/tqm85xx/tqm85xx.c | 6 ------ board/xes/common/fsl_85xx_pci.c | 7 ------- include/asm-ppc/fsl_pci.h | 12 +++++++++--- 14 files changed, 9 insertions(+), 83 deletions(-) diff --git a/board/atum8548/atum8548.c b/board/atum8548/atum8548.c index 3e5da08eb..c8085c707 100644 --- a/board/atum8548/atum8548.c +++ b/board/atum8548/atum8548.c @@ -172,9 +172,6 @@ static struct pci_controller pcie1_hose; int first_free_busno=0; -extern int fsl_pci_setup_inbound_windows(struct pci_region *r); -extern void fsl_pci_init(struct pci_controller *hose); - void pci_init_board(void) { @@ -322,7 +319,6 @@ pci_init_board(void) #ifdef CONFIG_PCI2 { volatile ccsr_fsl_pci_t *pci = (ccsr_fsl_pci_t *) CONFIG_SYS_PCI2_ADDR; - extern void fsl_pci_init(struct pci_controller *hose); struct pci_controller *hose = &pci2_hose; struct pci_region *r = hose->regions; @@ -366,9 +362,6 @@ int last_stage_init(void) } #if defined(CONFIG_OF_BOARD_SETUP) -extern void ft_fsl_pci_setup(void *blob, const char *pci_alias, - struct pci_controller *hose); - void ft_board_setup(void *blob, bd_t *bd) { ft_cpu_setup(blob, bd); diff --git a/board/freescale/mpc8536ds/mpc8536ds.c b/board/freescale/mpc8536ds/mpc8536ds.c index 88c6480d4..28b27ee8f 100644 --- a/board/freescale/mpc8536ds/mpc8536ds.c +++ b/board/freescale/mpc8536ds/mpc8536ds.c @@ -158,9 +158,6 @@ static struct pci_controller pcie2_hose; static struct pci_controller pcie3_hose; #endif -extern int fsl_pci_setup_inbound_windows(struct pci_region *r); -extern void fsl_pci_init(struct pci_controller *hose); - int first_free_busno=0; void @@ -650,9 +647,6 @@ int board_eth_init(bd_t *bis) } #if defined(CONFIG_OF_BOARD_SETUP) -extern void ft_fsl_pci_setup(void *blob, const char *pci_alias, - struct pci_controller *hose); - void ft_board_setup(void *blob, bd_t *bd) { ft_cpu_setup(blob, bd); diff --git a/board/freescale/mpc8544ds/mpc8544ds.c b/board/freescale/mpc8544ds/mpc8544ds.c index 4edf420d4..34bdbade7 100644 --- a/board/freescale/mpc8544ds/mpc8544ds.c +++ b/board/freescale/mpc8544ds/mpc8544ds.c @@ -93,9 +93,6 @@ static struct pci_controller pcie2_hose; static struct pci_controller pcie3_hose; #endif -extern int fsl_pci_setup_inbound_windows(struct pci_region *r); -extern void fsl_pci_init(struct pci_controller *hose); - int first_free_busno=0; void @@ -477,9 +474,6 @@ int board_eth_init(bd_t *bis) } #if defined(CONFIG_OF_BOARD_SETUP) -extern void ft_fsl_pci_setup(void *blob, const char *pci_alias, - struct pci_controller *hose); - void ft_board_setup(void *blob, bd_t *bd) { ft_cpu_setup(blob, bd); diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/freescale/mpc8548cds/mpc8548cds.c index 4d8c698ad..ac1c9b478 100644 --- a/board/freescale/mpc8548cds/mpc8548cds.c +++ b/board/freescale/mpc8548cds/mpc8548cds.c @@ -262,9 +262,6 @@ static struct pci_controller pci2_hose; static struct pci_controller pcie1_hose; #endif /* CONFIG_PCIE1 */ -extern int fsl_pci_setup_inbound_windows(struct pci_region *r); -extern void fsl_pci_init(struct pci_controller *hose); - int first_free_busno=0; void @@ -455,9 +452,6 @@ int last_stage_init(void) #if defined(CONFIG_OF_BOARD_SETUP) -extern void ft_fsl_pci_setup(void *blob, const char *pci_alias, - struct pci_controller *hose); - void ft_pci_setup(void *blob, bd_t *bd) { #ifdef CONFIG_PCI1 diff --git a/board/freescale/mpc8568mds/mpc8568mds.c b/board/freescale/mpc8568mds/mpc8568mds.c index c0e4f4999..8f991e537 100644 --- a/board/freescale/mpc8568mds/mpc8568mds.c +++ b/board/freescale/mpc8568mds/mpc8568mds.c @@ -311,9 +311,6 @@ static struct pci_controller pci1_hose = { static struct pci_controller pcie1_hose; #endif /* CONFIG_PCIE1 */ -extern int fsl_pci_setup_inbound_windows(struct pci_region *r); -extern void fsl_pci_init(struct pci_controller *hose); - int first_free_busno = 0; /* @@ -483,9 +480,6 @@ pci_init_board(void) #endif /* CONFIG_PCI */ #if defined(CONFIG_OF_BOARD_SETUP) -extern void ft_fsl_pci_setup(void *blob, const char *pci_alias, - struct pci_controller *hose); - void ft_board_setup(void *blob, bd_t *bd) { ft_cpu_setup(blob, bd); diff --git a/board/freescale/mpc8569mds/mpc8569mds.c b/board/freescale/mpc8569mds/mpc8569mds.c index 49a85462d..129c58c5f 100644 --- a/board/freescale/mpc8569mds/mpc8569mds.c +++ b/board/freescale/mpc8569mds/mpc8569mds.c @@ -232,9 +232,6 @@ local_bus_init(void) static struct pci_controller pcie1_hose; #endif /* CONFIG_PCIE1 */ -extern int fsl_pci_setup_inbound_windows(struct pci_region *r); -extern void fsl_pci_init(struct pci_controller *hose); - int first_free_busno = 0; #ifdef CONFIG_PCI @@ -315,9 +312,6 @@ pci_init_board(void) #endif /* CONFIG_PCI */ #if defined(CONFIG_OF_BOARD_SETUP) -extern void ft_fsl_pci_setup(void *blob, const char *pci_alias, - struct pci_controller *hose); - void ft_board_setup(void *blob, bd_t *bd) { ft_cpu_setup(blob, bd); diff --git a/board/freescale/mpc8572ds/mpc8572ds.c b/board/freescale/mpc8572ds/mpc8572ds.c index 0542bf4ae..4b956171f 100644 --- a/board/freescale/mpc8572ds/mpc8572ds.c +++ b/board/freescale/mpc8572ds/mpc8572ds.c @@ -139,9 +139,6 @@ static struct pci_controller pcie2_hose; static struct pci_controller pcie3_hose; #endif -extern int fsl_pci_setup_inbound_windows(struct pci_region *r); -extern void fsl_pci_init(struct pci_controller *hose); - int first_free_busno=0; #ifdef CONFIG_PCI void pci_init_board(void) @@ -557,9 +554,6 @@ int board_eth_init(bd_t *bis) #endif #if defined(CONFIG_OF_BOARD_SETUP) -extern void ft_fsl_pci_setup(void *blob, const char *pci_alias, - struct pci_controller *hose); - void ft_board_setup(void *blob, bd_t *bd) { phys_addr_t base; diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd.c b/board/freescale/mpc8610hpcd/mpc8610hpcd.c index 1a6f8b421..a85ebead5 100644 --- a/board/freescale/mpc8610hpcd/mpc8610hpcd.c +++ b/board/freescale/mpc8610hpcd/mpc8610hpcd.c @@ -229,9 +229,6 @@ static struct pci_controller pcie2_hose; int first_free_busno = 0; -extern int fsl_pci_setup_inbound_windows(struct pci_region *r); -extern void fsl_pci_init(struct pci_controller *hose); - void pci_init_board(void) { volatile immap_t *immap = (immap_t *) CONFIG_SYS_CCSRBAR; @@ -402,9 +399,6 @@ void pci_init_board(void) } #if defined(CONFIG_OF_BOARD_SETUP) -extern void ft_fsl_pci_setup(void *blob, const char *pci_alias, - struct pci_controller *hose); - void ft_board_setup(void *blob, bd_t *bd) { diff --git a/board/freescale/mpc8641hpcn/mpc8641hpcn.c b/board/freescale/mpc8641hpcn/mpc8641hpcn.c index 0239abe5f..7422e6b9d 100644 --- a/board/freescale/mpc8641hpcn/mpc8641hpcn.c +++ b/board/freescale/mpc8641hpcn/mpc8641hpcn.c @@ -133,9 +133,6 @@ static struct pci_controller pci2_hose; int first_free_busno = 0; -extern int fsl_pci_setup_inbound_windows(struct pci_region *r); -extern void fsl_pci_init(struct pci_controller *hose); - void pci_init_board(void) { #ifdef CONFIG_PCI1 @@ -251,9 +248,6 @@ void pci_init_board(void) #if defined(CONFIG_OF_BOARD_SETUP) -extern void ft_fsl_pci_setup(void *blob, const char *pci_alias, - struct pci_controller *hose); - void ft_board_setup(void *blob, bd_t *bd) { diff --git a/board/sbc8548/sbc8548.c b/board/sbc8548/sbc8548.c index 70b8119be..9c05c2f17 100644 --- a/board/sbc8548/sbc8548.c +++ b/board/sbc8548/sbc8548.c @@ -347,9 +347,6 @@ static struct pci_controller pcie1_hose; int first_free_busno=0; -extern int fsl_pci_setup_inbound_windows(struct pci_region *r); -extern void fsl_pci_init(struct pci_controller *hose); - void pci_init_board(void) { @@ -512,9 +509,6 @@ int last_stage_init(void) } #if defined(CONFIG_OF_BOARD_SETUP) -extern void ft_fsl_pci_setup(void *blob, const char *pci_alias, - struct pci_controller *hose); - void ft_board_setup(void *blob, bd_t *bd) { ft_cpu_setup(blob, bd); diff --git a/board/sbc8641d/sbc8641d.c b/board/sbc8641d/sbc8641d.c index ff489564a..c39d2c020 100644 --- a/board/sbc8641d/sbc8641d.c +++ b/board/sbc8641d/sbc8641d.c @@ -209,9 +209,6 @@ static struct pci_controller pci2_hose; int first_free_busno = 0; -extern int fsl_pci_setup_inbound_windows(struct pci_region *r); -extern void fsl_pci_init(struct pci_controller *hose); - void pci_init_board(void) { volatile immap_t *immap = (immap_t *) CONFIG_SYS_CCSRBAR; @@ -321,9 +318,6 @@ void pci_init_board(void) #if defined(CONFIG_OF_BOARD_SETUP) -extern void ft_fsl_pci_setup(void *blob, const char *pci_alias, - struct pci_controller *hose); - void ft_board_setup (void *blob, bd_t *bd) { ft_cpu_setup(blob, bd); diff --git a/board/tqc/tqm85xx/tqm85xx.c b/board/tqc/tqm85xx/tqm85xx.c index b96e7c2b9..a70fd2694 100644 --- a/board/tqc/tqm85xx/tqm85xx.c +++ b/board/tqc/tqm85xx/tqm85xx.c @@ -537,9 +537,6 @@ void local_bus_init (void) */ static int first_free_busno; -extern int fsl_pci_setup_inbound_windows(struct pci_region *r); -extern void fsl_pci_init(struct pci_controller *hose); - #ifdef CONFIG_PCI1 static struct pci_controller pci1_hose; #endif /* CONFIG_PCI1 */ @@ -700,9 +697,6 @@ void pci_init_board (void) } #ifdef CONFIG_OF_BOARD_SETUP -extern void ft_fsl_pci_setup(void *blob, const char *pci_alias, - struct pci_controller *hose); - void ft_board_setup (void *blob, bd_t *bd) { ft_cpu_setup (blob, bd); diff --git a/board/xes/common/fsl_85xx_pci.c b/board/xes/common/fsl_85xx_pci.c index 683297cb2..af34fe654 100644 --- a/board/xes/common/fsl_85xx_pci.c +++ b/board/xes/common/fsl_85xx_pci.c @@ -28,10 +28,6 @@ #include #include -extern int fsl_pci_setup_inbound_windows(struct pci_region *r); -extern void fsl_pci_config_unlock(struct pci_controller *hose); -extern void fsl_pci_init(struct pci_controller *hose); - int first_free_busno = 0; #ifdef CONFIG_PCI1 @@ -357,9 +353,6 @@ void pci_init_board(void) } #if defined(CONFIG_OF_BOARD_SETUP) -extern void ft_fsl_pci_setup(void *blob, const char *pci_alias, - struct pci_controller *hose); - void ft_board_pci_setup(void *blob, bd_t *bd) { /* TODO - make node name (eg pci0) dynamic */ diff --git a/include/asm-ppc/fsl_pci.h b/include/asm-ppc/fsl_pci.h index 6715064c9..624ca5685 100644 --- a/include/asm-ppc/fsl_pci.h +++ b/include/asm-ppc/fsl_pci.h @@ -17,8 +17,14 @@ * */ -#ifndef __IMMAP_85xx_fsl_pci__ -#define __IMMAP_85xx_fsl_pci__ +#ifndef __FSL_PCI_H_ +#define __FSL_PCI_H_ + +int fsl_pci_setup_inbound_windows(struct pci_region *r); +void fsl_pci_init(struct pci_controller *hose); +void fsl_pci_config_unlock(struct pci_controller *hose); +void ft_fsl_pci_setup(void *blob, const char *pci_alias, + struct pci_controller *hose); /* * Common PCI/PCIE Register structure for mpc85xx and mpc86xx @@ -149,4 +155,4 @@ typedef struct ccsr_pci { char res24[252]; } ccsr_fsl_pci_t; -#endif /*__IMMAP_fsl_pci__*/ +#endif From e6a6789f41f0560ce280089fbd3f1bd0f0f64306 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Sat, 4 Apr 2009 10:21:02 -0500 Subject: [PATCH 3/3] fsl_law: Fix bug in calculation of LAW sizing In set_ddr_laws() when we determined how much of the size requested to be mapped was covered by the the first LAW we needed to recalculate the size based on what was actually mapped. Signed-off-by: Kumar Gala --- drivers/misc/fsl_law.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/misc/fsl_law.c b/drivers/misc/fsl_law.c index be43a3ecf..f7d454dce 100644 --- a/drivers/misc/fsl_law.c +++ b/drivers/misc/fsl_law.c @@ -139,6 +139,9 @@ int set_ddr_laws(u64 start, u64 sz, enum law_trgt_if id) if (set_last_law(start, law_sz_enc, id) < 0) return -1; + /* recalculate size based on what was actually covered by the law */ + law_sz = 1ull << __ilog2_u64(law_sz); + /* do we still have anything to map */ sz = sz - law_sz; if (sz) {