mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Oleksij Rempel <o.rempel@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH v2] MIPS: init cache before using it
Date: Fri, 18 Oct 2019 13:49:59 +0200	[thread overview]
Message-ID: <20191018114959.66a6t2njafdkmmv7@pengutronix.de> (raw)
In-Reply-To: <20191016045743.22818-1-o.rempel@pengutronix.de>

On Wed, Oct 16, 2019 at 06:57:42AM +0200, Oleksij Rempel wrote:
> 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 <antonynpavlov@gmail.com>
> Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
> ---
>  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 <asm/bitops.h>
>  #include <asm/cache.h>
>  #include <asm/cacheops.h>
> +#include <asm/cpu-features.h>
>  #include <asm/cpu.h>
>  #include <asm/cpu-info.h>
>  #include <asm/io.h>
> @@ -40,6 +41,7 @@
>  #include <linux/sizes.h>
>  #include <asm-generic/memory_layout.h>
>  
> +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);
>	memset(bss_start, 0, bss_len);

bss is cleared twice now and with two different addresses. This looks
wrong.

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

      reply	other threads:[~2019-10-18 11:50 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-16  4:57 Oleksij Rempel
2019-10-18 11:49 ` Sascha Hauer [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191018114959.66a6t2njafdkmmv7@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=o.rempel@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox