Skip to content

ARM: Fix reset in SPL if SYSRESET is not used

Harald Seiler u-boot 1 version New

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest3 patches 0 repliesNew

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/3ARM: reset: use do_reset in SPL/TPL if SYSRESET was not enabled for themarch/arm/lib/Makefile+1 -12 replies
2/3imx: imx8m*: Remove do_reset from board filesboard/freescale/imx8mm_evk/spl.c board/freescale/imx8mn_evk/spl.c board/freescale/imx8mp_evk/spl.c +1 more+0 -362 replies
3/3imx: imx8m: Don't use the addr parameter of reset_cpuarch/arm/mach-imx/imx8m/soc.c+1 -42 replies
3/3imx: imx8m: Don't use the addr parameter of reset_cpu+0 -00 replies

Reviews trailers per patch

All 4 patches have a Reviewed-by or Acked-by.

PatchHarald SeilerMarek Vasut
1/3R-b
2/3Co-Authored-by R-b
3/3Co-Authored-by R-b
3/3Co-Authored-by R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [PATCH 0/3] ARM: Fix reset in SPL if SYSRESET is not used

Hello,

continuing on the discussion around Claudius' patch for fixing reset in SPL [1] we have taken a closer look at the issue. To quickly summarize the situation:

The original patch was to enable the generic ARM implementation of do_reset if CONFIG_SYSRESET is not enabled in SPL. This would break compilation for some boards which define their own do_reset in board/*/spl.c.

To be more specific, the following 4 boards have this custom do_reset:

- toradex/verdin-imx8mm
- freescale/imx8mn_evk
- freescale/imx8mm_evk
- freescale/imx8mp_evk

I hope we can all agree that do_reset is not at all meant to be implemented in board files. From looking at the related code for imx8m, it feels like this was just a workaround hack to archieve the same thing which Claudius has fixed. So this patch series reverts the addition of do_reset implementations in imx8m board files and instead switches to using the proper fix provided by Claudius.

Additionally, the custom do_reset implementations were passing an address (WDOG1_BASE_ADDR) to reset_cpu() instead of 0. This is the only place in the entire U-Boot tree where this happens. Instead, all other implementations simply ignore the parameter and 0 is passed by callers. It looks a lot like this is a legacy left-over which makes me think that using it for a (hard-coded) watchdog address is not a good idea as it breaks convention with the rest of U-Boot.

[1]: https://patchwork.ozlabs.org/patch/1201959

Claudius Heine (3):
ARM: reset: use do_reset in SPL/TPL if SYSRESET was not enabled for
them
imx: imx8m*: Remove do_reset from board files
imx: imx8m: Don't use the addr parameter of reset_cpu

 arch/arm/lib/Makefile             | 2 +-
 arch/arm/mach-imx/imx8m/soc.c     | 5 +----
 board/freescale/imx8mm_evk/spl.c  | 9 ---------
 board/freescale/imx8mn_evk/spl.c  | 9 ---------
 board/freescale/imx8mp_evk/spl.c  | 9 ---------
 board/toradex/verdin-imx8mm/spl.c | 9 ---------
 6 files changed, 2 insertions(+), 41 deletions(-)
Signature · 5 lines
Harald

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-62  Fax: +49-8142-66989-80   Email: hws at denx.de