drivers: stm32_bsec: move to early_init stage

BSEC driver shall initialize a early_init initcall level to prepare
OTP access needed to read the HUK from OTPs.

Acked-by: Jerome Forissier <jerome@for

drivers: stm32_bsec: move to early_init stage

BSEC driver shall initialize a early_init initcall level to prepare
OTP access needed to read the HUK from OTPs.

Acked-by: Jerome Forissier <jerome@forissier.org>
Acked-by: Jens Wiklander <jens.wiklander@linaro.org>
Signed-off-by: Etienne Carriere <etienne.carriere@st.com>

show more ...

drivers: stm32_bsec: fix error on SAFMEM power-up

Fix unbalanced access locking when SAFMEM power up sequence fails.

Acked-by: Jerome Forissier <jerome@forissier.org>
Acked-by: Jens Wiklander <jens

drivers: stm32_bsec: fix error on SAFMEM power-up

Fix unbalanced access locking when SAFMEM power up sequence fails.

Acked-by: Jerome Forissier <jerome@forissier.org>
Acked-by: Jens Wiklander <jens.wiklander@linaro.org>
Signed-off-by: Lionel Debieve <lionel.debieve@foss.st.com>
Signed-off-by: Etienne Carriere <etienne.carriere@st.com>

show more ...

drivers: stm32_bsec: increase timeout

Increase stm32_bsec timeout to handle worst case at 10ms.

Acked-by: Jerome Forissier <jerome@forissier.org>
Acked-by: Jens Wiklander <jens.wiklander@linaro.org

drivers: stm32_bsec: increase timeout

Increase stm32_bsec timeout to handle worst case at 10ms.

Acked-by: Jerome Forissier <jerome@forissier.org>
Acked-by: Jens Wiklander <jens.wiklander@linaro.org>
Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
Signed-off-by: Etienne Carriere <etienne.carriere@st.com>

show more ...

drivers: stm32_bsec: return busy/bad parms where applicable

Change stm32_bsec driver to return TEE_ERROR_BUSY when the
BSEC interface reports a busy state and TEE_ERROR_BAD_PARAMETERS
word programmi

drivers: stm32_bsec: return busy/bad parms where applicable

Change stm32_bsec driver to return TEE_ERROR_BUSY when the
BSEC interface reports a busy state and TEE_ERROR_BAD_PARAMETERS
word programming/locking has failed which means provided arguments
were invalid.

Acked-by: Jerome Forissier <jerome@forissier.org>
Acked-by: Jens Wiklander <jens.wiklander@linaro.org>
Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
Signed-off-by: Etienne Carriere <etienne.carriere@st.com>

show more ...

core: introduce CFG_CORE_HUK_SUBKEY_COMPAT_USE_OTP_DIE_ID

Adds CFG_CORE_HUK_SUBKEY_COMPAT_USE_OTP_DIE_ID which if set to 'y' makes
huk_subkey_derive() generate SSK using tee_otp_get_die_id().

Old s

core: introduce CFG_CORE_HUK_SUBKEY_COMPAT_USE_OTP_DIE_ID

Adds CFG_CORE_HUK_SUBKEY_COMPAT_USE_OTP_DIE_ID which if set to 'y' makes
huk_subkey_derive() generate SSK using tee_otp_get_die_id().

Old scheme for SSK generation:
SSK = HMAC_SHA256(HUK, Chip_ID || "ONLY_FOR_tee_fs_ssk")
This config changes Chip_ID from the default BEEF-like value to the
result of tee_otp_get_die_id().

Note that this option works only if
CFG_CORE_HUK_SUBKEY_COMPAT=y.

Acked-by: Jerome Forissier <jerome@forissier.org>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Signed-off-by: Ruslan Piasetskyi <ruslan.piasetskyi@gmail.com>

show more ...

Add config option CFG_WARN_DECL_AFTER_STATEMENT

Adds configuration option CFG_WARN_DECL_AFTER_STATEMENT which adds the
warning -Wdeclaration-after-statement.

