Skip to contentSkip to conversation

cmd: pxe_utils: Check fdtcontroladdr in label_boot

PATCH In review Peter Hoyes 6 participants 13 messages Oct 14, 2021 – May 23, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cmd: pxe_utils: Check fdtcontroladdr in label_boot

From: Peter Hoyes <[email protected]>

If using OF_CONTROL, fdtcontroladdr is set to the fdt used to configure U-Boot. When using PXE, if no fdt is defined in the menu file, and there is no fdt at fdt_addr, add fall back on fdtcontroladdr too.

We are developing board support for the Armv8r64 FVP using config_distro_bootcmd. We are also using OF_BOARD and would like the PXE boot option to default to the fdt provided by board_fdt_blob_setup.

---
 cmd/pxe_utils.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
cmd/pxe_utils.c +7 -1
index 067c24e5ff..8f8e69ca97 100644
@@ -556,7 +556,10 @@ static int label_boot(struct cmd_tbl *cmdtp, struct pxe_label *label)
 	 * Scenario 2: If there is an fdt_addr specified, pass it along to
 	 * bootm, and adjust argc appropriately.
 	 *
-	 * Scenario 3: fdt blob is not available.
+	 * Scenario 3: If there is an fdtcontroladdr specified, pass it along to
+	 * bootm, and adjust argc appropriately.
+	 *
+	 * Scenario 4: fdt blob is not available.
 	 */
 	bootm_argv[3] = env_get("fdt_addr_r");
 
@@ -646,6 +649,9 @@ static int label_boot(struct cmd_tbl *cmdtp, struct pxe_label *label)
 	if (!bootm_argv[3])
 		bootm_argv[3] = env_get("fdt_addr");
 
