mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Marcin Niestroj <m.niestroj@grinn-global.com>
To: barebox@lists.infradead.org
Cc: Marcin Niestroj <m.niestroj@emb.dev>
Subject: [PATCH] ARM: rpi: parse memory from vc fdt
Date: Tue, 10 Jan 2023 20:32:51 +0100	[thread overview]
Message-ID: <20230110193251.2821638-1-m.niestroj@grinn-global.com> (raw)

From: Marcin Niestroj <m.niestroj@emb.dev>

Currently for RaspberryPi platform there is only one memory bank
created, based on information fetched over mailbox. This is fine for
booting Barebox, but unfortunately all the other memory banks are not
propagated to Linux during boot, thus cannot be utilized. In fact, even
when using /vc.dtb as device-tree for Linux, all memory nodes in FDT are
deleted and new ones are created by Barebox by memory fixup mechanism,
using exising RAM information. As a result RaspberryPi 4 boots Linux
with 1GB RAM available, instead of 2GB (2 banks, each 1GB).

At the end of VideoCore FDT parsing, do the same as of_probe_memory() in
mem_initcall does, but for VideoCore provided devicetree/memory
information. During Linux boot this information is used for memory fixup
mechanism and in case of RaspberryPi 4 this results in 2 memory banks
being propagated:

  # ls /proc/device-tree/memory*
  /proc/device-tree/memory@0:
  device_type  name         reg

  /proc/device-tree/memory@40000000:
  device_type  name         reg

Signed-off-by: Marcin Niestroj <m.niestroj@emb.dev>
---
 arch/arm/boards/raspberry-pi/rpi-common.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boards/raspberry-pi/rpi-common.c b/arch/arm/boards/raspberry-pi/rpi-common.c
index 77935e5c88..0855eee872 100644
--- a/arch/arm/boards/raspberry-pi/rpi-common.c
+++ b/arch/arm/boards/raspberry-pi/rpi-common.c
@@ -258,7 +258,7 @@ static u32 rpi_boot_mode, rpi_boot_part;
 static void rpi_vc_fdt_parse(void *fdt)
 {
 	int ret;
-	struct device_node *root, *chosen, *bootloader;
+	struct device_node *root, *chosen, *bootloader, *memory;
 	char *str;
 
 	root = of_unflatten_dtb(fdt, INT_MAX);
@@ -324,6 +324,20 @@ static void rpi_vc_fdt_parse(void *fdt)
 	if (IS_ENABLED(CONFIG_RESET_SOURCE))
 		reset_source_set(rpi_decode_pm_rsts(chosen, bootloader));
 
+	/* Parse all available nodes with "memory" device_type */
+	memory = root;
+	while (1) {
+		int err;
+
+		memory = of_find_node_by_type(memory, "memory");
+		if (!memory)
+			break;
+
+		err = of_add_memory(memory, false);
+		if (err)
+			ret = err;
+	}
+
 out:
 	if (root)
 		of_delete_node(root);
-- 
2.39.0




             reply	other threads:[~2023-01-10 19:34 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-10 19:32 Marcin Niestroj [this message]
2023-01-10 19:56 ` Ahmad Fatoum
2023-01-11  8:28   ` 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=20230110193251.2821638-1-m.niestroj@grinn-global.com \
    --to=m.niestroj@grinn-global.com \
    --cc=barebox@lists.infradead.org \
    --cc=m.niestroj@emb.dev \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox