mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: "Sascha Hauer" <s.hauer@pengutronix.de>
To: "Fabian Pfitzner" <f.pfitzner@pengutronix.de>
Cc: BAREBOX <barebox@lists.infradead.org>,
	Fabian Pfitzner <f.pfitzner@pengutronix.de>
Subject: Re: [PATCH 2/2] arch: arm: imx: detect secondary boot
Date: Thu, 21 May 2026 12:27:12 +0000	[thread overview]
Message-ID: <E1wQ2Ub-00000004VNh-09rq@pty.whiteo.stw.pengutronix.de> (raw)
In-Reply-To: <20260520-fpf-bootsource-instance-index-v1-2-29942f0e8f2f@pengutronix.de>

On 2026-05-20 10:33, Fabian Pfitzner wrote:
> Integrate support to detect secondary boot on imx machines.
> Copy the logic for detection from the uboot-imx project[1].
> 
> The information will be stored in the `bootsource_instance_index`
> variable.
> 
> [1] https://github.com/nxp-imx/uboot-imx/blob/99518e6b6f20cb6a2bf19115e355db9f58100af8/arch/arm/mach-imx/imx8m/soc.c#L792
> 
> Signed-off-by: Fabian Pfitzner <f.pfitzner@pengutronix.de>
> ---
>  arch/arm/mach-imx/boot.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 52 insertions(+)
> 
> diff --git a/arch/arm/mach-imx/boot.c b/arch/arm/mach-imx/boot.c
> index 3fea22d05f3bfdf2fe9caa6767e1c7c5ea3ced00..a35a1acc2e71231236d3dd5008523f6c66912000 100644
> --- a/arch/arm/mach-imx/boot.c
> +++ b/arch/arm/mach-imx/boot.c
> @@ -26,6 +26,8 @@
>  
>  #include <soc/fsl/fsl_udc.h>
>  
> +int imx8m_detect_secondary_image_boot(void);

It should be either static without forward declaration or exported with
the declaration in a header file.

> +
>  static void
>  imx_boot_save_loc(void (*get_boot_source)(enum bootsource *, int *))
>  {
> @@ -35,6 +37,10 @@ imx_boot_save_loc(void (*get_boot_source)(enum bootsource *, int *))
>  	get_boot_source(&src, &instance);
>  
>  	bootsource_set(src, instance);
> +
> +	int index = imx8m_detect_secondary_image_boot();

You assume you are running on i.MX8M here which is not necessarily the
case.

> +
> +	bootsource_set_instance_index(index);
>  }
>  
>  
> @@ -756,3 +762,49 @@ void imx8mn_get_boot_source(enum bootsource *src, int *instance)
>  
>  void imx8mn_boot_save_loc(void)
>  	__alias(imx8mp_boot_save_loc);
> +
> +int imx8m_detect_secondary_image_boot(void)
> +{
> +	u32 *rom_log_addr = (u32 *)0x9e0;
> +	u32 *rom_log;
> +	u8 event_id;
> +	int i, boot_secondary = 0;
> +
> +	/* If the ROM event log pointer is not valid. */
> +	if (*rom_log_addr < 0x900000 || *rom_log_addr >= 0xb00000 ||
> +	    *rom_log_addr & 0x3)
> +		return -EINVAL;

We have imx8m_get_bootrom_log() which handles different cases like we
are in PBL/EL3 or in barebox proper. Why not use it here?

I wonder how this works at all because you are derefencing the ROM which
is inside the faulting zero page. I would assume barebox crashes here
when this is called from barebox proper.

> +
> +	/* Parse the ROM event ID version 2 log */
> +	rom_log = (u32 *)(uintptr_t)(*rom_log_addr);
> +	for (i = 0; i < 128; i++) {
> +		event_id = rom_log[i] >> 24;

We already have defines for this, see arch/arm/mach-imx/bootrom-cmd.c

Sascha

--
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 |



      reply	other threads:[~2026-05-21 12:28 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-05-20  8:32 [PATCH 0/2] Implement recovery boot detection for SPI flash Fabian Pfitzner
2026-05-20  8:32 ` [PATCH 1/2] bootsource: add bootsource instance index variable Fabian Pfitzner
2026-05-21 12:02   ` Sascha Hauer
2026-05-20  8:33 ` [PATCH 2/2] arch: arm: imx: detect secondary boot Fabian Pfitzner
2026-05-21 12:27   ` Sascha Hauer [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=E1wQ2Ub-00000004VNh-09rq@pty.whiteo.stw.pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=f.pfitzner@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox