From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iKbNa-0003uJ-3O for barebox@lists.infradead.org; Wed, 16 Oct 2019 04:57:47 +0000 From: Oleksij Rempel Date: Wed, 16 Oct 2019 06:57:42 +0200 Message-Id: <20191016045743.22818-1-o.rempel@pengutronix.de> MIME-Version: 1.0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH v2] MIPS: init cache before using it To: barebox@lists.infradead.org Cc: Oleksij Rempel flush_cache_all() uses 'struct cpuinfo_mips current_cpu_data' data fields. These data fields are initialized in r4k_cache_init(). However in the current implementation the r4k_cache_init() function is called __AFTER__ relocate_code(). Suggested-by: Antony Pavlov Signed-off-by: Oleksij Rempel --- arch/mips/lib/reloc.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/arch/mips/lib/reloc.c b/arch/mips/lib/reloc.c index 9a9e404f7e..14195d6f96 100644 --- a/arch/mips/lib/reloc.c +++ b/arch/mips/lib/reloc.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -40,6 +41,7 @@ #include #include +extern void r4k_cache_init(void); void main_entry(void *fdt, u32 fdt_size); void relocate_code(void *fdt, u32 fdt_size, u32 relocaddr); @@ -146,8 +148,14 @@ void relocate_code(void *fdt, u32 fdt_size, u32 ram_size) apply_reloc(type, (void *)addr, off); } - /* Ensure the icache is coherent */ - flush_cache_all(); + memset(__bss_start, 0, bss_len); + + cpu_probe(); + if (cpu_has_4k_cache) { + r4k_cache_init(); + /* Ensure the icache is coherent */ + flush_cache_all(); + } /* Clear the .bss section */ bss_start = (uint8_t *)((unsigned long)__bss_start + off); -- 2.23.0 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox