| Message ID | 20200720141407.30241-11-ovidiu.panait@windriver.com |
|---|---|
| State | Superseded |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [v3,01/17] Kconfig: Introduce CONFIG_SYS_HAS_SRAM | expand |
On Mon, 20 Jul 2020 at 08:20, Ovidiu Panait <ovidiu.panait@windriver.com> wrote: > > Factor out ppc-specific bdinfo setup from generic init sequence to > arch_setup_bdinfo in arch/powerpc/lib/bdinfo.c. > > Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> > --- > > arch/powerpc/lib/bdinfo.c | 25 +++++++++++++++++++++++++ > common/board_f.c | 36 ++---------------------------------- > 2 files changed, 27 insertions(+), 34 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org> Could this be a way to remove the weak SDRAM function?
Hi Simon, On 21.07.2020 17:17, Simon Glass wrote: > On Mon, 20 Jul 2020 at 08:20, Ovidiu Panait <ovidiu.panait@windriver.com> wrote: >> Factor out ppc-specific bdinfo setup from generic init sequence to >> arch_setup_bdinfo in arch/powerpc/lib/bdinfo.c. >> >> Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> >> --- >> >> arch/powerpc/lib/bdinfo.c | 25 +++++++++++++++++++++++++ >> common/board_f.c | 36 ++---------------------------------- >> 2 files changed, 27 insertions(+), 34 deletions(-) > Reviewed-by: Simon Glass <sjg@chromium.org> > > Could this be a way to remove the weak SDRAM function? I think the SDRAM weak function can be eliminated by overwriting the values set in common/board_f.c using the xtensa-specific arch_setup_bdinfo (arch/xtensa/lib/bdinfo.c), as you suggested. I plan to replace the weak SDRAM function patch with this one: iff --git a/arch/Kconfig b/arch/Kconfig index 9be02d1319..4d9557959c 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -10,7 +10,6 @@ choice config ARC bool "ARC architecture" - select ARCH_EARLY_INIT_R select ARC_TIMER select CLK select HAVE_PRIVATE_LIBGCC diff --git a/arch/arc/lib/cpu.c b/arch/arc/lib/cpu.c index 27b5832a0c..d66a8c867a 100644 --- a/arch/arc/lib/cpu.c +++ b/arch/arc/lib/cpu.c @@ -25,13 +25,6 @@ int arch_cpu_init(void) return 0; } -int arch_early_init_r(void) -{ - gd->bd->bi_memstart = CONFIG_SYS_SDRAM_BASE; - gd->bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE; - return 0; -} - /* This is a dummy function on arc */ int dram_init(void) { diff --git a/arch/xtensa/lib/bdinfo.c b/arch/xtensa/lib/bdinfo.c new file mode 100644 index 0000000000..b3ab7227aa --- /dev/null +++ b/arch/xtensa/lib/bdinfo.c @@ -0,0 +1,20 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * XTENSA-specific information for the 'bd' command + * + * (C) Copyright 2003 + * Wolfgang Denk, DENX Software Engineering, wd@denx.de. + */ + +#include <common.h> +#include <init.h> + +DECLARE_GLOBAL_DATA_PTR; + +int arch_setup_bdinfo(void) +{ + struct bd_info *bd = gd->bd; + + gd->bd->bi_memstart = PHYSADDR(CONFIG_SYS_SDRAM_BASE); + gd->bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE; +} diff --git a/board/cadence/xtfpga/xtfpga.c b/board/cadence/xtfpga/xtfpga.c index 2869e5cf68..4b49b6e5c8 100644 --- a/board/cadence/xtfpga/xtfpga.c +++ b/board/cadence/xtfpga/xtfpga.c @@ -51,9 +51,6 @@ int checkboard(void) int dram_init_banksize(void) { - gd->bd->bi_memstart = PHYSADDR(CONFIG_SYS_SDRAM_BASE); - gd->bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE; - return 0; } diff --git a/common/board_f.c b/common/board_f.c index 4356431488..3b11f08725 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -605,6 +605,11 @@ __weak int arch_setup_bdinfo(void) int setup_bdinfo(void) { + struct bd_info *bd = gd->bd; + + bd->bi_memstart = gd->ram_base; /* start of memory */ + bd->bi_memsize = gd->ram_size; /* size in bytes */ + return arch_setup_bdinfo(); } @@ -614,12 +619,6 @@ static int setup_board_part1(void) { struct bd_info *bd = gd->bd; - /* - * Save local variables to board info struct - */ - bd->bi_memstart = CONFIG_SYS_SDRAM_BASE; /* start of memory */ - bd->bi_memsize = gd->ram_size; /* size in bytes */ - #ifdef CONFIG_SYS_SRAM_BASE bd->bi_sramstart = CONFIG_SYS_SRAM_BASE; /* start of SRAM */ bd->bi_sramsize = CONFIG_SYS_SRAM_SIZE; /* size of SRAM */ Do you think this is a better approach? Ovidiu
Hi Ovidiu, On Tue, 21 Jul 2020 at 10:43, Ovidiu Panait <ovidiu.panait@windriver.com> wrote: > > Hi Simon, > > On 21.07.2020 17:17, Simon Glass wrote: > > On Mon, 20 Jul 2020 at 08:20, Ovidiu Panait <ovidiu.panait@windriver.com> wrote: > >> Factor out ppc-specific bdinfo setup from generic init sequence to > >> arch_setup_bdinfo in arch/powerpc/lib/bdinfo.c. > >> > >> Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> > >> --- > >> > >> arch/powerpc/lib/bdinfo.c | 25 +++++++++++++++++++++++++ > >> common/board_f.c | 36 ++---------------------------------- > >> 2 files changed, 27 insertions(+), 34 deletions(-) > > Reviewed-by: Simon Glass <sjg@chromium.org> > > > > Could this be a way to remove the weak SDRAM function? > > I think the SDRAM weak function can be eliminated by overwriting the > values set in common/board_f.c using the xtensa-specific > arch_setup_bdinfo (arch/xtensa/lib/bdinfo.c), as you suggested. > > > I plan to replace the weak SDRAM function patch with this one: > > iff --git a/arch/Kconfig b/arch/Kconfig > index 9be02d1319..4d9557959c 100644 > --- a/arch/Kconfig > +++ b/arch/Kconfig > @@ -10,7 +10,6 @@ choice > > config ARC > bool "ARC architecture" > - select ARCH_EARLY_INIT_R > select ARC_TIMER > select CLK > select HAVE_PRIVATE_LIBGCC > diff --git a/arch/arc/lib/cpu.c b/arch/arc/lib/cpu.c > index 27b5832a0c..d66a8c867a 100644 > --- a/arch/arc/lib/cpu.c > +++ b/arch/arc/lib/cpu.c > @@ -25,13 +25,6 @@ int arch_cpu_init(void) > return 0; > } > > -int arch_early_init_r(void) > -{ > - gd->bd->bi_memstart = CONFIG_SYS_SDRAM_BASE; > - gd->bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE; > - return 0; > -} > - > /* This is a dummy function on arc */ > int dram_init(void) > { > diff --git a/arch/xtensa/lib/bdinfo.c b/arch/xtensa/lib/bdinfo.c > new file mode 100644 > index 0000000000..b3ab7227aa > --- /dev/null > +++ b/arch/xtensa/lib/bdinfo.c > @@ -0,0 +1,20 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +/* > + * XTENSA-specific information for the 'bd' command > + * > + * (C) Copyright 2003 > + * Wolfgang Denk, DENX Software Engineering, wd@denx.de. > + */ > + > +#include <common.h> > +#include <init.h> > + > +DECLARE_GLOBAL_DATA_PTR; > + > +int arch_setup_bdinfo(void) > +{ > + struct bd_info *bd = gd->bd; > + > + gd->bd->bi_memstart = PHYSADDR(CONFIG_SYS_SDRAM_BASE); > + gd->bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE; > +} > diff --git a/board/cadence/xtfpga/xtfpga.c b/board/cadence/xtfpga/xtfpga.c > index 2869e5cf68..4b49b6e5c8 100644 > --- a/board/cadence/xtfpga/xtfpga.c > +++ b/board/cadence/xtfpga/xtfpga.c > @@ -51,9 +51,6 @@ int checkboard(void) > > int dram_init_banksize(void) > { > - gd->bd->bi_memstart = PHYSADDR(CONFIG_SYS_SDRAM_BASE); > - gd->bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE; > - > return 0; > } > > diff --git a/common/board_f.c b/common/board_f.c > index 4356431488..3b11f08725 100644 > --- a/common/board_f.c > +++ b/common/board_f.c > @@ -605,6 +605,11 @@ __weak int arch_setup_bdinfo(void) > > int setup_bdinfo(void) > { > + struct bd_info *bd = gd->bd; > + > + bd->bi_memstart = gd->ram_base; /* start of memory */ > + bd->bi_memsize = gd->ram_size; /* size in bytes */ > + > return arch_setup_bdinfo(); > } > > @@ -614,12 +619,6 @@ static int setup_board_part1(void) > { > struct bd_info *bd = gd->bd; > > - /* > - * Save local variables to board info struct > - */ > - bd->bi_memstart = CONFIG_SYS_SDRAM_BASE; /* start of memory */ > - bd->bi_memsize = gd->ram_size; /* size in bytes */ > - > #ifdef CONFIG_SYS_SRAM_BASE > bd->bi_sramstart = CONFIG_SYS_SRAM_BASE; /* start of SRAM */ > bd->bi_sramsize = CONFIG_SYS_SRAM_SIZE; /* size of SRAM */ > > Do you think this is a better approach? Yes it looks better to me. Regards, Simon
Hi Simon, On 28.07.2020 21:58, Simon Glass wrote: > Hi Ovidiu, > > On Tue, 21 Jul 2020 at 10:43, Ovidiu Panait <ovidiu.panait@windriver.com> wrote: >> Hi Simon, >> >> On 21.07.2020 17:17, Simon Glass wrote: >>> On Mon, 20 Jul 2020 at 08:20, Ovidiu Panait <ovidiu.panait@windriver.com> wrote: >>>> Factor out ppc-specific bdinfo setup from generic init sequence to >>>> arch_setup_bdinfo in arch/powerpc/lib/bdinfo.c. >>>> >>>> Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> >>>> --- >>>> >>>> arch/powerpc/lib/bdinfo.c | 25 +++++++++++++++++++++++++ >>>> common/board_f.c | 36 ++---------------------------------- >>>> 2 files changed, 27 insertions(+), 34 deletions(-) >>> Reviewed-by: Simon Glass <sjg@chromium.org> >>> >>> Could this be a way to remove the weak SDRAM function? >> I think the SDRAM weak function can be eliminated by overwriting the >> values set in common/board_f.c using the xtensa-specific >> arch_setup_bdinfo (arch/xtensa/lib/bdinfo.c), as you suggested. >> >> >> I plan to replace the weak SDRAM function patch with this one: >> >> iff --git a/arch/Kconfig b/arch/Kconfig >> index 9be02d1319..4d9557959c 100644 >> --- a/arch/Kconfig >> +++ b/arch/Kconfig >> @@ -10,7 +10,6 @@ choice >> >> config ARC >> bool "ARC architecture" >> - select ARCH_EARLY_INIT_R >> select ARC_TIMER >> select CLK >> select HAVE_PRIVATE_LIBGCC >> diff --git a/arch/arc/lib/cpu.c b/arch/arc/lib/cpu.c >> index 27b5832a0c..d66a8c867a 100644 >> --- a/arch/arc/lib/cpu.c >> +++ b/arch/arc/lib/cpu.c >> @@ -25,13 +25,6 @@ int arch_cpu_init(void) >> return 0; >> } >> >> -int arch_early_init_r(void) >> -{ >> - gd->bd->bi_memstart = CONFIG_SYS_SDRAM_BASE; >> - gd->bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE; >> - return 0; >> -} >> - >> /* This is a dummy function on arc */ >> int dram_init(void) >> { >> diff --git a/arch/xtensa/lib/bdinfo.c b/arch/xtensa/lib/bdinfo.c >> new file mode 100644 >> index 0000000000..b3ab7227aa >> --- /dev/null >> +++ b/arch/xtensa/lib/bdinfo.c >> @@ -0,0 +1,20 @@ >> +// SPDX-License-Identifier: GPL-2.0+ >> +/* >> + * XTENSA-specific information for the 'bd' command >> + * >> + * (C) Copyright 2003 >> + * Wolfgang Denk, DENX Software Engineering, wd@denx.de. >> + */ >> + >> +#include <common.h> >> +#include <init.h> >> + >> +DECLARE_GLOBAL_DATA_PTR; >> + >> +int arch_setup_bdinfo(void) >> +{ >> + struct bd_info *bd = gd->bd; >> + >> + gd->bd->bi_memstart = PHYSADDR(CONFIG_SYS_SDRAM_BASE); >> + gd->bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE; >> +} >> diff --git a/board/cadence/xtfpga/xtfpga.c b/board/cadence/xtfpga/xtfpga.c >> index 2869e5cf68..4b49b6e5c8 100644 >> --- a/board/cadence/xtfpga/xtfpga.c >> +++ b/board/cadence/xtfpga/xtfpga.c >> @@ -51,9 +51,6 @@ int checkboard(void) >> >> int dram_init_banksize(void) >> { >> - gd->bd->bi_memstart = PHYSADDR(CONFIG_SYS_SDRAM_BASE); >> - gd->bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE; >> - >> return 0; >> } >> >> diff --git a/common/board_f.c b/common/board_f.c >> index 4356431488..3b11f08725 100644 >> --- a/common/board_f.c >> +++ b/common/board_f.c >> @@ -605,6 +605,11 @@ __weak int arch_setup_bdinfo(void) >> >> int setup_bdinfo(void) >> { >> + struct bd_info *bd = gd->bd; >> + >> + bd->bi_memstart = gd->ram_base; /* start of memory */ >> + bd->bi_memsize = gd->ram_size; /* size in bytes */ >> + >> return arch_setup_bdinfo(); >> } >> >> @@ -614,12 +619,6 @@ static int setup_board_part1(void) >> { >> struct bd_info *bd = gd->bd; >> >> - /* >> - * Save local variables to board info struct >> - */ >> - bd->bi_memstart = CONFIG_SYS_SDRAM_BASE; /* start of memory */ >> - bd->bi_memsize = gd->ram_size; /* size in bytes */ >> - >> #ifdef CONFIG_SYS_SRAM_BASE >> bd->bi_sramstart = CONFIG_SYS_SRAM_BASE; /* start of SRAM */ >> bd->bi_sramsize = CONFIG_SYS_SRAM_SIZE; /* size of SRAM */ >> >> Do you think this is a better approach? > Yes it looks better to me. In the meantime, I have sent the v4 for this series, containing the above mentioned changes: https://lists.denx.de/pipermail/u-boot/2020-July/421283.html Thanks, Ovidiu > Regards, > Simon
diff --git a/arch/powerpc/lib/bdinfo.c b/arch/powerpc/lib/bdinfo.c index 07f823ee7a..36c9c99ee6 100644 --- a/arch/powerpc/lib/bdinfo.c +++ b/arch/powerpc/lib/bdinfo.c @@ -11,6 +11,31 @@ DECLARE_GLOBAL_DATA_PTR; +int arch_setup_bdinfo(void) +{ + struct bd_info *bd = gd->bd; + +#if defined(CONFIG_E500) || defined(CONFIG_MPC86xx) + bd->bi_immr_base = CONFIG_SYS_IMMR; /* base of IMMR register */ +#endif + +#if defined(CONFIG_MPC83xx) + bd->bi_immrbar = CONFIG_SYS_IMMR; +#endif + + bd->bi_intfreq = gd->cpu_clk; /* Internal Freq, in Hz */ + bd->bi_busfreq = gd->bus_clk; /* Bus Freq, in Hz */ + +#if defined(CONFIG_CPM2) + bd->bi_cpmfreq = gd->arch.cpm_clk; + bd->bi_brgfreq = gd->arch.brg_clk; + bd->bi_sccfreq = gd->arch.scc_clk; + bd->bi_vco = gd->arch.vco_out; +#endif /* CONFIG_CPM2 */ + + return 0; +} + void __weak board_detail(void) { /* Please define board_detail() for your PPC platform */ diff --git a/common/board_f.c b/common/board_f.c index 8ab76a5c7a..7eb65fc224 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -630,37 +630,9 @@ int setup_bdinfo(void) return arch_setup_bdinfo(); } -#if defined(CONFIG_MIPS) || defined(CONFIG_PPC) || \ - defined(CONFIG_SH) +#if defined(CONFIG_MIPS) || defined(CONFIG_SH) static int setup_board_part1(void) { - struct bd_info *bd = gd->bd; - -#if defined(CONFIG_E500) || defined(CONFIG_MPC86xx) - bd->bi_immr_base = CONFIG_SYS_IMMR; /* base of IMMR register */ -#endif -#if defined(CONFIG_MPC83xx) - bd->bi_immrbar = CONFIG_SYS_IMMR; -#endif - - return 0; -} -#endif - -#if defined(CONFIG_PPC) -static int setup_board_part2(void) -{ - struct bd_info *bd = gd->bd; - - bd->bi_intfreq = gd->cpu_clk; /* Internal Freq, in Hz */ - bd->bi_busfreq = gd->bus_clk; /* Bus Freq, in Hz */ -#if defined(CONFIG_CPM2) - bd->bi_cpmfreq = gd->arch.cpm_clk; - bd->bi_brgfreq = gd->arch.brg_clk; - bd->bi_sccfreq = gd->arch.scc_clk; - bd->bi_vco = gd->arch.vco_out; -#endif /* CONFIG_CPM2 */ - return 0; } #endif @@ -986,14 +958,10 @@ static const init_fnc_t init_sequence_f[] = { dram_init_banksize, show_dram_config, setup_bdinfo, -#if defined(CONFIG_MIPS) || defined(CONFIG_PPC) || \ - defined(CONFIG_SH) +#if defined(CONFIG_MIPS) || defined(CONFIG_SH) setup_board_part1, #endif -#if defined(CONFIG_PPC) INIT_FUNC_WATCHDOG_RESET - setup_board_part2, -#endif display_new_sp, #ifdef CONFIG_OF_BOARD_FIXUP fix_fdt,
Factor out ppc-specific bdinfo setup from generic init sequence to arch_setup_bdinfo in arch/powerpc/lib/bdinfo.c. Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> --- arch/powerpc/lib/bdinfo.c | 25 +++++++++++++++++++++++++ common/board_f.c | 36 ++---------------------------------- 2 files changed, 27 insertions(+), 34 deletions(-)