From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 17 Aug 2022 13:45:03 +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 1oOHTr-001pcG-Rh for lore@lore.pengutronix.de; Wed, 17 Aug 2022 13:45:03 +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 1oOHTo-0001zN-5H for lore@pengutronix.de; Wed, 17 Aug 2022 13:45:02 +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: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=AQCV1ktDwg/0/ysyEckG9VJ16GnsZ7xrgQfhQh+2rGM=; b=xYaKKXnSSxRxlwT2MZVV7A33FH OkwB7KGyxxuNI08H3we+VL6GFgGCYzu658sKvRbEOXWczdH5GweBAgAttBnO3Fzi7pYGdkoPITZuM ZnovxOzTVkBm6jDaHU1xvpD1YFi52BJf9hMgutp8l2ILXTcaL6xqg1TovuIZcyW3CKHoHr9us5QI6 u06CG/Z0jOFgWFJuK6J3sCehFvvlMrkwsAwLIPMNQ5fLDNAdbRkSXuJpAHAtWiXZmMY8FjdWDGyt3 jU+vupa0VdXgzoJ6cBCAYlMVtQPbOFjLSLXRM/m/R6NMpontPUiSpGFzxw2r0jrfCL83Uz5Up+sQZ 0KhUMfnA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oOHSO-001ZYK-9f; Wed, 17 Aug 2022 11:43:32 +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 1oOHRp-001ZAB-V1 for barebox@lists.infradead.org; Wed, 17 Aug 2022 11:43:02 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oOHRg-0001OB-II; Wed, 17 Aug 2022 13:42:48 +0200 Received: from [2a0a:edc0:0:1101:1d::ac] (helo=dude04.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1oOHRf-000IqL-Q7; Wed, 17 Aug 2022 13:42:47 +0200 Received: from afa by dude04.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1oOHRd-007dCs-LS; Wed, 17 Aug 2022 13:42:45 +0200 From: Ahmad Fatoum To: barebox@lists.infradead.org Cc: uol@pengutronix.de, Ahmad Fatoum Date: Wed, 17 Aug 2022 13:42:39 +0200 Message-Id: <20220817114244.1810531-6-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220817114244.1810531-1-a.fatoum@pengutronix.de> References: <20220817114244.1810531-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220817_044258_071179_19EA8B2F X-CRM114-Status: GOOD ( 14.87 ) 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=-3.7 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH v2 05/10] of: reserved-mem: reserve regions prior to mmu_initcall() 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) Now that we both have a way to mark SDRAM regions requested as reserved and an postmem_initcall() to do this add, change device tree memory reservation parsing code to use them instead of requesting them as normal memory at coredevice_initcall() level. This allows us to reuse this information for MMU setup in the follow-up commit. Signed-off-by: Ahmad Fatoum --- common/memory.c | 15 +++------------ drivers/of/reserved-mem.c | 34 +++++++++++++++++++++++----------- include/of.h | 7 ------- 3 files changed, 26 insertions(+), 30 deletions(-) diff --git a/common/memory.c b/common/memory.c index 40c795d2cde1..7e24ecb2bd03 100644 --- a/common/memory.c +++ b/common/memory.c @@ -56,17 +56,6 @@ void mem_malloc_init(void *start, void *end) mem_malloc_initialized = 1; } -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__ @@ -96,7 +85,7 @@ static int mem_malloc_resource(void) request_sdram_region("stack", STACK_BASE, STACK_SIZE); #endif - return of_reserved_mem_walk(request_reservation); + return 0; } coredevice_initcall(mem_malloc_resource); @@ -173,6 +162,8 @@ int barebox_add_memory_bank(const char *name, resource_size_t start, if (IS_ERR(res)) return PTR_ERR(res); + res->flags = IORESOURCE_MEM; + bank = xzalloc(sizeof(*bank)); bank->res = res; diff --git a/drivers/of/reserved-mem.c b/drivers/of/reserved-mem.c index 34e61dfea343..f50a0bd8374d 100644 --- a/drivers/of/reserved-mem.c +++ b/drivers/of/reserved-mem.c @@ -4,16 +4,31 @@ #include #include #include +#include +#include #define MEMRESERVE_NCELLS 2 -#define MEMRESERVE_FLAGS (IORESOURCE_MEM | IORESOURCE_EXCLUSIVE) -int of_reserved_mem_walk(int (*handler)(const struct resource *res)) +static void request_region(struct resource *r) +{ + struct memory_bank *bank; + + for_each_memory_bank(bank) { + if (!resource_contains(bank->res, r)) + continue; + + if (!reserve_sdram_region(r->name, r->start, resource_size(r))) + pr_warn("couldn't request reserved sdram region %pa-%pa\n", + &r->start, &r->end); + break; + } +} + +static int of_reserved_mem_walk(void) { struct device_node *node, *child; int ncells = 0; const __be32 *reg; - int ret; node = of_find_node_by_path("/reserved-memory"); if (node) { @@ -27,11 +42,9 @@ int of_reserved_mem_walk(int (*handler)(const struct resource *res)) of_address_to_resource(child, 0, &resource); resource.name = child->name; - resource.flags = MEMRESERVE_FLAGS; + resource.flags = IORESOURCE_MEM; - ret = handler(&resource); - if (ret) - return ret; + request_region(&resource); } } @@ -48,7 +61,7 @@ int of_reserved_mem_walk(int (*handler)(const struct resource *res)) snprintf(name, sizeof(name), "fdt-memreserve-%u", n++); resource.name = name; - resource.flags = MEMRESERVE_FLAGS; + resource.flags = IORESOURCE_MEM; resource.start = of_read_number(reg + i, MEMRESERVE_NCELLS); i += MEMRESERVE_NCELLS; @@ -61,11 +74,10 @@ int of_reserved_mem_walk(int (*handler)(const struct resource *res)) resource.end = resource.start + size - 1; - ret = handler(&resource); - if (ret) - return ret; + request_region(&resource); } } return 0; } +postmem_initcall(of_reserved_mem_walk); diff --git a/include/of.h b/include/of.h index 37320da5ec76..995e9b591399 100644 --- a/include/of.h +++ b/include/of.h @@ -328,8 +328,6 @@ int of_autoenable_device_by_path(char *path); int of_autoenable_i2c_by_component(char *path); int of_prepend_machine_compatible(struct device_node *root, const char *compat); -int of_reserved_mem_walk(int (*handler)(const struct resource *res)); - #else static inline struct of_reserve_map *of_get_reserve_map(void) { @@ -877,11 +875,6 @@ static inline int of_prepend_machine_compatible(struct device_node *root, return -ENODEV; } -static inline int of_reserved_mem_walk(int (*handler)(const struct resource *res)) -{ - return 0; -} - #endif #define for_each_property_of_node(dn, pp) \ -- 2.30.2