+	if (!bootm_argv[3])
+		bootm_argv[3] = env_get("fdtcontroladdr");
+
 	if (bootm_argv[3]) {
 		if (!bootm_argv[2])
 			bootm_argv[2] = "-";
Signature · 1 line
2.25.1
#1 lore raw

Hi Peter,

Quoted 43 lines · Peter Hoyes

From: Peter Hoyes <[email protected]>

If using OF_CONTROL, fdtcontroladdr is set to the fdt used to configure U-Boot. When using PXE, if no fdt is defined in the menu file, and there is no fdt at fdt_addr, add fall back on fdtcontroladdr too.

We are developing board support for the Armv8r64 FVP using config_distro_bootcmd. We are also using OF_BOARD and would like the PXE boot option to default to the fdt provided by board_fdt_blob_setup.

---
 cmd/pxe_utils.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
cmd/pxe_utils.c +7 -2
index 067c24e5ff..8f8e69ca97 100644
@@ -556,7 +556,10 @@ static int label_boot(struct cmd_tbl *cmdtp, struct pxe_label *label)
         * Scenario 2: If there is an fdt_addr specified, pass it along to
         * bootm, and adjust argc appropriately.
         *
-        * Scenario 3: fdt blob is not available.
+        * Scenario 3: If there is an fdtcontroladdr specified, pass it along to
+        * bootm, and adjust argc appropriately.
+        *
+        * Scenario 4: fdt blob is not available.
         */
        bootm_argv[3] = env_get("fdt_addr_r");
 
@@ -646,6 +649,9 @@ static int label_boot(struct cmd_tbl *cmdtp, struct pxe_label *label)
        if (!bootm_argv[3])
                bootm_argv[3] = env_get("fdt_addr");
 
+       if (!bootm_argv[3])
+               bootm_argv[3] = env_get("fdtcontroladdr");
+
        if (bootm_argv[3]) {
                if (!bootm_argv[2])
                        bootm_argv[2] = "-";
--
Quoted 2 lines

2.25.1

This is a bit strange as fdtcontroladdr is the control dtb that U-Boot uses. Can you not set fdt_addr to that, if you need to? Is it not already set to that?

Also, there is a clean-up series for this code outstanding. I will send v3 and copy you, if you are able to review it.

Regards,
Simon

#2 lore raw

On Thu, 14 Oct 2021 12:24:45 -0600
Simon Glass <[email protected]> wrote:

Hi Simon,

Quoted 37 lines · Peter Hoyes
Quoted 36 lines

From: Peter Hoyes <[email protected]>

If using OF_CONTROL, fdtcontroladdr is set to the fdt used to configure U-Boot. When using PXE, if no fdt is defined in the menu file, and there is no fdt at fdt_addr, add fall back on fdtcontroladdr too.

We are developing board support for the Armv8r64 FVP using config_distro_bootcmd. We are also using OF_BOARD and would like the PXE boot option to default to the fdt provided by board_fdt_blob_setup.

---
 cmd/pxe_utils.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
cmd/pxe_utils.c +4 -1
index 067c24e5ff..8f8e69ca97 100644
@@ -556,7 +556,10 @@ static int label_boot(struct cmd_tbl *cmdtp, struct pxe_label *label)
         * Scenario 2: If there is an fdt_addr specified, pass it along to
         * bootm, and adjust argc appropriately.
         *
-        * Scenario 3: fdt blob is not available.
+        * Scenario 3: If there is an fdtcontroladdr specified, pass it along to
+        * bootm, and adjust argc appropriately.
+        *
+        * Scenario 4: fdt blob is not available.
         */
        bootm_argv[3] = env_get("fdt_addr_r");
 
@@ -646,6 +649,9 @@ static int label_boot(struct cmd_tbl *cmdtp, struct pxe_label *label)
        if (!bootm_argv[3])
                bootm_argv[3] = env_get("fdt_addr");
 
Quoted 12 lines
Quoted 9 lines
cmd/pxe_utils.c +3 -1
+       if (!bootm_argv[3])
+               bootm_argv[3] = env_get("fdtcontroladdr");
+
        if (bootm_argv[3]) {
                if (!bootm_argv[2])
                        bootm_argv[2] = "-";
--

2.25.1

This is a bit strange as fdtcontroladdr is the control dtb that U-Boot uses.

Yes, that is the idea. This DTB should be as good as any, and this is the last check before giving up on DTs completely, so "U-Boot's DTB" (actually there is no such thing) is better than none at all. In fact EFI boot does the very same thing:
https://source.denx.de/u-boot/u-boot/-/blob/master/include/config_distro_bootcmd.h#L144-L148

Quoted 2 lines

Can you not set fdt_addr to that, if you need to? Is it not already set to that?

According to doc/README.distro, fdt_addr is reserved for DTBs residing at a (fixed?) ROM address. We don't really know yet where the DT comes from, the cleanest seems to be to be passed down from TF-A, in which case this would definitely not be ROM. board_fdt_blob_setup() knows this address, and this is what will be written to $fdtcontroladdr.

FWIW, this patch looks good to me.

Cheers,
Andre

Quoted 5 lines

Also, there is a clean-up series for this code outstanding. I will send v3 and copy you, if you are able to review it.

Regards,
Simon

Reviewed-by
#3 lore raw

Hi,

Quoted 65 lines · Andre Przywara

On Thu, 14 Oct 2021 12:24:45 -0600
Simon Glass <[email protected]> wrote:

Hi Simon,

Quoted 37 lines · Peter Hoyes
Quoted 36 lines

From: Peter Hoyes <[email protected]>

If using OF_CONTROL, fdtcontroladdr is set to the fdt used to configure U-Boot. When using PXE, if no fdt is defined in the menu file, and there is no fdt at fdt_addr, add fall back on fdtcontroladdr too.

We are developing board support for the Armv8r64 FVP using config_distro_bootcmd. We are also using OF_BOARD and would like the PXE boot option to default to the fdt provided by board_fdt_blob_setup.

---
 cmd/pxe_utils.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
cmd/pxe_utils.c +4 -1
index 067c24e5ff..8f8e69ca97 100644
@@ -556,7 +556,10 @@ static int label_boot(struct cmd_tbl *cmdtp, struct pxe_label *label)
         * Scenario 2: If there is an fdt_addr specified, pass it along to
         * bootm, and adjust argc appropriately.
         *
-        * Scenario 3: fdt blob is not available.
+        * Scenario 3: If there is an fdtcontroladdr specified, pass it along to
+        * bootm, and adjust argc appropriately.
+        *
+        * Scenario 4: fdt blob is not available.
         */
        bootm_argv[3] = env_get("fdt_addr_r");
 
@@ -646,6 +649,9 @@ static int label_boot(struct cmd_tbl *cmdtp, struct pxe_label *label)
        if (!bootm_argv[3])
                bootm_argv[3] = env_get("fdt_addr");
 
Quoted 12 lines
Quoted 9 lines
cmd/pxe_utils.c +3 -1
+       if (!bootm_argv[3])
+               bootm_argv[3] = env_get("fdtcontroladdr");
+
        if (bootm_argv[3]) {
                if (!bootm_argv[2])
                        bootm_argv[2] = "-";
--

2.25.1

This is a bit strange as fdtcontroladdr is the control dtb that U-Boot uses.

Yes, that is the idea. This DTB should be as good as any, and this is the last check before giving up on DTs completely, so "U-Boot's DTB" (actually there is no such thing) is better than none at all. In fact EFI boot does the very same thing:
https://source.denx.de/u-boot/u-boot/-/blob/master/include/config_distro_bootcmd.h#L144-L148

Quoted 2 lines

Can you not set fdt_addr to that, if you need to? Is it not already set to that?

Quoted 7 lines

According to doc/README.distro, fdt_addr is reserved for DTBs residing at a (fixed?) ROM address. We don't really know yet where the DT comes from, the cleanest seems to be to be passed down from TF-A, in which case this would definitely not be ROM. board_fdt_blob_setup() knows this address, and this is what will be written to $fdtcontroladdr.

FWIW, this patch looks good to me.

OK.

But note that OF_BOARD is going to become an option, not something that let's us leave out the DT. Board vendors must provide a DT in U-Boot. So long as that is understood:

Regards,
Simom

#4 lore raw
Quoted 79 lines · Simon Glass

Hi,

Quoted 65 lines · Andre Przywara

On Thu, 14 Oct 2021 12:24:45 -0600
Simon Glass <[email protected]> wrote:

Hi Simon,

Quoted 37 lines · Peter Hoyes
Quoted 36 lines

From: Peter Hoyes <[email protected]>

If using OF_CONTROL, fdtcontroladdr is set to the fdt used to configure U-Boot. When using PXE, if no fdt is defined in the menu file, and there is no fdt at fdt_addr, add fall back on fdtcontroladdr too.

We are developing board support for the Armv8r64 FVP using config_distro_bootcmd. We are also using OF_BOARD and would like the PXE boot option to default to the fdt provided by board_fdt_blob_setup.

---
 cmd/pxe_utils.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
cmd/pxe_utils.c +4 -1
index 067c24e5ff..8f8e69ca97 100644
@@ -556,7 +556,10 @@ static int label_boot(struct cmd_tbl *cmdtp, struct pxe_label *label)
         * Scenario 2: If there is an fdt_addr specified, pass it along to
         * bootm, and adjust argc appropriately.
         *
-        * Scenario 3: fdt blob is not available.
+        * Scenario 3: If there is an fdtcontroladdr specified, pass it along to
+        * bootm, and adjust argc appropriately.
+        *
+        * Scenario 4: fdt blob is not available.
         */
        bootm_argv[3] = env_get("fdt_addr_r");
 
@@ -646,6 +649,9 @@ static int label_boot(struct cmd_tbl *cmdtp, struct pxe_label *label)
        if (!bootm_argv[3])
                bootm_argv[3] = env_get("fdt_addr");
 
Quoted 12 lines
Quoted 9 lines
cmd/pxe_utils.c +3 -1
+       if (!bootm_argv[3])
+               bootm_argv[3] = env_get("fdtcontroladdr");
+
        if (bootm_argv[3]) {
                if (!bootm_argv[2])
                        bootm_argv[2] = "-";
--

2.25.1

This is a bit strange as fdtcontroladdr is the control dtb that U-Boot uses.

Yes, that is the idea. This DTB should be as good as any, and this is the last check before giving up on DTs completely, so "U-Boot's DTB" (actually there is no such thing) is better than none at all. In fact EFI boot does the very same thing:
https://source.denx.de/u-boot/u-boot/-/blob/master/include/config_distro_bootcmd.h#L144-L148

Quoted 2 lines

Can you not set fdt_addr to that, if you need to? Is it not already set to that?

Quoted 7 lines

According to doc/README.distro, fdt_addr is reserved for DTBs residing at a (fixed?) ROM address. We don't really know yet where the DT comes from, the cleanest seems to be to be passed down from TF-A, in which case this would definitely not be ROM. board_fdt_blob_setup() knows this address, and this is what will be written to $fdtcontroladdr.

FWIW, this patch looks good to me.

OK.

Quoted 8 lines

But note that OF_BOARD is going to become an option, not something that let's us leave out the DT. Board vendors must provide a DT in U-Boot. So long as that is understood:

Regards,
Simom

applied to u-boot-net/next
Thanks,
Ramon.

#5 lore raw
Quoted 77 lines · Ramon Fried
Quoted 76 lines · Simon Glass

Hi,

Quoted 60 lines · Andre Przywara

On Thu, 14 Oct 2021 12:24:45 -0600
Simon Glass <[email protected]> wrote:

Hi Simon,

Quoted 36 lines · Peter Hoyes
Quoted 35 lines

From: Peter Hoyes <[email protected]>

If using OF_CONTROL, fdtcontroladdr is set to the fdt used to configure U-Boot. When using PXE, if no fdt is defined in the menu file, and there is no fdt at fdt_addr, add fall back on fdtcontroladdr too.

We are developing board support for the Armv8r64 FVP using config_distro_bootcmd. We are also using OF_BOARD and would like the PXE boot option to default to the fdt provided by board_fdt_blob_setup.

---
  cmd/pxe_utils.c | 8 +++++++-
  1 file changed, 7 insertions(+), 1 deletion(-)
cmd/pxe_utils.c +4 -1
index 067c24e5ff..8f8e69ca97 100644
@@ -556,7 +556,10 @@ static int label_boot(struct cmd_tbl *cmdtp, struct pxe_label *label)
          * Scenario 2: If there is an fdt_addr specified, pass it along to
          * bootm, and adjust argc appropriately.
          *
-        * Scenario 3: fdt blob is not available.
+        * Scenario 3: If there is an fdtcontroladdr specified, pass it along to
+        * bootm, and adjust argc appropriately.
+        *
+        * Scenario 4: fdt blob is not available.
          */
         bootm_argv[3] = env_get("fdt_addr_r");
 
@@ -646,6 +649,9 @@ static int label_boot(struct cmd_tbl *cmdtp, struct pxe_label *label)
         if (!bootm_argv[3])
                 bootm_argv[3] = env_get("fdt_addr");
 
Quoted 11 lines
Quoted 9 lines
cmd/pxe_utils.c +3 -1
+       if (!bootm_argv[3])
+               bootm_argv[3] = env_get("fdtcontroladdr");
+
         if (bootm_argv[3]) {
                 if (!bootm_argv[2])
                         bootm_argv[2] = "-";
--

2.25.1

This is a bit strange as fdtcontroladdr is the control dtb that U-Boot uses.

Yes, that is the idea. This DTB should be as good as any, and this is the last check before giving up on DTs completely, so "U-Boot's DTB" (actually there is no such thing) is better than none at all. In fact EFI boot does the very same thing:
https://source.denx.de/u-boot/u-boot/-/blob/master/include/config_distro_bootcmd.h#L144-L148

Quoted 2 lines

Can you not set fdt_addr to that, if you need to? Is it not already set to that?

Quoted 7 lines

According to doc/README.distro, fdt_addr is reserved for DTBs residing at a (fixed?) ROM address. We don't really know yet where the DT comes from, the cleanest seems to be to be passed down from TF-A, in which case this would definitely not be ROM. board_fdt_blob_setup() knows this address, and this is what will be written to $fdtcontroladdr.

FWIW, this patch looks good to me.

OK.

But note that OF_BOARD is going to become an option, not something that let's us leave out the DT. Board vendors must provide a DT in U-Boot. So long as that is understood:

Quoted 7 lines
Quoted 4 lines

Regards,
Simom

applied to u-boot-net/next
Thanks,
Ramon.

Hi,

Thanks for accepting this patch. I wondered if you could give an indication when it will reach u-boot/master?

Cheers,

Peter

IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.

#6 lore raw
Quoted 89 lines · Peter Hoyes
Quoted 77 lines · Ramon Fried
Quoted 76 lines · Simon Glass

Hi,

Quoted 60 lines · Andre Przywara

On Thu, 14 Oct 2021 12:24:45 -0600
Simon Glass <[email protected]> wrote:

Hi Simon,

Quoted 36 lines · Peter Hoyes
Quoted 35 lines

From: Peter Hoyes <[email protected]>

If using OF_CONTROL, fdtcontroladdr is set to the fdt used to configure U-Boot. When using PXE, if no fdt is defined in the menu file, and there is no fdt at fdt_addr, add fall back on fdtcontroladdr too.

We are developing board support for the Armv8r64 FVP using config_distro_bootcmd. We are also using OF_BOARD and would like the PXE boot option to default to the fdt provided by board_fdt_blob_setup.

---
  cmd/pxe_utils.c | 8 +++++++-
  1 file changed, 7 insertions(+), 1 deletion(-)
cmd/pxe_utils.c +4 -1
index 067c24e5ff..8f8e69ca97 100644
@@ -556,7 +556,10 @@ static int label_boot(struct cmd_tbl *cmdtp, struct pxe_label *label)
          * Scenario 2: If there is an fdt_addr specified, pass it along to
          * bootm, and adjust argc appropriately.
          *
-        * Scenario 3: fdt blob is not available.
+        * Scenario 3: If there is an fdtcontroladdr specified, pass it along to
+        * bootm, and adjust argc appropriately.
+        *
+        * Scenario 4: fdt blob is not available.
          */
         bootm_argv[3] = env_get("fdt_addr_r");
 
@@ -646,6 +649,9 @@ static int label_boot(struct cmd_tbl *cmdtp, struct pxe_label *label)
         if (!bootm_argv[3])
                 bootm_argv[3] = env_get("fdt_addr");
 
Quoted 11 lines
Quoted 9 lines
cmd/pxe_utils.c +3 -1
+       if (!bootm_argv[3])
+               bootm_argv[3] = env_get("fdtcontroladdr");
+
         if (bootm_argv[3]) {
                 if (!bootm_argv[2])
                         bootm_argv[2] = "-";
--

2.25.1

This is a bit strange as fdtcontroladdr is the control dtb that U-Boot uses.

Yes, that is the idea. This DTB should be as good as any, and this is the last check before giving up on DTs completely, so "U-Boot's DTB" (actually there is no such thing) is better than none at all. In fact EFI boot does the very same thing:
https://source.denx.de/u-boot/u-boot/-/blob/master/include/config_distro_bootcmd.h#L144-L148

Quoted 2 lines

Can you not set fdt_addr to that, if you need to? Is it not already set to that?

Quoted 7 lines

According to doc/README.distro, fdt_addr is reserved for DTBs residing at a (fixed?) ROM address. We don't really know yet where the DT comes from, the cleanest seems to be to be passed down from TF-A, in which case this would definitely not be ROM. board_fdt_blob_setup() knows this address, and this is what will be written to $fdtcontroladdr.

FWIW, this patch looks good to me.

OK.

But note that OF_BOARD is going to become an option, not something that let's us leave out the DT. Board vendors must provide a DT in U-Boot. So long as that is understood:

Quoted 7 lines
Quoted 4 lines

Regards,
Simom

applied to u-boot-net/next
Thanks,
Ramon.

Hi,

Quoted 8 lines

Thanks for accepting this patch. I wondered if you could give an indication when it will reach u-boot/master?

Cheers,

Peter

IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.

Follow the pull request I sent to Tom.

#7 lore raw
In reply to Peter Hoyes

Hi,

Quoted 32 lines · Peter Hoyes

From: Peter Hoyes <[email protected]>

If using OF_CONTROL, fdtcontroladdr is set to the fdt used to configure U-Boot. When using PXE, if no fdt is defined in the menu file, and there is no fdt at fdt_addr, add fall back on fdtcontroladdr too.

We are developing board support for the Armv8r64 FVP using config_distro_bootcmd. We are also using OF_BOARD and would like the PXE boot option to default to the fdt provided by board_fdt_blob_setup.

---
  cmd/pxe_utils.c | 8 +++++++-
  1 file changed, 7 insertions(+), 1 deletion(-)
cmd/pxe_utils.c +4 -1
index 067c24e5ff..8f8e69ca97 100644
@@ -556,7 +556,10 @@ static int label_boot(struct cmd_tbl *cmdtp, struct pxe_label *label)
  	 * Scenario 2: If there is an fdt_addr specified, pass it along to
  	 * bootm, and adjust argc appropriately.
  	 *
-	 * Scenario 3: fdt blob is not available.
+	 * Scenario 3: If there is an fdtcontroladdr specified, pass it along to
+	 * bootm, and adjust argc appropriately.
+	 *
+	 * Scenario 4: fdt blob is not available.
  	 */
  	bootm_argv[3] = env_get("fdt_addr_r");
 

cmd/pxe_utils.c static int label_boot(struct cmd_tbl *cmdtp, struct pxe_label *label) · line 657

Quoted 9 lines
cmd/pxe_utils.c +3 -0
@@ -646,6 +649,9 @@ static int label_boot(struct cmd_tbl *cmdtp, struct pxe_label *label)
  	if (!bootm_argv[3])
  		bootm_argv[3] = env_get("fdt_addr");
 
+	if (!bootm_argv[3])
+		bootm_argv[3] = env_get("fdtcontroladdr");
+
  	if (bootm_argv[3]) {
  		if (!bootm_argv[2])
  			bootm_argv[2] = "-";

This change makes a regression when using a FIT image as kernel image within an extlinux.conf

Before this change, when a DT wasn't specified, the DT in the FIT image was selected, not the u-boot DT is selected.

While it should work because the U-Boot DT should work in Linux, it's not always the case.

Before:
Found /extlinux/extlinux.conf
Retrieving file: /extlinux/extlinux.conf
1: Yocto
Retrieving file: /fitImage
append: root=PARTUUID=fd26d57f-02 rootwait console=ttyAML0,115200 ## Loading kernel from FIT Image at 08080000 ...
Using 'conf-amlogic_meson-gxl-s905x-libretech-cc.dtb' configuration Trying 'kernel-1' kernel subimage

     Description:  Linux kernel
     Type:         Kernel Image
     Compression:  gzip compressed
     Data Start:   0x08080120
     Data Size:    9926956 Bytes = 9.5 MiB
     Architecture: AArch64
     OS:           Linux
     Load Address: 0x01080000
     Entry Point:  0x01080000
     Hash algo:    sha256
     Hash value:   5181a76e4e7a728e24cd8569f8e48c543ac259bf4d66591a3dc5e166d709429e

Verifying Hash Integrity ... sha256+ OK
## Loading fdt from FIT Image at 08080000 ...
Using 'conf-amlogic_meson-gxl-s905x-libretech-cc.dtb' configuration Trying 'fdt-amlogic_meson-gxl-s905x-libretech-cc.dtb' fdt subimage

     Description:  Flattened Device Tree blob
     Type:         Flat Device Tree
     Compression:  uncompressed
     Data Start:   0x089f7b78
     Data Size:    29092 Bytes = 28.4 KiB

Architecture: AArch64
Hash algo: sha256
Hash value: 72e5e4fcbb4aa59042377720e5636132ba790d85b6c3f6442446acc63f48cf67
Verifying Hash Integrity ... sha256+ OK
Booting using the fdt blob at 0x89f7b78
Uncompressing Kernel Image
Loading Device Tree to 000000007bf2f000, end 000000007bf391a3 ... OK

After:
Found /extlinux/extlinux.conf
Retrieving file: /extlinux/extlinux.conf
1: Yocto
Retrieving file: /fitImage
append: root=PARTUUID=fd26d57f-02 rootwait console=ttyAML0,115200 ## Loading kernel from FIT Image at 08080000 ...
Using 'conf-amlogic_meson-gxl-s905x-libretech-cc.dtb' configuration Trying 'kernel-1' kernel subimage

     Description:  Linux kernel
     Type:         Kernel Image
     Compression:  gzip compressed
     Data Start:   0x08080120
     Data Size:    9926956 Bytes = 9.5 MiB
     Architecture: AArch64
     OS:           Linux
     Load Address: 0x01080000
     Entry Point:  0x01080000
     Hash algo:    sha256
     Hash value:   5181a76e4e7a728e24cd8569f8e48c543ac259bf4d66591a3dc5e166d709429e

Verifying Hash Integrity ... sha256+ OK
## Flattened Device Tree blob at 7bf40210
Booting using the fdt blob at 0x7bf40210
Uncompressing Kernel Image
Loading Device Tree to 000000007bf2c000, end 000000007bf38ba7 ... OK

Note this is the "best in town" boot method in Yocto/OE when using WIC, FIT Image and generating extlinux.conf from the WIC "bootimg-partition" plugin.

So this change will regress all platforms using this scheme.

In case we only want the FIT image and not DTB, the fdtdir is ommited at:
https://github.com/openembedded/openembedded-core/blob/9015dec93233c7d45fd0c9885ff5d4ec23ad377d/scripts/lib/wic/plugins/source/bootimg-partition.py#L150

Neil

#8 lore raw
Quoted 115 lines · Neil Armstrong

Hi,

Quoted 31 lines · Peter Hoyes

From: Peter Hoyes <[email protected]>

If using OF_CONTROL, fdtcontroladdr is set to the fdt used to configure U-Boot. When using PXE, if no fdt is defined in the menu file, and there is no fdt at fdt_addr, add fall back on fdtcontroladdr too.

We are developing board support for the Armv8r64 FVP using config_distro_bootcmd. We are also using OF_BOARD and would like the PXE boot option to default to the fdt provided by board_fdt_blob_setup.

---
  cmd/pxe_utils.c | 8 +++++++-
  1 file changed, 7 insertions(+), 1 deletion(-)
cmd/pxe_utils.c +4 -1
index 067c24e5ff..8f8e69ca97 100644
@@ -556,7 +556,10 @@ static int label_boot(struct cmd_tbl *cmdtp, struct pxe_label *label)
  	 * Scenario 2: If there is an fdt_addr specified, pass it along to
  	 * bootm, and adjust argc appropriately.
  	 *
-	 * Scenario 3: fdt blob is not available.
+	 * Scenario 3: If there is an fdtcontroladdr specified, pass it along to
+	 * bootm, and adjust argc appropriately.
+	 *
+	 * Scenario 4: fdt blob is not available.
  	 */
  	bootm_argv[3] = env_get("fdt_addr_r");

cmd/pxe_utils.c static int label_boot(struct cmd_tbl *cmdtp, struct pxe_label *label) · line 656

Quoted 8 lines
cmd/pxe_utils.c +3 -0
@@ -646,6 +649,9 @@ static int label_boot(struct cmd_tbl *cmdtp, struct pxe_label *label)
  	if (!bootm_argv[3])
  		bootm_argv[3] = env_get("fdt_addr");
+	if (!bootm_argv[3])
+		bootm_argv[3] = env_get("fdtcontroladdr");
+
  	if (bootm_argv[3]) {
  		if (!bootm_argv[2])
  			bootm_argv[2] = "-";

This change makes a regression when using a FIT image as kernel image within an extlinux.conf

Before this change, when a DT wasn't specified, the DT in the FIT image was selected, not the u-boot DT is selected.

While it should work because the U-Boot DT should work in Linux, it's not always the case.

Before:
Found /extlinux/extlinux.conf
Retrieving file: /extlinux/extlinux.conf
1: Yocto
Retrieving file: /fitImage
append: root=PARTUUID=fd26d57f-02 rootwait console=ttyAML0,115200 ## Loading kernel from FIT Image at 08080000 ...
Using 'conf-amlogic_meson-gxl-s905x-libretech-cc.dtb' configuration Trying 'kernel-1' kernel subimage

     Description:  Linux kernel
     Type:         Kernel Image
     Compression:  gzip compressed
     Data Start:   0x08080120
     Data Size:    9926956 Bytes = 9.5 MiB
     Architecture: AArch64
     OS:           Linux
     Load Address: 0x01080000
     Entry Point:  0x01080000
     Hash algo:    sha256
     Hash value:   5181a76e4e7a728e24cd8569f8e48c543ac259bf4d66591a3dc5e166d709429e

Verifying Hash Integrity ... sha256+ OK
## Loading fdt from FIT Image at 08080000 ...
Using 'conf-amlogic_meson-gxl-s905x-libretech-cc.dtb' configuration Trying 'fdt-amlogic_meson-gxl-s905x-libretech-cc.dtb' fdt subimage

     Description:  Flattened Device Tree blob
     Type:         Flat Device Tree
     Compression:  uncompressed
     Data Start:   0x089f7b78
     Data Size:    29092 Bytes = 28.4 KiB

Architecture: AArch64
Hash algo: sha256
Hash value: 72e5e4fcbb4aa59042377720e5636132ba790d85b6c3f6442446acc63f48cf67
Verifying Hash Integrity ... sha256+ OK
Booting using the fdt blob at 0x89f7b78
Uncompressing Kernel Image
Loading Device Tree to 000000007bf2f000, end 000000007bf391a3 ... OK

After:
Found /extlinux/extlinux.conf
Retrieving file: /extlinux/extlinux.conf
1: Yocto
Retrieving file: /fitImage
append: root=PARTUUID=fd26d57f-02 rootwait console=ttyAML0,115200 ## Loading kernel from FIT Image at 08080000 ...
Using 'conf-amlogic_meson-gxl-s905x-libretech-cc.dtb' configuration Trying 'kernel-1' kernel subimage

     Description:  Linux kernel
     Type:         Kernel Image
     Compression:  gzip compressed
     Data Start:   0x08080120
     Data Size:    9926956 Bytes = 9.5 MiB
     Architecture: AArch64
     OS:           Linux
     Load Address: 0x01080000
     Entry Point:  0x01080000
     Hash algo:    sha256
     Hash value:   5181a76e4e7a728e24cd8569f8e48c543ac259bf4d66591a3dc5e166d709429e

Verifying Hash Integrity ... sha256+ OK
## Flattened Device Tree blob at 7bf40210
Booting using the fdt blob at 0x7bf40210
Uncompressing Kernel Image
Loading Device Tree to 000000007bf2c000, end 000000007bf38ba7 ... OK

Quoted 7 lines

Note this is the "best in town" boot method in Yocto/OE when using WIC, FIT Image and generating extlinux.conf from the WIC "bootimg-partition" plugin.

So this change will regress all platforms using this scheme.

In case we only want the FIT image and not DTB, the fdtdir is ommited at:
https://github.com/openembedded/openembedded-core/blob/9015dec93233c7d45fd0c9885ff5d4ec23ad377d/scripts/lib/wic/plugins/source/bootimg-partition.py#L150

Well this is certainly tricky. Do we be "boring" and say that the built-in device tree should be used, or "boring" and say that the distro provided device tree should be used. I assume that in the OE case we're not always going to be booting U-Boot that was built, so updating the logic there to have the correct dtb isn't right either.

Signature · 1 line
Tom
#9 lore raw
Quoted 121 lines · Tom Rini
Quoted 120 lines · Neil Armstrong

Hi,

Quoted 31 lines · Peter Hoyes

From: Peter Hoyes <[email protected]>

If using OF_CONTROL, fdtcontroladdr is set to the fdt used to configure U-Boot. When using PXE, if no fdt is defined in the menu file, and there is no fdt at fdt_addr, add fall back on fdtcontroladdr too.

We are developing board support for the Armv8r64 FVP using config_distro_bootcmd. We are also using OF_BOARD and would like the PXE boot option to default to the fdt provided by board_fdt_blob_setup.

---
   cmd/pxe_utils.c | 8 +++++++-
   1 file changed, 7 insertions(+), 1 deletion(-)
cmd/pxe_utils.c +4 -1
index 067c24e5ff..8f8e69ca97 100644
@@ -556,7 +556,10 @@ static int label_boot(struct cmd_tbl *cmdtp, struct pxe_label *label)
   	 * Scenario 2: If there is an fdt_addr specified, pass it along to
   	 * bootm, and adjust argc appropriately.
   	 *
-	 * Scenario 3: fdt blob is not available.
+	 * Scenario 3: If there is an fdtcontroladdr specified, pass it along to
+	 * bootm, and adjust argc appropriately.
+	 *
+	 * Scenario 4: fdt blob is not available.
   	 */
   	bootm_argv[3] = env_get("fdt_addr_r");

cmd/pxe_utils.c static int label_boot(struct cmd_tbl *cmdtp, struct pxe_label *label) · line 656

Quoted 8 lines
cmd/pxe_utils.c +3 -0
@@ -646,6 +649,9 @@ static int label_boot(struct cmd_tbl *cmdtp, struct pxe_label *label)
   	if (!bootm_argv[3])
   		bootm_argv[3] = env_get("fdt_addr");
+	if (!bootm_argv[3])
+		bootm_argv[3] = env_get("fdtcontroladdr");
+
   	if (bootm_argv[3]) {
   		if (!bootm_argv[2])
   			bootm_argv[2] = "-";

This change makes a regression when using a FIT image as kernel image within an extlinux.conf

Before this change, when a DT wasn't specified, the DT in the FIT image was selected, not the u-boot DT is selected.

While it should work because the U-Boot DT should work in Linux, it's not always the case.

Before:
Found /extlinux/extlinux.conf
Retrieving file: /extlinux/extlinux.conf
1: Yocto
Retrieving file: /fitImage
append: root=PARTUUID=fd26d57f-02 rootwait console=ttyAML0,115200 ## Loading kernel from FIT Image at 08080000 ...
Using 'conf-amlogic_meson-gxl-s905x-libretech-cc.dtb' configuration Trying 'kernel-1' kernel subimage
Description: Linux kernel
Type: Kernel Image
Compression: gzip compressed
Data Start: 0x08080120
Data Size: 9926956 Bytes = 9.5 MiB
Architecture: AArch64
OS: Linux
Load Address: 0x01080000
Entry Point: 0x01080000
Hash algo: sha256
Hash value: 5181a76e4e7a728e24cd8569f8e48c543ac259bf4d66591a3dc5e166d709429e
Verifying Hash Integrity ... sha256+ OK
## Loading fdt from FIT Image at 08080000 ...
Using 'conf-amlogic_meson-gxl-s905x-libretech-cc.dtb' configuration Trying 'fdt-amlogic_meson-gxl-s905x-libretech-cc.dtb' fdt subimage
Description: Flattened Device Tree blob
Type: Flat Device Tree
Compression: uncompressed
Data Start: 0x089f7b78
Data Size: 29092 Bytes = 28.4 KiB
Architecture: AArch64
Hash algo: sha256
Hash value: 72e5e4fcbb4aa59042377720e5636132ba790d85b6c3f6442446acc63f48cf67
Verifying Hash Integrity ... sha256+ OK
Booting using the fdt blob at 0x89f7b78
Uncompressing Kernel Image
Loading Device Tree to 000000007bf2f000, end 000000007bf391a3 ... OK

After:
Found /extlinux/extlinux.conf
Retrieving file: /extlinux/extlinux.conf
1: Yocto
Retrieving file: /fitImage
append: root=PARTUUID=fd26d57f-02 rootwait console=ttyAML0,115200 ## Loading kernel from FIT Image at 08080000 ...
Using 'conf-amlogic_meson-gxl-s905x-libretech-cc.dtb' configuration Trying 'kernel-1' kernel subimage
Description: Linux kernel
Type: Kernel Image
Compression: gzip compressed
Data Start: 0x08080120
Data Size: 9926956 Bytes = 9.5 MiB
Architecture: AArch64
OS: Linux
Load Address: 0x01080000
Entry Point: 0x01080000
Hash algo: sha256
Hash value: 5181a76e4e7a728e24cd8569f8e48c543ac259bf4d66591a3dc5e166d709429e
Verifying Hash Integrity ... sha256+ OK
## Flattened Device Tree blob at 7bf40210

    Booting using the fdt blob at 0x7bf40210
    Uncompressing Kernel Image
    Loading Device Tree to 000000007bf2c000, end 000000007bf38ba7 ... OK

Note this is the "best in town" boot method in Yocto/OE when using WIC, FIT Image and generating extlinux.conf from the WIC "bootimg-partition" plugin.

So this change will regress all platforms using this scheme.

Quoted 9 lines
Quoted 2 lines

In case we only want the FIT image and not DTB, the fdtdir is ommited at:
https://github.com/openembedded/openembedded-core/blob/9015dec93233c7d45fd0c9885ff5d4ec23ad377d/scripts/lib/wic/plugins/source/bootimg-partition.py#L150

Well this is certainly tricky. Do we be "boring" and say that the built-in device tree should be used, or "boring" and say that the distro provided device tree should be used. I assume that in the OE case we're not always going to be booting U-Boot that was built, so updating the logic there to have the correct dtb isn't right either.

I'm not against this logic, it should definitely be aligned on EFI and permit using built-in DT, but the logic breaks fitImage loading via extlinux, because now we have no way to say "use the fitImage DT".

This change should have been elsewhere, like in the non-FIT bootm path when no DT was supplied and DT is mandatory for the platform.

Or by passing a keyword like fdt-built-in or ftdfile=builtin.

==><=======================================================

boot/pxe_utils.c +2 -2
index 0c24becae3..22040c2340 100644
@@ -682,7 +682,7 @@ static int label_boot(struct pxe_context *ctx, struct pxe_label *label)
                        fdtfile = fdtfilefree;
                }
 
-               if (fdtfile) {
+               if (strcmp(fdtfile, "builtin") && fdtfile) {
                        int err = get_relfile_envaddr(ctx, fdtfile,
                                                      "fdt_addr_r", NULL);
 
@@ -724,7 +724,7 @@ static int label_boot(struct pxe_context *ctx, struct pxe_label *label)
        if (!bootm_argv[3])
                bootm_argv[3] = env_get("fdt_addr");
 
-       if (!bootm_argv[3])
+       if (!strcmp(fdtfile, "builtin"))
                bootm_argv[3] = env_get("fdtcontroladdr");
 
        if (bootm_argv[3]) {

==><=======================================================

Or by checking the image format before using fdtcontroladdr like:

==><=======================================================

boot/pxe_utils.c +1 -1
index 0c24becae3..f4f6369de6 100644
@@ -724,7 +724,7 @@ static int label_boot(struct pxe_context *ctx, struct pxe_label *label)
        if (!bootm_argv[3])
                bootm_argv[3] = env_get("fdt_addr");
 
-       if (!bootm_argv[3])
+       if (genimg_get_format(buf) != IMAGE_FORMAT_FIT && !bootm_argv[3])
                bootm_argv[3] = env_get("fdtcontroladdr");
 
        if (bootm_argv[3]) {

==><=======================================================

Neil

#10 lore raw
Quoted 136 lines · Neil Armstrong
Quoted 128 lines · Tom Rini
Quoted 118 lines · Neil Armstrong

Hi,

Quoted 33 lines · Peter Hoyes

From: Peter Hoyes <[email protected]>

If using OF_CONTROL, fdtcontroladdr is set to the fdt used to configure U-Boot. When using PXE, if no fdt is defined in the menu file, and there is no fdt at fdt_addr, add fall back on fdtcontroladdr too.

We are developing board support for the Armv8r64 FVP using config_distro_bootcmd. We are also using OF_BOARD and would like the PXE boot option to default to the fdt provided by board_fdt_blob_setup.

---
   cmd/pxe_utils.c | 8 +++++++-

   1 file changed, 7 insertions(+), 1 deletion(-)
cmd/pxe_utils.c +1 -1
index 067c24e5ff..8f8e69ca97 100644
@@ -556,7 +556,10 @@ static int label_boot(struct cmd_tbl *cmdtp, 
 struct pxe_label *label)
         * Scenario 2: If there is an fdt_addr specified, pass it along to
         * bootm, and adjust argc appropriately.
         *
-     * Scenario 3: fdt blob is not available.
+     * Scenario 3: If there is an fdtcontroladdr specified, pass 

it along to
+     * bootm, and adjust argc appropriately.
+     *
+     * Scenario 4: fdt blob is not available.
        */
       bootm_argv[3] = env_get("fdt_addr_r");

cmd/pxe_utils.c static int label_boot(struct cmd_tbl *cmdtp, · line 657

Quoted 9 lines
cmd/pxe_utils.c +3 -0
@@ -646,6 +649,9 @@ static int label_boot(struct cmd_tbl *cmdtp, 
 struct pxe_label *label)
        if (!bootm_argv[3])
            bootm_argv[3] = env_get("fdt_addr");
+    if (!bootm_argv[3])
+        bootm_argv[3] = env_get("fdtcontroladdr");
+
        if (bootm_argv[3]) {
            if (!bootm_argv[2])
                bootm_argv[2] = "-";

This change makes a regression when using a FIT image as kernel image within an extlinux.conf

Before this change, when a DT wasn't specified, the DT in the FIT image was selected, not the u-boot DT is selected.

While it should work because the U-Boot DT should work in Linux, it's not always the case.

Before:
Found /extlinux/extlinux.conf
Retrieving file: /extlinux/extlinux.conf
1:    Yocto
Retrieving file: /fitImage
append: root=PARTUUID=fd26d57f-02 rootwait console=ttyAML0,115200
## Loading kernel from FIT Image at 08080000 ...
    Using 'conf-amlogic_meson-gxl-s905x-libretech-cc.dtb' configuration Trying 'kernel-1' kernel subimage
      Description:  Linux kernel
      Type:         Kernel Image
      Compression:  gzip compressed
      Data Start:   0x08080120
      Data Size:    9926956 Bytes = 9.5 MiB
      Architecture: AArch64
      OS:           Linux
      Load Address: 0x01080000
      Entry Point:  0x01080000
      Hash algo:    sha256
      Hash value: 5181a76e4e7a728e24cd8569f8e48c543ac259bf4d66591a3dc5e166d709429e Verifying Hash Integrity ... sha256+ OK
## Loading fdt from FIT Image at 08080000 ...
    Using 'conf-amlogic_meson-gxl-s905x-libretech-cc.dtb' configuration Trying 'fdt-amlogic_meson-gxl-s905x-libretech-cc.dtb' fdt subimage Description:  Flattened Device Tree blob
      Type:         Flat Device Tree
      Compression:  uncompressed
      Data Start:   0x089f7b78
      Data Size:    29092 Bytes = 28.4 KiB
      Architecture: AArch64
      Hash algo:    sha256
      Hash value: 72e5e4fcbb4aa59042377720e5636132ba790d85b6c3f6442446acc63f48cf67 Verifying Hash Integrity ... sha256+ OK
    Booting using the fdt blob at 0x89f7b78
    Uncompressing Kernel Image
    Loading Device Tree to 000000007bf2f000, end 000000007bf391a3 ... OK

After:
Found /extlinux/extlinux.conf
Retrieving file: /extlinux/extlinux.conf
1:    Yocto
Retrieving file: /fitImage
append: root=PARTUUID=fd26d57f-02 rootwait console=ttyAML0,115200
## Loading kernel from FIT Image at 08080000 ...
    Using 'conf-amlogic_meson-gxl-s905x-libretech-cc.dtb' configuration Trying 'kernel-1' kernel subimage
      Description:  Linux kernel
      Type:         Kernel Image
      Compression:  gzip compressed
      Data Start:   0x08080120
      Data Size:    9926956 Bytes = 9.5 MiB
      Architecture: AArch64
      OS:           Linux
      Load Address: 0x01080000
      Entry Point:  0x01080000
      Hash algo:    sha256
      Hash value: 5181a76e4e7a728e24cd8569f8e48c543ac259bf4d66591a3dc5e166d709429e Verifying Hash Integrity ... sha256+ OK
## Flattened Device Tree blob at 7bf40210
    Booting using the fdt blob at 0x7bf40210
    Uncompressing Kernel Image
    Loading Device Tree to 000000007bf2c000, end 000000007bf38ba7 ... OK

Quoted 8 lines

Note this is the "best in town" boot method in Yocto/OE when using WIC, FIT Image and generating extlinux.conf from the WIC "bootimg-partition" plugin.

So this change will regress all platforms using this scheme.

In case we only want the FIT image and not DTB, the fdtdir is ommited at:
https://github.com/openembedded/openembedded-core/blob/9015dec93233c7d45fd0c9885ff5d4ec23ad377d/scripts/lib/wic/plugins/source/bootimg-partition.py#L150

Quoted 6 lines

Well this is certainly tricky.  Do we be "boring" and say that the built-in device tree should be used, or "boring" and say that the distro provided device tree should be used.  I assume that in the OE case we're not always going to be booting U-Boot that was built, so updating the logic there to have the correct dtb isn't right either.

Quoted 8 lines

I'm not against this logic, it should definitely be aligned on EFI and permit using built-in DT, but the logic breaks fitImage loading via extlinux, because now we have no way to say "use the fitImage DT".

This change should have been elsewhere, like in the non-FIT bootm path when no DT was supplied and DT is mandatory for the platform.

Or by passing a keyword like fdt-built-in or ftdfile=builtin.

I agree the correct logic should be:

 * Use the extlinux.conf fdt file, if defined
 * Use a FIT fdt, if available
 * Use fdtcontroladdr, as a last resort

, so FIT images was an oversight.

Quoted 47 lines

==><=======================================================

boot/pxe_utils.c +2 -2
index 0c24becae3..22040c2340 100644
@@ -682,7 +682,7 @@ static int label_boot(struct pxe_context *ctx, 
 struct pxe_label *label)
                         fdtfile = fdtfilefree;
                 }
 
-               if (fdtfile) {
+               if (strcmp(fdtfile, "builtin") && fdtfile) {
                         int err = get_relfile_envaddr(ctx, fdtfile,
 "fdt_addr_r", NULL);
@@ -724,7 +724,7 @@ static int label_boot(struct pxe_context *ctx, 
 struct pxe_label *label)
         if (!bootm_argv[3])
                 bootm_argv[3] = env_get("fdt_addr");
 
-       if (!bootm_argv[3])
+       if (!strcmp(fdtfile, "builtin"))
                 bootm_argv[3] = env_get("fdtcontroladdr");
 

        if (bootm_argv[3]) { ==><=======================================================

Or by checking the image format before using fdtcontroladdr like:

==><=======================================================

boot/pxe_utils.c +1 -1
index 0c24becae3..f4f6369de6 100644
@@ -724,7 +724,7 @@ static int label_boot(struct pxe_context *ctx, 
 struct pxe_label *label)
         if (!bootm_argv[3])
                 bootm_argv[3] = env_get("fdt_addr");
 
-       if (!bootm_argv[3])
+       if (genimg_get_format(buf) != IMAGE_FORMAT_FIT && !bootm_argv[3])
                 bootm_argv[3] = env_get("fdtcontroladdr");
 

        if (bootm_argv[3]) { ==><=======================================================

Quoted 1 line

Neil

Your second diff above seems like the least invasive way of achieving this behavior.

I did wonder whether it would make sense to add a global 'fdtcontroladdr' fallback for bootm (i.e. in boot_get_fdt in image-fdt.c), so that:

   bootm $kernel_addr_r

falls back to $fdtcontroladdr (if valid) as a last resort. Then we could remove the branch in pxe_utils, and the FIT logic would happen in the right order. It looks like bootefi already does something similar, but I guess modifying the bootm behavior would affect a lot of existing boards.

Peter

#11 lore raw

Hi,

Quoted 198 lines · Peter Hoyes
Quoted 132 lines · Neil Armstrong
Quoted 121 lines · Tom Rini
Quoted 120 lines · Neil Armstrong

Hi,

Quoted 31 lines · Peter Hoyes

From: Peter Hoyes <[email protected]>

If using OF_CONTROL, fdtcontroladdr is set to the fdt used to configure U-Boot. When using PXE, if no fdt is defined in the menu file, and there is no fdt at fdt_addr, add fall back on fdtcontroladdr too.

We are developing board support for the Armv8r64 FVP using config_distro_bootcmd. We are also using OF_BOARD and would like the PXE boot option to default to the fdt provided by board_fdt_blob_setup.

---
   cmd/pxe_utils.c | 8 +++++++-

   1 file changed, 7 insertions(+), 1 deletion(-)
cmd/pxe_utils.c +4 -1
index 067c24e5ff..8f8e69ca97 100644
@@ -556,7 +556,10 @@ static int label_boot(struct cmd_tbl *cmdtp, struct pxe_label *label)
         * Scenario 2: If there is an fdt_addr specified, pass it along to
         * bootm, and adjust argc appropriately.
         *
-     * Scenario 3: fdt blob is not available.
+     * Scenario 3: If there is an fdtcontroladdr specified, pass it along to
+     * bootm, and adjust argc appropriately.
+     *
+     * Scenario 4: fdt blob is not available.
         */
        bootm_argv[3] = env_get("fdt_addr_r");

cmd/pxe_utils.c static int label_boot(struct cmd_tbl *cmdtp, struct pxe_label *label) · line 656

Quoted 8 lines
cmd/pxe_utils.c +3 -0
@@ -646,6 +649,9 @@ static int label_boot(struct cmd_tbl *cmdtp, struct pxe_label *label)
        if (!bootm_argv[3])
            bootm_argv[3] = env_get("fdt_addr");
+    if (!bootm_argv[3])
+        bootm_argv[3] = env_get("fdtcontroladdr");
+
        if (bootm_argv[3]) {
            if (!bootm_argv[2])
                bootm_argv[2] = "-";

This change makes a regression when using a FIT image as kernel image within an extlinux.conf

Before this change, when a DT wasn't specified, the DT in the FIT image was selected, not the u-boot DT is selected.

While it should work because the U-Boot DT should work in Linux, it's not always the case.

Before:
Found /extlinux/extlinux.conf
Retrieving file: /extlinux/extlinux.conf
1:    Yocto
Retrieving file: /fitImage
append: root=PARTUUID=fd26d57f-02 rootwait console=ttyAML0,115200
## Loading kernel from FIT Image at 08080000 ...
    Using 'conf-amlogic_meson-gxl-s905x-libretech-cc.dtb' configuration Trying 'kernel-1' kernel subimage
      Description:  Linux kernel
      Type:         Kernel Image
      Compression:  gzip compressed
      Data Start:   0x08080120
      Data Size:    9926956 Bytes = 9.5 MiB
      Architecture: AArch64
      OS:           Linux
      Load Address: 0x01080000
      Entry Point:  0x01080000
      Hash algo:    sha256
      Hash value: 5181a76e4e7a728e24cd8569f8e48c543ac259bf4d66591a3dc5e166d709429e Verifying Hash Integrity ... sha256+ OK
## Loading fdt from FIT Image at 08080000 ...
    Using 'conf-amlogic_meson-gxl-s905x-libretech-cc.dtb' configuration Trying 'fdt-amlogic_meson-gxl-s905x-libretech-cc.dtb' fdt subimage Description:  Flattened Device Tree blob
      Type:         Flat Device Tree
      Compression:  uncompressed
      Data Start:   0x089f7b78
      Data Size:    29092 Bytes = 28.4 KiB
      Architecture: AArch64
      Hash algo:    sha256
      Hash value: 72e5e4fcbb4aa59042377720e5636132ba790d85b6c3f6442446acc63f48cf67 Verifying Hash Integrity ... sha256+ OK
    Booting using the fdt blob at 0x89f7b78
    Uncompressing Kernel Image
    Loading Device Tree to 000000007bf2f000, end 000000007bf391a3 ... OK

After:
Found /extlinux/extlinux.conf
Retrieving file: /extlinux/extlinux.conf
1:    Yocto
Retrieving file: /fitImage
append: root=PARTUUID=fd26d57f-02 rootwait console=ttyAML0,115200
## Loading kernel from FIT Image at 08080000 ...
    Using 'conf-amlogic_meson-gxl-s905x-libretech-cc.dtb' configuration Trying 'kernel-1' kernel subimage
      Description:  Linux kernel
      Type:         Kernel Image
      Compression:  gzip compressed
      Data Start:   0x08080120
      Data Size:    9926956 Bytes = 9.5 MiB
      Architecture: AArch64
      OS:           Linux
      Load Address: 0x01080000
      Entry Point:  0x01080000
      Hash algo:    sha256
      Hash value: 5181a76e4e7a728e24cd8569f8e48c543ac259bf4d66591a3dc5e166d709429e Verifying Hash Integrity ... sha256+ OK
## Flattened Device Tree blob at 7bf40210
    Booting using the fdt blob at 0x7bf40210
    Uncompressing Kernel Image
    Loading Device Tree to 000000007bf2c000, end 000000007bf38ba7 ... OK

Note this is the "best in town" boot method in Yocto/OE when using WIC, FIT Image and generating extlinux.conf from the WIC "bootimg-partition" plugin.

So this change will regress all platforms using this scheme.

Quoted 9 lines
Quoted 2 lines

In case we only want the FIT image and not DTB, the fdtdir is ommited at:
https://github.com/openembedded/openembedded-core/blob/9015dec93233c7d45fd0c9885ff5d4ec23ad377d/scripts/lib/wic/plugins/source/bootimg-partition.py#L150

Well this is certainly tricky.  Do we be "boring" and say that the built-in device tree should be used, or "boring" and say that the distro provided device tree should be used.  I assume that in the OE case we're not always going to be booting U-Boot that was built, so updating the logic there to have the correct dtb isn't right either.

Quoted 8 lines

I'm not against this logic, it should definitely be aligned on EFI and permit using built-in DT, but the logic breaks fitImage loading via extlinux, because now we have no way to say "use the fitImage DT".

This change should have been elsewhere, like in the non-FIT bootm path when no DT was supplied and DT is mandatory for the platform.

Or by passing a keyword like fdt-built-in or ftdfile=builtin.

I agree the correct logic should be:

 * Use the extlinux.conf fdt file, if defined
 * Use a FIT fdt, if available
 * Use fdtcontroladdr, as a last resort

, so FIT images was an oversight.

Quoted 44 lines

==><=======================================================

boot/pxe_utils.c +2 -2
index 0c24becae3..22040c2340 100644
@@ -682,7 +682,7 @@ static int label_boot(struct pxe_context *ctx, struct pxe_label *label)
                         fdtfile = fdtfilefree;
                 }
 
-               if (fdtfile) {
+               if (strcmp(fdtfile, "builtin") && fdtfile) {
                         int err = get_relfile_envaddr(ctx, fdtfile,
 "fdt_addr_r", NULL);
 
@@ -724,7 +724,7 @@ static int label_boot(struct pxe_context *ctx, struct pxe_label *label)
         if (!bootm_argv[3])
                 bootm_argv[3] = env_get("fdt_addr");
 
-       if (!bootm_argv[3])
+       if (!strcmp(fdtfile, "builtin"))
                 bootm_argv[3] = env_get("fdtcontroladdr");
 
         if (bootm_argv[3]) {

==><=======================================================

Or by checking the image format before using fdtcontroladdr like:

==><=======================================================

boot/pxe_utils.c +1 -1
index 0c24becae3..f4f6369de6 100644
@@ -724,7 +724,7 @@ static int label_boot(struct pxe_context *ctx, struct pxe_label *label)
         if (!bootm_argv[3])
                 bootm_argv[3] = env_get("fdt_addr");
 
-       if (!bootm_argv[3])
+       if (genimg_get_format(buf) != IMAGE_FORMAT_FIT && !bootm_argv[3])
                 bootm_argv[3] = env_get("fdtcontroladdr");
 
         if (bootm_argv[3]) {

==><=======================================================

Quoted 1 line

Neil

Your second diff above seems like the least invasive way of achieving this behavior.

Quoted 5 lines

I did wonder whether it would make sense to add a global 'fdtcontroladdr' fallback for bootm (i.e. in boot_get_fdt in image-fdt.c), so that:

   bootm $kernel_addr_r

falls back to $fdtcontroladdr (if valid) as a last resort. Then we could remove the branch in pxe_utils, and the FIT logic would happen in the right order. It looks like bootefi already does something similar, but I guess modifying the bootm behavior would affect a lot of existing boards.

Probably, but I think getting back fit image working would be the priority.

Tom, should I send the last change ?

Neil

Quoted 3 lines

Peter

#12 lore raw
Quoted 203 lines · Neil Armstrong

Hi,

Quoted 200 lines · Peter Hoyes
Quoted 132 lines · Neil Armstrong
Quoted 121 lines · Tom Rini
Quoted 120 lines · Neil Armstrong

Hi,

Quoted 31 lines · Peter Hoyes

From: Peter Hoyes <[email protected]>

If using OF_CONTROL, fdtcontroladdr is set to the fdt used to configure U-Boot. When using PXE, if no fdt is defined in the menu file, and there is no fdt at fdt_addr, add fall back on fdtcontroladdr too.

We are developing board support for the Armv8r64 FVP using config_distro_bootcmd. We are also using OF_BOARD and would like the PXE boot option to default to the fdt provided by board_fdt_blob_setup.

---
   cmd/pxe_utils.c | 8 +++++++-

   1 file changed, 7 insertions(+), 1 deletion(-)
cmd/pxe_utils.c +4 -1
index 067c24e5ff..8f8e69ca97 100644
@@ -556,7 +556,10 @@ static int label_boot(struct cmd_tbl *cmdtp, struct pxe_label *label)
         * Scenario 2: If there is an fdt_addr specified, pass it along to
         * bootm, and adjust argc appropriately.
         *
-     * Scenario 3: fdt blob is not available.
+     * Scenario 3: If there is an fdtcontroladdr specified, pass it along to
+     * bootm, and adjust argc appropriately.
+     *
+     * Scenario 4: fdt blob is not available.
         */
        bootm_argv[3] = env_get("fdt_addr_r");

cmd/pxe_utils.c static int label_boot(struct cmd_tbl *cmdtp, struct pxe_label *label) · line 656

Quoted 8 lines
cmd/pxe_utils.c +3 -0
@@ -646,6 +649,9 @@ static int label_boot(struct cmd_tbl *cmdtp, struct pxe_label *label)
        if (!bootm_argv[3])
            bootm_argv[3] = env_get("fdt_addr");
+    if (!bootm_argv[3])
+        bootm_argv[3] = env_get("fdtcontroladdr");
+
        if (bootm_argv[3]) {
            if (!bootm_argv[2])
                bootm_argv[2] = "-";

This change makes a regression when using a FIT image as kernel image within an extlinux.conf

Before this change, when a DT wasn't specified, the DT in the FIT image was selected, not the u-boot DT is selected.

While it should work because the U-Boot DT should work in Linux, it's not always the case.

Before:
Found /extlinux/extlinux.conf
Retrieving file: /extlinux/extlinux.conf
1:    Yocto
Retrieving file: /fitImage
append: root=PARTUUID=fd26d57f-02 rootwait console=ttyAML0,115200
## Loading kernel from FIT Image at 08080000 ...
    Using 'conf-amlogic_meson-gxl-s905x-libretech-cc.dtb' configuration Trying 'kernel-1' kernel subimage
      Description:  Linux kernel
      Type:         Kernel Image
      Compression:  gzip compressed
      Data Start:   0x08080120
      Data Size:    9926956 Bytes = 9.5 MiB
      Architecture: AArch64
      OS:           Linux
      Load Address: 0x01080000
      Entry Point:  0x01080000
      Hash algo:    sha256
      Hash value: 5181a76e4e7a728e24cd8569f8e48c543ac259bf4d66591a3dc5e166d709429e Verifying Hash Integrity ... sha256+ OK
## Loading fdt from FIT Image at 08080000 ...
    Using 'conf-amlogic_meson-gxl-s905x-libretech-cc.dtb' configuration Trying 'fdt-amlogic_meson-gxl-s905x-libretech-cc.dtb' fdt subimage Description:  Flattened Device Tree blob
      Type:         Flat Device Tree
      Compression:  uncompressed
      Data Start:   0x089f7b78
      Data Size:    29092 Bytes = 28.4 KiB
      Architecture: AArch64
      Hash algo:    sha256
      Hash value: 72e5e4fcbb4aa59042377720e5636132ba790d85b6c3f6442446acc63f48cf67 Verifying Hash Integrity ... sha256+ OK
    Booting using the fdt blob at 0x89f7b78
    Uncompressing Kernel Image
    Loading Device Tree to 000000007bf2f000, end 000000007bf391a3 ... OK

After:
Found /extlinux/extlinux.conf
Retrieving file: /extlinux/extlinux.conf
1:    Yocto
Retrieving file: /fitImage
append: root=PARTUUID=fd26d57f-02 rootwait console=ttyAML0,115200
## Loading kernel from FIT Image at 08080000 ...
    Using 'conf-amlogic_meson-gxl-s905x-libretech-cc.dtb' configuration Trying 'kernel-1' kernel subimage
      Description:  Linux kernel
      Type:         Kernel Image
      Compression:  gzip compressed
      Data Start:   0x08080120
      Data Size:    9926956 Bytes = 9.5 MiB
      Architecture: AArch64
      OS:           Linux
      Load Address: 0x01080000
      Entry Point:  0x01080000
      Hash algo:    sha256
      Hash value: 5181a76e4e7a728e24cd8569f8e48c543ac259bf4d66591a3dc5e166d709429e Verifying Hash Integrity ... sha256+ OK
## Flattened Device Tree blob at 7bf40210
    Booting using the fdt blob at 0x7bf40210
    Uncompressing Kernel Image
    Loading Device Tree to 000000007bf2c000, end 000000007bf38ba7 ... OK

Note this is the "best in town" boot method in Yocto/OE when using WIC, FIT Image and generating extlinux.conf from the WIC "bootimg-partition" plugin.

So this change will regress all platforms using this scheme.

Quoted 9 lines
Quoted 2 lines

In case we only want the FIT image and not DTB, the fdtdir is ommited at:
https://github.com/openembedded/openembedded-core/blob/9015dec93233c7d45fd0c9885ff5d4ec23ad377d/scripts/lib/wic/plugins/source/bootimg-partition.py#L150

Well this is certainly tricky.  Do we be "boring" and say that the built-in device tree should be used, or "boring" and say that the distro provided device tree should be used.  I assume that in the OE case we're not always going to be booting U-Boot that was built, so updating the logic there to have the correct dtb isn't right either.

Quoted 8 lines

I'm not against this logic, it should definitely be aligned on EFI and permit using built-in DT, but the logic breaks fitImage loading via extlinux, because now we have no way to say "use the fitImage DT".

This change should have been elsewhere, like in the non-FIT bootm path when no DT was supplied and DT is mandatory for the platform.

Or by passing a keyword like fdt-built-in or ftdfile=builtin.

I agree the correct logic should be:

 * Use the extlinux.conf fdt file, if defined
 * Use a FIT fdt, if available
 * Use fdtcontroladdr, as a last resort

, so FIT images was an oversight.

Quoted 44 lines

==><=======================================================

boot/pxe_utils.c +2 -2
index 0c24becae3..22040c2340 100644
@@ -682,7 +682,7 @@ static int label_boot(struct pxe_context *ctx, struct pxe_label *label)
                         fdtfile = fdtfilefree;
                 }
 
-               if (fdtfile) {
+               if (strcmp(fdtfile, "builtin") && fdtfile) {
                         int err = get_relfile_envaddr(ctx, fdtfile,
 "fdt_addr_r", NULL);
 
@@ -724,7 +724,7 @@ static int label_boot(struct pxe_context *ctx, struct pxe_label *label)
         if (!bootm_argv[3])
                 bootm_argv[3] = env_get("fdt_addr");
 
-       if (!bootm_argv[3])
+       if (!strcmp(fdtfile, "builtin"))
                 bootm_argv[3] = env_get("fdtcontroladdr");
 
         if (bootm_argv[3]) {

==><=======================================================

Or by checking the image format before using fdtcontroladdr like:

==><=======================================================

boot/pxe_utils.c +1 -1
index 0c24becae3..f4f6369de6 100644
@@ -724,7 +724,7 @@ static int label_boot(struct pxe_context *ctx, struct pxe_label *label)
         if (!bootm_argv[3])
                 bootm_argv[3] = env_get("fdt_addr");
 
-       if (!bootm_argv[3])
+       if (genimg_get_format(buf) != IMAGE_FORMAT_FIT && !bootm_argv[3])
                 bootm_argv[3] = env_get("fdtcontroladdr");
 
         if (bootm_argv[3]) {

==><=======================================================

Quoted 1 line

Neil

Your second diff above seems like the least invasive way of achieving this behavior.

I did wonder whether it would make sense to add a global 'fdtcontroladdr' fallback for bootm (i.e. in boot_get_fdt in image-fdt.c), so that:

Quoted 7 lines
Quoted 3 lines

   bootm $kernel_addr_r

falls back to $fdtcontroladdr (if valid) as a last resort. Then we could remove the branch in pxe_utils, and the FIT logic would happen in the right order. It looks like bootefi already does something similar, but I guess modifying the bootm behavior would affect a lot of existing boards.

Probably, but I think getting back fit image working would be the priority.

Tom, should I send the last change ?

Yes please, thanks!

Signature · 1 line
Tom