The coding style doesn't allow declarat

Add config option CFG_WARN_DECL_AFTER_STATEMENT

Adds configuration option CFG_WARN_DECL_AFTER_STATEMENT which adds the
warning -Wdeclaration-after-statement.

The coding style doesn't allow declarations after statements in the
code. So add a warning for this to let the compiler catch this before
the review.

Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>
Reviewed-by: Jerome Forissier <jerome@forissier.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

show more ...

avb: Fix warnings in ta/avb/entry.c

Fixes -Wdeclaration-after-statement warnings in ta/avb/entry.c:
ta/avb/entry.c: In function ‘write_persist_value’:
ta/avb/entry.c:267:2: error: ISO C90 forbids mi

avb: Fix warnings in ta/avb/entry.c

Fixes -Wdeclaration-after-statement warnings in ta/avb/entry.c:
ta/avb/entry.c: In function ‘write_persist_value’:
ta/avb/entry.c:267:2: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
char *name_buf = params[0].memref.buffer;
^~~~
ta/avb/entry.c: In function ‘read_persist_value’:
ta/avb/entry.c:316:2: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
char *name_buf = params[0].memref.buffer;
^~~~

Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

show more ...

core: Fix warning in gprof_send_rpc()

Fixes a -Wdeclaration-after-statement warning in gprof_send_rpc():
core/pta/gprof.c: In function ‘gprof_send_rpc’:
core/pta/gprof.c:35:2: error: ISO C90 forbids

core: Fix warning in gprof_send_rpc()

Fixes a -Wdeclaration-after-statement warning in gprof_send_rpc():
core/pta/gprof.c: In function ‘gprof_send_rpc’:
core/pta/gprof.c:35:2: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
struct thread_param params[3] = {
^~~~~~

Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

show more ...

core: Fix warnings in core/kernel/lockdep.c

Fixes -Wdeclaration-after-statement warnings in core/kernel/lockdep.c:
core/kernel/lockdep.c: In function 'lockdep_graph_get_shortest_cycle':
core/kernel/

core: Fix warnings in core/kernel/lockdep.c

Fixes -Wdeclaration-after-statement warnings in core/kernel/lockdep.c:
core/kernel/lockdep.c: In function 'lockdep_graph_get_shortest_cycle':
core/kernel/lockdep.c:151:3: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
struct lockdep_node *n = qe->node;
^~~~~~
core/kernel/lockdep.c:155:3: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
struct lockdep_edge *e = NULL;
^~~~~~
core/kernel/lockdep.c:183:5: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
size_t nlen = qe->pathlen + 1;
^~~~~~
core/kernel/lockdep.c: In function 'lockdep_visit':
core/kernel/lockdep.c:221:2: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
struct lockdep_edge *e;
^~~~~~
core/kernel/lockdep.c: In function '__lockdep_lock_acquire':
core/kernel/lockdep.c:343:2: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
struct lockdep_lock *lock = NULL;
^~~~~~
core/kernel/lockdep.c:356:2: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
TEE_Result res = lockdep_graph_sort(graph);
^~~~~~~~~~
core/kernel/lockdep.c: In function '__lockdep_lock_tryacquire':
core/kernel/lockdep.c:390:2: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
struct lockdep_lock *lock = NULL;
^~~~~~

Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

show more ...

core: Fix warnings in core/tee/socket.c

Fixes -Wdeclaration-after-statement warnings in core/tee/socket.c:
core/tee/socket.c: In function ‘socket_open’:
core/tee/socket.c:44:2: error: ISO C90 forbid

core: Fix warnings in core/tee/socket.c

Fixes -Wdeclaration-after-statement warnings in core/tee/socket.c:
core/tee/socket.c: In function ‘socket_open’:
core/tee/socket.c:44:2: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
struct thread_param tpm[4] = {
^~~~~~
core/tee/socket.c: In function ‘socket_close’:
core/tee/socket.c:76:2: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
struct thread_param tpm = THREAD_PARAM_VALUE(IN, OPTEE_RPC_SOCKET_CLOSE,
^~~~~~
core/tee/socket.c: In function ‘socket_send’:
core/tee/socket.c:108:2: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
struct thread_param tpm[3] = {
^~~~~~
core/tee/socket.c: In function ‘socket_recv’:
core/tee/socket.c:147:2: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
struct thread_param tpm[3] = {
^~~~~~
core/tee/socket.c: In function ‘socket_ioctl’:
core/tee/socket.c:190:2: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
struct thread_param tpm[3] = {
^~~~~~

Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

show more ...

core: Fix warnings in core/tee/tadb.c

Fixes -Wdeclaration-after-statement warnings in core/tee/tadb.c:
core/tee/tadb.c:111:2: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-

core: Fix warnings in core/tee/tadb.c

Fixes -Wdeclaration-after-statement warnings in core/tee/tadb.c:
core/tee/tadb.c:111:2: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
struct thread_param params[] = {
^~~~~~
core/tee/tadb.c: In function ‘ta_operation_remove’:
core/tee/tadb.c:137:2: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
struct thread_param params[] = {
^~~~~~
core/tee/tadb.c: In function ‘ta_load’:
core/tee/tadb.c:712:2: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
struct thread_param params[] = {
^~~~~~

Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

show more ...

core: Fix warnings in core/tee/tee_fs_rpc.c

Fixes -Wdeclaration-after-statement warnings in core/tee/tee_fs_rpc.c:
core/tee/tee_fs_rpc.c: In function ‘operation_open_dfh’:
core/tee/tee_fs_rpc.c:49:2

core: Fix warnings in core/tee/tee_fs_rpc.c

Fixes -Wdeclaration-after-statement warnings in core/tee/tee_fs_rpc.c:
core/tee/tee_fs_rpc.c: In function ‘operation_open_dfh’:
core/tee/tee_fs_rpc.c:49:2: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
struct tee_fs_rpc_operation op = {
^~~~~~
core/tee/tee_fs_rpc.c: In function ‘tee_fs_rpc_remove_dfh’:
core/tee/tee_fs_rpc.c:192:2: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
struct tee_fs_rpc_operation op = {
^~~~~~

Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

show more ...

core: Fix warnings in core/tee/tee_svc_cryp.c

Fixes -Wdeclaration-after-statement warnings in core/tee/tee_svc_cryp.c:
core/tee/tee_svc_cryp.c: In function ‘syscall_cryp_obj_populate’:
core/tee/tee_

core: Fix warnings in core/tee/tee_svc_cryp.c

Fixes -Wdeclaration-after-statement warnings in core/tee/tee_svc_cryp.c:
core/tee/tee_svc_cryp.c: In function ‘syscall_cryp_obj_populate’:
core/tee/tee_svc_cryp.c:1665:2: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
size_t alloc_size = 0;
^~~~~~
core/tee/tee_svc_cryp.c: In function ‘syscall_obj_generate_key’:
core/tee/tee_svc_cryp.c:1907:2: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
size_t alloc_size = 0;
^~~~~~
core/tee/tee_svc_cryp.c: In function ‘syscall_cryp_derive_key’:
core/tee/tee_svc_cryp.c:2975:3: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
size_t bin_size = params[0].content.ref.length;
^~~~~~
core/tee/tee_svc_cryp.c: In function ‘syscall_asymm_operate’:
core/tee/tee_svc_cryp.c:3560:2: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
size_t alloc_size = 0;
^~~~~~
core/tee/tee_svc_cryp.c: In function ‘syscall_asymm_verify’:
core/tee/tee_svc_cryp.c:3734:2: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
size_t alloc_size = 0;
^~~~~~

Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

show more ...

core: Fix warning in register_shm()

Fixes a -Wdeclaration-after-statement warning in register_shm():
core/tee/entry_std.c:491:2: error: ISO C90 forbids mixed declarations and code [-Werror=declarati

core: Fix warning in register_shm()

Fixes a -Wdeclaration-after-statement warning in register_shm():
core/tee/entry_std.c:491:2: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
struct optee_msg_param_tmem *tmem = &arg->params[0].u.tmem;
^~~~~~

Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

show more ...

core: Fix warning in __wq_rpc()

Fixes a -Wdeclaration-after-statement warning in __wq_rpc():
core/kernel/wait_queue.c:36:2: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-af

core: Fix warning in __wq_rpc()

Fixes a -Wdeclaration-after-statement warning in __wq_rpc():
core/kernel/wait_queue.c:36:2: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
struct thread_param params = THREAD_PARAM_VALUE(IN, func, id, 0);
^~~~~~

Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

show more ...

core: Fix warning in find_chosen_node()

Fixes a -Wdeclaration-after-statement warning in find_chosen_node():
core/kernel/console.c:48:2: error: ISO C90 forbids mixed declarations and code [-Werror=d

core: Fix warning in find_chosen_node()

Fixes a -Wdeclaration-after-statement warning in find_chosen_node():
core/kernel/console.c:48:2: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
int offset = fdt_path_offset(fdt, "/secure-chosen");
^~~

Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

show more ...

core: Fix warning in mobj_reg_shm_inc_map()

Fixes a -Wdeclaration-after-statement warning in mobj_reg_shm_inc_map()
core/arch/arm/mm/mobj_dyn_shm.c: In function ‘mobj_reg_shm_inc_map’:
core/arch/arm

core: Fix warning in mobj_reg_shm_inc_map()

Fixes a -Wdeclaration-after-statement warning in mobj_reg_shm_inc_map()
core/arch/arm/mm/mobj_dyn_shm.c: In function ‘mobj_reg_shm_inc_map’:
core/arch/arm/mm/mobj_dyn_shm.c:188:2: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
uint32_t exceptions = cpu_spin_lock_xsave(&reg_shm_map_lock);
^~~~~~~~

Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

show more ...

core: fix warning in tee_time_get_ree_time()

Fixes a -Wdeclaration-after-statement warning in tee_time_get_ree_time():
core/arch/arm/kernel/tee_time.c: In function ‘tee_time_get_ree_time’:
core/arch

core: fix warning in tee_time_get_ree_time()

Fixes a -Wdeclaration-after-statement warning in tee_time_get_ree_time():
core/arch/arm/kernel/tee_time.c: In function ‘tee_time_get_ree_time’:
core/arch/arm/kernel/tee_time.c:58:2: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
struct thread_param params = THREAD_PARAM_VALUE(OUT, 0, 0, 0);

Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

show more ...

libutee: Fix warning in TEE_BigIntInvMod()

Fixes a -Wdeclaration-after-statement warning in TEE_BigIntInvMod:
lib/libutee/tee_api_arith_mpi.c: In function ‘TEE_BigIntInvMod’:
lib/libutee/tee_api_ari

libutee: Fix warning in TEE_BigIntInvMod()

Fixes a -Wdeclaration-after-statement warning in TEE_BigIntInvMod:
lib/libutee/tee_api_arith_mpi.c: In function ‘TEE_BigIntInvMod’:
lib/libutee/tee_api_arith_mpi.c:539:2: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
mbedtls_mpi mpi_dest;
^~~~~~~~~~~

Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

show more ...

libutee: Fix warning in bigint_binary_mod()

Fixes a -Wdeclaration-after-statement warning in bigint_binary_mod:
lib/libutee/tee_api_arith_mpi.c: In function ‘bigint_binary_mod’:
lib/libutee/tee_api_

libutee: Fix warning in bigint_binary_mod()

Fixes a -Wdeclaration-after-statement warning in bigint_binary_mod:
lib/libutee/tee_api_arith_mpi.c: In function ‘bigint_binary_mod’:
lib/libutee/tee_api_arith_mpi.c:358:2: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
mbedtls_mpi mpi_dest;
^~~~~~~~~~~
lib/libutee/tee_api_arith_mpi.c: In function ‘TEE_BigIntInvMod’:
lib/libutee/tee_api_arith_mpi.c:539:2: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
mbedtls_mpi mpi_dest;

Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

show more ...

libtomcrypt: disable -Wdeclaration-after-statement

Disables -Wdeclaration-after-statement when compiling the libtomcrypt
library in order to avoid that kind of warnings from upstream code.

Reviewed

libtomcrypt: disable -Wdeclaration-after-statement

Disables -Wdeclaration-after-statement when compiling the libtomcrypt
library in order to avoid that kind of warnings from upstream code.

Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

show more ...

libmbedtls: disable -Wdeclaration-after-statement

Disabled -Wdeclaration-after-statement when compiling the mbedtls
library in order to avoid that kind of warnings from upstream code.

Reviewed-by:

libmbedtls: disable -Wdeclaration-after-statement

Disabled -Wdeclaration-after-statement when compiling the mbedtls
library in order to avoid that kind of warnings from upstream code.

Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

show more ...

plat-rzn1: Add Cortex-M3 start

The RZ/N1 platform contains a Cortex-M3 in addition to dual A7 cores.

Add CFG_BOOT_CM3 flat (default=y) to start the Cortex-M3 unit.

Signed-off-by: Ralph Siemsen <ra

plat-rzn1: Add Cortex-M3 start

The RZ/N1 platform contains a Cortex-M3 in addition to dual A7 cores.

Add CFG_BOOT_CM3 flat (default=y) to start the Cortex-M3 unit.

Signed-off-by: Ralph Siemsen <ralph.siemsen@linaro.org>
Acked-by: Jerome Forissier <jerome@forissier.org>
Reviewed-by: Sumit Garg <sumit.garg@linaro.org>
Acked-by: Etienne Carriere <etienne.carriere@linaro.org>

show more ...

plat-rzn1: fix unmasked register writes

When writing all 32 bits of a register, there is no need for iomask_32
which performs a read-modify-write operation. Not only is it faster, but
certain hardwa

plat-rzn1: fix unmasked register writes

When writing all 32 bits of a register, there is no need for iomask_32
which performs a read-modify-write operation. Not only is it faster, but
certain hardware registers are write-only or have side effects on read.

Using iomask_32 was found to cause the following issues on RZ/N1:
- accessing the I2C EEPROM gives timeout errors on read
- serial console drops characters on input (eg. when pasting)
Switching to io_write32 for non-masked writes fixes the issues.

Fixes: f1cf4b79 ("Add support for Renesas RZ/N1 platform")
Signed-off-by: Ralph Siemsen <ralph.siemsen@linaro.org>
Acked-by: Jerome Forissier <jerome@forissier.org>
Reviewed-by: Sumit Garg <sumit.garg@linaro.org>
Acked-by: Etienne Carriere <etienne.carriere@linaro.org>

show more ...

core: ltc: always define LTC_DER

tomcrypt_private.h uses ltc_asn1_list which is defined in tomcrypt_pk.h
only when LTC_DER is defined. Since tomcrypt_private.h is included
unconditionally in some fi

core: ltc: always define LTC_DER

tomcrypt_private.h uses ltc_asn1_list which is defined in tomcrypt_pk.h
only when LTC_DER is defined. Since tomcrypt_private.h is included
unconditionally in some files such as core/lib/libtomcrypt/tomcrypt.c
it needs to compile with no error. Therefore add -DLTC_DER.

Fixes the following error:

$ make CFG_CRYPTO=n CFG_REE_FS=n
...
CC out/arm-plat-vexpress/core/lib/libtomcrypt/tomcrypt.o
In file included from core/lib/libtomcrypt/tomcrypt.c:9:
core/lib/libtomcrypt/src/headers/tomcrypt_private.h:64:4: error: unknown type name ‘ltc_asn1_list’
64 | ltc_asn1_list *enc_data;
| ^~~~~~~~~~~~~
...

Signed-off-by: Jerome Forissier <jerome@forissier.org>
Acked-by: Jens Wiklander <jens.wiklander@linaro.org>
Acked-by: Etienne Carriere <etienne.carriere@linaro.org>

show more ...