Skip to contentSkip to conversation

rpi: copy /chosen/bootloader node with properties and set boot_partition

PATCH RESEND In review Gregor Herburger 2 participants 5 messages Nov 17 Broadcom BCM2711/BCM2835 Arm architecture

lore
Share & tools
lore
#0 lore raw

v4 cover rpi: copy /chosen/bootloader node with properties and set boot_partition

The Raspberry Pi has the "tryboot" feature where it can boot from a different partition enabling failsafe A/B updates. After boot the firmware adds some properties in /chosen/bootloader, e.g. partition.

Pass this node through to the OS devicetree and use partition to set the environment variable boot_partition.

Changes in v4:
- Split into two patches
- update commit messages
- Drop Reviewed-by-tag again
- Link to v3: https://patch.msgid.link/[email protected]

Changes in v3:
- Copy the complete '/chosen/bootloader' node instead of only the partition property
- Link to v2: https://patch.msgid.link/[email protected]

Changes in v2:
- update Reviewed-by tag

---
Gregor Herburger (2):
rpi: set boot partition from devicetree
rpi: pass the bootloader node through to the OS devicetree

 board/raspberrypi/rpi/rpi.c | 51 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

---
base-commit: baa64b2f892890f00a377eac4a3e685472bb56b5
change-id: 20260803-tryboot2-8c5221376e5a

Best regards,
--
Gregor Herburger <[email protected]>

Signature · 1 line
Gregor Herburger <[email protected]>
#1 lore raw

PATCH RESEND v4 1/2 rpi: set boot partition from devicetree

The Raspberry Pi has the "tryboot" feature where it can boot from a different partition enabling failsafe A/B updates. After boot the firmware sets 'partition' property in /chosen/bootloader.

Set the env variable boot_partition accordingly to allow boards to create a bootcmd based on the boot partition.

---
 board/raspberrypi/rpi/rpi.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
board/raspberrypi/rpi/rpi.c +15 -0
index 1da5df92351c..8354fec833cc 100644
@@ -480,6 +480,20 @@ static void set_serial_number(void)
 	env_set("serial#", serial_string);
 }
 
+static void set_boot_partition_fdt(void)
+{
+	void *fdtp = (void *)gd->fdt_blob;
+	u32 partition;
+
+	partition = fdt_getprop_u32_default(fdtp, "/chosen/bootloader", "partition", 1);
+	if (!partition) {
+		printf("Failed to the get partition property.\n");
+		return;
+	}
+
+	env_set_ulong("boot_partition", partition);
+}
+
 int misc_init_r(void)
 {
 	set_fdt_addr();
@@ -489,6 +503,7 @@ int misc_init_r(void)
 	set_board_info();
 #endif
 	set_serial_number();
+	set_boot_partition_fdt();
 
 	return 0;
 }
Signature · 1 line
2.47.3
#2 lore raw

PATCH RESEND v4 2/2 rpi: pass the bootloader node through to the OS devicetree

In reply to Gregor Herburger

The Raspberry Pi has the "tryboot" feature where it can boot from a different partition enabling failsafe A/B updates. After boot the firmware adds some properties in /chosen/bootloader, e.g. partition.

Copy the complete /chosen/bootloader node with all its properties to the OS device tree.

---
 board/raspberrypi/rpi/rpi.c | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
board/raspberrypi/rpi/rpi.c +36 -0
index 8354fec833cc..ba8a2c1ba4cf 100644
@@ -594,6 +594,39 @@ int board_fdt_blob_setup(void **fdtp)
 	return 0;
 }
 
+int copy_node_all_properties(void *dst, void *src, const char *path, const char *node)
+{
+	int src_parent, dst_parent;
+	int src_node, dst_node;
+	int prop;
+	int len;
+
+	src_parent = fdt_path_offset(src, path);
+	dst_parent = fdt_path_offset(dst, path);
+	if (src_parent < 0 || dst_parent < 0)
+		return -1;
+
+	src_node = fdt_subnode_offset(src, src_parent, node);
+	if (src_node < 0)
+		return -1;
+
+	dst_node = fdt_find_or_add_subnode(dst, dst_parent, node);
+	if (dst_node < 0)
+		return -1;
+
+	fdt_for_each_property_offset(prop, src, src_node) {
+		const char *name;
+		const void *value = fdt_getprop_by_offset(src, prop, &name, &len);
+
+		if (!value || !name)
+			continue;
+
+		fdt_setprop(dst, dst_node, name, value, len);
+	}
+
+	return 0;
+}
+
 int copy_property(void *dst, void *src, char *path, char *property)
 {
 	int dst_offset, src_offset;
@@ -656,6 +689,9 @@ void  update_fdt_from_fw(void *fdt, void *fw_fdt)
 
 	/* copy uart clk as provided by the firmware */
 	copy_property(fdt, fw_fdt, "/clocks/clk-uart", "clock-frequency");
+
+	/* Copy the bootloader node */
+	copy_node_all_properties(fdt, fw_fdt, "/chosen", "bootloader");
 }
 
 int ft_board_setup(void *blob, struct bd_info *bd)
Signature · 1 line
2.47.3
#3 lore raw
In reply to Gregor Herburger

Gregor,

I have your series in patchwork, doing multiple "resends" doesn't put it any higher in my review and testing queue. I am sorry, it's on my list, I am in the process of getting to it but unless there's any changes needed this doesn't make any difference.

Peter

Quoted 43 lines · Gregor Herburger

The Raspberry Pi has the "tryboot" feature where it can boot from a different partition enabling failsafe A/B updates. After boot the firmware adds some properties in /chosen/bootloader, e.g. partition.

Pass this node through to the OS devicetree and use partition to set the environment variable boot_partition.

Changes in v4:
- Split into two patches
- update commit messages
- Drop Reviewed-by-tag again
- Link to v3:
https://patch.msgid.link/[email protected]

Changes in v3:
- Copy the complete '/chosen/bootloader' node instead of only the partition property
- Link to v2:
https://patch.msgid.link/[email protected]

Changes in v2:
- update Reviewed-by tag

---
Gregor Herburger (2):
rpi: set boot partition from devicetree
rpi: pass the bootloader node through to the OS devicetree

 board/raspberrypi/rpi/rpi.c | 51
+++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

---
base-commit: baa64b2f892890f00a377eac4a3e685472bb56b5
change-id: 20260803-tryboot2-8c5221376e5a

Best regards,
--
Gregor Herburger <[email protected]>
--
Gregor Herburger <[email protected]>

#4 lore raw

Hi Peter,

Quoted 6 lines · Peter Robinson

Gregor,

I have your series in patchwork, doing multiple "resends" doesn't put it any higher in my review and testing queue. I am sorry, it's on my list, I am in the process of getting to it but unless there's any changes needed this doesn't make any difference.

Sorry for the noise. This iteration of this series is around since August so I thought resending it would be appropriate. As I know now that it is in your queue I will not send any updates unless changes are needed.

Best regards

Signature · 11 lines
Gregor Herburger
Linutronix GmbH | Bahnhofstrasse 3 | D-88690 Uhldingen-Mühlhofen
Phone: +49 7556 25 999 35; Fax.: +49 7556 25 999 99

Hinweise zum Datenschutz finden Sie hier (Informations on data privacy 
can be found here): https://linutronix.de/legal/data-protection.php

Linutronix GmbH | Firmensitz (Registered Office): Uhldingen-Mühlhofen | 
Registergericht (Registration Court): Amtsgericht Freiburg i.Br., HRB700 
806 | Geschäftsführer (Managing Directors): Dr. Wilfried Wessner, 
Katharina Kopp, Alexander Gieringer