From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 15 Jun 2022 08:08:02 +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 1o1MC9-002n4J-CW for lore@lore.pengutronix.de; Wed, 15 Jun 2022 08:08:02 +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 1o1MC9-0006Sm-5u for lore@pengutronix.de; Wed, 15 Jun 2022 08:08:01 +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:Content-Transfer-Encoding: Content-Type:In-Reply-To:From:References:Cc:To:Subject:MIME-Version:Date: Message-ID:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=IaptokJ5m81+dTm8DETuskcZxKF42J+8SbgZNpEJO58=; b=p7fRRq5twaBJIC7dLUPtdAiSnn R2I5DO4SEHq3nUMtlbh0f3ondO9rCrWCR6XaL1Ylh77ZaGOI0bSKIEYkPfXPm5Sy+uTBC9QikC6qJ EVT64LJJM3Zvv463KQijkxLgc16Tizycml+GjpJB0bSzjYGMoAwfT9YOYiPW2yvyrU5q+wHLvf7ti A4vfbrGcW6yGEQhdV3seTtJstag/ZW7fn1uWAkyzZsykwlABXRNmtoq8d4oGNNK5tbL5m/32bQh7L DxLsNNcPSQ8hVBz8tLJNDi807vr460M9m26O87fuiyfAp8AJl/u4UmFvyyklrtoNQJC3AUKy7E/3E P69PUO/w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o1MAl-00Cncx-LA; Wed, 15 Jun 2022 06:06:35 +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 1o1MAh-00Cnbs-JP for barebox@lists.infradead.org; Wed, 15 Jun 2022 06:06:33 +0000 Received: from ptz.office.stw.pengutronix.de ([2a0a:edc0:0:900:1d::77] helo=[127.0.0.1]) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1o1MAg-0006IF-61; Wed, 15 Jun 2022 08:06:30 +0200 Message-ID: <01713bd8-4bca-3049-a1c4-0bcfc5f58e94@pengutronix.de> Date: Wed, 15 Jun 2022 08:06:29 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.0 Content-Language: en-US To: Sascha Hauer Cc: barebox@lists.infradead.org References: <20220609111810.2454588-1-a.fatoum@pengutronix.de> <20220609111810.2454588-3-a.fatoum@pengutronix.de> <20220615050849.GS2387@pengutronix.de> From: Ahmad Fatoum In-Reply-To: <20220615050849.GS2387@pengutronix.de> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220614_230631_708577_62237304 X-CRM114-Status: GOOD ( 26.20 ) 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.8 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,NICE_REPLY_A,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 15.06.22 07:08, Sascha Hauer wrote: > 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. I am surprised that works. With !CONFIG_OFTREE, included in reserved-mem.c would provide a static inline helper that should clash with of_reserved_mem_walk defined with external linkage in that file. Can you change this into obj-$(CONFIG_OFTREE)? Thanks and sorry for the hassle, Ahmad > > 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 |