[PATCH v2 1/2] sandbox: Initialize sysreset before relocation
Without this the early sysreset code cannot be tested.
Signed-off-by: Michal Suchanek msuchanek@suse.de --- v2: use u-boot,dm-pre-proper rather than u-boot,dm-pre-reloc - sandbox SPL cannot build otherwise --- arch/sandbox/dts/sandbox.dtsi | 1 + arch/sandbox/dts/test.dts | 2 ++ 2 files changed, 3 insertions(+)
diff --git a/arch/sandbox/dts/sandbox.dtsi b/arch/sandbox/dts/sandbox.dtsi index de7a218f45..14c3f54563 100644 --- a/arch/sandbox/dts/sandbox.dtsi +++ b/arch/sandbox/dts/sandbox.dtsi @@ -239,6 +239,7 @@
reset@1 { compatible = "sandbox,reset"; + u-boot,dm-pre-proper; };
rng { diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts index 4ee471238e..88ddc7c4da 100644 --- a/arch/sandbox/dts/test.dts +++ b/arch/sandbox/dts/test.dts @@ -1121,10 +1121,12 @@
reset@0 { compatible = "sandbox,warm-reset"; + u-boot,dm-pre-proper; };
reset@1 { compatible = "sandbox,reset"; + u-boot,dm-pre-proper; };
resetc: reset-ctl {
Boards can have multiple sysresets, iterate all when printing sysreset info.
Fixes: 23471aed5c ("board_f: Add reset status printing") Signed-off-by: Michal Suchanek msuchanek@suse.de ---
v2: - do not use errno_str - rename flag variable --- common/board_f.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-)
diff --git a/common/board_f.c b/common/board_f.c index 5f1711181c..4355d1c82d 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -146,20 +146,27 @@ static int print_resetinfo(void) { struct udevice *dev; char status[256]; + bool status_printed = false; int ret;
- ret = uclass_first_device_err(UCLASS_SYSRESET, &dev); - if (ret) { - debug("%s: No sysreset device found (error: %d)\n", - __func__, ret); - /* Not all boards have sysreset drivers available during early - * boot, so don't fail if one can't be found. - */ - return 0; - } + /* Not all boards have sysreset drivers available during early + * boot, so don't fail if one can't be found. + */ + for (ret = uclass_first_device_check(UCLASS_SYSRESET, &dev); dev; + ret = uclass_next_device_check(&dev)) { + if (ret) { + debug("%s: %s sysreset device (error: %d)\n", + __func__, dev->name, ret); + continue; + }
- if (!sysreset_get_status(dev, status, sizeof(status))) - printf("%s", status); + if (!sysreset_get_status(dev, status, sizeof(status))) { + printf("%s%s", status_printed ? " " : "", status); + status_printed = true; + } + } + if (status_printed) + printf("\n");
return 0; }
On Mon, 10 Oct 2022 at 12:30, Michal Suchanek msuchanek@suse.de wrote:
Boards can have multiple sysresets, iterate all when printing sysreset info.
Fixes: 23471aed5c ("board_f: Add reset status printing") Signed-off-by: Michal Suchanek msuchanek@suse.de
v2:
- do not use errno_str
- rename flag variable
common/board_f.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org
On Mon, Oct 10, 2022 at 08:29:40PM +0200, Michal Suchanek wrote:
Boards can have multiple sysresets, iterate all when printing sysreset info.
Fixes: 23471aed5c ("board_f: Add reset status printing") Signed-off-by: Michal Suchanek msuchanek@suse.de Reviewed-by: Simon Glass sjg@chromium.org
Applied to u-boot/master, thanks!
On Mon, 10 Oct 2022 at 12:30, Michal Suchanek msuchanek@suse.de wrote:
Without this the early sysreset code cannot be tested.
Signed-off-by: Michal Suchanek msuchanek@suse.de
v2: use u-boot,dm-pre-proper rather than u-boot,dm-pre-reloc - sandbox SPL cannot build otherwise
arch/sandbox/dts/sandbox.dtsi | 1 + arch/sandbox/dts/test.dts | 2 ++ 2 files changed, 3 insertions(+)
Reviewed-by: Simon Glass sjg@chromium.org
On Mon, Oct 10, 2022 at 08:29:39PM +0200, Michal Suchanek wrote:
Without this the early sysreset code cannot be tested.
Signed-off-by: Michal Suchanek msuchanek@suse.de Reviewed-by: Simon Glass sjg@chromium.org
Applied to u-boot/master, thanks!
participants (3)
-
Michal Suchanek -
Simon Glass -
Tom Rini