| Message ID | 1321010541-31337-5-git-send-email-pdeschrijver@nvidia.com |
|---|---|
| State | New, archived |
| Headers | show |
Hi Peter, On Fri, Nov 11, 2011 at 01:22:10PM +0200, Peter De Schrijver wrote: > This patch splits the early init code in a common and a tegra20 specific part. > L2 cache initialization is generalized and discovers the cache associativity > at runtime. Also use arm_pm_restart instead of arm_arch_reset and reset the > the system using the PMC reset feature rather then the CAR system reset. > > Signed-off-by: Peter De Schrijver <pdeschrijver@nvidia.com> > --- > arch/arm/mach-tegra/board-dt.c | 21 ++++++++++++++ > arch/arm/mach-tegra/board-harmony.c | 2 +- > arch/arm/mach-tegra/board-paz00.c | 2 +- > arch/arm/mach-tegra/board-seaboard.c | 6 ++-- > arch/arm/mach-tegra/board-trimslice.c | 2 +- > arch/arm/mach-tegra/board.h | 6 ++-- > arch/arm/mach-tegra/clock.c | 5 --- > arch/arm/mach-tegra/common.c | 47 ++++++++++++++++++++++---------- > 8 files changed, 62 insertions(+), 29 deletions(-) > > diff --git a/arch/arm/mach-tegra/board-dt.c b/arch/arm/mach-tegra/board-dt.c > index d368f8d..15ee974 100644 > --- a/arch/arm/mach-tegra/board-dt.c > +++ b/arch/arm/mach-tegra/board-dt.c > @@ -118,6 +118,27 @@ static void __init tegra_dt_init(void) > of_platform_populate(NULL, tegra_dt_match_table, tegra20_auxdata_lookup, NULL); > } > > +static struct { > + const char *machine; > + void (*init)(void); > +} early_init[] __initdata = { > +#ifdef CONFIG_ARCH_TEGRA_2x_SOC > + { "nvidia,tegra20", tegra20_init_early }, > +#endif > +}; > + > +static void __init tegra_init_early(void) > +{ > + > + int i; > + > + for (i = 0; i < ARRAY_SIZE(early_init); i++) > + if (of_machine_is_compatible(early_init[i].machine)) > + return early_init[i].init(); > + > + pr_warn("Unknown platform detected\n"); > +} Wouldn't it be better just to have separate machine descs for tegra20 and tegra30 and have a different .init_early for each? I'm not sure that this extra indirection buys us much, especially if we had to repeat it for any of the other entries. Jamie -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Peter De Schrijver wrote at Friday, November 11, 2011 4:22 AM: > This patch splits the early init code in a common and a tegra20 specific part. > L2 cache initialization is generalized and discovers the cache associativity > at runtime. Also use arm_pm_restart instead of arm_arch_reset and reset the > the system using the PMC reset feature rather then the CAR system reset. > diff --git a/arch/arm/mach-tegra/board.h b/arch/arm/mach-tegra/board.h > -void tegra_assert_system_reset(char mode, const char *cmd); Given you explicitly removed that from the header... > +++ b/arch/arm/mach-tegra/clock.c > void tegra_assert_system_reset(char mode, const char *cmd) Maybe you want to make it static in the .c file too?
Jamie Iles wrote at Friday, November 11, 2011 4:45 AM: > On Fri, Nov 11, 2011 at 01:22:10PM +0200, Peter De Schrijver wrote: > > This patch splits the early init code in a common and a tegra20 specific part. > > L2 cache initialization is generalized and discovers the cache associativity > > at runtime. Also use arm_pm_restart instead of arm_arch_reset and reset the > > the system using the PMC reset feature rather then the CAR system reset. ... > > diff --git a/arch/arm/mach-tegra/board-dt.c b/arch/arm/mach-tegra/board-dt.c ... > > +static struct { > > + const char *machine; > > + void (*init)(void); > > +} early_init[] __initdata = { > > +#ifdef CONFIG_ARCH_TEGRA_2x_SOC > > + { "nvidia,tegra20", tegra20_init_early }, > > +#endif > > +}; > > + > > +static void __init tegra_init_early(void) > > +{ > > + > > + int i; > > + > > + for (i = 0; i < ARRAY_SIZE(early_init); i++) > > + if (of_machine_is_compatible(early_init[i].machine)) > > + return early_init[i].init(); > > + > > + pr_warn("Unknown platform detected\n"); > > +} > > Wouldn't it be better just to have separate machine descs for tegra20 > and tegra30 and have a different .init_early for each? I'm not sure > that this extra indirection buys us much, especially if we had to repeat > it for any of the other entries. Jamie, thanks for pointing that. I think that does sound a lot simpler.
diff --git a/arch/arm/mach-tegra/board-dt.c b/arch/arm/mach-tegra/board-dt.c index d368f8d..15ee974 100644 --- a/arch/arm/mach-tegra/board-dt.c +++ b/arch/arm/mach-tegra/board-dt.c @@ -118,6 +118,27 @@ static void __init tegra_dt_init(void) of_platform_populate(NULL, tegra_dt_match_table, tegra20_auxdata_lookup, NULL); } +static struct { + const char *machine; + void (*init)(void); +} early_init[] __initdata = { +#ifdef CONFIG_ARCH_TEGRA_2x_SOC + { "nvidia,tegra20", tegra20_init_early }, +#endif +}; + +static void __init tegra_init_early(void) +{ + + int i; + + for (i = 0; i < ARRAY_SIZE(early_init); i++) + if (of_machine_is_compatible(early_init[i].machine)) + return early_init[i].init(); + + pr_warn("Unknown platform detected\n"); +} + static const char * tegra_dt_board_compat[] = { "nvidia,harmony", "nvidia,seaboard", diff --git a/arch/arm/mach-tegra/board-harmony.c b/arch/arm/mach-tegra/board-harmony.c index f0bdc5e..c422aeb 100644 --- a/arch/arm/mach-tegra/board-harmony.c +++ b/arch/arm/mach-tegra/board-harmony.c @@ -185,7 +185,7 @@ MACHINE_START(HARMONY, "harmony") .atag_offset = 0x100, .fixup = tegra_harmony_fixup, .map_io = tegra_map_common_io, - .init_early = tegra_init_early, + .init_early = tegra20_init_early, .init_irq = tegra_init_irq, .timer = &tegra_timer, .init_machine = tegra_harmony_init, diff --git a/arch/arm/mach-tegra/board-paz00.c b/arch/arm/mach-tegra/board-paz00.c index 602f8dd..6997a47 100644 --- a/arch/arm/mach-tegra/board-paz00.c +++ b/arch/arm/mach-tegra/board-paz00.c @@ -188,7 +188,7 @@ MACHINE_START(PAZ00, "Toshiba AC100 / Dynabook AZ") .atag_offset = 0x100, .fixup = tegra_paz00_fixup, .map_io = tegra_map_common_io, - .init_early = tegra_init_early, + .init_early = tegra20_init_early, .init_irq = tegra_init_irq, .timer = &tegra_timer, .init_machine = tegra_paz00_init, diff --git a/arch/arm/mach-tegra/board-seaboard.c b/arch/arm/mach-tegra/board-seaboard.c index bf13ea3..5e42e08 100644 --- a/arch/arm/mach-tegra/board-seaboard.c +++ b/arch/arm/mach-tegra/board-seaboard.c @@ -282,7 +282,7 @@ static void __init tegra_wario_init(void) MACHINE_START(SEABOARD, "seaboard") .atag_offset = 0x100, .map_io = tegra_map_common_io, - .init_early = tegra_init_early, + .init_early = tegra20_init_early, .init_irq = tegra_init_irq, .timer = &tegra_timer, .init_machine = tegra_seaboard_init, @@ -291,7 +291,7 @@ MACHINE_END MACHINE_START(KAEN, "kaen") .atag_offset = 0x100, .map_io = tegra_map_common_io, - .init_early = tegra_init_early, + .init_early = tegra20_init_early, .init_irq = tegra_init_irq, .timer = &tegra_timer, .init_machine = tegra_kaen_init, @@ -300,7 +300,7 @@ MACHINE_END MACHINE_START(WARIO, "wario") .atag_offset = 0x100, .map_io = tegra_map_common_io, - .init_early = tegra_init_early, + .init_early = tegra20_init_early, .init_irq = tegra_init_irq, .timer = &tegra_timer, .init_machine = tegra_wario_init, diff --git a/arch/arm/mach-tegra/board-trimslice.c b/arch/arm/mach-tegra/board-trimslice.c index e008c0e..7117e81 100644 --- a/arch/arm/mach-tegra/board-trimslice.c +++ b/arch/arm/mach-tegra/board-trimslice.c @@ -175,7 +175,7 @@ MACHINE_START(TRIMSLICE, "trimslice") .atag_offset = 0x100, .fixup = tegra_trimslice_fixup, .map_io = tegra_map_common_io, - .init_early = tegra_init_early, + .init_early = tegra20_init_early, .init_irq = tegra_init_irq, .timer = &tegra_timer, .init_machine = tegra_trimslice_init, diff --git a/arch/arm/mach-tegra/board.h b/arch/arm/mach-tegra/board.h index 1d14df7..355f488 100644 --- a/arch/arm/mach-tegra/board.h +++ b/arch/arm/mach-tegra/board.h @@ -23,9 +23,9 @@ #include <linux/types.h> -void tegra_assert_system_reset(char mode, const char *cmd); - -void __init tegra_init_early(void); +#ifdef CONFIG_ARCH_TEGRA_2x_SOC +void __init tegra20_init_early(void); +#endif void __init tegra_map_common_io(void); void __init tegra_init_irq(void); void __init tegra_init_clock(void); diff --git a/arch/arm/mach-tegra/clock.c b/arch/arm/mach-tegra/clock.c index 47f6366..e8d214d 100644 --- a/arch/arm/mach-tegra/clock.c +++ b/arch/arm/mach-tegra/clock.c @@ -399,11 +399,6 @@ void tegra_periph_reset_assert(struct clk *c) } EXPORT_SYMBOL(tegra_periph_reset_assert); -void __init tegra_init_clock(void) -{ - tegra2_init_clocks(); -} - /* * The SDMMC controllers on tegra20 have extra bits in the clock source * register that adjust the delay between the clock and data to compenstate diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c index 03c2bd4..3ad1ca3 100644 --- a/arch/arm/mach-tegra/common.c +++ b/arch/arm/mach-tegra/common.c @@ -1,5 +1,5 @@ /* - * arch/arm/mach-tegra/board-harmony.c + * arch/arm/mach-tegra/common.c * * Copyright (C) 2010 Google, Inc. * @@ -33,16 +33,16 @@ void tegra_assert_system_reset(char mode, const char *cmd) { - void __iomem *reset = IO_ADDRESS(TEGRA_CLK_RESET_BASE + 0x04); + void __iomem *reset = IO_ADDRESS(TEGRA_PMC_BASE + 0); u32 reg; - /* use *_related to avoid spinlock since caches are off */ reg = readl_relaxed(reset); - reg |= 0x04; + reg |= 0x10; writel_relaxed(reg, reset); } -static __initdata struct tegra_clk_init_table common_clk_init_table[] = { +#ifdef CONFIG_ARCH_TEGRA_2x_SOC +static __initdata struct tegra_clk_init_table tegra20_clk_init_table[] = { /* name parent rate enabled */ { "clk_m", NULL, 0, true }, { "pll_p", "clk_m", 216000000, true }, @@ -58,26 +58,43 @@ static __initdata struct tegra_clk_init_table common_clk_init_table[] = { { "cpu", NULL, 0, true }, { NULL, NULL, 0, 0}, }; +#endif -static void __init tegra_init_cache(void) +static void __init tegra_init_cache(u32 tag_latency, u32 data_latency) { #ifdef CONFIG_CACHE_L2X0 void __iomem *p = IO_ADDRESS(TEGRA_ARM_PERIF_BASE) + 0x3000; + u32 aux_ctrl, cache_type; + + writel_relaxed(tag_latency, p + L2X0_TAG_LATENCY_CTRL); + writel_relaxed(data_latency, p + L2X0_DATA_LATENCY_CTRL); - writel_relaxed(0x331, p + L2X0_TAG_LATENCY_CTRL); - writel_relaxed(0x441, p + L2X0_DATA_LATENCY_CTRL); + cache_type = readl(p + L2X0_CACHE_TYPE); + aux_ctrl = (cache_type & 0x700) << (17-8); + aux_ctrl |= 0x6C000001; - l2x0_init(p, 0x6C080001, 0x8200c3fe); + l2x0_init(p, aux_ctrl, 0x8200c3fe); #endif } -void __init tegra_init_early(void) +static void __init tegra_setup_system_reset(void) { - tegra_init_fuse(); - tegra_init_clock(); - tegra_clk_init_from_table(common_clk_init_table); - tegra_init_cache(); + arm_pm_restart = tegra_assert_system_reset; +} + +static void __init tegra_common_init(void) +{ + tegra_setup_system_reset(); +} - arm_arch_reset = tegra_assert_system_reset; +#ifdef CONFIG_ARCH_TEGRA_2x_SOC +void __init tegra20_init_early(void) +{ + tegra_init_fuse(); + tegra2_init_clocks(); + tegra_clk_init_from_table(tegra20_clk_init_table); + tegra_init_cache(0x331, 0x441); + tegra_common_init(); } +#endif
This patch splits the early init code in a common and a tegra20 specific part. L2 cache initialization is generalized and discovers the cache associativity at runtime. Also use arm_pm_restart instead of arm_arch_reset and reset the the system using the PMC reset feature rather then the CAR system reset. Signed-off-by: Peter De Schrijver <pdeschrijver@nvidia.com> --- arch/arm/mach-tegra/board-dt.c | 21 ++++++++++++++ arch/arm/mach-tegra/board-harmony.c | 2 +- arch/arm/mach-tegra/board-paz00.c | 2 +- arch/arm/mach-tegra/board-seaboard.c | 6 ++-- arch/arm/mach-tegra/board-trimslice.c | 2 +- arch/arm/mach-tegra/board.h | 6 ++-- arch/arm/mach-tegra/clock.c | 5 --- arch/arm/mach-tegra/common.c | 47 ++++++++++++++++++++++---------- 8 files changed, 62 insertions(+), 29 deletions(-)