dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-01 16:52:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

autoboot: make sure watchdog device(s) are handled with keyed autoboot

Browse Source 
Currently, AUTOBOOT_KEYED and its variant AUTOBOOT_ENCRYPTION are
broken when one has an external always-running watchdog device with a
timeout shorter than the configured boot delay (in my case, I have a
gpio-wdt one with a timeout of 1 second), because we fail to call
WATCHDOG_RESET() in the loops where we wait for the bootdelay to
elapse.

This is done implicitly in the !AUTOBOOT_KEYED case,
i.e. abortboot_single_key(), because that loop contains a
udelay(10000), and udelay() does a WATCHDOG_RESET().

To fix this, simply add similar udelay() calls in the other loops.

Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
Reviewed-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Rasmus Villemoes
2022-09-27 11:54:02 +02:00
committed by Stefan Roese
parent c5f5ee3732
commit c11cedc876
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
common/autoboot.c
View File

@@ -115,6 +115,7 @@ static int passwd_abort_crypt(uint64_t etime)
presskey_len++;
}
}
udelay(10000);
} while (never_timeout || get_ticks() <= etime);
return abort;
@@ -206,6 +207,7 @@ static int passwd_abort_sha256(uint64_t etime)
if (slow_equals(sha, sha_env, SHA256_SUM_LEN))
abort = 1;
}
udelay(10000);
} while (!abort && get_ticks() <= etime);
free(presskey);
@@ -293,6 +295,7 @@ static int passwd_abort_key(uint64_t etime)
abort = 1;
}
}
udelay(10000);
} while (!abort && get_ticks() <= etime);
return abort;