From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from magratgarlick.emantor.de ([78.46.208.201]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kc05s-0004Ew-CS for barebox@lists.infradead.org; Mon, 09 Nov 2020 05:51:57 +0000 From: Rouven Czerwinski Date: Mon, 9 Nov 2020 06:51:50 +0100 Message-Id: <20201109055150.16444-1-r.czerwinski@pengutronix.de> MIME-Version: 1.0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH] of: base: ignore disabled memory nodes To: barebox@lists.infradead.org Cc: Rouven Czerwinski Qemu with the secure extension enabled will insert a secram node into the device tree: secram@e000000 { secure-status = "okay"; status = "disabled"; reg = <0x0 0xe000000 0x0 0x1000000>; device_type = "memory"; }; Barebox would previously parse this node, add it as a memory bank and than reinsert an enabled node into the fixed up device tree. Fix this by skipping disabled memory nodes. Signed-off-by: Rouven Czerwinski --- drivers/of/base.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/of/base.c b/drivers/of/base.c index 0a2632f963..32cb1e78a5 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -2090,6 +2090,9 @@ int of_add_memory(struct device_node *node, bool dump) if (!resource_size(&res)) continue; + if (!of_device_is_available(node)) + continue; + of_add_memory_bank(node, dump, mem_bank_num, res.start, resource_size(&res)); mem_bank_num++; -- 2.28.0 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox