mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <sha@pengutronix.de>
To: Ahmad Fatoum <a.fatoum@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH v2 3/3] of: request reserved memory regions so other code can't
Date: Wed, 15 Jun 2022 07:08:49 +0200	[thread overview]
Message-ID: <20220615050849.GS2387@pengutronix.de> (raw)
In-Reply-To: <20220609111810.2454588-3-a.fatoum@pengutronix.de>

On Thu, Jun 09, 2022 at 01:18:10PM +0200, Ahmad Fatoum wrote:
> Add a new of_reserved_mem_walk that can be used to request
> reserved memory regions. This avoids e.g. bootm trying to
> place the kernel into a reserved region.
> 
> Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
> v1 -> v2:
>   - don't use of_reserve_entry accounting and instead
>     directly request memory (Sascha)
> ---
>  common/memory.c           | 21 ++++++++++--
>  drivers/of/Makefile       |  1 +
>  drivers/of/reserved-mem.c | 71 +++++++++++++++++++++++++++++++++++++++
>  include/of.h              |  9 +++++
>  4 files changed, 99 insertions(+), 3 deletions(-)
>  create mode 100644 drivers/of/reserved-mem.c
> 
> diff --git a/common/memory.c b/common/memory.c
> index 95995bb6e310..fd782c7f24f6 100644
> --- a/common/memory.c
> +++ b/common/memory.c
> @@ -3,6 +3,8 @@
>   * Copyright (c) 2011 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
>   */
>  
> +#define pr_fmt(fmt) "memory: " fmt
> +
>  #include <common.h>
>  #include <memory.h>
>  #include <of.h>
> @@ -12,6 +14,7 @@
>  #include <asm-generic/memory_layout.h>
>  #include <asm/sections.h>
>  #include <malloc.h>
> +#include <of.h>
>  
>  /*
>   * Begin and End of memory area for malloc(), and current "brk"
> @@ -53,9 +56,20 @@ void mem_malloc_init(void *start, void *end)
>  	mem_malloc_initialized = 1;
>  }
>  
> -#if !defined __SANDBOX__
> +static int request_reservation(const struct resource *res)
> +{
> +	if (!(res->flags & IORESOURCE_EXCLUSIVE))
> +		return 0;
> +
> +	pr_debug("region %s %pa-%pa\n", res->name, &res->start, &res->end);
> +
> +	request_sdram_region(res->name, res->start, resource_size(res));
> +	return 0;
> +}
> +
>  static int mem_malloc_resource(void)
>  {
> +#if !defined __SANDBOX__
>  	/*
>  	 * Normally it's a bug when one of these fails,
>  	 * but we have some setups where some of these
> @@ -77,13 +91,14 @@ static int mem_malloc_resource(void)
>  			(unsigned long)&__bss_start,
>  			(unsigned long)&__bss_stop -
>  			(unsigned long)&__bss_start);
> +#endif
>  #ifdef STACK_BASE
>  	request_sdram_region("stack", STACK_BASE, STACK_SIZE);
>  #endif
> -	return 0;
> +
> +	return of_reserved_mem_walk(request_reservation);
>  }
>  coredevice_initcall(mem_malloc_resource);
> -#endif
>  
>  static void *sbrk_no_zero(ptrdiff_t increment)
>  {
> diff --git a/drivers/of/Makefile b/drivers/of/Makefile
> index ca8da71cb4f0..99b610cba85e 100644
> --- a/drivers/of/Makefile
> +++ b/drivers/of/Makefile
> @@ -5,6 +5,7 @@ obj-$(CONFIG_OF_GPIO) += of_gpio.o
>  obj-$(CONFIG_OF_PCI) += of_pci.o
>  obj-y += partition.o
>  obj-y += of_net.o
> +obj-$(CONFIG_OFDEVICE) += reserved-mem.o

Compilation of this file depends on CONFIG_OFDEVICE, but the static
inline wrapper or not decision depends on CONFIG_OFTREE. This breaks a
number of defconfigs.
I took the easiest way out for now and changed to obj-y above to fix
this.

Sascha

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |



  reply	other threads:[~2022-06-15  5:10 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-09 11:18 [PATCH v2 1/3] nvmem: rmem: get, don't request, memory region Ahmad Fatoum
2022-06-09 11:18 ` [PATCH v2 2/3] of: remove unused and misleading #cells in /memreserve Ahmad Fatoum
2022-06-09 11:18 ` [PATCH v2 3/3] of: request reserved memory regions so other code can't Ahmad Fatoum
2022-06-15  5:08   ` Sascha Hauer [this message]
2022-06-15  6:06     ` Ahmad Fatoum
2022-06-15  6:28       ` Sascha Hauer
2022-06-10  8:13 ` [PATCH v2 1/3] nvmem: rmem: get, don't request, memory region Sascha Hauer

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=20220615050849.GS2387@pengutronix.de \
    --to=sha@pengutronix.de \
    --cc=a.fatoum@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --subject='Re: [PATCH v2 3/3] of: request reserved memory regions so other code can'\''t' \
    /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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox