[PATCH v6 4/4] test: cmd: fdt: fix chosen test for DM_RNG

Heinrich Schuchardt xypron.glpk at gmx.de
Tue Jun 18 13:45:57 CEST 2024


On 17.06.24 21:14, Tim Harvey wrote:
> Now that kaslr-seed is automatically added to the chosen node if DM_RNG
> is enabled, adjust the test to expect this.

We need to check that if CONFIG_EFI_TCG2_PROTOCOL=y no kaslr-seed node
is passed to EFI binaries.

The right location for such a test is lib/efi_selftest/efi_selftest_tcg2.c.

We need as similar check for CONFIG_MEASURED_BOOT=y.

Best regards

Heinrich

>
> Signed-off-by: Tim Harvey <tharvey at gateworks.com>
> Cc: Michal Simek <michal.simek at amd.com>
> Cc: Andy Yan <andy.yan at rock-chips.com>
> Cc: Akash Gajjar <gajjar04akash at gmail.com>
> Cc: Ilias Apalodimas <ilias.apalodimas at linaro.org>
> Cc: Simon Glass <sjg at chromium.org>
> Cc: Patrick Delaunay <patrick.delaunay at foss.st.com>
> Cc: Patrice Chotard <patrice.chotard at foss.st.com>
> Cc: Devarsh Thakkar <devarsht at ti.com>
> Cc: Heinrich Schuchardt <xypron.glpk at gmx.de>
> Cc: Hugo Villeneuve <hvilleneuve at dimonoff.com>
> Cc: Marek Vasut <marex at denx.de>
> Cc: Tom Rini <trini at konsulko.com>
> Cc: Chris Morgan <macromorgan at hotmail.com>
> ---
> v6: new patch
> ---
>   test/cmd/fdt.c | 4 ++++
>   1 file changed, 4 insertions(+)
>
> diff --git a/test/cmd/fdt.c b/test/cmd/fdt.c
> index 547085521758..537d8a338bbf 100644
> --- a/test/cmd/fdt.c
> +++ b/test/cmd/fdt.c
> @@ -1347,6 +1347,8 @@ static int fdt_test_chosen(struct unit_test_state *uts)
>   	ut_assert_nextlinen("\tu-boot,version = "); /* Ignore the version string */
>   	if (env_bootargs)
>   		ut_assert_nextline("\tbootargs = \"%s\";", env_bootargs);
> +	if (CONFIG_IS_ENABLED(DM_RNG))
> +		ut_assert_nextlinen("\tkaslr-seed = ");
>   	ut_assert_nextline("};");
>   	ut_assertok(ut_check_console_end(uts));
>
> @@ -1363,6 +1365,8 @@ static int fdt_test_chosen(struct unit_test_state *uts)
>   	ut_assert_nextlinen("\tu-boot,version = "); /* Ignore the version string */
>   	if (env_bootargs)
>   		ut_assert_nextline("\tbootargs = \"%s\";", env_bootargs);
> +	if (CONFIG_IS_ENABLED(DM_RNG))
> +		ut_assert_nextlinen("\tkaslr-seed = ");
>   	ut_assert_nextline("};");
>   	ut_assertok(ut_check_console_end(uts));
>



More information about the U-Boot mailing list