Skip to contentSkip to conversation

cmd: pxe_utils: Limit fdtcontroladdr usage to non-fitImage

PATCH In review Marek Vasut 6 participants 7 messages Dec 14, 2022 – Jan 6, 2023

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 cmd: pxe_utils: Limit fdtcontroladdr usage to non-fitImage

Commit d5ba6188dfb ("cmd: pxe_utils: Check fdtcontroladdr in label_boot") forces '$fdtcontroladdr' DT address as a third parameter of bootm command even if the PXE transfer pulls in a fitImage which contains configuration node with its own DT that is preferrable to be passed to Linux. Limit the $fdtcontroladdr fallback utilization to non-fitImages, since it is highly likely a fitImage would come with its own DT, while single-file images do need a separate DT.

Fixes d5ba6188dfb ("cmd: pxe_utils: Check fdtcontroladdr in label_boot")

---
Cc: Peter Hoyes <[email protected]>
Cc: Ramon Fried <[email protected]>
Cc: Simon Glass <[email protected]>
---
V1: Map the kernel buffer before testing image type
V2: Update code comment to reflect the change

---
 boot/pxe_utils.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
boot/pxe_utils.c +5 -4
index 8133006875f..099aa2f4bc7 100644
@@ -617,7 +617,7 @@ static int label_boot(struct pxe_context *ctx, struct pxe_label *label)
 	 * bootm, and adjust argc appropriately.
 	 *
 	 * Scenario 3: If there is an fdtcontroladdr specified, pass it along to
-	 * bootm, and adjust argc appropriately.
+	 * bootm, and adjust argc appropriately, unless the image type is fitImage.
 	 *
 	 * Scenario 4: fdt blob is not available.
 	 */
@@ -724,7 +724,10 @@ 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])
+	kernel_addr_r = genimg_get_kernel_addr(kernel_addr);
+	buf = map_sysmem(kernel_addr_r, 0);
+
+	if (!bootm_argv[3] && genimg_get_format(buf) != IMAGE_FORMAT_FIT)
 		bootm_argv[3] = env_get("fdtcontroladdr");
 
 	if (bootm_argv[3]) {
@@ -733,8 +736,6 @@ static int label_boot(struct pxe_context *ctx, struct pxe_label *label)
 		bootm_argc = 4;
 	}
 
-	kernel_addr_r = genimg_get_kernel_addr(kernel_addr);
-	buf = map_sysmem(kernel_addr_r, 0);
 	/* Try bootm for legacy and FIT format image */
 	if (genimg_get_format(buf) != IMAGE_FORMAT_INVALID &&
             IS_ENABLED(CONFIG_CMD_BOOTM))
Signature · 1 line
2.35.1
Reviewed-by Tested-by on v2 1/1
#1 lore raw

Hi Marek,

Quoted 8 lines · Marek Vasut

Commit d5ba6188dfb ("cmd: pxe_utils: Check fdtcontroladdr in label_boot") forces '$fdtcontroladdr' DT address as a third parameter of bootm command even if the PXE transfer pulls in a fitImage which contains configuration node with its own DT that is preferrable to be passed to Linux. Limit the $fdtcontroladdr fallback utilization to non-fitImages, since it is highly likely a fitImage would come with its own DT, while single-file images do need a separate DT.

Tested on top of an almost vanilla v2022.10 on Ringneck PX30, the FDT from the selected fitimage configuration (via #conf in kernel field in extlinux.conf) is taken into account.

Not sure overriding the DT gotten from the fit image wasn't a use-case Peter wanted to support though.

Cheers,
Quentin

Quoted 47 lines
Fixes d5ba6188dfb ("cmd: pxe_utils: Check fdtcontroladdr in label_boot")

---
Cc: Peter Hoyes <[email protected]>
Cc: Ramon Fried <[email protected]>
Cc: Simon Glass <[email protected]>
---
V1: Map the kernel buffer before testing image type
V2: Update code comment to reflect the change

---
  boot/pxe_utils.c | 9 +++++----
  1 file changed, 5 insertions(+), 4 deletions(-)
boot/pxe_utils.c +5 -4
index 8133006875f..099aa2f4bc7 100644
@@ -617,7 +617,7 @@ static int label_boot(struct pxe_context *ctx, struct pxe_label *label)
  	 * bootm, and adjust argc appropriately.
  	 *
  	 * Scenario 3: If there is an fdtcontroladdr specified, pass it along to
-	 * bootm, and adjust argc appropriately.
+	 * bootm, and adjust argc appropriately, unless the image type is fitImage.
  	 *
  	 * Scenario 4: fdt blob is not available.
  	 */
@@ -724,7 +724,10 @@ 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])
+	kernel_addr_r = genimg_get_kernel_addr(kernel_addr);
+	buf = map_sysmem(kernel_addr_r, 0);
+
+	if (!bootm_argv[3] && genimg_get_format(buf) != IMAGE_FORMAT_FIT)
  		bootm_argv[3] = env_get("fdtcontroladdr");
 
  	if (bootm_argv[3]) {
@@ -733,8 +736,6 @@ static int label_boot(struct pxe_context *ctx, struct pxe_label *label)
  		bootm_argc = 4;
  	}
 
