mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-12-19 08:21:27 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

test: Fix optee unit test

Browse Source 
This was apparently not built for several years: Since a2535243e011,
optee_copy_fdt_nodes implicitly works against the U-Boot dt. We
therefore have to tweak its reference before using the function and
restore things afterwards.

If it had been built, actually trying it out would have failed next: We
need CONFIG_OPTEE_LIB to actually build the function that is primarily
being tested here. And we need to re-initialize target fdt, now that the
tests may run in random order.

Fixes: a2535243e011 ("lib: optee: migration optee_copy_fdt_nodes for OF_LIVE support")
Fixes: ba2feaf41435 ("test: Split optee tests into three functions")
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
This commit is contained in:
Jan Kiszka 2025-09-15 15:41:55 +02:00 committed by Tom Rini
parent 7cae89bac4
commit 44c4919e9d
2 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/optee/Kconfig
View File

@ -1,6 +1,7 @@
config UT_OPTEE config UT_OPTEE
bool "Enable OP-TEE Unit Tests" bool "Enable OP-TEE Unit Tests"
depends on OF_CONTROL && OPTEE depends on OF_CONTROL && OPTEE
select OPTEE_LIB
default y default y
help help
This enables the 'ut optee' command which runs a series of unit This enables the 'ut optee' command which runs a series of unit

42
test/optee/optee.c
View File

@ -5,16 +5,20 @@
#include <command.h> #include <command.h>
#include <errno.h> #include <errno.h>
#include <fdtdec.h>
#include <fdt_support.h> #include <fdt_support.h>
#include <log.h> #include <log.h>
#include <malloc.h> #include <malloc.h>
#include <tee/optee.h> #include <tee/optee.h>
#include <asm/global_data.h>
#include <linux/sizes.h> #include <linux/sizes.h>
#include <test/ut.h> #include <test/ut.h>
#include <test/optee.h> #include <test/optee.h>
DECLARE_GLOBAL_DATA_PTR;
/* 4k ought to be enough for anybody */ /* 4k ought to be enough for anybody */
#define FDT_COPY_SIZE (4 * SZ_1K) #define FDT_COPY_SIZE (4 * SZ_1K)
@ -40,14 +44,6 @@ static int optee_test_init(struct unit_test_state *uts)
if (!fdt) if (!fdt)
return ret; return ret;
/*
* Resize the FDT to 4k so that we have room to operate on
*
* (and relocate it since the memory might be mapped
* read-only)
*/
ut_assertok(fdt_open_into(fdt_base, fdt, FDT_COPY_SIZE));
return 0; return 0;
} }
OPTEE_TEST_INIT(optee_test_init, 0); OPTEE_TEST_INIT(optee_test_init, 0);
@ -127,9 +123,21 @@ static int optee_fdt_protected_memory(struct unit_test_state *uts)
static int optee_fdt_copy_empty(struct unit_test_state *uts) static int optee_fdt_copy_empty(struct unit_test_state *uts)
{ {
void *fdt_no_optee = &__dtb_test_optee_no_optee_begin; void *fdt_no_optee = &__dtb_test_optee_no_optee_begin;
const void *fdt_blob = gd->fdt_blob;
/*
* Resize the FDT to 4k so that we have room to operate on
*
* (and relocate it since the memory might be mapped
* read-only)
*/
ut_assertok(fdt_open_into(&__dtb_test_optee_base_begin, fdt,
FDT_COPY_SIZE));
/* This should still run successfully */ /* This should still run successfully */
ut_assertok(optee_copy_fdt_nodes(fdt_no_optee, fdt)); gd->fdt_blob = fdt_no_optee;
ut_assertok(optee_copy_fdt_nodes(fdt));
gd->fdt_blob = fdt_blob;
expect_success = false; expect_success = false;
ut_assertok(optee_fdt_firmware(uts)); ut_assertok(optee_fdt_firmware(uts));
@ -143,8 +151,14 @@ OPTEE_TEST(optee_fdt_copy_empty, 0);
static int optee_fdt_copy_prefilled(struct unit_test_state *uts) static int optee_fdt_copy_prefilled(struct unit_test_state *uts)
{ {
void *fdt_optee = &__dtb_test_optee_optee_begin; void *fdt_optee = &__dtb_test_optee_optee_begin;
const void *fdt_blob = gd->fdt_blob;
ut_assertok(optee_copy_fdt_nodes(fdt_optee, fdt)); ut_assertok(fdt_open_into(&__dtb_test_optee_base_begin, fdt,
FDT_COPY_SIZE));
gd->fdt_blob = fdt_optee;
ut_assertok(optee_copy_fdt_nodes(fdt));
gd->fdt_blob = fdt_blob;
expect_success = true; expect_success = true;
ut_assertok(optee_fdt_firmware(uts)); ut_assertok(optee_fdt_firmware(uts));
@ -158,9 +172,15 @@ OPTEE_TEST(optee_fdt_copy_prefilled, 0);
static int optee_fdt_copy_already_filled(struct unit_test_state *uts) static int optee_fdt_copy_already_filled(struct unit_test_state *uts)
{ {
void *fdt_optee = &__dtb_test_optee_optee_begin; void *fdt_optee = &__dtb_test_optee_optee_begin;
const void *fdt_blob = gd->fdt_blob;
ut_assertok(fdt_open_into(&__dtb_test_optee_base_begin, fdt,
FDT_COPY_SIZE));
ut_assertok(fdt_open_into(fdt_optee, fdt, FDT_COPY_SIZE)); ut_assertok(fdt_open_into(fdt_optee, fdt, FDT_COPY_SIZE));
ut_assertok(optee_copy_fdt_nodes(fdt_optee, fdt)); gd->fdt_blob = fdt_optee;
ut_assertok(optee_copy_fdt_nodes(fdt));
gd->fdt_blob = fdt_blob;
expect_success = true; expect_success = true;
ut_assertok(optee_fdt_firmware(uts)); ut_assertok(optee_fdt_firmware(uts));