From a5cabbda760c798bb551d53a697058de28fce51c Mon Sep 17 00:00:00 2001 From: Meador Inge Date: Tue, 10 Apr 2012 15:04:23 -0500 Subject: target-ppc: Init dcache and icache size for e500 user mode MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit f7aa558396dd0f6b7a2b22c05cb503c655854102 pulled the dcache and icache line size initialization inside of a '#if !defined(CONFIG_USER_ONLY)' block. This is not correct because instructions like 'dcbz' need the dcache size initialized even for user mode. Signed-off-by: Meador Inge Cc: Varun Sethi [AF: Simplify #ifdefs by using cache line size 32 for *-user as before] Suggested-by: Scott Wood Signed-off-by: Andreas Färber --- target-ppc/translate_init.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index fdc0a5f..ba4b84d 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -4462,7 +4462,10 @@ static void init_proc_e500 (CPUPPCState *env, int version) &spr_read_spefscr, &spr_write_spefscr, 0x00000000); /* Memory management */ -#if !defined(CONFIG_USER_ONLY) +#if defined(CONFIG_USER_ONLY) + env->dcache_line_size = 32; + env->icache_line_size = 32; +#else /* !defined(CONFIG_USER_ONLY) */ env->nb_pids = 3; env->nb_ways = 2; env->id_tlbs = 0; -- cgit v1.1