-	kernel_addr_r = genimg_get_kernel_addr(kernel_addr);
-	buf = map_sysmem(kernel_addr_r, 0);
  	/* Try bootm for legacy and FIT format image */
  	if (genimg_get_format(buf) != IMAGE_FORMAT_INVALID &&
              IS_ENABLED(CONFIG_CMD_BOOTM))
#2 lore raw
Quoted 1 line · Quentin Schulz

Hi Marek,

Hi,

Quoted 10 lines · Marek Vasut
Quoted 8 lines

Commit d5ba6188dfb ("cmd: pxe_utils: Check fdtcontroladdr in label_boot") forces '$fdtcontroladdr' DT address as a third parameter of bootm command even if the PXE transfer pulls in a fitImage which contains configuration node with its own DT that is preferrable to be passed to Linux. Limit the $fdtcontroladdr fallback utilization to non-fitImages, since it is highly likely a fitImage would come with its own DT, while single-file images do need a separate DT.

Quoted 6 lines

Tested on top of an almost vanilla v2022.10 on Ringneck PX30, the FDT from the selected fitimage configuration (via #conf in kernel field in extlinux.conf) is taken into account.

Not sure overriding the DT gotten from the fit image wasn't a use-case Peter wanted to support though.

I am hoping to get feedback from Peter, but that kind of behavior would be rather odd. If user wants to use fdtcontroladdr DT, then just don't add DT fdt property into the configuration node entry in the fitImage.

Reviewed-by Tested-by
#3 lore raw
Quoted 15 lines · Marek Vasut
Quoted 1 line · Quentin Schulz

Hi Marek,

Hi,

Quoted 10 lines · Marek Vasut
Quoted 8 lines

Commit d5ba6188dfb ("cmd: pxe_utils: Check fdtcontroladdr in label_boot") forces '$fdtcontroladdr' DT address as a third parameter of bootm command even if the PXE transfer pulls in a fitImage which contains configuration node with its own DT that is preferrable to be passed to Linux. Limit the $fdtcontroladdr fallback utilization to non-fitImages, since it is highly likely a fitImage would come with its own DT, while single-file images do need a separate DT.

Quoted 8 lines
Quoted 6 lines

Tested on top of an almost vanilla v2022.10 on Ringneck PX30, the FDT from the selected fitimage configuration (via #conf in kernel field in extlinux.conf) is taken into account.

Not sure overriding the DT gotten from the fit image wasn't a use-case Peter wanted to support though.

I am hoping to get feedback from Peter, but that kind of behavior would be rather odd. If user wants to use fdtcontroladdr DT, then just don't add DT fdt property into the configuration node entry in the fitImage.

Tested with an fdtcontroladdr provided by a prior boot stage (TF-A) on an Arm FVP.

The implemented behavior works for me. We do not have any need to override the DT from a FIT image.

Thanks,

Peter

Reviewed-by on v2 1/1
#4 lore raw
In reply to Marek Vasut
Quoted 57 lines · Marek Vasut

Commit d5ba6188dfb ("cmd: pxe_utils: Check fdtcontroladdr in label_boot") forces '$fdtcontroladdr' DT address as a third parameter of bootm command even if the PXE transfer pulls in a fitImage which contains configuration node with its own DT that is preferrable to be passed to Linux. Limit the $fdtcontroladdr fallback utilization to non-fitImages, since it is highly likely a fitImage would come with its own DT, while single-file images do need a separate DT.

Fixes d5ba6188dfb ("cmd: pxe_utils: Check fdtcontroladdr in label_boot")

---
Cc: Peter Hoyes <[email protected]>
Cc: Ramon Fried <[email protected]>
Cc: Simon Glass <[email protected]>
---
V1: Map the kernel buffer before testing image type
V2: Update code comment to reflect the change

---
 boot/pxe_utils.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
boot/pxe_utils.c +5 -5
index 8133006875f..099aa2f4bc7 100644
@@ -617,7 +617,7 @@ static int label_boot(struct pxe_context *ctx, struct pxe_label *label)
         * bootm, and adjust argc appropriately.
         *
         * Scenario 3: If there is an fdtcontroladdr specified, pass it along to
-        * bootm, and adjust argc appropriately.
+        * bootm, and adjust argc appropriately, unless the image type is fitImage.
         *
         * Scenario 4: fdt blob is not available.
         */
@@ -724,7 +724,10 @@ 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])
+       kernel_addr_r = genimg_get_kernel_addr(kernel_addr);
+       buf = map_sysmem(kernel_addr_r, 0);
+
+       if (!bootm_argv[3] && genimg_get_format(buf) != IMAGE_FORMAT_FIT)
                bootm_argv[3] = env_get("fdtcontroladdr");
 
        if (bootm_argv[3]) {
@@ -733,8 +736,6 @@ static int label_boot(struct pxe_context *ctx, struct pxe_label *label)
                bootm_argc = 4;
        }
 
