raspi: fixup additional vc created nodes
Hi,
I think so, too.
I think that my mistake was in 5ea6e19737e10973ce2cf785970e32562d9ee8f1.
...
Review static void rpi_vc_fdt(void) · line 382
Quoted 12 lines
(quoted diff) +1
-1@@ -363,7 +365,7 @@ out: return; } -static void rpi_vc_fdt(void) +static struct device_node *rpi_vc_fdt(void) { void *saved_vc_fdt; struct fdt_header *oftree;@@ -379,17 +381,17 @@ static void rpi_vc_fdt(void) if (oftree->totalsize) pr_err("there was an error copying fdt in pbl:
%d\n",
Review static void rpi_vc_fdt(void) · line 382
Quoted 2 lines
(quoted diff) +0
-1be32_to_cpu(oftree->totalsize)); - return;
This return previously avoided a call of rpi_vc_fdt_parse().
Quoted 14 lines
(quoted diff) +3
-2+ return ERR_PTR(-EINVAL); } if (magic != FDT_MAGIC) - return; + return ERR_PTR(-EINVAL); size = be32_to_cpu(oftree->totalsize); if (write_file("/vc.dtb", saved_vc_fdt, size)) pr_err("failed to save videocore fdt to a file\n"); - rpi_vc_fdt_parse(saved_vc_fdt); + return of_unflatten_dtb(saved_vc_fdt, INT_MAX); }
...
Review static int rpi_devices_probe(struct device *dev) · line 487
Quoted 7 lines
(quoted diff) +2
-1@@ -480,7 +483,8 @@ static int rpi_devices_probe(struct device *dev) bcm2835_register_fb(); armlinux_set_architecture(MACH_TYPE_BCM2708); rpi_env_init(); - rpi_vc_fdt(); + root = rpi_vc_fdt(); + rpi_vc_fdt_parse(IS_ERR(root) ? priv->dev->device_node : root);
Now rpi_vc_fdt_parse() is called in both cases.
So, it should be:
if (!IS_ERR(root)) rpi_vc_fdt_parse(root);
Review static int rpi_devices_probe(struct device *dev) · line 489
Quoted 2 lines
(quoted diff) +0
-0rpi_set_kernel_name();
...
Or do I miss something?
Regards, Denis
-----Original Message-----
From: Ahmad Fatoum <[email protected]>
Sent: Monday, February 19, 2024 10:43 PM
To: Roland Hieber <[email protected]>; Denis Osterland-Heim <[email protected]>
Cc: [email protected]; Denis OSTERLAND-HEIM <[email protected]>; Alexander Dahl <[email protected]>
Subject: [EXT] Re: [PATCH v2 2/2] raspi: fixup additional vc created nodes
[EXTERNAL EMAIL]
Hello Roland,
Quoted 107 lines · Roland Hieber
(quoted diff) +0
-0Hi,Quoted 67 lines · Denis Osterland-Heim
From: Denis OSTERLAND-HEIM <[email protected]>
The video core creates some additional nodes.
This code takes over this values.
The /hat node is only there if an raspi hat with EEPROM is detected.Signed-off-by Denis OSTERLAND-HEIM <[email protected]>Acked-by Ahmad Fatoum <[email protected]>---
arch/arm/boards/raspberry-pi/rpi-common.c | 39
+++++++++++++++++------1 file changed, 30 insertions(+), 9 deletions(-)arch/arm/boards/raspberry-pi/rpi-common.c +0
-0@@ -264,19 +264,37 @@ static enum reset_src_type rpi_decode_pm_rsts(struct device_node *chosen,
static intrpi_vc_fdt_fixup(struct device_node *root, void *data){
- const structdevice_node*vc_chosen= data;
- structdevice_node*chosen;
+ const structdevice_node*vc_node= data;
+ structdevice_node*node;
+ struct property *pp;
- chosen =of_create_node(root, "/chosen");
- if (!chosen)
+ node =of_create_node(root, vc_node->full_name); + if (!node)
return-ENOMEM;
- of_copy_property(vc_chosen, "overlay_prefix", chosen); - of_copy_property(vc_chosen, "os_prefix", chosen); + for_each_property_of_node(vc_node, pp)
+ of_copy_property(vc_node,pp->name, node);
return 0;
}arch/arm/boards/raspberry-pi/rpi-common.c +17
-0+static struct device_node *register_vc_fixup (struct device_node +*root, + const char *path) { + struct device_node *ret, *tmp; + + ret = of_find_node_by_path_from(root, path); + if (ret) { + tmp = of_dup(ret); + tmp->full_name = xstrdup(ret->full_name); + of_register_fixup(rpi_vc_fdt_fixup, tmp); + } else { + pr_info("no '%s' node found in vc fdtn", path); + } + + return ret; +} +static u32
rpi_boot_mode,rpi_boot_part;
/* Extract useful information from the VideoCore FDT we got.
* Some parameters are defined here:arch/arm/boards/raspberry-pi/rpi-common.c +0
-0@@ -300,14 +318,17 @@ static void rpi_vc_fdt_parse(struct device_node *root) free(str); }Quoted 8 lines
- chosen =of_find_node_by_path_from(root, "/chosen"); + register_vc_fixup(root, "/system");
+ register_vc_fixup(root, "/axi");
+ register_vc_fixup(root, "/reserved-memory"); + register_vc_fixup(root, "/hat");
+ register_vc_fixup(root, "/chosen/bootloader"); + chosen =register_vc_fixup(root, "/chosen");This throws a lot of new warnings and errors on our RPi 3B:
barebox 2024.01.0 #1 2024-02-01T00:00:00+00:00 Buildsystem version: DistroKit-2019.12.0-552-g775624b9f5d6
Board: Raspberry Pi 3 Model B
deep-probe: supported due to raspberrypi,3-model-b
netconsole: registered as netconsole-1
bcm2835-sdhost [email protected]: registered as mci0bcm2835_mci[email protected]: registered as mci1
mci0: detected SD card version 2.0
mci0: registered disk0
state: New state registered 'state'
state: Using bucket 0@0x00000000
malloc space:0x1d87f620->0x3b0fec3f(size 472.5 MiB)
WARNING: no property 'serial-number' found in vc fdt's '' node no '/system' node found in vc fdt
no '/axi' node found in vc fdt
no '/hat' node found in vc fdt
no '/chosen/bootloader' node found in vc fdt
WARNING: no property 'bootargs' found in vc fdt's '/chosen' node
WARNING: no property 'overlay_prefix' found in vc fdt's '/chosen' node
WARNING: no property 'os_prefix' found in vc fdt's '/chosen' node
WARNING: 'pm_rsts' value not found in vc fdt
ERROR: Won't delete root device node
environment load/boot/barebox.env: No such file or directory Maybe you have to create the partition.
Quoted 5 lines
Do you have any idea what is going on here?
I also don't see /vc.dtb, which should have been created. I have 'vc.kernel: kernel7.img' in the 'global' output, but nothing else starting with vc.*.
I think that a non-existent /vc.dtb is expected if there's no DTs in the boot partition as is the case with DistroKit (except for rpi4) or if using barebox-dt-2nd.img.
I think the info/warning messages should just be dropped.
Cheers,
Ahmad
Quoted 18 lines
- Roland
Quoted 14 lines
if (!chosen) {
pr_err("no '/chosen' node found in vc fdtn"); goto out;
}
- of_register_fixup(rpi_vc_fdt_fixup,of_dup(chosen)); -
bootloader =of_find_node_by_name(chosen, "bootloader");
str =of_read_vc_string(chosen, "bootargs"); --
2.39.2
Signature · 4 lines
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 |
Hello Denis,
Quoted 4 lines · Denis OSTERLAND-HEIM
Hi,
I think so, too.
I think that my mistake was in5ea6e19737e10973ce2cf785970e32562d9ee8f1.
Yes.
Quoted 8 lines
Review static void rpi_vc_fdt(void) · line 382
Quoted 3 lines
(quoted diff) +0
-0@@ -379,17 +381,17 @@ static void rpi_vc_fdt(void) if (oftree->totalsize) pr_err("there was an error copying fdt in pbl:%d\n",
Review static void rpi_vc_fdt(void) · line 382
Quoted 2 lines
(quoted diff) +0
-1be32_to_cpu(oftree->totalsize)); - return;This return previously avoided a call of
rpi_vc_fdt_parse().
[snip]
Quoted 6 lines
Review
Quoted 4 lines
rpi_env_init();(quoted diff) +2
-1- rpi_vc_fdt(); + root = rpi_vc_fdt(); + rpi_vc_fdt_parse(IS_ERR(root) ? priv->dev->device_node : root);Now
rpi_vc_fdt_parse()is called in both cases.
So, it should be:
Quoted 7 lines
if (!IS_ERR(root)) rpi_vc_fdt_parse(root);Quoted 2 lines
rpi_set_kernel_name();...
Or do I miss something?
Now that I think of it, I think the commit should just be reverted. I don't see the utility of using barebox-dt-2nd.img on the Raspberry Pi:
- If the board is already supported, use barebox-raspberry-pi.img, which has the DT built-in.
- If the board is not supported , use barebox-raspberry-pi.img, which will take the outside DT and save it where the board code expects it.
What do you think?
Thanks,
Ahmad
Quoted 159 lines
Regards, Denis
-----Original Message-----
From: Ahmad Fatoum <[email protected]>
Sent: Monday, February 19, 2024 10:43 PM
To: Roland Hieber <[email protected]>; Denis Osterland-Heim <[email protected]>
Cc: [email protected]; Denis OSTERLAND-HEIM <[email protected]>; Alexander Dahl <[email protected]>
Subject: [EXT] Re: [PATCH v2 2/2] raspi: fixup additional vc created nodes[EXTERNAL EMAIL]
Hello Roland,
Quoted 107 lines · Roland Hieber
Hi,
Quoted 67 lines · Denis Osterland-Heim
From: Denis OSTERLAND-HEIM <[email protected]>
The video core creates some additional nodes.
This code takes over this values.
The /hat node is only there if an raspi hat with EEPROM is detected.Signed-off-by Denis OSTERLAND-HEIM <[email protected]>Acked-by Ahmad Fatoum <[email protected]>---
arch/arm/boards/raspberry-pi/rpi-common.c | 39
+++++++++++++++++------1 file changed, 30 insertions(+), 9 deletions(-)arch/arm/boards/raspberry-pi/rpi-common.c +0
-0@@ -264,19 +264,37 @@ static enum reset_src_type rpi_decode_pm_rsts(struct device_node *chosen,
static intrpi_vc_fdt_fixup(struct device_node *root, void *data){
- const structdevice_node*vc_chosen= data;
- structdevice_node*chosen;
+ const structdevice_node*vc_node= data;
+ structdevice_node*node;
+ struct property *pp;
- chosen =of_create_node(root, "/chosen");
- if (!chosen)
+ node =of_create_node(root, vc_node->full_name); + if (!node)
return-ENOMEM;
- of_copy_property(vc_chosen, "overlay_prefix", chosen); - of_copy_property(vc_chosen, "os_prefix", chosen); + for_each_property_of_node(vc_node, pp)
+ of_copy_property(vc_node,pp->name, node);
return 0;
}arch/arm/boards/raspberry-pi/rpi-common.c +17
-0+static struct device_node *register_vc_fixup (struct device_node +*root, + const char *path) { + struct device_node *ret, *tmp; + + ret = of_find_node_by_path_from(root, path); + if (ret) { + tmp = of_dup(ret); + tmp->full_name = xstrdup(ret->full_name); + of_register_fixup(rpi_vc_fdt_fixup, tmp); + } else { + pr_info("no '%s' node found in vc fdtn", path); + } + + return ret; +} +static u32
rpi_boot_mode,rpi_boot_part;
/* Extract useful information from the VideoCore FDT we got.
* Some parameters are defined here:arch/arm/boards/raspberry-pi/rpi-common.c +0
-0@@ -300,14 +318,17 @@ static void rpi_vc_fdt_parse(struct device_node *root) free(str); }Quoted 8 lines
- chosen =of_find_node_by_path_from(root, "/chosen"); + register_vc_fixup(root, "/system");
+ register_vc_fixup(root, "/axi");
+ register_vc_fixup(root, "/reserved-memory"); + register_vc_fixup(root, "/hat");
+ register_vc_fixup(root, "/chosen/bootloader"); + chosen =register_vc_fixup(root, "/chosen");This throws a lot of new warnings and errors on our RPi 3B:
barebox 2024.01.0 #1 2024-02-01T00:00:00+00:00 Buildsystem version: DistroKit-2019.12.0-552-g775624b9f5d6
Board: Raspberry Pi 3 Model B
deep-probe: supported due to raspberrypi,3-model-b
netconsole: registered as netconsole-1
bcm2835-sdhost [email protected]: registered as mci0bcm2835_mci[email protected]: registered as mci1
mci0: detected SD card version 2.0
mci0: registered disk0
state: New state registered 'state'
state: Using bucket 0@0x00000000
malloc space:0x1d87f620->0x3b0fec3f(size 472.5 MiB)
WARNING: no property 'serial-number' found in vc fdt's '' node no '/system' node found in vc fdt
no '/axi' node found in vc fdt
no '/hat' node found in vc fdt
no '/chosen/bootloader' node found in vc fdt
WARNING: no property 'bootargs' found in vc fdt's '/chosen' node
WARNING: no property 'overlay_prefix' found in vc fdt's '/chosen' node
WARNING: no property 'os_prefix' found in vc fdt's '/chosen' node
WARNING: 'pm_rsts' value not found in vc fdt
ERROR: Won't delete root device node
environment load/boot/barebox.env: No such file or directory Maybe you have to create the partition.Quoted 5 lines
Do you have any idea what is going on here?
I also don't see /vc.dtb, which should have been created. I have 'vc.kernel: kernel7.img' in the 'global' output, but nothing else starting with vc.*.
I think that a non-existent /vc.dtb is expected if there's no DTs in the boot partition as is the case with DistroKit (except for rpi4) or if using barebox-dt-2nd.img.
I think the info/warning messages should just be dropped.
Cheers,
AhmadQuoted 18 lines
- Roland
Quoted 14 lines
if (!chosen) {
pr_err("no '/chosen' node found in vc fdtn"); goto out;
}
- of_register_fixup(rpi_vc_fdt_fixup,of_dup(chosen)); -
bootloader =of_find_node_by_name(chosen, "bootloader");
str =of_read_vc_string(chosen, "bootargs"); --
2.39.2
Signature · 4 lines
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 |