From 50fdda702fe5c833a69aa36bbfe878319bbf443d Mon Sep 17 00:00:00 2001 From: Peter Griffin Date: Wed, 11 May 2016 18:40:00 +0200 Subject: ARM: STi: Update machine _namestr to be more generic. This string is used by dump_stack and as we now support more SoC's than just STiH415/6 it is misleading to have the current string in the stack trace. This patch updates it to be more generic for the STi family of SoCs. So instead of looking like this [ 271.672555] Hardware name: STiH415/416 SoC with Flattened Device Tree [ 271.678998] [] (unwind_backtrace) from [] (show_stack+0x10/0x14) [ 271.686746] [] (show_stack) from [] (dump_stack+0x98/0xac) [snip] it now looks like this: [ 2.669879] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 4.6.0-rc3-00026-g38a1ce6-dirty #76 [ 2.677973] Hardware name: STi SoC with Flattened Device Tree [ 2.683723] [] (unwind_backtrace) from [] (show_stack+0x10/0x14) [ 2.691472] [] (show_stack) from [] (dump_stack+0x98/0xac) [snip] Signed-off-by: Peter Griffin Acked-by: Patrice Chotard --- arch/arm/mach-sti/board-dt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/mach-sti') diff --git a/arch/arm/mach-sti/board-dt.c b/arch/arm/mach-sti/board-dt.c index ae10fb280a78..cfee0efc75f9 100644 --- a/arch/arm/mach-sti/board-dt.c +++ b/arch/arm/mach-sti/board-dt.c @@ -23,7 +23,7 @@ static const char *const stih41x_dt_match[] __initconst = { NULL }; -DT_MACHINE_START(STM, "STiH415/416 SoC with Flattened Device Tree") +DT_MACHINE_START(STM, "STi SoC with Flattened Device Tree") .dt_compat = stih41x_dt_match, .l2c_aux_val = L2C_AUX_CTRL_SHARED_OVERRIDE | L310_AUX_CTRL_DATA_PREFETCH | -- cgit From 7b8e0188fa717cd9abc4fb52587445b421835c2a Mon Sep 17 00:00:00 2001 From: Patrice Chotard Date: Tue, 28 Jun 2016 11:21:52 +0200 Subject: ARM: sti: Implement dummy L2 cache's write_sec This patch implements the write_sec callback that handle PL310 secure registers writes. This callback is just a stub for now, to avoid system crash. Later, it could handle SMC calls so that TZ handles the needed writes. Signed-off-by: Patrice Chotard --- arch/arm/mach-sti/board-dt.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'arch/arm/mach-sti') diff --git a/arch/arm/mach-sti/board-dt.c b/arch/arm/mach-sti/board-dt.c index cfee0efc75f9..e04cd1b201bb 100644 --- a/arch/arm/mach-sti/board-dt.c +++ b/arch/arm/mach-sti/board-dt.c @@ -23,6 +23,14 @@ static const char *const stih41x_dt_match[] __initconst = { NULL }; +static void sti_l2_write_sec(unsigned long val, unsigned reg) +{ + /* + * We can't write to secure registers as we are in non-secure + * mode, until we have some SMI service available. + */ +} + DT_MACHINE_START(STM, "STi SoC with Flattened Device Tree") .dt_compat = stih41x_dt_match, .l2c_aux_val = L2C_AUX_CTRL_SHARED_OVERRIDE | @@ -31,4 +39,5 @@ DT_MACHINE_START(STM, "STi SoC with Flattened Device Tree") L2C_AUX_CTRL_WAY_SIZE(4), .l2c_aux_mask = 0xc0000fff, .smp = smp_ops(sti_smp_ops), + .l2c_write_sec = sti_l2_write_sec, MACHINE_END -- cgit