sandbox: sysreset: Update to support power-on reset

If U-Boot is started from SPL or TPL, then those earlier phases deal with
the reset cause. On real hardware this cause may be lost once it is read.
Emulate that behaviour in sandbox by reporting a warm reset when a
previous phase has run since start-up.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/drivers/sysreset/sysreset_sandbox.c b/drivers/sysreset/sysreset_sandbox.c
index 7f6d4186e16b60e5fb913a14ff57f8a7c23e94b4..38e2a7e241ddd6679cb54fabfd850fa4a9149d36 100644 (file)
--- a/drivers/sysreset/sysreset_sandbox.c
+++ b/drivers/sysreset/sysreset_sandbox.c
@@ -84,7 +84,13 @@ int sandbox_sysreset_get_status(struct udevice *dev, char *buf, int size)
 
 int sandbox_sysreset_get_last(struct udevice *dev)
 {
-       return SYSRESET_COLD;
+       struct sandbox_state *state = state_get_current();
+
+       /*
+        * The first phase is a power reset, after that we assume we don't
+        * know.
+        */
+       return state->jumped_fname ? SYSRESET_WARM : SYSRESET_POWER;
 }
 
 static struct sysreset_ops sandbox_sysreset_ops = {

diff --git a/test/dm/sysreset.c b/test/dm/sysreset.c
index e1b7bf5277dd5f9d9b5e26f2eb9de782f663c1b7..5b2358ef674c5651936d94b4af35530d3e64d41a 100644 (file)
--- a/test/dm/sysreset.c
+++ b/test/dm/sysreset.c
@@ -102,10 +102,10 @@ static int dm_test_sysreset_get_last(struct unit_test_state *uts)
 
        /* Device 2 is the cold sysreset device */
        ut_assertok(uclass_get_device(UCLASS_SYSRESET, 2, &dev));
-       ut_asserteq(SYSRESET_COLD, sysreset_get_last(dev));
+       ut_asserteq(SYSRESET_POWER, sysreset_get_last(dev));
 
        /* This is device 0, the non-DT one */
-       ut_asserteq(SYSRESET_COLD, sysreset_get_last_walk());
+       ut_asserteq(SYSRESET_POWER, sysreset_get_last_walk());
 
        return 0;
 }