From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 15 Jun 2022 07:10:55 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1o1LIs-002l5I-L7 for lore@lore.pengutronix.de; Wed, 15 Jun 2022 07:10:55 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1o1LIs-0008Dk-Hf for lore@pengutronix.de; Wed, 15 Jun 2022 07:10:55 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:From:In-Reply-To: Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=oBn9TU883qDwI/UA6qlctJeLantcBNMsrEZaNBJapx4=; b=TtF+0r1Z+eI2OkDgFmTTT9I8Jq R5V+09QbUVunJYIh+odWSythyb7dldL/3GlxQAf78X/x2DG2j7H/mKK9liPp+K64pDz6k2Q2XyIGl U5URGJHRKTgGFhfuQ7HySaUdJ/lQpnhDW8uD1F26mXrHp92jfbS+HKLcgnF/Mzyvti4cHTeQ3eEGg 4yI6ohdCU57ej+yiLjqA7bfF6GZW0sfvR6keOidNllcL4FwenIx8am/eOTDRd8t6yCm9Hr/osqTbk AnfcZItEmEZ75moyX5aEBCOp6aaNqoODZ3I6OVh/mL/ZO7c17Cj5naH6PoShgpqGlcRXZiZZcWQM2 AhT7DBYQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o1LH3-00CcKb-Gl; Wed, 15 Jun 2022 05:09:01 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o1LGy-00CcJl-Jw for barebox@lists.infradead.org; Wed, 15 Jun 2022 05:08:58 +0000 Received: from ptx.hi.pengutronix.de ([2001:67c:670:100:1d::c0]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1o1LGt-0007uZ-VN; Wed, 15 Jun 2022 07:08:51 +0200 Received: from sha by ptx.hi.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1o1LGr-0004BO-Pn; Wed, 15 Jun 2022 07:08:49 +0200 Date: Wed, 15 Jun 2022 07:08:49 +0200 To: Ahmad Fatoum Cc: barebox@lists.infradead.org Message-ID: <20220615050849.GS2387@pengutronix.de> References: <20220609111810.2454588-1-a.fatoum@pengutronix.de> <20220609111810.2454588-3-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220609111810.2454588-3-a.fatoum@pengutronix.de> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-IRC: #ptxdist @freenode X-Accept-Language: de,en X-Accept-Content-Type: text/plain X-Uptime: 07:05:43 up 76 days, 17:35, 58 users, load average: 0.10, 0.16, 0.09 User-Agent: Mutt/1.10.1 (2018-07-13) From: Sascha Hauer X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220614_220856_695020_93A215BB X-CRM114-Status: GOOD ( 31.35 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.1 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: Re: [PATCH v2 3/3] of: request reserved memory regions so other code can't X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.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 > Signed-off-by: Ahmad Fatoum > --- > 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 , Pengutronix > */ > > +#define pr_fmt(fmt) "memory: " fmt > + > #include > #include > #include > @@ -12,6 +14,7 @@ > #include > #include > #include > +#include > > /* > * 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 |