-       kernel_addr_r = genimg_get_kernel_addr(kernel_addr);
-       buf = map_sysmem(kernel_addr_r, 0);
        /* Try bootm for legacy and FIT format image */
        if (genimg_get_format(buf) != IMAGE_FORMAT_INVALID &&
             IS_ENABLED(CONFIG_CMD_BOOTM))
--
Quoted 2 lines

2.35.1

Reviewed-by on v2 1/1
#5 lore raw
In reply to Marek Vasut
Quoted 47 lines · Marek Vasut

Commit d5ba6188dfb ("cmd: pxe_utils: Check fdtcontroladdr in label_boot") forces '$fdtcontroladdr' DT address as a third parameter of bootm command even if the PXE transfer pulls in a fitImage which contains configuration node with its own DT that is preferrable to be passed to Linux. Limit the $fdtcontroladdr fallback utilization to non-fitImages, since it is highly likely a fitImage would come with its own DT, while single-file images do need a separate DT.

Fixes d5ba6188dfb ("cmd: pxe_utils: Check fdtcontroladdr in label_boot")

---
Cc: Peter Hoyes <[email protected]>
Cc: Ramon Fried <[email protected]>
Cc: Simon Glass <[email protected]>
---
V1: Map the kernel buffer before testing image type
V2: Update code comment to reflect the change

---
  boot/pxe_utils.c | 9 +++++----
  1 file changed, 5 insertions(+), 4 deletions(-)
boot/pxe_utils.c +5 -2
index 8133006875f..099aa2f4bc7 100644
@@ -617,7 +617,7 @@ static int label_boot(struct pxe_context *ctx, struct pxe_label *label)
  	 * bootm, and adjust argc appropriately.
  	 *
  	 * Scenario 3: If there is an fdtcontroladdr specified, pass it along to
-	 * bootm, and adjust argc appropriately.
+	 * bootm, and adjust argc appropriately, unless the image type is fitImage.
  	 *
  	 * Scenario 4: fdt blob is not available.
  	 */
@@ -724,7 +724,10 @@ 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])
+	kernel_addr_r = genimg_get_kernel_addr(kernel_addr);
+	buf = map_sysmem(kernel_addr_r, 0);
+
+	if (!bootm_argv[3] && genimg_get_format(buf) != IMAGE_FORMAT_FIT)
  		bootm_argv[3] = env_get("fdtcontroladdr");
 
  	if (bootm_argv[3]) {

boot/pxe_utils.c static int label_boot(struct pxe_context *ctx, struct pxe_label *label) · line 741

Quoted 8 lines
boot/pxe_utils.c +0 -2
@@ -733,8 +736,6 @@ static int label_boot(struct pxe_context *ctx, struct pxe_label *label)
  		bootm_argc = 4;
  	}
 
-	kernel_addr_r = genimg_get_kernel_addr(kernel_addr);
-	buf = map_sysmem(kernel_addr_r, 0);
  	/* Try bootm for legacy and FIT format image */
  	if (genimg_get_format(buf) != IMAGE_FORMAT_INVALID &&
              IS_ENABLED(CONFIG_CMD_BOOTM))
#6 lore raw
In reply to Marek Vasut
Quoted 8 lines · Marek Vasut

Commit d5ba6188dfb ("cmd: pxe_utils: Check fdtcontroladdr in label_boot") forces '$fdtcontroladdr' DT address as a third parameter of bootm command even if the PXE transfer pulls in a fitImage which contains configuration node with its own DT that is preferrable to be passed to Linux. Limit the $fdtcontroladdr fallback utilization to non-fitImages, since it is highly likely a fitImage would come with its own DT, while single-file images do need a separate DT.

Quoted 8 lines

Applied to u-boot/master, thanks!

Signature · 1 line
Tom